diff --git a/src/routers/auth.py b/src/routers/auth.py index 66e81d8..9d1dee6 100644 --- a/src/routers/auth.py +++ b/src/routers/auth.py @@ -95,7 +95,7 @@ async def request_magic_link( await db.commit() # E-Mail senden - link = f"{MAGIC_LINK_BASE_URL}/auth/verify?token={token}" + link = f"{MAGIC_LINK_BASE_URL}/?token={token}" subject, html = magic_link_login_email(user["username"], code, link) await send_email(email, subject, html) diff --git a/src/routers/incidents.py b/src/routers/incidents.py index e1a17c6..52770e5 100644 --- a/src/routers/incidents.py +++ b/src/routers/incidents.py @@ -320,6 +320,50 @@ async def get_locations( return list(loc_map.values()) +@router.post("/{incident_id}/geoparse") +async def trigger_geoparse( + incident_id: int, + current_user: dict = Depends(get_current_user), + db: aiosqlite.Connection = Depends(db_dependency), +): + """Geoparsing fuer alle Artikel einer Lage nachholen (bestehende Orte werden uebersprungen).""" + tenant_id = current_user.get("tenant_id") + await _check_incident_access(db, incident_id, current_user["id"], tenant_id) + + # Artikel laden, die noch keine Locations haben + cursor = await db.execute( + """SELECT a.* FROM articles a + WHERE a.incident_id = ? + AND a.id NOT IN (SELECT DISTINCT article_id FROM article_locations WHERE incident_id = ?)""", + (incident_id, incident_id), + ) + articles = [dict(row) for row in await cursor.fetchall()] + + if not articles: + return {"message": "Alle Artikel wurden bereits geoparsed", "new_locations": 0} + + try: + from agents.geoparsing import geoparse_articles + geo_results = await geoparse_articles(articles) + geo_count = 0 + for art_id, locations in geo_results.items(): + for loc in locations: + await db.execute( + """INSERT INTO article_locations + (article_id, incident_id, location_name, location_name_normalized, + country_code, latitude, longitude, confidence, source_text, tenant_id) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""", + (art_id, incident_id, loc["location_name"], loc["location_name_normalized"], + loc["country_code"], loc["lat"], loc["lon"], loc["confidence"], + loc.get("source_text", ""), tenant_id), + ) + geo_count += 1 + await db.commit() + return {"message": f"{geo_count} Orte aus {len(geo_results)} Artikeln extrahiert", "new_locations": geo_count} + except Exception as e: + raise HTTPException(status_code=500, detail=f"Geoparsing fehlgeschlagen: {str(e)}") + + @router.get("/{incident_id}/refresh-log") async def get_refresh_log( incident_id: int, diff --git a/src/static/dashboard.html b/src/static/dashboard.html index 6e17913..f37f117 100644 --- a/src/static/dashboard.html +++ b/src/static/dashboard.html @@ -16,7 +16,7 @@ - + @@ -76,7 +76,7 @@ Archiv -
+
@@ -266,6 +266,7 @@
Geografische Verteilung
+
Keine Orte erkannt
@@ -559,10 +560,10 @@ - - - - - + + + + + diff --git a/src/static/js/api.js b/src/static/js/api.js index e20b5b8..0a2abde 100644 --- a/src/static/js/api.js +++ b/src/static/js/api.js @@ -106,6 +106,10 @@ const API = { return this._request('GET', `/incidents/${incidentId}/locations`); }, + triggerGeoparse(incidentId) { + return this._request('POST', `/incidents/${incidentId}/geoparse`); + }, + refreshIncident(id) { return this._request('POST', `/incidents/${id}/refresh`); }, diff --git a/src/static/js/app.js b/src/static/js/app.js index 8f582f6..59a9427 100644 --- a/src/static/js/app.js +++ b/src/static/js/app.js @@ -461,8 +461,15 @@ const App = { document.getElementById('fb-char-count').textContent = e.target.value.length.toLocaleString('de-DE'); }); + // Sidebar-Chevrons initial auf offen setzen (Archiv geschlossen) + document.querySelectorAll('.sidebar-chevron').forEach(c => c.classList.add('open')); + document.getElementById('chevron-archived-incidents').classList.remove('open'); + + // Lagen laden (frueh, damit Sidebar sofort sichtbar) + await this.loadIncidents(); + // Notification-Center initialisieren - await NotificationCenter.init(); + try { await NotificationCenter.init(); } catch (e) { console.warn('NotificationCenter:', e); } // WebSocket WS.connect(); @@ -472,14 +479,6 @@ const App = { WS.on('refresh_error', (msg) => this.handleRefreshError(msg)); WS.on('refresh_cancelled', (msg) => this.handleRefreshCancelled(msg)); - // Sidebar-Chevrons initial auf offen setzen (Archiv geschlossen) - document.querySelectorAll('.sidebar-chevron').forEach(c => c.classList.add('open')); - document.getElementById('archived-incidents').style.display = 'none'; - document.getElementById('chevron-archived-incidents').classList.remove('open'); - - // Lagen laden - await this.loadIncidents(); - // Laufende Refreshes wiederherstellen try { const data = await API.getRefreshingIncidents(); @@ -1430,6 +1429,24 @@ const App = { } }, + async triggerGeoparse() { + if (!this.currentIncidentId) return; + const btn = document.getElementById('geoparse-btn'); + if (btn) { btn.disabled = true; btn.textContent = 'Erkennung...'; } + try { + const result = await API.triggerGeoparse(this.currentIncidentId); + UI.showToast(result.message, result.new_locations > 0 ? 'success' : 'info'); + if (result.new_locations > 0) { + const locations = await API.getLocations(this.currentIncidentId).catch(() => []); + UI.renderMap(locations); + } + } catch (err) { + UI.showToast('Geoparsing fehlgeschlagen: ' + err.message, 'error'); + } finally { + if (btn) { btn.disabled = false; btn.textContent = 'Orte erkennen'; } + } + }, + _formatInterval(minutes) { if (minutes >= 10080 && minutes % 10080 === 0) { const w = minutes / 10080;