Compare commits

..

1 commit

Author SHA1 Message Date
Dennis Priskorn
c709372d88 chore: requirements.txt: Add pinned versions 2024-08-28 09:51:11 +02:00
4 changed files with 15 additions and 54 deletions

View file

@ -1,35 +0,0 @@
#!/usr/bin/python3
from sqlalchemy.schema import CreateIndex, CreateTable
from matcher import database, model
DB_URL = "postgresql:///matcher"
database.init_db(DB_URL)
def create_db():
model.Base.metadata.create_all(database.session.get_bind())
def print_create_table(classes):
database.init_db(DB_URL)
engine = database.session.get_bind()
for cls in classes:
sql = str(CreateTable(cls.__table__).compile(engine))
print(sql.strip() + ";")
for index in cls.__table__.indexes:
sql = str(CreateIndex(index).compile(engine))
print(sql.strip() + ";")
# print_create_table([model.ItemIsA])
# print_create_table([model.EditSession])
# print_create_table([model.Changeset, model.ChangesetEdit, model.SkipIsA])
# print_create_table([model.User])
# print_create_table([model.Extract])
create_db()

View file

@ -31,8 +31,6 @@ def lookup_with_params(**kwargs: str) -> list[Hit]:
r = requests.get(url, params=params, headers=user_agent_headers()) r = requests.get(url, params=params, headers=user_agent_headers())
if r.status_code == 500: if r.status_code == 500:
raise SearchError raise SearchError
if r.status_code == 403:
raise SearchError("Nominatim returned 403 Forbidden")
try: try:
reply: list[Hit] = json.loads(r.text, object_pairs_hook=OrderedDict) reply: list[Hit] = json.loads(r.text, object_pairs_hook=OrderedDict)

View file

@ -1,13 +1,14 @@
flask flask==3.0.3
-e git+https://github.com/maxcountryman/flask-login.git#egg=Flask-Login -e git+https://github.com/maxcountryman/flask-login.git@26d12eaa99a18fc91e662ef0c8466245b8865c1c#egg=Flask-Login
GeoIP GeoIP==1.3.2
lxml lxml==5.3.0
maxminddb maxminddb==2.6.2
requests requests==2.32.3
sqlalchemy sqlalchemy==2.0.32
requests_oauthlib requests_oauthlib==2.0.0
geoalchemy2 geoalchemy2==0.15.2
simplejson simplejson==3.19.3
user_agents user_agents==2.2.0
num2words num2words==0.5.13
psycopg2 psycopg2==2.9.9

View file

@ -653,10 +653,7 @@ def api_missing_wikidata_items():
@app.route("/api/1/search") @app.route("/api/1/search")
def api_search(): def api_search():
q = flask.request.args["q"] q = flask.request.args["q"]
try:
hits = nominatim.lookup(q) hits = nominatim.lookup(q)
except nominatim.SearchError as e:
return cors_jsonify({"success": False, "error": str(e)}, 503)
for hit in hits: for hit in hits:
hit["name"] = nominatim.get_hit_name(hit) hit["name"] = nominatim.get_hit_name(hit)
hit["label"] = nominatim.get_hit_label(hit) hit["label"] = nominatim.get_hit_label(hit)