dpriskorn/owl-map
1
0
Fork 0
forked from edward/owl-map
Code Pull requests Activity

Use session instead of database.session in update.py

Browse source
This commit is contained in:
Edward Betts 2023-11-02 07:46:36 +00:00
parent eaca7a93bc
commit f0677e2468
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
update.py
View file

@ -6,10 +6,11 @@ import json
import typing import typing
from time import sleep from time import sleep
from matcher import database, model, wikidata, wikidata_api from matcher import model, wikidata, wikidata_api
from matcher.database import init_db, session
DB_URL = "postgresql:///matcher" DB_URL = "postgresql:///matcher"
database.init_db(DB_URL) init_db(DB_URL)
entity_keys = {"labels", "sitelinks", "aliases", "claims", "descriptions", "lastrevid"} entity_keys = {"labels", "sitelinks", "aliases", "claims", "descriptions", "lastrevid"}
@ -59,7 +60,7 @@ def handle_new(change: Change) -> None:
print(entity.keys()) print(entity.keys())
raise raise
item.locations = model.location_objects(coords) item.locations = model.location_objects(coords)
database.session.add(item) session.add(item)
def coords_equal(a: dict[str, typing.Any], b: dict[str, typing.Any]) -> bool: def coords_equal(a: dict[str, typing.Any], b: dict[str, typing.Any]) -> bool:
@ -84,8 +85,8 @@ def handle_edit(change: Change) -> None:
entity_qid = entity.pop("id") entity_qid = entity.pop("id")
if entity_qid != qid: if entity_qid != qid:
print(f"{ts}: item {qid} replaced with redirect") print(f"{ts}: item {qid} replaced with redirect")
database.session.delete(item) session.delete(item)
database.session.commit() session.commit()
return return
assert entity_qid == qid assert entity_qid == qid
@ -101,7 +102,7 @@ def handle_edit(change: Change) -> None:
print(f"{ts}: update item {qid}, no change to coordinates") print(f"{ts}: update item {qid}, no change to coordinates")
for key in entity_keys: for key in entity_keys:
setattr(item, key, entity[key]) setattr(item, key, entity[key]) # type: ignore
def update_timestamp(timestamp: str) -> None: def update_timestamp(timestamp: str) -> None:
@ -138,13 +139,13 @@ def update_database() -> None:
update_timestamp(timestamp) update_timestamp(timestamp)
print("commit") print("commit")
database.session.commit() session.commit()
if "continue" not in reply: if "continue" not in reply:
break break
rccontinue = reply["continue"]["rccontinue"] rccontinue = reply["continue"]["rccontinue"]
database.session.commit() session.commit()
print("finished") print("finished")