AegisSight/AegisSight-Monitor
3
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

globe-feed komplett neu geschrieben (unhashable dict Fix)

Quellcode durchsuchen 
Saubere Implementierung mit set() fuer Artikel-Deduplizierung.
54 Features mit ortsspezifischen Artikeln fuer Lage 45.
Dieser Commit ist enthalten in:
Claude Dev
2026-03-24 14:47:28 +01:00
Ursprung 8a520389c5
Commit 5789cc1706
1 geänderte Dateien mit 51 neuen und 70 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

121
src/routers/public_api.py
Datei anzeigen

@@ -247,20 +247,19 @@ async def get_globe_feed(
incident_id: int = None, incident_id: int = None,
db=Depends(db_dependency), db=Depends(db_dependency),
): ):
"""Globe-Feed: Locations + Artikel + Summary fuer beliebige Lage(n) als GeoJSON.""" """Globe-Feed: Geoparsete Standorte mit Artikeln pro Ort."""
import json as _json import json as _json
# Wenn keine ID: alle oeffentlichen Lagen
if incident_id: if incident_id:
cursor = await db.execute( cursor = await db.execute(
"SELECT id, title, description, summary, updated_at, type, status, category_labels " "SELECT id, title, description, summary, updated_at, type, status, category_labels "
"FROM incidents WHERE id = ? AND status != 'deleted'", (incident_id,) "FROM incidents WHERE id = ?", (incident_id,)
) )
else: else:
cursor = await db.execute( cursor = await db.execute(
"SELECT id, title, description, summary, updated_at, type, status, category_labels " "SELECT id, title, description, summary, updated_at, type, status, category_labels "
"FROM incidents WHERE visibility = 'public' AND status IN ('active','archived') " "FROM incidents WHERE visibility = 'public' AND status = 'active' AND type = 'adhoc' "
"ORDER BY updated_at DESC LIMIT 20" "ORDER BY updated_at DESC LIMIT 10"
) )
incidents = [dict(r) for r in await cursor.fetchall()] incidents = [dict(r) for r in await cursor.fetchall()]
if not incidents: if not incidents:
@@ -269,96 +268,77 @@ async def get_globe_feed(
inc_ids = [i["id"] for i in incidents] inc_ids = [i["id"] for i in incidents]
ids_sql = ",".join(str(i) for i in inc_ids) ids_sql = ",".join(str(i) for i in inc_ids)
# Locations mit vollstaendigen Artikel-Details # Alle Locations mit Artikel-IDs holen
cursor = await db.execute( cursor = await db.execute(
f"""SELECT f"""SELECT al.location_name_normalized as name,
al.location_name_normalized as name, ROUND(al.latitude, 4) as lat, ROUND(al.longitude, 4) as lon,
ROUND(al.latitude, 4) as lat, al.country_code, al.category, al.incident_id, al.article_id
ROUND(al.longitude, 4) as lon, FROM article_locations al
al.country_code, WHERE al.incident_id IN ({ids_sql})"""
al.category,
al.incident_id,
al.article_id
FROM article_locations al
WHERE al.incident_id IN ({ids_sql})
ORDER BY al.location_name_normalized"""
) )
loc_rows = [dict(r) for r in await cursor.fetchall()] loc_rows = [dict(r) for r in await cursor.fetchall()]
# Artikel-IDs sammeln # Alle referenzierten Artikel laden
all_article_ids = list(set(r["article_id"] for r in loc_rows if r.get("article_id"))) art_ids = list(set(r["article_id"] for r in loc_rows if r.get("article_id")))
articles_by_id = {}
# Artikel laden if art_ids:
articles_map = {{}} for chunk_start in range(0, len(art_ids), 500):
if all_article_ids: chunk = art_ids[chunk_start:chunk_start+500]
aids_sql = ",".join(str(a) for a in all_article_ids[:1000]) aids = ",".join(str(a) for a in chunk)
cursor = await db.execute( cursor = await db.execute(
f"""SELECT id, headline_de, headline, source, source_url, content_de, f"SELECT id, headline_de, headline, source, source_url, content_de, "
published_at, collected_at f"published_at, collected_at FROM articles WHERE id IN ({aids})"
FROM articles WHERE id IN ({{aids_sql}})""" )
) for a in await cursor.fetchall():
for a in await cursor.fetchall(): a = dict(a)
a = dict(a) articles_by_id[a["id"]] = a
articles_map[a["id"]] = a
# Nach Ort gruppieren # Nach Ort gruppieren
from collections import defaultdict loc_map = {}
loc_groups = defaultdict(lambda: {{"articles": [], "lat": 0, "lon": 0, "country": "", "category": "", "incident_id": 0}})
for r in loc_rows: for r in loc_rows:
key = r["name"] or "unknown" key = (r["name"] or "unknown", r["incident_id"])
g = loc_groups[key] if key not in loc_map:
g["lat"] = r["lat"] loc_map[key] = {
g["lon"] = r["lon"] "lat": r["lat"], "lon": r["lon"], "country": r["country_code"],
g["country"] = r["country_code"] "category": r["category"], "incident_id": r["incident_id"],
g["category"] = r["category"] "seen_ids": set(), "articles": [],
g["incident_id"] = r["incident_id"] }
if r.get("article_id") and r["article_id"] in articles_map: g = loc_map[key]
art = articles_map[r["article_id"]] aid = r.get("article_id")
if art not in g["articles"]: if aid and aid in articles_by_id and aid not in g["seen_ids"]:
g["articles"].append(art) g["seen_ids"].add(aid)
g["articles"].append(articles_by_id[aid])
# Als GeoJSON # GeoJSON bauen
features = [] features = []
for name, g in list(loc_groups.items())[:500]: for (name, inc_id), g in list(loc_map.items())[:500]:
inc = next((i for i in incidents if i["id"] == g["incident_id"]), None) inc = next((i for i in incidents if i["id"] == inc_id), None)
art_list = g["articles"][:5] features.append({
features.append({{
"type": "Feature", "type": "Feature",
"geometry": {{"type": "Point", "coordinates": [g["lon"], g["lat"]]}}, "geometry": {"type": "Point", "coordinates": [g["lon"], g["lat"]]},
"properties": {{ "properties": {
"name": name, "name": name,
"country": g["country"], "country": g["country"],
"category": g["category"], "category": g["category"],
"article_count": len(g["articles"]), "article_count": len(g["articles"]),
"incident_id": g["incident_id"], "incident_id": inc_id,
"incident_title": inc["title"] if inc else "", "incident_title": inc["title"] if inc else "",
"articles": [{{ "articles": [{
"headline": a.get("headline_de") or a.get("headline", ""), "headline": a.get("headline_de") or a.get("headline", ""),
"source": a.get("source", ""), "source": a.get("source", ""),
"url": a.get("source_url", ""), "url": a.get("source_url", ""),
"summary": (a.get("content_de") or "")[:300], "summary": (a.get("content_de") or "")[:300],
"date": a.get("published_at") or a.get("collected_at", ""), "date": a.get("published_at") or a.get("collected_at", ""),
}} for a in art_list], } for a in g["articles"][:5]],
}}, },
}}) })
# Incident-Summaries
inc_summaries = [] inc_summaries = []
for i in incidents: for i in incidents:
cat_labels = None
if i.get("category_labels"):
try:
cat_labels = _json.loads(i["category_labels"])
except Exception:
pass
inc_summaries.append({ inc_summaries.append({
"id": i["id"], "id": i["id"], "title": i["title"], "type": i["type"],
"title": i["title"], "status": i["status"], "summary": (i.get("summary") or "")[:1000],
"type": i["type"],
"status": i["status"],
"summary": (i.get("summary") or "")[:1000],
"updated_at": i["updated_at"], "updated_at": i["updated_at"],
"category_labels": cat_labels,
}) })
return { return {
@@ -368,6 +348,7 @@ async def get_globe_feed(
"generated_at": datetime.now(TIMEZONE).isoformat(), "generated_at": datetime.now(TIMEZONE).isoformat(),
} }
@router.get("/lagebild/snapshot/{snapshot_id}", dependencies=[Depends(verify_api_key)]) @router.get("/lagebild/snapshot/{snapshot_id}", dependencies=[Depends(verify_api_key)])
async def get_snapshot(snapshot_id: int, db=Depends(db_dependency)): async def get_snapshot(snapshot_id: int, db=Depends(db_dependency)):
"""Liefert einen historischen Snapshot.""" """Liefert einen historischen Snapshot."""