Commits vergleichen
45 Commits
pre-incide
...
b3bc96c580
| Autor | SHA1 | Datum | |
|---|---|---|---|
| b3bc96c580 | |||
| c9bd6310ae | |||
| 392028a9aa | |||
| 7b5adccf2b | |||
| 059a9a2dc7 | |||
| 3a346ba2ec | |||
| dc75b89618 | |||
| 2b51e49d0d | |||
|
|
e3fe7fac85 | ||
| 44de6616f1 | |||
|
|
88b18d0775 | ||
| bfa4d5fd78 | |||
|
|
682828ea58 | ||
| c57ac6c6d8 | |||
| ac5160010d | |||
|
|
059395393c | ||
|
|
14d1062583 | ||
|
|
2ee90a4b3b | ||
| d9e5733cfb | |||
| d1f88c9e9f | |||
|
|
ad53786a24 | ||
| 9574308c29 | |||
| a9806a586b | |||
|
|
2aaa51e2a8 | ||
|
|
2df37cb617 | ||
|
|
5473ba3ed7 | ||
|
|
8042639d20 | ||
|
|
ec53ab27cd | ||
|
|
c73541cdbe | ||
|
|
5d5ec7c924 | ||
|
|
e8ac0d0c50 | ||
|
|
c8a8e10020 | ||
|
|
a579e2c275 | ||
|
|
efae707fa9 | ||
|
|
05b60ffb35 | ||
|
|
60b8646fe4 | ||
|
|
285df86c7b | ||
|
|
5add8d9d59 | ||
|
|
949df868ff | ||
|
|
9293e66d01 | ||
|
|
c0f68e40a5 | ||
| 0d6ad8ea90 | |||
| a302790777 | |||
| 9a43dffa6c | |||
| 194790899c |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,3 +4,4 @@ __pycache__/
|
||||
logs/
|
||||
data/
|
||||
.venv/
|
||||
data
|
||||
|
||||
125
CLAUDE.md
125
CLAUDE.md
@@ -220,3 +220,128 @@ Changelog-Kategorien in TaskMate:
|
||||
- 34 = Changelog Verwaltung
|
||||
- 35 = Changelog Website
|
||||
- 36 = Changelog TaskMate
|
||||
|
||||
## Staging-Umgebung
|
||||
|
||||
```yaml
|
||||
staging:
|
||||
url: https://staging.monitor.aegis-sight.de
|
||||
server: 46.225.141.13 (gleicher Host wie Live)
|
||||
pfad: /home/claude-dev/AegisSight-Monitor-staging
|
||||
branch: develop
|
||||
port: 18891 (Live: 8891)
|
||||
service: aegis-monitor-staging.service (systemd)
|
||||
venv: /home/claude-dev/AegisSight-Monitor-staging/venv (eigenes venv)
|
||||
zugriff: Magic-Link-Login an info@aegis-sight.de (Cookie 30 Tage)
|
||||
|
||||
datenbank:
|
||||
pfad: ~/AegisSight-Monitor-staging/data/osint.db
|
||||
initial: einmalige Kopie der Live-DB
|
||||
drift: gewollt - Aenderungen in Staging beeinflussen Live nicht
|
||||
reseed_von_live: |
|
||||
sudo systemctl stop aegis-monitor-staging
|
||||
cp ~/AegisSight-Monitor/data/osint.db ~/AegisSight-Monitor-staging/data/osint.db
|
||||
sudo systemctl start aegis-monitor-staging
|
||||
|
||||
besonderheiten_env:
|
||||
JWT_SECRET: eigener fuer Staging (nicht Live-JWT)
|
||||
MAGIC_LINK_BASE_URL: https://staging.monitor.aegis-sight.de (sonst leitet App zu Live)
|
||||
TELEGRAM_API_ID: 0 # deaktiviert - verhindert Doppel-Login mit Live
|
||||
TELEGRAM_API_HASH: 0
|
||||
DB-Pfad: relative aus config.py (nutzt automatisch ~/AegisSight-Monitor-staging/data/)
|
||||
|
||||
auth_service:
|
||||
pfad: /opt/aegis-staging-auth
|
||||
service: aegis-monitor-staging-auth.service
|
||||
port: 127.0.0.1:8095
|
||||
cookie_domain: staging.monitor.aegis-sight.de
|
||||
cookie_name: aegis_monitor_staging_auth
|
||||
code_quelle: identisch zum Service auf 46.225.225.49 (eigene Konfig)
|
||||
```
|
||||
|
||||
### Workflow Staging -> Live
|
||||
|
||||
1. **Aenderung in develop machen** (im Staging-Verzeichnis):
|
||||
```bash
|
||||
cd ~/AegisSight-Monitor-staging
|
||||
git checkout develop
|
||||
# Aenderung
|
||||
git add . && git commit -m ... && git push origin develop
|
||||
```
|
||||
|
||||
2. **Staging aktualisieren** (aktuell manuell):
|
||||
```bash
|
||||
ssh claude-dev@46.225.141.13 'cd ~/AegisSight-Monitor-staging && git pull && sudo systemctl restart aegis-monitor-staging'
|
||||
```
|
||||
|
||||
3. **In https://staging.monitor.aegis-sight.de testen**
|
||||
|
||||
4. **Promote zu Live**: Pull Request develop -> main in Gitea, dann:
|
||||
```bash
|
||||
ssh claude-dev@46.225.141.13 'cd ~/AegisSight-Monitor && git pull'
|
||||
# Live laeuft als loser uvicorn-Prozess (kein systemd) - manueller Restart
|
||||
# bei Backend-Aenderungen noetig
|
||||
```
|
||||
|
||||
### Offen (noch nicht implementiert)
|
||||
|
||||
- Auto-Deploy bei Push auf develop (Webhook-Listener)
|
||||
- Promote-UI mit Ein-Klick-Button
|
||||
- Live-Monitor auf systemd umstellen (~10s Downtime einmalig)
|
||||
|
||||
## Auto-Deploy + Promote-UI
|
||||
|
||||
```yaml
|
||||
auto_deploy:
|
||||
listener_service:
|
||||
pfad: /opt/aegis-staging-deploy
|
||||
service: aegis-staging-deploy.service
|
||||
port: 127.0.0.1:8096
|
||||
deployments:
|
||||
staging: develop -> ~/AegisSight-Monitor-staging (restartet aegis-monitor-staging)
|
||||
live: main -> ~/AegisSight-Monitor (restartet aegis-monitor)
|
||||
endpoints:
|
||||
"POST /__deploy": staging via Gitea-Webhook (HMAC)
|
||||
"POST /__deploy/live": live via Promote-UI (HMAC)
|
||||
secrets: /opt/aegis-staging-deploy/.env (nicht im Repo)
|
||||
|
||||
gitea_webhook:
|
||||
repo: AegisSight/AegisSight-Monitor
|
||||
url: https://staging.monitor.aegis-sight.de/__deploy
|
||||
branch_filter: develop
|
||||
|
||||
live_systemd:
|
||||
service: aegis-monitor.service
|
||||
hinweis: |
|
||||
Live-Monitor laeuft seit 2026-04-26 als systemd-Service (vorher loser
|
||||
uvicorn-Prozess). Manueller Restart bei Backend-Aenderungen:
|
||||
sudo systemctl restart aegis-monitor
|
||||
Beim Promote via UI passiert das automatisch.
|
||||
|
||||
promote_ui:
|
||||
url: https://deploy.aegis-sight.de
|
||||
laeuft_auf: 46.225.225.49 (zentral fuer alle Services)
|
||||
zugriff: Magic-Link-Login an info@aegis-sight.de
|
||||
funktion: |
|
||||
Live- vs. Staging-Stand pro Service inkl. Liste der ausstehenden Commits.
|
||||
Promote-Knopf -> Gitea-PR develop->main wird auto-gemerged + Live-Listener
|
||||
pullt main + restartet aegis-monitor.
|
||||
```
|
||||
|
||||
### Vollstaendiger Workflow (Aenderung am Monitor)
|
||||
|
||||
1. **Entwickeln in develop**:
|
||||
```bash
|
||||
cd ~/AegisSight-Monitor-staging
|
||||
git checkout develop
|
||||
# Aenderung
|
||||
git add . && git commit -m "..." && git push origin develop
|
||||
# Auto-Deploy pullt automatisch + restartet aegis-monitor-staging
|
||||
```
|
||||
|
||||
2. **Auf https://staging.monitor.aegis-sight.de pruefen**
|
||||
|
||||
3. **Promoten via https://deploy.aegis-sight.de** (Klick auf Monitor-Karte)
|
||||
→ Gitea merged develop→main → Listener pullt main → `systemctl restart aegis-monitor`
|
||||
|
||||
4. **Live-Check auf https://monitor.aegis-sight.de**
|
||||
|
||||
56
RELEASES.json
Normale Datei
56
RELEASES.json
Normale Datei
@@ -0,0 +1,56 @@
|
||||
[
|
||||
{
|
||||
"version": "2026-04-30T23:12Z",
|
||||
"date": "2026-04-30",
|
||||
"title": "Hintergrundbild-Unschärfe zuverlässiger und vollständiger",
|
||||
"items": [
|
||||
"Der Weichzeichner-Effekt wird jetzt stabiler angezeigt und aktualisiert sich korrekt",
|
||||
"Der Header-Bereich wird nun ebenfalls korrekt mit dem Unschärfe-Effekt versehen"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026-04-29T22:30Z",
|
||||
"date": "2026-04-29",
|
||||
"title": "Update-Meldungen folgen Hell-/Dunkelmodus, korrekte Umlaute",
|
||||
"items": [
|
||||
"Banner und „Was ist neu?“-Modal nutzen jetzt die Theme-Variablen und passen sich automatisch dem aktiven Hell- oder Dunkelmodus an",
|
||||
"Ältere Release-Einträge mit ae/oe/ue-Schreibweise wurden auf korrekte Umlaute umgestellt"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026-04-29T20:10Z",
|
||||
"date": "2026-04-29",
|
||||
"title": "Blur versucht zu fixen",
|
||||
"items": [
|
||||
"war nix..."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026-04-26T21:10Z",
|
||||
"date": "2026-04-26",
|
||||
"title": "Update-Modal kommt jetzt auch beim ersten Besuch",
|
||||
"items": [
|
||||
"Beim ersten Login nach einer Aktualisierung erscheint die Was-ist-neu-Übersicht jetzt automatisch",
|
||||
"Für Kunden-Onboarding: erste Highlights werden direkt sichtbar"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026-04-26T20:40Z",
|
||||
"date": "2026-04-26",
|
||||
"title": "Updatenachricht bei Deployment",
|
||||
"items": [
|
||||
"Einrichtung Deployment für Updates",
|
||||
"Message im Monitor bei Update"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "5473ba3",
|
||||
"date": "2026-04-26",
|
||||
"title": "Update-System eingeführt",
|
||||
"items": [
|
||||
"Updates berühren ab jetzt nie mehr die Fälle oder Daten",
|
||||
"Beim Promote landet eine 'Was ist neu'-Info hier",
|
||||
"Strukturelle Trennung von Live- und Staging-Datenbank"
|
||||
]
|
||||
}
|
||||
]
|
||||
1
data
1
data
@@ -1 +0,0 @@
|
||||
/home/claude-dev/osint-data
|
||||
@@ -11,3 +11,4 @@ python-multipart
|
||||
aiosmtplib
|
||||
geonamescache>=2.0
|
||||
telethon
|
||||
pikepdf>=9.0
|
||||
|
||||
@@ -206,7 +206,7 @@ Antworte AUSSCHLIESSLICH als JSON-Objekt mit diesen Feldern:
|
||||
Antworte NUR mit dem JSON-Objekt. Keine Einleitung, keine Erklärung."""
|
||||
|
||||
|
||||
LATEST_DEVELOPMENTS_PROMPT_TEMPLATE = """Du pflegst eine Kachel "Neueste Entwicklungen" für eine Live-Monitoring-Lage.
|
||||
LATEST_DEVELOPMENTS_PROMPT_TEMPLATE = """Du erzeugst die Kachel "Neueste Entwicklungen" für eine Live-Monitoring-Lage.
|
||||
HEUTIGES DATUM: {today}
|
||||
AUSGABESPRACHE: {output_language}
|
||||
WICHTIG: Verwende IMMER echte UTF-8-Umlaute (ä, ö, ü, ß) — NIEMALS Umschreibungen (ae, oe, ue, ss).
|
||||
@@ -214,37 +214,60 @@ WICHTIG: Verwende IMMER echte UTF-8-Umlaute (ä, ö, ü, ß) — NIEMALS Umschre
|
||||
LAGE: {title}
|
||||
KONTEXT: {description}
|
||||
|
||||
BISHERIGE ENTWICKLUNGEN (chronologisch absteigend, neueste oben):
|
||||
{previous_developments}
|
||||
AKTUELLES LAGEBILD (autoritative inhaltliche Grundlage):
|
||||
{summary}
|
||||
|
||||
NEUE MELDUNGEN SEIT DEM LETZTEN UPDATE:
|
||||
{new_articles_text}
|
||||
BELEGENDE MELDUNGEN (chronologisch absteigend, neueste zuerst — nur hieraus dürfen Zeitstempel und Quellen-Klammern stammen):
|
||||
{articles_text}
|
||||
|
||||
AUFTRAG:
|
||||
Extrahiere aus den NEUEN Meldungen konkrete Ereignisse und aktualisiere die Liste. Fasse die bisherigen und neuen Ereignisse zu EINER Liste zusammen (max. 8 Bullets, neueste oben).
|
||||
Extrahiere aus dem LAGEBILD die wichtigsten jüngsten Ereignisse und stelle sie als chronologisch absteigende Bullet-Liste dar. Für jedes Bullet wählst du eine oder mehrere belegende Meldungen aus der obigen Liste und übernimmst deren Publikationsdatum als Zeitstempel.
|
||||
|
||||
REGELN:
|
||||
- Jedes Bullet = EIN konkretes Ereignis (1-2 Sätze, faktenbasiert). Keine Themen-Zusammenfassungen.
|
||||
- Jedes Bullet beginnt mit dem Zeitstempel der frühesten belegenden Quelle im Format "[DD.MM. HH:MM]".
|
||||
- Jedes Bullet ENDET mit einer Quellen-Klammer — ZWINGEND. Bullets ohne Klammer werden verworfen.
|
||||
- NEUE Bullets (aus den NEUEN MELDUNGEN): {{M<ID1>, M<ID2>}} mit den ganzzahligen IDs aus der "ID:"-Zeile der belegenden Meldung(en). Beispiele: {{M42}} oder {{M42, M17}}.
|
||||
- UEBERNOMMENE Bullets aus BISHERIGE ENTWICKLUNGEN: behalten ihre bestehende Klammer KOMPLETT UND UNVERAENDERT, inklusive des Pipe-Zeichens und der URL. Beispiel: {{Reuters|https://reuters.com/article, Rybar|https://t.me/rybar/123}}. NICHT in M-IDs umwandeln, NICHT die URL entfernen, NICHT umformatieren.
|
||||
- Wenn mehrere Meldungen dasselbe Ereignis belegen: EIN Bullet, Zeitstempel = frühester Zeitpunkt, ALLE IDs in der Klammer.
|
||||
- Bestehende Bullets aus BISHERIGE ENTWICKLUNGEN sinngemäß übernehmen, NICHT umformulieren. Nur entfernen, wenn sie durch neue Meldungen nachweislich überholt sind oder die 8-Bullet-Grenze überschritten wird (dann älteste fallen raus). Wenn einem uebernommenen Bullet die Quellen-Klammer fehlt (Altformat): Bullet VERWERFEN und nicht in die neue Liste uebernehmen.
|
||||
- Wenn eine Quelle eine erkennbare politische Ausrichtung hat (z.B. pro-russisch, staatsnah, rechtsextrem), im Bullet-Text erwähnen ("laut pro-russischem Telegram-Kanal Rybar...").
|
||||
- Neutral und sachlich — keine Wertungen oder Spekulationen.
|
||||
- KEINE Gedankenstriche (—, –) — stattdessen Kommas, Doppelpunkte oder neue Sätze.
|
||||
REGELN zur Auswahl der Bullets:
|
||||
- Ziel: 4 bis 6 Bullets. Wenn das Lagebild weniger tatsächlich AKTUELLE Ereignisse hergibt, dann lieber 3 ehrliche Bullets als 6 mit veralteten. Kein Auffüllen.
|
||||
- "AKTUELL" bedeutet: belegende Meldung ist spätestens ~7 Tage alt (relativ zu HEUTIGES DATUM). Ältere Ereignisse — auch wenn sie im Lagebild stehen — gehören NICHT rein. Sie sind Hintergrund, keine Neuesten Entwicklungen.
|
||||
- Wenn das Lagebild ein Ereignis erwähnt, aber KEINE aktuelle belegende Meldung dafür existiert: Bullet verwerfen. Lieber weglassen als fabulieren.
|
||||
- Bevorzuge Ereignisse mit hohem Neuigkeitswert und konkretem Vorfall/Aussage gegenüber allgemeinen Hintergrundkonstatierungen.
|
||||
|
||||
REGELN zur Formulierung:
|
||||
- Jedes Bullet = EIN konkretes Ereignis oder eine konkrete Aussage, 1-2 Sätze, präzise und neutral.
|
||||
- Beginne JEDES Bullet mit dem Zeitstempel der frühesten belegenden Meldung im Format "[DD.MM. HH:MM]".
|
||||
- Ende JEDES Bullet mit einer Quellen-Klammer mit Pipe-getrennten Paaren "Name|URL", kommagetrennt bei mehreren Belegen: {{Reuters|https://reuters.com/..., Rybar|https://t.me/rybar/123}}. Maximal 3 Quellen pro Bullet. Bullets ohne Klammer werden verworfen.
|
||||
- Sortiere die Bullets nach Zeitstempel absteigend — neueste zuerst.
|
||||
- Wenn eine Quelle eine erkennbare politische Ausrichtung hat (pro-russisch, staatsnah, rechtsextrem etc.), im Bullet-Text erwähnen ("laut pro-russischem Telegram-Kanal Rybar...").
|
||||
- KEINE Gedankenstriche (—, –). Stattdessen Kommas, Doppelpunkte, neue Sätze.
|
||||
- Bei widersprüchlichen Angaben beide Seiten knapp nennen.
|
||||
- KEINE Einleitung, KEINE Überschrift, KEINE Nachbemerkungen.
|
||||
- Wenn aus den neuen Meldungen kein neues Ereignis extrahierbar ist: BISHERIGE ENTWICKLUNGEN unverändert zurückgeben.
|
||||
|
||||
OUTPUT-FORMAT (ausschliesslich, keine Anführungszeichen, kein Code-Fence, JEDE Zeile beginnt mit "- "):
|
||||
- [DD.MM. HH:MM] Ereignistext neu. {{M<ID>}}
|
||||
- [DD.MM. HH:MM] Ereignistext neu mit mehreren Belegen. {{M<ID1>, M<ID2>}}
|
||||
- [DD.MM. HH:MM] Ereignistext aus BISHERIGE ENTWICKLUNGEN. {{Quellenname1|URL1, Quellenname2|URL2}}
|
||||
OUTPUT-FORMAT (ausschliesslich, kein Code-Fence, JEDE Zeile beginnt mit "- "):
|
||||
- [DD.MM. HH:MM] Ereignistext. {{Quellenname1|URL1}}
|
||||
- [DD.MM. HH:MM] Ereignistext mit mehreren Belegen. {{Quellenname1|URL1, Quellenname2|URL2}}
|
||||
..."""
|
||||
|
||||
|
||||
TOPIC_FILTER_PROMPT_TEMPLATE = """Du bist ein OSINT-Relevanzfilter. Ein vorgeschalteter Keyword-Prefilter hat diese Artikel für eine Lage durchgelassen — aber Keyword-Treffer allein reichen nicht. Artikel müssen das SPEZIFISCHE KERNTHEMA der Lage inhaltlich behandeln.
|
||||
|
||||
LAGE: {title}
|
||||
KONTEXT: {description}
|
||||
|
||||
ARTIKEL-KANDIDATEN:
|
||||
{articles_text}
|
||||
|
||||
AUFGABE:
|
||||
Entscheide je Artikel, ob er thematisch zur Lage passt, und gib die laufenden Nummern der relevanten Artikel zurück.
|
||||
|
||||
REGELN:
|
||||
- Relevant = der Artikel behandelt konkret das im Titel + Kontext beschriebene Kernthema. Zentrale Akteure, Handlungen, Aussagen oder Ereignisse des Themas müssen im Artikel erkennbar sein.
|
||||
- NICHT relevant = Artikel, die nur allgemeine Begriffe aus dem Thema streifen (z.B. "Russland", "Iran", "Krieg", "Drohne"), ohne das Spezifikum der Lage zu behandeln. Allgemeine Kontext-Berichte aus der gleichen Region oder zum gleichen Großkonflikt sind NICHT automatisch relevant.
|
||||
- Breit gefasste Lagen (z.B. "Iran-Israel-Krieg", "Ukrainekrieg – aktuelle Lage") akzeptieren alle Meldungen, die einen der direkt beteiligten Akteure oder Kriegsschauplätze behandeln.
|
||||
- Eng gefasste Lagen (z.B. "Russische Militärblogger", "Ausfall bei Cloudflare", "Cybervorfall Stadtwerke X") akzeptieren NUR Meldungen zum Spezifikum. Peripheres, auch wenn im selben Großkontext, wird abgelehnt.
|
||||
- Eine Meldung gilt auch dann als relevant, wenn sie das Thema aus einer gegnerischen/kritischen Perspektive behandelt — es geht um thematische Zugehörigkeit, nicht um Ausrichtung.
|
||||
- Im Zweifel: NICHT relevant. Ein zu schmaler Filter ist besser als ein Schwall off-topic-Treffer.
|
||||
|
||||
Antworte AUSSCHLIESSLICH als JSON-Objekt — KEINE Erklärung, KEINE Einleitung:
|
||||
{{"relevant_ids": [1, 3, 7]}}"""
|
||||
|
||||
|
||||
class AnalyzerAgent:
|
||||
"""Analysiert und übersetzt Meldungen über Claude CLI."""
|
||||
|
||||
@@ -379,32 +402,127 @@ class AnalyzerAgent:
|
||||
logger.error(f"Inkrementelle Analyse-Fehler: {e}")
|
||||
return None, None
|
||||
|
||||
async def filter_relevant_articles(
|
||||
self,
|
||||
title: str,
|
||||
description: str,
|
||||
articles: list[dict],
|
||||
) -> tuple[list[dict], ClaudeUsage | None]:
|
||||
"""Semantischer Topic-Filter (Haiku).
|
||||
|
||||
Nimmt die vom Keyword-Prefilter durchgelassenen Artikel und wirft diejenigen raus,
|
||||
die zwar auf Keywords matchen, aber das Kernthema der Lage thematisch nicht treffen.
|
||||
Fällt bei Parsing- oder API-Fehlern auf die unveränderte Liste zurück.
|
||||
"""
|
||||
if not articles:
|
||||
return articles, None
|
||||
|
||||
lines = []
|
||||
for i, article in enumerate(articles, 1):
|
||||
headline = article.get("headline_de") or article.get("headline", "")
|
||||
source = article.get("source", "Unbekannt")
|
||||
content = article.get("content_de") or article.get("content_original") or ""
|
||||
lines.append(f"[{i}] Quelle: {source}")
|
||||
lines.append(f" Überschrift: {headline}")
|
||||
if content:
|
||||
lines.append(f" Inhalt: {content[:400]}")
|
||||
articles_text = "\n".join(lines)
|
||||
|
||||
prompt = TOPIC_FILTER_PROMPT_TEMPLATE.format(
|
||||
title=title,
|
||||
description=description or "Keine weiteren Details",
|
||||
articles_text=articles_text,
|
||||
)
|
||||
|
||||
from config import CLAUDE_MODEL_FAST
|
||||
try:
|
||||
result, usage = await call_claude(prompt, tools=None, model=CLAUDE_MODEL_FAST)
|
||||
except Exception as e:
|
||||
logger.warning(f"Topic-Filter-Fehler (behalte alle {len(articles)} Artikel): {e}")
|
||||
return articles, None
|
||||
|
||||
parsed = self._parse_response(result)
|
||||
if not parsed or not isinstance(parsed.get("relevant_ids"), list):
|
||||
logger.warning(
|
||||
f"Topic-Filter: keine relevant_ids geparst, behalte alle {len(articles)} Artikel"
|
||||
)
|
||||
return articles, usage
|
||||
|
||||
relevant_set = {
|
||||
i for i in parsed["relevant_ids"]
|
||||
if isinstance(i, int) and 1 <= i <= len(articles)
|
||||
}
|
||||
filtered = [a for i, a in enumerate(articles, 1) if i in relevant_set]
|
||||
|
||||
rejected = len(articles) - len(filtered)
|
||||
if not filtered and articles:
|
||||
logger.warning(
|
||||
f"Topic-Filter hat ALLE {len(articles)} Artikel verworfen — "
|
||||
"möglicherweise zu aggressiv. Behalte Original."
|
||||
)
|
||||
return articles, usage
|
||||
|
||||
logger.info(
|
||||
f"Topic-Filter: {len(filtered)}/{len(articles)} Artikel thematisch relevant "
|
||||
f"({rejected} verworfen)"
|
||||
)
|
||||
return filtered, usage
|
||||
|
||||
async def generate_latest_developments(
|
||||
self,
|
||||
title: str,
|
||||
description: str,
|
||||
new_articles: list[dict],
|
||||
previous_developments: str | None,
|
||||
summary: str,
|
||||
recent_articles: list[dict],
|
||||
previous_developments: str | None = None,
|
||||
) -> tuple[str | None, ClaudeUsage | None]:
|
||||
"""Pflegt die Kachel 'Neueste Entwicklungen' für Live-Monitoring-Lagen.
|
||||
"""Generiert die Kachel 'Neueste Entwicklungen' aus dem Lagebild.
|
||||
|
||||
Gibt Markdown-Bullets mit Zeitstempel zurück (max 8, neueste oben).
|
||||
Wenn keine neuen Artikel vorliegen, werden die bisherigen Bullets unverändert zurückgegeben.
|
||||
Der LLM extrahiert aus dem Summary die jüngsten Ereignisse und bindet sie an
|
||||
das Publikationsdatum der belegenden Meldungen (recent_articles). Damit bleiben
|
||||
die Einträge zwingend aktuell und thematisch an das Lagebild gekoppelt. Alte
|
||||
Hintergrund-Erwähnungen im Lagebild erzeugen keine Bullets, weil keine aktuelle
|
||||
Meldung sie belegen würde.
|
||||
|
||||
Gibt 4–6 Bullets (absteigend nach Zeitstempel) zurück. Bei Fehler/Parsing-Leer:
|
||||
Fallback auf previous_developments (falls vorhanden), sonst None.
|
||||
"""
|
||||
prev = (previous_developments or "").strip()
|
||||
if not new_articles:
|
||||
return (prev or None), None
|
||||
prev = (previous_developments or "").strip() or None
|
||||
if not summary or not summary.strip():
|
||||
return prev, None
|
||||
if not recent_articles:
|
||||
return prev, None
|
||||
|
||||
from config import OUTPUT_LANGUAGE, CLAUDE_MODEL_FAST
|
||||
today = datetime.now(TIMEZONE).strftime("%d.%m.%Y")
|
||||
new_articles_text = self._format_articles_text(new_articles, max_articles=25)
|
||||
prev_block = prev if prev else "(noch keine Einträge)"
|
||||
|
||||
# Kompakter Artikel-Block: nur die für Zeitstempel/Quellen nötigen Felder.
|
||||
# Sortiert nach published_at absteigend — damit der LLM die jüngsten sofort sieht.
|
||||
def _pub_sort_key(a: dict) -> str:
|
||||
return a.get("published_at") or ""
|
||||
|
||||
sorted_articles = sorted(recent_articles, key=_pub_sort_key, reverse=True)
|
||||
lines: list[str] = []
|
||||
for a in sorted_articles[:60]:
|
||||
headline = a.get("headline_de") or a.get("headline", "")
|
||||
source = a.get("source", "Unbekannt")
|
||||
url = a.get("source_url", "")
|
||||
published = a.get("published_at") or "unbekannt"
|
||||
bias = a.get("source_bias") or ""
|
||||
line = f"- [{published}] {source}"
|
||||
if bias:
|
||||
line += f" ({bias})"
|
||||
line += f" | {headline}"
|
||||
if url:
|
||||
line += f" | {url}"
|
||||
lines.append(line)
|
||||
articles_text = "\n".join(lines) if lines else "(keine belegenden Meldungen verfügbar)"
|
||||
|
||||
prompt = LATEST_DEVELOPMENTS_PROMPT_TEMPLATE.format(
|
||||
title=title,
|
||||
description=description or "Keine weiteren Details",
|
||||
previous_developments=prev_block,
|
||||
new_articles_text=new_articles_text,
|
||||
summary=summary.strip(),
|
||||
articles_text=articles_text,
|
||||
today=today,
|
||||
output_language=OUTPUT_LANGUAGE,
|
||||
)
|
||||
@@ -413,16 +531,16 @@ class AnalyzerAgent:
|
||||
result, usage = await call_claude(prompt, tools=None, model=CLAUDE_MODEL_FAST, raw_text=True)
|
||||
except Exception as e:
|
||||
logger.error(f"Latest-Developments-Fehler: {e}")
|
||||
return (prev or None), None
|
||||
return prev, None
|
||||
|
||||
bullets = self._parse_latest_developments(result, new_articles)
|
||||
bullets = self._parse_latest_developments(result, recent_articles)
|
||||
if not bullets:
|
||||
logger.info("Latest-Developments: keine Bullets geparst, behalte bisherigen Stand")
|
||||
return (prev or None), usage
|
||||
return prev, usage
|
||||
|
||||
bullets = bullets[:8]
|
||||
bullets = bullets[:6]
|
||||
output = "\n".join(bullets)
|
||||
logger.info(f"Latest-Developments: {len(bullets)} Bullets generiert")
|
||||
logger.info(f"Latest-Developments: {len(bullets)} Bullets aus Lagebild generiert")
|
||||
return output, usage
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -13,6 +13,35 @@ _cancel_event_var: contextvars.ContextVar[asyncio.Event | None] = contextvars.Co
|
||||
logger = logging.getLogger("osint.claude_client")
|
||||
|
||||
|
||||
class ClaudeCliError(RuntimeError):
|
||||
"""Strukturierter Fehler aus dem Claude CLI mit Kategorie.
|
||||
|
||||
error_type:
|
||||
- "rate_limit": Anthropic Rate-Limit oder Overload (transient, retry-tauglich)
|
||||
- "auth_error": Account-Problem (Organisation hat keinen Claude-Zugang,
|
||||
Token abgelaufen/ungueltig) - kein Retry sinnvoll, Admin-Aktion noetig
|
||||
- "timeout": Claude CLI Timeout (transient)
|
||||
- "cli_error": Sonstiger CLI-Fehler (unspezifisch, Default)
|
||||
"""
|
||||
|
||||
def __init__(self, error_type: str, message: str):
|
||||
self.error_type = error_type
|
||||
self.message = message
|
||||
super().__init__(f"Claude CLI [{error_type}]: {message}")
|
||||
|
||||
|
||||
def _classify_cli_error(combined_output: str) -> str:
|
||||
"""Ordnet einer Fehler-Ausgabe eine error_type-Kategorie zu."""
|
||||
txt = combined_output.lower()
|
||||
rate_limit_keywords = ["hit your limit", "rate limit", "resets", "rate_limit", "overloaded"]
|
||||
auth_error_keywords = ["does not have access", "login again", "contact your administrator"]
|
||||
if any(kw in txt for kw in rate_limit_keywords):
|
||||
return "rate_limit"
|
||||
if any(kw in txt for kw in auth_error_keywords):
|
||||
return "auth_error"
|
||||
return "cli_error"
|
||||
|
||||
|
||||
@dataclass
|
||||
class ClaudeUsage:
|
||||
"""Token-Verbrauch eines einzelnen Claude CLI Aufrufs."""
|
||||
@@ -48,7 +77,7 @@ def _sanitize_mdash(text: str) -> str:
|
||||
"""Ersetzt Gedankenstriche durch Bindestriche (KI-Indikator reduzieren)."""
|
||||
return text.replace("\u2014", " - ").replace("\u2013", " - ")
|
||||
|
||||
async def call_claude(prompt: str, tools: str | None = "WebSearch,WebFetch", model: str | None = None, raw_text: bool = False) -> tuple[str, ClaudeUsage]:
|
||||
async def call_claude(prompt: str, tools: str | None = "WebSearch,WebFetch", model: str | None = None, raw_text: bool = False, timeout: float | None = None) -> tuple[str, ClaudeUsage]:
|
||||
"""Ruft Claude CLI auf. Gibt (result_text, usage) zurück.
|
||||
|
||||
Prompt wird via stdin uebergeben um OS ARG_MAX Limits zu vermeiden.
|
||||
@@ -57,8 +86,10 @@ async def call_claude(prompt: str, tools: str | None = "WebSearch,WebFetch", mod
|
||||
prompt: Der Prompt fuer Claude
|
||||
tools: Kommagetrennte erlaubte Tools (None = keine Tools, --max-turns 1)
|
||||
model: Optionales Modell (z.B. CLAUDE_MODEL_FAST fuer Haiku). None = CLAUDE_MODEL_STANDARD (Opus 4.7).
|
||||
timeout: Override in Sekunden. None = Fallback auf globalen CLAUDE_TIMEOUT (1800s).
|
||||
"""
|
||||
effective_model = model or CLAUDE_MODEL_STANDARD
|
||||
effective_timeout = timeout if timeout is not None else CLAUDE_TIMEOUT
|
||||
cmd = [CLAUDE_PATH, "-p", "-", "--output-format", "json", "--model", effective_model]
|
||||
if tools:
|
||||
cmd.extend(["--allowedTools", tools])
|
||||
@@ -89,7 +120,7 @@ async def call_claude(prompt: str, tools: str | None = "WebSearch,WebFetch", mod
|
||||
process.communicate(input=prompt.encode("utf-8"))
|
||||
)
|
||||
cancel_wait_task = asyncio.create_task(cancel_event.wait())
|
||||
timeout_task = asyncio.create_task(asyncio.sleep(CLAUDE_TIMEOUT))
|
||||
timeout_task = asyncio.create_task(asyncio.sleep(effective_timeout))
|
||||
|
||||
done, pending = await asyncio.wait(
|
||||
[communicate_task, cancel_wait_task, timeout_task],
|
||||
@@ -108,32 +139,33 @@ async def call_claude(prompt: str, tools: str | None = "WebSearch,WebFetch", mod
|
||||
else:
|
||||
process.kill()
|
||||
await process.wait()
|
||||
raise TimeoutError(f"Claude CLI Timeout nach {CLAUDE_TIMEOUT}s")
|
||||
raise TimeoutError(f"Claude CLI Timeout nach {effective_timeout}s")
|
||||
else:
|
||||
stdout, stderr = await asyncio.wait_for(
|
||||
process.communicate(input=prompt.encode("utf-8")), timeout=CLAUDE_TIMEOUT
|
||||
process.communicate(input=prompt.encode("utf-8")), timeout=effective_timeout
|
||||
)
|
||||
except asyncio.TimeoutError:
|
||||
process.kill()
|
||||
raise TimeoutError(f"Claude CLI Timeout nach {CLAUDE_TIMEOUT}s")
|
||||
raise TimeoutError(f"Claude CLI Timeout nach {effective_timeout}s")
|
||||
|
||||
if process.returncode != 0:
|
||||
error_msg = stderr.decode("utf-8", errors="replace").strip()
|
||||
stdout_msg = stdout.decode("utf-8", errors="replace").strip()
|
||||
|
||||
# Rate-Limit-Fehler kommen als JSON auf stdout, nicht auf stderr
|
||||
error_type = "cli_error"
|
||||
rate_limit_keywords = ["hit your limit", "rate limit", "resets", "rate_limit", "overloaded"]
|
||||
combined_output = f"{error_msg} {stdout_msg}".lower()
|
||||
if any(kw in combined_output for kw in rate_limit_keywords):
|
||||
error_type = "rate_limit"
|
||||
# Rate-Limit/Auth-Fehler kommen teils als JSON auf stdout, nicht auf stderr
|
||||
combined_output = f"{error_msg} {stdout_msg}"
|
||||
error_type = _classify_cli_error(combined_output)
|
||||
|
||||
if error_type == "rate_limit":
|
||||
logger.warning(f"Claude CLI Rate-Limit (Exit {process.returncode}): {stdout_msg or error_msg}")
|
||||
elif error_type == "auth_error":
|
||||
logger.error(f"Claude CLI Auth-Fehler (Exit {process.returncode}): {stdout_msg or error_msg}")
|
||||
else:
|
||||
logger.error(f"Claude CLI Fehler (Exit {process.returncode}): {error_msg}")
|
||||
if stdout_msg:
|
||||
logger.error(f"Claude CLI stdout bei Fehler: {stdout_msg[:500]}")
|
||||
|
||||
raise RuntimeError(f"Claude CLI Fehler [{error_type}]: {stdout_msg or error_msg}")
|
||||
raise ClaudeCliError(error_type, stdout_msg or error_msg)
|
||||
|
||||
raw = stdout.decode("utf-8", errors="replace").strip()
|
||||
usage = ClaudeUsage()
|
||||
@@ -141,6 +173,19 @@ async def call_claude(prompt: str, tools: str | None = "WebSearch,WebFetch", mod
|
||||
|
||||
try:
|
||||
data = json.loads(raw)
|
||||
# CLI kann returncode=0 liefern und trotzdem is_error=true setzen
|
||||
# (z.B. "Your organization does not have access to Claude")
|
||||
if data.get("is_error"):
|
||||
error_text = str(data.get("result", ""))
|
||||
error_type = _classify_cli_error(error_text)
|
||||
if error_type == "rate_limit":
|
||||
logger.warning(f"Claude CLI Rate-Limit (is_error): {error_text}")
|
||||
elif error_type == "auth_error":
|
||||
logger.error(f"Claude CLI Auth-Fehler (is_error): {error_text}")
|
||||
else:
|
||||
logger.error(f"Claude CLI Fehler (is_error): {error_text}")
|
||||
raise ClaudeCliError(error_type, error_text)
|
||||
|
||||
result_text = data.get("result", raw)
|
||||
u = data.get("usage", {})
|
||||
usage = ClaudeUsage(
|
||||
|
||||
@@ -395,6 +395,10 @@ class AgentOrchestrator:
|
||||
self._queue: asyncio.Queue = asyncio.Queue()
|
||||
self._running = False
|
||||
self._current_task: Optional[int] = None
|
||||
# Session-Start des aktuellen Tasks (UTC ISO mit 'Z'). Ueberspannt Multi-Pass
|
||||
# und Retries innerhalb derselben Queue-Abarbeitung — verhindert, dass der
|
||||
# Frontend-Timer beim Seiten-Reload auf den Pass/Retry-Start zurueckspringt.
|
||||
self._current_task_started_at: Optional[str] = None
|
||||
self._ws_manager = None
|
||||
self._queued_ids: set[int] = set()
|
||||
self._cancel_requested: set[int] = set()
|
||||
@@ -515,14 +519,20 @@ class AgentOrchestrator:
|
||||
user_id = None
|
||||
self._queued_ids.discard(incident_id)
|
||||
self._current_task = incident_id
|
||||
# Session-Start EINMAL setzen — bleibt ueber Multi-Pass/Retry hinweg stabil
|
||||
self._current_task_started_at = datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ')
|
||||
self._cancel_event = asyncio.Event()
|
||||
_cancel_event_var.set(self._cancel_event)
|
||||
logger.info(f"Starte Refresh für Lage {incident_id} (Trigger: {trigger_type})")
|
||||
|
||||
RETRY_DELAYS = [0, 120, 300] # Sekunden: sofort, 2min, 5min
|
||||
TRANSIENT_ERRORS = (asyncio.TimeoutError, TimeoutError, ConnectionError, OSError)
|
||||
from agents.claude_client import ClaudeCliError
|
||||
last_error = None
|
||||
|
||||
def _is_transient_cli(err: Exception) -> bool:
|
||||
return isinstance(err, ClaudeCliError) and err.error_type in ("rate_limit", "timeout")
|
||||
|
||||
try:
|
||||
# Research-Lagen: Automatisch 3 Durchläufe nur beim ersten Refresh
|
||||
incident_type, has_summary = await self._get_incident_info(incident_id)
|
||||
@@ -551,14 +561,23 @@ class AgentOrchestrator:
|
||||
}, _vis, _cb, _tid)
|
||||
last_error = None
|
||||
break
|
||||
except TRANSIENT_ERRORS as e:
|
||||
except Exception as e:
|
||||
# Auth/CLI-Fehler: sofort abbrechen, kein Retry sinnvoll
|
||||
if isinstance(e, ClaudeCliError) and e.error_type in ("auth_error", "cli_error"):
|
||||
last_error = e
|
||||
logger.warning(f"Transienter Fehler bei Lage {incident_id} (Versuch {attempt + 1}/3): {e}")
|
||||
logger.error(f"Permanenter Claude-Fehler [{e.error_type}] bei Lage {incident_id}: {e}")
|
||||
await self._mark_refresh_failed(incident_id, str(e))
|
||||
break
|
||||
|
||||
# Transiente Fehler: Retry bis 3x
|
||||
if isinstance(e, TRANSIENT_ERRORS) or _is_transient_cli(e):
|
||||
last_error = e
|
||||
kind = e.error_type if isinstance(e, ClaudeCliError) else type(e).__name__
|
||||
logger.warning(f"Transienter Fehler [{kind}] bei Lage {incident_id} (Versuch {attempt + 1}/3): {e}")
|
||||
if attempt < 2:
|
||||
await self._mark_refresh_failed(incident_id, str(e))
|
||||
delay = RETRY_DELAYS[attempt + 1]
|
||||
logger.info(f"Retry in {delay}s für Lage {incident_id}")
|
||||
# Retry-Status per WebSocket senden
|
||||
if self._ws_manager:
|
||||
try:
|
||||
_vis, _cb, _tid = await self._get_incident_visibility(incident_id)
|
||||
@@ -570,13 +589,16 @@ class AgentOrchestrator:
|
||||
"data": {"status": "retrying", "attempt": attempt + 1, "delay": delay},
|
||||
}, _vis, _cb, _tid)
|
||||
await asyncio.sleep(delay)
|
||||
continue
|
||||
else:
|
||||
await self._mark_refresh_failed(incident_id, f"Endgültig fehlgeschlagen nach 3 Versuchen: {e}")
|
||||
except Exception as e:
|
||||
break
|
||||
|
||||
# Alles andere: permanent
|
||||
last_error = e
|
||||
logger.error(f"Permanenter Fehler bei Refresh für Lage {incident_id}: {e}")
|
||||
await self._mark_refresh_failed(incident_id, str(e))
|
||||
break # Permanenter Fehler, kein Retry
|
||||
break
|
||||
|
||||
if last_error and self._ws_manager:
|
||||
try:
|
||||
@@ -590,6 +612,7 @@ class AgentOrchestrator:
|
||||
}, _vis, _cb, _tid)
|
||||
finally:
|
||||
self._current_task = None
|
||||
self._current_task_started_at = None
|
||||
self._cancel_event = None
|
||||
_cancel_event_var.set(None)
|
||||
self._queue.task_done()
|
||||
@@ -654,6 +677,7 @@ class AgentOrchestrator:
|
||||
from agents.analyzer import AnalyzerAgent
|
||||
from agents.factchecker import FactCheckerAgent
|
||||
from feeds.rss_parser import RSSParser
|
||||
from services import pipeline_tracker as _pipe
|
||||
|
||||
db = await get_db()
|
||||
try:
|
||||
@@ -696,6 +720,47 @@ class AgentOrchestrator:
|
||||
log_id = cursor.lastrowid
|
||||
usage_acc = UsageAccumulator()
|
||||
|
||||
# --- Pipeline-Tracking (Analysepipeline-Visualisierung) ---
|
||||
_pass_nr = (_pass_info or {}).get("nr", 1)
|
||||
_step_ids: dict[str, Optional[int]] = {}
|
||||
|
||||
async def _pipe_start(step_key: str):
|
||||
try:
|
||||
sid = await _pipe.start_step(
|
||||
db, self._ws_manager,
|
||||
refresh_log_id=log_id, incident_id=incident_id, step_key=step_key,
|
||||
pass_number=_pass_nr, tenant_id=tenant_id,
|
||||
visibility=visibility, created_by=created_by,
|
||||
)
|
||||
_step_ids[step_key] = sid
|
||||
return sid
|
||||
except Exception as _e:
|
||||
logger.debug(f"_pipe_start({step_key}) ignoriert: {_e}")
|
||||
return None
|
||||
|
||||
async def _pipe_done(step_key: str, count_value=None, count_secondary=None):
|
||||
try:
|
||||
sid = _step_ids.pop(step_key, None)
|
||||
await _pipe.complete_step(
|
||||
db, self._ws_manager, step_id=sid,
|
||||
refresh_log_id=log_id, incident_id=incident_id, step_key=step_key,
|
||||
pass_number=_pass_nr, count_value=count_value, count_secondary=count_secondary,
|
||||
tenant_id=tenant_id, visibility=visibility, created_by=created_by,
|
||||
)
|
||||
except Exception as _e:
|
||||
logger.debug(f"_pipe_done({step_key}) ignoriert: {_e}")
|
||||
|
||||
async def _pipe_skip(step_key: str):
|
||||
try:
|
||||
await _pipe.skip_step(
|
||||
db, self._ws_manager,
|
||||
refresh_log_id=log_id, incident_id=incident_id, step_key=step_key,
|
||||
pass_number=_pass_nr, tenant_id=tenant_id,
|
||||
visibility=visibility, created_by=created_by,
|
||||
)
|
||||
except Exception as _e:
|
||||
logger.debug(f"_pipe_skip({step_key}) ignoriert: {_e}")
|
||||
|
||||
research_status = "deep_researching" if incident_type == "research" else "researching"
|
||||
research_detail = "Hintergrundrecherche im Web läuft..." if incident_type == "research" else "RSS-Feeds und Web werden durchsucht..."
|
||||
# Multi-Pass: Detail-Text mit Durchlauf-Info versehen
|
||||
@@ -718,6 +783,23 @@ class AgentOrchestrator:
|
||||
)
|
||||
existing_db_articles_full = await cursor.fetchall()
|
||||
|
||||
# Pipeline-Schritt 1: Quellen sichten (vorbereitet)
|
||||
await _pipe_start("sources_review")
|
||||
try:
|
||||
if incident_type == "adhoc":
|
||||
_src_cursor = await db.execute(
|
||||
"SELECT COUNT(*) AS cnt FROM sources WHERE tenant_id = ? AND status = 'active'",
|
||||
(tenant_id,),
|
||||
)
|
||||
_src_row = await _src_cursor.fetchone()
|
||||
_src_total = _src_row["cnt"] if _src_row else 0
|
||||
else:
|
||||
_src_total = None
|
||||
except Exception:
|
||||
_src_total = None
|
||||
# secondary wird später mit der Anzahl tatsächlich liefernder Quellen ergänzt
|
||||
await _pipe_done("sources_review", count_value=_src_total, count_secondary=None)
|
||||
|
||||
# Schritt 1+2: RSS-Feeds und Claude-Recherche parallel ausführen
|
||||
async def _rss_pipeline():
|
||||
"""RSS-Feed-Suche (Feed-Selektion + dynamische Keywords + Parsing)."""
|
||||
@@ -773,13 +855,16 @@ class AgentOrchestrator:
|
||||
"source_url": row["source_url"]}
|
||||
for row in existing_db_articles_full
|
||||
]
|
||||
results, usage = await researcher.search(
|
||||
results, usage, parse_failed = await researcher.search(
|
||||
title, description, incident_type,
|
||||
international=international, user_id=user_id,
|
||||
existing_articles=existing_for_context,
|
||||
)
|
||||
logger.info(f"Claude-Recherche: {len(results)} Ergebnisse")
|
||||
return results, usage
|
||||
logger.info(
|
||||
f"Claude-Recherche: {len(results)} Ergebnisse"
|
||||
+ (" (Parser fehlgeschlagen)" if parse_failed else "")
|
||||
)
|
||||
return results, usage, parse_failed
|
||||
|
||||
async def _podcast_pipeline():
|
||||
"""Podcast-Episoden-Suche (nur adhoc-Lagen, nur mit vorhandenen Transkripten)."""
|
||||
@@ -854,6 +939,9 @@ class AgentOrchestrator:
|
||||
logger.info(f"Telegram-Pipeline: {len(articles)} Nachrichten")
|
||||
return articles, None
|
||||
|
||||
# Pipeline-Schritt 2: Nachrichten sammeln (Start)
|
||||
await _pipe_start("collect")
|
||||
|
||||
# Pipelines parallel starten (RSS + WebSearch + Podcasts + optional Telegram)
|
||||
pipelines = [_rss_pipeline(), _web_search_pipeline(), _podcast_pipeline()]
|
||||
if include_telegram:
|
||||
@@ -862,7 +950,7 @@ class AgentOrchestrator:
|
||||
pipeline_results = await asyncio.gather(*pipelines)
|
||||
|
||||
(rss_articles, rss_feed_usage) = pipeline_results[0]
|
||||
(search_results, search_usage) = pipeline_results[1]
|
||||
(search_results, search_usage, search_parse_failed) = pipeline_results[1]
|
||||
(podcast_articles, _podcast_usage) = pipeline_results[2]
|
||||
telegram_articles = pipeline_results[3][0] if include_telegram else []
|
||||
|
||||
@@ -884,6 +972,15 @@ class AgentOrchestrator:
|
||||
|
||||
# Alle Ergebnisse zusammenführen
|
||||
all_results = rss_articles + search_results + telegram_articles
|
||||
# Pipeline-Schritt 2: Nachrichten sammeln (fertig)
|
||||
try:
|
||||
_delivering_sources = len({a.get("source", "") for a in all_results if a.get("source")})
|
||||
except Exception:
|
||||
_delivering_sources = None
|
||||
await _pipe_done("collect", count_value=len(all_results), count_secondary=_delivering_sources)
|
||||
|
||||
# Pipeline-Schritt 3: Doppeltes filtern (Start)
|
||||
await _pipe_start("dedup")
|
||||
|
||||
# Duplikate entfernen (normalisierte URL + Headline-Ähnlichkeit)
|
||||
seen_urls = set()
|
||||
@@ -896,6 +993,7 @@ class AgentOrchestrator:
|
||||
dupes_removed = len(all_results) - len(unique_results)
|
||||
if dupes_removed > 0:
|
||||
logger.info(f"Deduplizierung: {dupes_removed} Duplikate entfernt, {len(unique_results)} verbleibend")
|
||||
await _pipe_done("dedup", count_value=dupes_removed, count_secondary=len(unique_results))
|
||||
|
||||
# Relevanz-Scoring und Sortierung
|
||||
for article in unique_results:
|
||||
@@ -933,18 +1031,15 @@ class AgentOrchestrator:
|
||||
|
||||
logger.info(f"DB-Dedup: {len(existing_urls)} URLs, {len(existing_headlines)} Headlines im Bestand")
|
||||
|
||||
# Neue Artikel speichern und für Analyse tracken
|
||||
new_count = 0
|
||||
new_articles_for_analysis = []
|
||||
# --- Dedup gegen Bestand: nur neue (noch nicht gespeicherte) Kandidaten behalten ---
|
||||
new_candidates = []
|
||||
for article in unique_results:
|
||||
# URL-Duplikat gegen DB
|
||||
if article.get("source_url"):
|
||||
norm_url = _normalize_url(article["source_url"])
|
||||
if norm_url in existing_urls:
|
||||
continue
|
||||
existing_urls.add(norm_url)
|
||||
|
||||
# Headline-Duplikat gegen DB
|
||||
headline = article.get("headline", "")
|
||||
if headline and len(headline) > 20:
|
||||
norm_h = _normalize_headline(headline)
|
||||
@@ -953,6 +1048,28 @@ class AgentOrchestrator:
|
||||
if norm_h:
|
||||
existing_headlines.add(norm_h)
|
||||
|
||||
new_candidates.append(article)
|
||||
|
||||
# Pipeline-Schritt 4: Relevanz bewerten (Start)
|
||||
await _pipe_start("relevance")
|
||||
_candidates_before_topic = len(new_candidates)
|
||||
|
||||
# --- Semantischer Topic-Filter (Haiku) ---
|
||||
# Wirft Artikel raus, die zwar Keyword-Treffer hatten, aber das Kernthema
|
||||
# der Lage nicht inhaltlich behandeln. Bei Fehler Fallback auf alle Kandidaten.
|
||||
if new_candidates:
|
||||
_tf_agent = AnalyzerAgent()
|
||||
new_candidates, _tf_usage = await _tf_agent.filter_relevant_articles(
|
||||
title, description, new_candidates,
|
||||
)
|
||||
if _tf_usage:
|
||||
usage_acc.add(_tf_usage)
|
||||
await _pipe_done("relevance", count_value=len(new_candidates), count_secondary=_candidates_before_topic)
|
||||
|
||||
# --- Neue (thematisch gefilterte) Artikel speichern und für Analyse tracken ---
|
||||
new_count = 0
|
||||
new_articles_for_analysis = []
|
||||
for article in new_candidates:
|
||||
cursor = await db.execute(
|
||||
"""INSERT INTO articles (incident_id, headline, headline_de, source,
|
||||
source_url, content_original, content_de, language, published_at, tenant_id)
|
||||
@@ -971,7 +1088,6 @@ class AgentOrchestrator:
|
||||
),
|
||||
)
|
||||
new_count += 1
|
||||
# Artikel mit DB-ID für die Analyse tracken
|
||||
article_with_id = dict(article)
|
||||
article_with_id["id"] = cursor.lastrowid
|
||||
new_articles_for_analysis.append(article_with_id)
|
||||
@@ -980,6 +1096,8 @@ class AgentOrchestrator:
|
||||
|
||||
# Geoparsing: Orte aus neuen Artikeln extrahieren und speichern
|
||||
if new_articles_for_analysis:
|
||||
# Pipeline-Schritt 5: Orte erkennen (Start)
|
||||
await _pipe_start("geoparsing")
|
||||
try:
|
||||
from agents.geoparsing import geoparse_articles
|
||||
incident_context = f"{title} - {description}"
|
||||
@@ -1010,8 +1128,12 @@ class AgentOrchestrator:
|
||||
)
|
||||
await db.commit()
|
||||
logger.info(f"Category-Labels gespeichert fuer Incident {incident_id}: {category_labels}")
|
||||
await _pipe_done("geoparsing", count_value=geo_count, count_secondary=len(geo_results) if geo_results else 0)
|
||||
except Exception as e:
|
||||
logger.warning(f"Geoparsing fehlgeschlagen (Pipeline laeuft weiter): {e}")
|
||||
await _pipe_done("geoparsing", count_value=0, count_secondary=0)
|
||||
else:
|
||||
await _pipe_skip("geoparsing")
|
||||
|
||||
# Quellen-Statistiken aktualisieren
|
||||
if new_count > 0:
|
||||
@@ -1157,6 +1279,10 @@ class AgentOrchestrator:
|
||||
articles_for_check = [dict(row) for row in await cursor.fetchall()]
|
||||
return await factchecker.check(title, articles_for_check, incident_type)
|
||||
|
||||
# Pipeline-Schritte 6+7: Lagebild verfassen + Fakten prüfen (Start, parallel)
|
||||
await _pipe_start("summary")
|
||||
await _pipe_start("factcheck")
|
||||
|
||||
# Beide Tasks PARALLEL starten
|
||||
logger.info("Starte Analyse und Faktencheck parallel...")
|
||||
analysis_result, factcheck_result = await asyncio.gather(
|
||||
@@ -1166,6 +1292,8 @@ class AgentOrchestrator:
|
||||
|
||||
analysis, analysis_usage = analysis_result
|
||||
fact_checks, fc_usage = factcheck_result
|
||||
# Pipeline-Schritt 6: Lagebild verfassen (fertig, keine Zahl, nur Status)
|
||||
await _pipe_done("summary", count_value=None, count_secondary=None)
|
||||
|
||||
# --- Analyse-Ergebnisse verarbeiten ---
|
||||
if analysis_usage:
|
||||
@@ -1273,11 +1401,24 @@ class AgentOrchestrator:
|
||||
self._check_cancelled(incident_id)
|
||||
|
||||
# --- Neueste Entwicklungen (nur Live-Monitoring / adhoc) ---
|
||||
if incident_type == "adhoc" and new_articles_for_analysis:
|
||||
# Basis ist jetzt das frisch generierte Lagebild (autoritativ, thematisch sauber).
|
||||
# Zeitstempel und Quellen kommen aus den jüngsten belegenden Artikeln.
|
||||
dev_summary_source = (locals().get("new_summary") or previous_summary or "").strip()
|
||||
if incident_type == "adhoc" and dev_summary_source:
|
||||
try:
|
||||
# Top-60 neueste Artikel mit Publikationsdatum als Beleg-Pool.
|
||||
dev_cursor = await db.execute(
|
||||
"""SELECT id, headline, headline_de, source, source_url, published_at
|
||||
FROM articles
|
||||
WHERE incident_id = ? AND published_at IS NOT NULL
|
||||
ORDER BY published_at DESC LIMIT 60""",
|
||||
(incident_id,),
|
||||
)
|
||||
dev_articles = [dict(row) for row in await dev_cursor.fetchall()]
|
||||
|
||||
dev_analyzer = AnalyzerAgent()
|
||||
dev_text, dev_usage = await dev_analyzer.generate_latest_developments(
|
||||
title, description, new_articles_for_analysis, previous_developments,
|
||||
title, description, dev_summary_source, dev_articles, previous_developments,
|
||||
)
|
||||
if dev_usage:
|
||||
usage_acc.add(dev_usage)
|
||||
@@ -1406,6 +1547,13 @@ class AgentOrchestrator:
|
||||
|
||||
await db.commit()
|
||||
|
||||
# Pipeline-Schritt 7: Fakten prüfen (fertig)
|
||||
_new_facts_count = max(0, len(fact_checks) - len(existing_facts))
|
||||
await _pipe_done("factcheck", count_value=_new_facts_count, count_secondary=len(fact_checks) if fact_checks else 0)
|
||||
|
||||
# Pipeline-Schritt 8: Qualitätscheck (Start, ohne Zahlen)
|
||||
await _pipe_start("qc")
|
||||
|
||||
# Post-Refresh Quality Check: Duplikate und Karten-Kategorien pruefen
|
||||
try:
|
||||
from services.post_refresh_qc import run_post_refresh_qc
|
||||
@@ -1417,6 +1565,12 @@ class AgentOrchestrator:
|
||||
)
|
||||
except Exception as qc_err:
|
||||
logger.warning(f"Post-Refresh QC fehlgeschlagen: {qc_err}")
|
||||
await _pipe_done("qc", count_value=None, count_secondary=None)
|
||||
|
||||
# Pipeline-Schritt 9: Benachrichtigen (Start)
|
||||
await _pipe_start("notify")
|
||||
_notify_count = 0
|
||||
|
||||
# Gebündelte Notification senden (nicht beim ersten Refresh)
|
||||
if not is_first_refresh:
|
||||
if self._ws_manager:
|
||||
@@ -1473,6 +1627,32 @@ class AgentOrchestrator:
|
||||
db, incident_id, title, visibility, created_by, tenant_id, db_notifications,
|
||||
incident_type=incident_type,
|
||||
)
|
||||
_notify_count = len(db_notifications)
|
||||
|
||||
# Pipeline-Schritt 9: Benachrichtigen (fertig)
|
||||
await _pipe_done("notify", count_value=_notify_count, count_secondary=None)
|
||||
|
||||
# Falls Analyse-Block übersprungen wurde (kein neuer Artikel und Summary existiert),
|
||||
# die noch offenen Pipeline-Schritte als übersprungen markieren.
|
||||
for _skipped_key in ("summary", "factcheck", "qc", "notify"):
|
||||
if _skipped_key in _step_ids or _skipped_key not in {"summary", "factcheck", "qc", "notify"}:
|
||||
pass
|
||||
# Saubere Variante: alle noch offenen Steps am Ende skippen
|
||||
for _open_key in list(_step_ids.keys()):
|
||||
await _pipe_skip(_open_key)
|
||||
# Auch Steps die nie gestartet wurden (bei übersprungenem Outer-If)
|
||||
_started_keys = set()
|
||||
try:
|
||||
_check_cursor = await db.execute(
|
||||
"SELECT step_key FROM refresh_pipeline_steps WHERE refresh_log_id = ? AND pass_number = ?",
|
||||
(log_id, _pass_nr),
|
||||
)
|
||||
_started_keys = {row[0] for row in await _check_cursor.fetchall()}
|
||||
except Exception:
|
||||
pass
|
||||
for _missing_key in ("summary", "factcheck", "qc", "notify"):
|
||||
if _missing_key not in _started_keys:
|
||||
await _pipe_skip(_missing_key)
|
||||
|
||||
# Refresh-Log abschließen (mit Token-Statistiken)
|
||||
await db.execute(
|
||||
@@ -1495,38 +1675,9 @@ class AgentOrchestrator:
|
||||
|
||||
# Credits-Tracking: Monatliche Aggregation + Credits abziehen
|
||||
if tenant_id and usage_acc.total_cost_usd > 0:
|
||||
year_month = datetime.now(TIMEZONE).strftime('%Y-%m')
|
||||
await db.execute("""
|
||||
INSERT INTO token_usage_monthly
|
||||
(organization_id, year_month, source, input_tokens, output_tokens,
|
||||
cache_creation_tokens, cache_read_tokens, total_cost_usd, api_calls, refresh_count)
|
||||
VALUES (?, ?, 'monitor', ?, ?, ?, ?, ?, ?, 1)
|
||||
ON CONFLICT(organization_id, year_month, source) DO UPDATE SET
|
||||
input_tokens = input_tokens + excluded.input_tokens,
|
||||
output_tokens = output_tokens + excluded.output_tokens,
|
||||
cache_creation_tokens = cache_creation_tokens + excluded.cache_creation_tokens,
|
||||
cache_read_tokens = cache_read_tokens + excluded.cache_read_tokens,
|
||||
total_cost_usd = total_cost_usd + excluded.total_cost_usd,
|
||||
api_calls = api_calls + excluded.api_calls,
|
||||
refresh_count = refresh_count + 1,
|
||||
updated_at = CURRENT_TIMESTAMP
|
||||
""", (tenant_id, year_month,
|
||||
usage_acc.input_tokens, usage_acc.output_tokens,
|
||||
usage_acc.cache_creation_tokens, usage_acc.cache_read_tokens,
|
||||
round(usage_acc.total_cost_usd, 7), usage_acc.call_count))
|
||||
|
||||
# Credits auf Lizenz abziehen
|
||||
lic_cursor = await db.execute(
|
||||
"SELECT cost_per_credit FROM licenses WHERE organization_id = ? AND status = 'active' ORDER BY id DESC LIMIT 1",
|
||||
(tenant_id,))
|
||||
lic = await lic_cursor.fetchone()
|
||||
if lic and lic["cost_per_credit"] and lic["cost_per_credit"] > 0:
|
||||
credits_consumed = usage_acc.total_cost_usd / lic["cost_per_credit"]
|
||||
await db.execute(
|
||||
"UPDATE licenses SET credits_used = COALESCE(credits_used, 0) + ? WHERE organization_id = ? AND status = 'active'",
|
||||
(round(credits_consumed, 2), tenant_id))
|
||||
from services.license_service import charge_usage_to_tenant
|
||||
await charge_usage_to_tenant(db, tenant_id, usage_acc, source="monitor")
|
||||
await db.commit()
|
||||
logger.info(f"Credits: {round(credits_consumed, 1) if lic and lic['cost_per_credit'] else 0} abgezogen für Tenant {tenant_id}")
|
||||
|
||||
# Quellen-Discovery im Background starten
|
||||
if unique_results:
|
||||
@@ -1548,6 +1699,11 @@ class AgentOrchestrator:
|
||||
|
||||
logger.info(f"Refresh für Lage {incident_id} abgeschlossen: {new_count} neue Artikel")
|
||||
|
||||
# Multi-Pass-Diagnose: Pass-Ergebnis zurueck an Multi-Pass-Caller geben
|
||||
if _pass_info is not None:
|
||||
_pass_info["new_count"] = new_count
|
||||
_pass_info["parse_failed"] = search_parse_failed
|
||||
|
||||
# Executive Summary im Hintergrund vorab generieren (fuer schnelleren Export)
|
||||
if new_count > 0:
|
||||
async def _pregenerate_exec_summary():
|
||||
@@ -1602,6 +1758,7 @@ class AgentOrchestrator:
|
||||
Durchlauf 3: Konsolidierung (letzte Lücken, Fakten-Upgrade)
|
||||
"""
|
||||
total = RESEARCH_MULTI_PASS_COUNT
|
||||
pass_results = []
|
||||
|
||||
for pass_nr in range(1, total + 1):
|
||||
# Cancel zwischen Durchläufen prüfen
|
||||
@@ -1642,12 +1799,27 @@ class AgentOrchestrator:
|
||||
if is_last:
|
||||
raise
|
||||
# Nicht-letzter Durchlauf: weiter mit nächstem, bisherige Ergebnisse bleiben
|
||||
finally:
|
||||
pass_results.append(pass_info)
|
||||
|
||||
logger.info(
|
||||
f"Research Multi-Pass abgeschlossen für Lage {incident_id}: "
|
||||
f"{total} Durchläufe"
|
||||
)
|
||||
|
||||
# Diagnose: Wenn ALLE Passes 0 neue Artikel hatten UND mindestens einer
|
||||
# an einem Parser-Fehler scheiterte, ist die Recherche faktisch fehlgeschlagen —
|
||||
# Claude lieferte zwar Antworten, aber kein verwertbares JSON. Sonst bliebe
|
||||
# die Lage ohne sichtbare Fehlermeldung leer (siehe staging Lage "Friedrich Merz").
|
||||
total_new = sum(p.get("new_count", 0) for p in pass_results)
|
||||
any_parse_failed = any(p.get("parse_failed") for p in pass_results)
|
||||
if total_new == 0 and any_parse_failed:
|
||||
raise RuntimeError(
|
||||
"Recherche fehlgeschlagen: Claude lieferte keine verwertbaren Quellen "
|
||||
"(JSON-Parsing schlug bei mindestens einem Durchlauf fehl). "
|
||||
"Bitte Logs prüfen und Refresh erneut starten."
|
||||
)
|
||||
|
||||
|
||||
# Singleton-Instanz
|
||||
orchestrator = AgentOrchestrator()
|
||||
|
||||
@@ -7,6 +7,60 @@ from config import CLAUDE_MODEL_FAST
|
||||
|
||||
logger = logging.getLogger("osint.researcher")
|
||||
|
||||
|
||||
class ResearcherParseError(Exception):
|
||||
"""Claude hat eine nicht-leere Antwort geliefert, aus der kein JSON extrahiert werden konnte."""
|
||||
|
||||
|
||||
def _truncate_for_log(text: str, limit: int = 600) -> str:
|
||||
"""Kürzt eine Claude-Antwort für Logs, damit ein Sample sichtbar ist."""
|
||||
if not text:
|
||||
return ""
|
||||
snippet = text.strip().replace("\n", "\\n")
|
||||
if len(snippet) > limit:
|
||||
snippet = snippet[:limit] + "..."
|
||||
return snippet
|
||||
|
||||
|
||||
def _extract_json_array(text: str):
|
||||
"""Findet das erste vollständige JSON-Array im Text (auch mit Vor-/Nachtext oder Markdown-Fence)."""
|
||||
if not text:
|
||||
return None
|
||||
decoder = json.JSONDecoder()
|
||||
idx = 0
|
||||
while True:
|
||||
bracket = text.find("[", idx)
|
||||
if bracket == -1:
|
||||
return None
|
||||
try:
|
||||
obj, _ = decoder.raw_decode(text, bracket)
|
||||
except json.JSONDecodeError:
|
||||
idx = bracket + 1
|
||||
continue
|
||||
if isinstance(obj, list):
|
||||
return obj
|
||||
idx = bracket + 1
|
||||
|
||||
|
||||
def _extract_json_object(text: str):
|
||||
"""Findet das erste vollständige JSON-Objekt im Text (auch mit Vor-/Nachtext oder Markdown-Fence)."""
|
||||
if not text:
|
||||
return None
|
||||
decoder = json.JSONDecoder()
|
||||
idx = 0
|
||||
while True:
|
||||
brace = text.find("{", idx)
|
||||
if brace == -1:
|
||||
return None
|
||||
try:
|
||||
obj, _ = decoder.raw_decode(text, brace)
|
||||
except json.JSONDecodeError:
|
||||
idx = brace + 1
|
||||
continue
|
||||
if isinstance(obj, dict):
|
||||
return obj
|
||||
idx = brace + 1
|
||||
|
||||
RESEARCH_PROMPT_TEMPLATE = """Du bist ein OSINT-Recherche-Agent für ein Lagemonitoring-System.
|
||||
AUSGABESPRACHE: {output_language}
|
||||
- KEINE Gedankenstriche (— oder –) verwenden, stattdessen Kommas, Doppelpunkte oder neue Saetze.
|
||||
@@ -211,30 +265,28 @@ class ResearcherAgent:
|
||||
try:
|
||||
result, usage = await call_claude(prompt, tools=None, model=CLAUDE_MODEL_FAST)
|
||||
|
||||
# Neues Format: JSON-Objekt mit "feeds" und "keywords"
|
||||
keywords = None
|
||||
indices = None
|
||||
|
||||
# Versuche JSON-Objekt zu parsen
|
||||
obj_match = re.search(r'\{[^{}]*"feeds"\s*:\s*\[[\d\s,]+\][^{}]*\}', result, re.DOTALL)
|
||||
if obj_match:
|
||||
try:
|
||||
obj = json.loads(obj_match.group())
|
||||
indices = obj.get("feeds", [])
|
||||
# Neues Format: {"feeds": [...], "keywords": [...]}
|
||||
obj = _extract_json_object(result)
|
||||
if isinstance(obj, dict) and isinstance(obj.get("feeds"), list):
|
||||
indices = obj["feeds"]
|
||||
raw_keywords = obj.get("keywords", [])
|
||||
if isinstance(raw_keywords, list) and raw_keywords:
|
||||
keywords = [str(k).lower().strip() for k in raw_keywords if k]
|
||||
logger.info(f"Feed-Selektion Keywords: {keywords}")
|
||||
except (json.JSONDecodeError, ValueError):
|
||||
pass
|
||||
|
||||
# Fallback: altes Array-Format
|
||||
# Fallback: nacktes Array
|
||||
if indices is None:
|
||||
arr_match = re.search(r'\[[\d\s,]+\]', result)
|
||||
if not arr_match:
|
||||
logger.warning("Feed-Selektion: Kein JSON in Antwort, nutze alle Feeds")
|
||||
arr = _extract_json_array(result)
|
||||
if not isinstance(arr, list):
|
||||
logger.warning(
|
||||
"Feed-Selektion: Kein JSON in Antwort, nutze alle Feeds. Sample: %s",
|
||||
_truncate_for_log(result),
|
||||
)
|
||||
return feeds_metadata, None, usage
|
||||
indices = json.loads(arr_match.group())
|
||||
indices = arr
|
||||
|
||||
selected = []
|
||||
for idx in indices:
|
||||
@@ -275,19 +327,12 @@ class ResearcherAgent:
|
||||
try:
|
||||
result, usage = await call_claude(prompt, tools=None, model=CLAUDE_MODEL_FAST)
|
||||
|
||||
parsed = None
|
||||
try:
|
||||
parsed = json.loads(result)
|
||||
except json.JSONDecodeError:
|
||||
match = re.search(r'\[.*\]', result, re.DOTALL)
|
||||
if match:
|
||||
try:
|
||||
parsed = json.loads(match.group())
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
|
||||
if not parsed or not isinstance(parsed, list):
|
||||
logger.warning("Keyword-Extraktion: Kein gueltiges JSON erhalten")
|
||||
parsed = _extract_json_array(result)
|
||||
if not isinstance(parsed, list):
|
||||
logger.warning(
|
||||
"Keyword-Extraktion: Kein gueltiges JSON erhalten. Sample: %s",
|
||||
_truncate_for_log(result),
|
||||
)
|
||||
return None, usage
|
||||
|
||||
# Flache Liste: alle DE + EN Begriffe
|
||||
@@ -310,8 +355,14 @@ class ResearcherAgent:
|
||||
logger.warning(f"Keyword-Extraktion fehlgeschlagen: {e}")
|
||||
return None, None
|
||||
|
||||
async def search(self, title: str, description: str = "", incident_type: str = "adhoc", international: bool = True, user_id: int = None, existing_articles: list[dict] = None) -> tuple[list[dict], ClaudeUsage | None]:
|
||||
"""Sucht nach Informationen zu einem Vorfall."""
|
||||
async def search(self, title: str, description: str = "", incident_type: str = "adhoc", international: bool = True, user_id: int = None, existing_articles: list[dict] = None) -> tuple[list[dict], ClaudeUsage | None, bool]:
|
||||
"""Sucht nach Informationen zu einem Vorfall.
|
||||
|
||||
Returns:
|
||||
(artikel, usage, parse_failed) — parse_failed ist True, wenn Claude geantwortet hat,
|
||||
das JSON aber nicht extrahierbar war. So kann der Orchestrator zwischen
|
||||
"echt keine Treffer" und "kaputte Antwort" unterscheiden.
|
||||
"""
|
||||
from config import OUTPUT_LANGUAGE
|
||||
if incident_type == "research":
|
||||
lang_instruction = LANG_DEEP_INTERNATIONAL if international else LANG_DEEP_GERMAN_ONLY
|
||||
@@ -354,7 +405,13 @@ class ResearcherAgent:
|
||||
|
||||
try:
|
||||
result, usage = await call_claude(prompt)
|
||||
try:
|
||||
articles = self._parse_response(result)
|
||||
except ResearcherParseError as parse_err:
|
||||
# Claude hat geantwortet, aber kein verwertbares JSON dabei.
|
||||
# Usage trotzdem zurueckgeben, damit Credits korrekt verbucht werden.
|
||||
logger.warning("Claude-Recherche: %s", parse_err)
|
||||
return [], usage, True
|
||||
|
||||
# Ausgeschlossene Quellen dynamisch aus DB laden
|
||||
excluded_sources = await self._get_excluded_sources(user_id=user_id)
|
||||
@@ -376,13 +433,13 @@ class ResearcherAgent:
|
||||
filtered.append(article)
|
||||
|
||||
logger.info(f"Recherche ergab {len(filtered)} Artikel (von {len(articles)} gefundenen, international={international})")
|
||||
return filtered, usage
|
||||
return filtered, usage, False
|
||||
|
||||
except TimeoutError:
|
||||
raise # Timeout nach oben durchreichen fuer Retry im Orchestrator
|
||||
except Exception as e:
|
||||
logger.error(f"Recherche-Fehler: {e}")
|
||||
return [], None
|
||||
return [], None, False
|
||||
|
||||
async def _get_excluded_sources(self, user_id: int = None) -> list[str]:
|
||||
"""Laedt ausgeschlossene Quellen (global + per-User)."""
|
||||
@@ -405,56 +462,57 @@ class ResearcherAgent:
|
||||
return list(EXCLUDED_SOURCES)
|
||||
|
||||
def _parse_response(self, response: str) -> list[dict]:
|
||||
"""Parst die Claude-Antwort als JSON-Array."""
|
||||
# Versuche JSON direkt zu parsen
|
||||
"""Parst die Claude-Antwort als JSON-Array.
|
||||
|
||||
Wirft ResearcherParseError, wenn die Antwort nicht-leer ist, sich aber
|
||||
kein JSON extrahieren laesst. Eine echte leere Liste (z.B. wenn Claude
|
||||
wirklich keine Treffer hat) wird als [] zurueckgegeben.
|
||||
"""
|
||||
text = (response or "").strip()
|
||||
if not text:
|
||||
return []
|
||||
|
||||
# 1) Direkt parsen (Antwort ist bereits sauberes JSON)
|
||||
try:
|
||||
data = json.loads(response)
|
||||
data = json.loads(text)
|
||||
if isinstance(data, list):
|
||||
return data
|
||||
if isinstance(data, dict) and "articles" in data:
|
||||
if isinstance(data, dict) and isinstance(data.get("articles"), list):
|
||||
return data["articles"]
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
|
||||
# JSON-Code-Block extrahieren
|
||||
code_pat = r'`{3}(?:json)?\s*\n?(\[.*?\])\s*`{3}'
|
||||
code_match = re.search(code_pat, response, re.DOTALL)
|
||||
if code_match:
|
||||
try:
|
||||
data = json.loads(code_match.group(1))
|
||||
if isinstance(data, list):
|
||||
return data
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
# 2) JSON-Array irgendwo im Text (Markdown-Fence oder Vor-/Nachtext)
|
||||
arr = _extract_json_array(text)
|
||||
if isinstance(arr, list):
|
||||
return arr
|
||||
|
||||
# Versuche JSON aus der Antwort zu extrahieren (zwischen [ und ])
|
||||
arr_pat = r'\[\s*\{.*\}\s*\]'
|
||||
match = re.search(arr_pat, response, re.DOTALL)
|
||||
if match:
|
||||
try:
|
||||
data = json.loads(match.group())
|
||||
if isinstance(data, list):
|
||||
return data
|
||||
except json.JSONDecodeError:
|
||||
pass
|
||||
# 3) JSON-Objekt mit "articles"-Key
|
||||
obj = _extract_json_object(text)
|
||||
if isinstance(obj, dict) and isinstance(obj.get("articles"), list):
|
||||
return obj["articles"]
|
||||
|
||||
# Letzter Versuch: einzelne JSON-Objekte mit headline
|
||||
objects = re.findall(r'\{[^{}]*"headline"[^{}]*\}', response)
|
||||
if objects:
|
||||
results = []
|
||||
for obj_str in objects:
|
||||
# 4) Recovery: einzelne Headline-Objekte aus Fliesstext
|
||||
recovered = []
|
||||
for obj_str in re.findall(r'\{[^{}]*"headline"[^{}]*\}', text, re.DOTALL):
|
||||
try:
|
||||
obj = json.loads(obj_str)
|
||||
if "headline" in obj:
|
||||
results.append(obj)
|
||||
parsed = json.loads(obj_str)
|
||||
except json.JSONDecodeError:
|
||||
continue
|
||||
if results:
|
||||
logger.info(f"JSON-Recovery: {len(results)} Artikel aus Einzelobjekten extrahiert")
|
||||
return results
|
||||
if isinstance(parsed, dict) and "headline" in parsed:
|
||||
recovered.append(parsed)
|
||||
if recovered:
|
||||
logger.info("JSON-Recovery: %d Artikel aus Einzelobjekten extrahiert", len(recovered))
|
||||
return recovered
|
||||
|
||||
logger.warning(f"Konnte Claude-Antwort nicht als JSON parsen (Laenge: {len(response)})")
|
||||
return []
|
||||
# Parse fehlgeschlagen — Claude hat geantwortet, aber kein verwertbares JSON dabei.
|
||||
# Sample loggen, damit der Fehler debuggbar ist, und Aufrufer signalisieren.
|
||||
logger.warning(
|
||||
"Konnte Claude-Antwort nicht als JSON parsen (Laenge: %d). Sample: %s",
|
||||
len(text),
|
||||
_truncate_for_log(text),
|
||||
)
|
||||
raise ResearcherParseError(f"Claude-Antwort enthielt kein verwertbares JSON (Laenge: {len(text)})")
|
||||
|
||||
async def select_relevant_telegram_channels(
|
||||
self,
|
||||
@@ -488,12 +546,14 @@ class ResearcherAgent:
|
||||
try:
|
||||
result, usage = await call_claude(prompt, tools=None, model=CLAUDE_MODEL_FAST)
|
||||
|
||||
arr_match = re.search(r'\[[\d\s,]+\]', result)
|
||||
if not arr_match:
|
||||
logger.warning("Telegram-Selektion: Kein JSON in Antwort, nutze alle Kanaele")
|
||||
indices = _extract_json_array(result)
|
||||
if not isinstance(indices, list):
|
||||
logger.warning(
|
||||
"Telegram-Selektion: Kein JSON in Antwort, nutze alle Kanaele. Sample: %s",
|
||||
_truncate_for_log(result),
|
||||
)
|
||||
return channels_metadata, usage
|
||||
|
||||
indices = json.loads(arr_match.group())
|
||||
selected = []
|
||||
for idx in indices:
|
||||
if isinstance(idx, int) and 1 <= idx <= len(channels_metadata):
|
||||
|
||||
@@ -10,7 +10,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
DATA_DIR = os.path.join(BASE_DIR, "data")
|
||||
LOG_DIR = os.path.join(BASE_DIR, "logs")
|
||||
STATIC_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "static")
|
||||
DB_PATH = os.path.join(DATA_DIR, "osint.db")
|
||||
DB_PATH = os.environ.get("DB_PATH") or os.path.join(DATA_DIR, "osint.db")
|
||||
|
||||
# JWT
|
||||
_JWT_SECRET = os.environ.get("JWT_SECRET", "")
|
||||
|
||||
@@ -117,6 +117,22 @@ CREATE TABLE IF NOT EXISTS refresh_log (
|
||||
tenant_id INTEGER REFERENCES organizations(id)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS refresh_pipeline_steps (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
refresh_log_id INTEGER REFERENCES refresh_log(id) ON DELETE CASCADE,
|
||||
incident_id INTEGER REFERENCES incidents(id) ON DELETE CASCADE,
|
||||
step_key TEXT NOT NULL,
|
||||
pass_number INTEGER DEFAULT 1,
|
||||
started_at TIMESTAMP,
|
||||
completed_at TIMESTAMP,
|
||||
status TEXT DEFAULT 'pending',
|
||||
count_value INTEGER,
|
||||
count_secondary INTEGER,
|
||||
tenant_id INTEGER REFERENCES organizations(id)
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_pipeline_steps_incident ON refresh_pipeline_steps(incident_id, started_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS idx_pipeline_steps_log ON refresh_pipeline_steps(refresh_log_id);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS incident_snapshots (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
incident_id INTEGER REFERENCES incidents(id) ON DELETE CASCADE,
|
||||
@@ -418,6 +434,29 @@ async def init_db():
|
||||
await db.execute("ALTER TABLE refresh_log ADD COLUMN tenant_id INTEGER REFERENCES organizations(id)")
|
||||
await db.commit()
|
||||
|
||||
# Migration: refresh_pipeline_steps-Tabelle (Analysepipeline-Visualisierung)
|
||||
cursor = await db.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='refresh_pipeline_steps'")
|
||||
if not await cursor.fetchone():
|
||||
await db.executescript("""
|
||||
CREATE TABLE refresh_pipeline_steps (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
refresh_log_id INTEGER REFERENCES refresh_log(id) ON DELETE CASCADE,
|
||||
incident_id INTEGER REFERENCES incidents(id) ON DELETE CASCADE,
|
||||
step_key TEXT NOT NULL,
|
||||
pass_number INTEGER DEFAULT 1,
|
||||
started_at TIMESTAMP,
|
||||
completed_at TIMESTAMP,
|
||||
status TEXT DEFAULT 'pending',
|
||||
count_value INTEGER,
|
||||
count_secondary INTEGER,
|
||||
tenant_id INTEGER REFERENCES organizations(id)
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_pipeline_steps_incident ON refresh_pipeline_steps(incident_id, started_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS idx_pipeline_steps_log ON refresh_pipeline_steps(refresh_log_id);
|
||||
""")
|
||||
await db.commit()
|
||||
logger.info("Migration: refresh_pipeline_steps-Tabelle erstellt")
|
||||
|
||||
# Migration: notifications-Tabelle (fuer bestehende DBs)
|
||||
cursor = await db.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='notifications'")
|
||||
if not await cursor.fetchone():
|
||||
@@ -583,6 +622,7 @@ async def init_db():
|
||||
for idx_sql in [
|
||||
"CREATE INDEX IF NOT EXISTS idx_incidents_tenant_status ON incidents(tenant_id, status)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_articles_tenant_incident ON articles(tenant_id, incident_id)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_articles_incident_collected ON articles(incident_id, collected_at DESC)",
|
||||
]:
|
||||
try:
|
||||
await db.execute(idx_sql)
|
||||
|
||||
@@ -378,6 +378,7 @@ from routers.feedback import router as feedback_router
|
||||
from routers.public_api import router as public_api_router
|
||||
from routers.chat import router as chat_router
|
||||
from routers.tutorial import router as tutorial_router
|
||||
from routes.version_router import router as version_router
|
||||
|
||||
app.include_router(auth_router)
|
||||
app.include_router(incidents_router)
|
||||
@@ -387,6 +388,7 @@ app.include_router(feedback_router)
|
||||
app.include_router(public_api_router)
|
||||
app.include_router(chat_router, prefix="/api/chat")
|
||||
app.include_router(tutorial_router)
|
||||
app.include_router(version_router)
|
||||
|
||||
|
||||
@app.websocket("/api/ws")
|
||||
|
||||
@@ -78,6 +78,11 @@ class DescriptionEnhanceRequest(BaseModel):
|
||||
|
||||
|
||||
class IncidentResponse(BaseModel):
|
||||
"""Vollstaendige Lage-Details (fuer GET /incidents/{id}).
|
||||
|
||||
Enthaelt summary + latest_developments, aber NICHT mehr sources_json —
|
||||
das wird separat per GET /incidents/{id}/sources geladen (Lazy-Load).
|
||||
"""
|
||||
id: int
|
||||
title: str
|
||||
description: Optional[str]
|
||||
@@ -90,7 +95,6 @@ class IncidentResponse(BaseModel):
|
||||
visibility: str = "public"
|
||||
summary: Optional[str]
|
||||
latest_developments: Optional[str] = None
|
||||
sources_json: Optional[str] = None
|
||||
international_sources: bool = True
|
||||
include_telegram: bool = False
|
||||
created_by: int
|
||||
@@ -101,6 +105,35 @@ class IncidentResponse(BaseModel):
|
||||
source_count: int = 0
|
||||
|
||||
|
||||
class IncidentListItem(BaseModel):
|
||||
"""Schlankes Sidebar-Item (fuer GET /incidents).
|
||||
|
||||
Enthaelt, was Sidebar und Edit-Dialog brauchen — kein summary,
|
||||
kein sources_json. Statt summary-Volltext ein ``has_summary``-Bit,
|
||||
damit das Frontend "erster Refresh"-Zustand erkennen kann.
|
||||
description bleibt drin (kurz, vom Edit-Modal direkt genutzt).
|
||||
"""
|
||||
id: int
|
||||
title: str
|
||||
description: Optional[str] = None
|
||||
type: str
|
||||
status: str
|
||||
refresh_mode: str
|
||||
refresh_interval: int
|
||||
refresh_start_time: Optional[str] = None
|
||||
retention_days: int
|
||||
visibility: str = "public"
|
||||
international_sources: bool = True
|
||||
include_telegram: bool = False
|
||||
created_by: int
|
||||
created_by_username: str = ""
|
||||
created_at: str
|
||||
updated_at: str
|
||||
article_count: int = 0
|
||||
source_count: int = 0
|
||||
has_summary: bool = False
|
||||
|
||||
|
||||
|
||||
|
||||
# Sources (Quellenverwaltung)
|
||||
|
||||
@@ -4,10 +4,12 @@ import io
|
||||
import json
|
||||
import logging
|
||||
import re
|
||||
import uuid
|
||||
from collections import defaultdict
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
import pikepdf
|
||||
from jinja2 import Environment, FileSystemLoader
|
||||
from weasyprint import HTML
|
||||
from docx import Document
|
||||
@@ -391,10 +393,267 @@ LAGEBILD:
|
||||
return "<ul><li>Zusammenfassung konnte nicht generiert werden.</li></ul>"
|
||||
|
||||
|
||||
def _parse_db_timestamp(value) -> datetime | None:
|
||||
"""SQLite-Timestamp robust als datetime parsen (ISO oder 'YYYY-MM-DD HH:MM:SS')."""
|
||||
if not value:
|
||||
return None
|
||||
if isinstance(value, datetime):
|
||||
return value
|
||||
try:
|
||||
text = str(value).replace("T", " ").replace("Z", "")
|
||||
# Sekundenbruchteile und Timezone-Offset abschneiden (python-docx mag nur naive dt)
|
||||
text = text.split(".")[0].split("+")[0].strip()
|
||||
return datetime.strptime(text, "%Y-%m-%d %H:%M:%S")
|
||||
except (ValueError, TypeError):
|
||||
try:
|
||||
return datetime.strptime(str(value)[:10], "%Y-%m-%d")
|
||||
except (ValueError, TypeError):
|
||||
return None
|
||||
|
||||
|
||||
def _slug_scope_label(scope: str, sections: set[str] | None) -> str:
|
||||
"""Scope-Label fuer Metadaten und Dateinamen."""
|
||||
if sections:
|
||||
if sections == {"zusammenfassung"}:
|
||||
return "Zusammenfassung"
|
||||
if "timeline" in sections:
|
||||
return "Vollständiger Bericht"
|
||||
return "Lagebericht"
|
||||
return {"summary": "Zusammenfassung", "report": "Lagebericht", "full": "Vollständiger Bericht"}.get(
|
||||
scope, "Lagebericht"
|
||||
)
|
||||
|
||||
|
||||
def _build_export_metadata(
|
||||
incident: dict,
|
||||
articles: list,
|
||||
fact_checks: list,
|
||||
sources: list,
|
||||
creator: str,
|
||||
scope: str,
|
||||
sections: set[str] | None,
|
||||
organization_name: str | None,
|
||||
top_locations: list[str] | None,
|
||||
snapshot_count: int = 0,
|
||||
) -> dict:
|
||||
"""Einheitlicher Metadaten-Dict fuer PDF (HTML-Meta-Tags) und DOCX (core_properties)."""
|
||||
is_research = incident.get("type") == "research"
|
||||
type_label = "Hintergrundrecherche" if is_research else "Live-Monitoring"
|
||||
category = "OSINT-Hintergrundrecherche" if is_research else "OSINT-Lagebericht"
|
||||
scope_label = _slug_scope_label(scope, sections)
|
||||
|
||||
title_raw = (incident.get("title") or "Unbenannte Lage").strip()
|
||||
title = f"{title_raw} — {type_label}"
|
||||
|
||||
subject = (incident.get("description") or "").strip()
|
||||
if not subject:
|
||||
subject = f"{type_label} zu: {title_raw}"
|
||||
|
||||
# Keywords sammeln (Reihenfolge relevant für Anzeige, Dedup mit dict.fromkeys)
|
||||
keywords: list[str] = ["OSINT", type_label]
|
||||
if organization_name:
|
||||
keywords.append(organization_name)
|
||||
|
||||
# category_labels: kann JSON-Dict (Karte primary/secondary/...), JSON-Liste
|
||||
# oder ein Komma-getrennter String sein. Nur die Label-Werte extrahieren.
|
||||
cat_labels_raw = (incident.get("category_labels") or "").strip()
|
||||
if cat_labels_raw:
|
||||
cat_values: list[str] = []
|
||||
try:
|
||||
parsed = json.loads(cat_labels_raw)
|
||||
if isinstance(parsed, dict):
|
||||
cat_values = [str(v).strip() for v in parsed.values() if isinstance(v, str) and v.strip()]
|
||||
elif isinstance(parsed, list):
|
||||
cat_values = [str(v).strip() for v in parsed if isinstance(v, str) and v.strip()]
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
cat_values = [lbl.strip() for lbl in cat_labels_raw.split(",") if lbl.strip()]
|
||||
# Keine JSON-Fragmente (geschweifte/eckige Klammern) als Keyword zulassen
|
||||
for lbl in cat_values:
|
||||
if lbl and not any(c in lbl for c in "{}[]"):
|
||||
keywords.append(lbl)
|
||||
|
||||
if top_locations:
|
||||
keywords.extend([loc for loc in top_locations if loc])
|
||||
|
||||
# Sanitize: Zeilenumbrueche/Tabs weg, Sonderzeichen mit PDF-Sonderbedeutung filtern
|
||||
def _sanitize_keyword(kw: str) -> str:
|
||||
if not kw:
|
||||
return ""
|
||||
# Whitespace normalisieren
|
||||
cleaned = re.sub(r"\s+", " ", kw).strip()
|
||||
# PDF-Dict/Array-Klammern und Backslash raus (WeasyPrint escaped () bei Strings,
|
||||
# { und [ koennen aber den Keywords-Stream abschneiden)
|
||||
cleaned = re.sub(r"[{}\[\]\\]", "", cleaned)
|
||||
return cleaned.strip(" ,;:")
|
||||
|
||||
# Dedup (case-insensitive) mit Reihenfolge erhalten, max 15
|
||||
seen = set()
|
||||
unique_keywords: list[str] = []
|
||||
for kw in keywords:
|
||||
clean_kw = _sanitize_keyword(kw)
|
||||
if not clean_kw:
|
||||
continue
|
||||
key = clean_kw.lower()
|
||||
if key not in seen:
|
||||
seen.add(key)
|
||||
unique_keywords.append(clean_kw)
|
||||
if len(unique_keywords) >= 15:
|
||||
break
|
||||
|
||||
now = datetime.now(TIMEZONE)
|
||||
created = _parse_db_timestamp(incident.get("created_at")) or now.replace(tzinfo=None)
|
||||
modified = _parse_db_timestamp(incident.get("updated_at")) or created
|
||||
|
||||
# Strukturierter Comments-Block (wird in DOCX angezeigt, kompakt)
|
||||
stand = now.strftime("%d.%m.%Y")
|
||||
comments_lines = [
|
||||
f"Incident-ID: {incident.get('id', '?')} | Typ: {incident.get('type', 'adhoc')} | Scope: {scope_label}",
|
||||
f"Stand: {stand}",
|
||||
]
|
||||
if organization_name:
|
||||
comments_lines.append(f"Organisation: {organization_name}")
|
||||
comments_lines.append(
|
||||
f"Umfang: {len(articles)} Artikel, {len(fact_checks)} Faktenchecks, {len(sources)} Quellen"
|
||||
)
|
||||
if top_locations:
|
||||
comments_lines.append("Orte: " + ", ".join(top_locations[:5]))
|
||||
comments = "\n".join(comments_lines)
|
||||
|
||||
publisher = organization_name or "AegisSight"
|
||||
identifier = f"urn:aegissight:incident:{incident.get('id', '0')}:{now.strftime('%Y%m%dT%H%M%S')}"
|
||||
rights = (
|
||||
"Vertrauliche Lageanalyse — AegisSight Monitor. "
|
||||
"Weitergabe nur an autorisierte Empfänger."
|
||||
)
|
||||
|
||||
return {
|
||||
"title": title,
|
||||
"author": creator or "AegisSight Monitor",
|
||||
"subject": subject,
|
||||
"keywords": unique_keywords,
|
||||
"keywords_comma": ", ".join(unique_keywords),
|
||||
"keywords_semicolon": "; ".join(unique_keywords),
|
||||
"category": category,
|
||||
"comments": comments,
|
||||
"creator_app": "AegisSight Monitor",
|
||||
"language": "de-DE",
|
||||
"created": created,
|
||||
"modified": modified,
|
||||
"created_iso": created.strftime("%Y-%m-%dT%H:%M:%S"),
|
||||
"modified_iso": modified.strftime("%Y-%m-%dT%H:%M:%S"),
|
||||
"type_label": type_label,
|
||||
"scope_label": scope_label,
|
||||
"publisher": publisher,
|
||||
"identifier": identifier,
|
||||
"rights": rights,
|
||||
"doc_type": "Report",
|
||||
"version_id": str(max(1, snapshot_count)),
|
||||
}
|
||||
|
||||
|
||||
def _format_pdf_date(dt: datetime) -> str:
|
||||
"""PDF-Datumsformat: D:YYYYMMDDHHmmSS+HH'mm' (mit Zeitzone) oder Z (UTC)."""
|
||||
if dt.tzinfo is None:
|
||||
# Naive dt — als lokale TIMEZONE interpretieren
|
||||
dt = dt.replace(tzinfo=TIMEZONE)
|
||||
base = dt.strftime("D:%Y%m%d%H%M%S")
|
||||
offset = dt.utcoffset()
|
||||
if offset is None:
|
||||
return base + "Z"
|
||||
total_minutes = int(offset.total_seconds() // 60)
|
||||
sign = "+" if total_minutes >= 0 else "-"
|
||||
total_minutes = abs(total_minutes)
|
||||
return f"{base}{sign}{total_minutes // 60:02d}'{total_minutes % 60:02d}'"
|
||||
|
||||
|
||||
def _enrich_pdf_metadata(pdf_bytes: bytes, meta: dict) -> bytes:
|
||||
"""PDF-Ausgabe um XMP-Metadaten und CreationDate/ModDate erweitern (post-process via pikepdf)."""
|
||||
try:
|
||||
buf_in = io.BytesIO(pdf_bytes)
|
||||
with pikepdf.Pdf.open(buf_in) as pdf:
|
||||
created: datetime = meta.get("created")
|
||||
modified: datetime = meta.get("modified")
|
||||
if created and created.tzinfo is None:
|
||||
created = created.replace(tzinfo=TIMEZONE)
|
||||
if modified and modified.tzinfo is None:
|
||||
modified = modified.replace(tzinfo=TIMEZONE)
|
||||
|
||||
# Klassisches Info-Dict: CreationDate + ModDate nachziehen
|
||||
if created:
|
||||
pdf.docinfo["/CreationDate"] = pikepdf.String(_format_pdf_date(created))
|
||||
if modified:
|
||||
pdf.docinfo["/ModDate"] = pikepdf.String(_format_pdf_date(modified))
|
||||
|
||||
# Document-/Instance-ID fuer DMS-Versionierung (frisch pro Export)
|
||||
doc_uuid = f"uuid:{uuid.uuid4()}"
|
||||
instance_uuid = f"uuid:{uuid.uuid4()}"
|
||||
|
||||
# XMP-Metadatenblock schreiben (Dublin Core + XMP + PDF + xmpRights + xmpMM)
|
||||
with pdf.open_metadata(set_pikepdf_as_editor=False) as xmp:
|
||||
# Dublin Core
|
||||
xmp["dc:title"] = meta.get("title", "")
|
||||
xmp["dc:creator"] = [meta.get("author", "")]
|
||||
xmp["dc:description"] = meta.get("subject", "")
|
||||
if meta.get("keywords"):
|
||||
xmp["dc:subject"] = list(meta["keywords"])
|
||||
xmp["dc:language"] = [meta.get("language", "de-DE")]
|
||||
xmp["dc:publisher"] = [meta.get("publisher", "AegisSight")]
|
||||
xmp["dc:identifier"] = meta.get("identifier", "")
|
||||
xmp["dc:format"] = "application/pdf"
|
||||
xmp["dc:type"] = [meta.get("doc_type", "Report")]
|
||||
xmp["dc:rights"] = meta.get("rights", "")
|
||||
if created:
|
||||
xmp["dc:date"] = [created.strftime("%Y-%m-%dT%H:%M:%S%z")]
|
||||
|
||||
# PDF Namespace
|
||||
xmp["pdf:Keywords"] = meta.get("keywords_comma", "")
|
||||
xmp["pdf:Producer"] = "WeasyPrint + AegisSight Monitor"
|
||||
|
||||
# XMP Namespace
|
||||
xmp["xmp:CreatorTool"] = meta.get("creator_app", "AegisSight Monitor")
|
||||
if created:
|
||||
xmp["xmp:CreateDate"] = created.strftime("%Y-%m-%dT%H:%M:%S%z")
|
||||
if modified:
|
||||
xmp["xmp:ModifyDate"] = modified.strftime("%Y-%m-%dT%H:%M:%S%z")
|
||||
xmp["xmp:MetadataDate"] = modified.strftime("%Y-%m-%dT%H:%M:%S%z")
|
||||
|
||||
# xmpRights: Rechte- und Vertraulichkeitshinweis (XMP erwartet String "True")
|
||||
xmp["xmpRights:Marked"] = "True"
|
||||
if meta.get("rights"):
|
||||
# String: pikepdf wrapped das automatisch als LangAlt mit x-default
|
||||
xmp["xmpRights:UsageTerms"] = meta["rights"]
|
||||
|
||||
# xmpMM: Document- und Instance-ID fuer DMS-Versionierung
|
||||
xmp["xmpMM:DocumentID"] = doc_uuid
|
||||
xmp["xmpMM:InstanceID"] = instance_uuid
|
||||
xmp["xmpMM:VersionID"] = meta.get("version_id", "1")
|
||||
|
||||
# xmpMM:History — Audit-Event fuer diesen Export (einzeiliger Eintrag je Seq-Item)
|
||||
history_when = (modified or datetime.now(TIMEZONE)).strftime("%Y-%m-%dT%H:%M:%S%z")
|
||||
history_entry = (
|
||||
f"action=published; when={history_when}; "
|
||||
f"softwareAgent={meta.get('creator_app', 'AegisSight Monitor')}; "
|
||||
f"instanceID={instance_uuid}; "
|
||||
f"scope={meta.get('scope_label', '')}; "
|
||||
f"version={meta.get('version_id', '1')}"
|
||||
)
|
||||
xmp["xmpMM:History"] = [history_entry]
|
||||
|
||||
buf_out = io.BytesIO()
|
||||
pdf.save(buf_out)
|
||||
return buf_out.getvalue()
|
||||
except Exception as e:
|
||||
logger.warning(f"PDF-Metadaten-Anreicherung (XMP/Dates) fehlgeschlagen: {e}")
|
||||
return pdf_bytes
|
||||
|
||||
|
||||
async def generate_pdf(
|
||||
incident: dict, articles: list, fact_checks: list, snapshots: list,
|
||||
scope: str, creator: str, executive_summary_html: str,
|
||||
sections: set[str] | None = None,
|
||||
organization_name: str | None = None,
|
||||
top_locations: list[str] | None = None,
|
||||
snapshot_count: int = 0,
|
||||
) -> bytes:
|
||||
"""PDF-Report via WeasyPrint generieren."""
|
||||
# Sections aus scope ableiten wenn nicht explizit angegeben
|
||||
@@ -424,6 +683,11 @@ async def generate_pdf(
|
||||
if not is_research and zusammenfassung_html:
|
||||
zusammenfassung_html = _linkify_citations_html(zusammenfassung_html, all_sources)
|
||||
|
||||
meta = _build_export_metadata(
|
||||
incident, articles, fact_checks, all_sources, creator, scope, sections,
|
||||
organization_name, top_locations, snapshot_count=snapshot_count,
|
||||
)
|
||||
|
||||
env = Environment(loader=FileSystemLoader(str(TEMPLATE_DIR)))
|
||||
template = env.get_template("report.html")
|
||||
|
||||
@@ -449,6 +713,7 @@ async def generate_pdf(
|
||||
source_stats=_prepare_source_stats(articles)[:20] if scope == "report" else _prepare_source_stats(articles),
|
||||
timeline=_prepare_timeline(articles) if scope == "full" else [],
|
||||
articles=articles if scope == "full" else [],
|
||||
meta=meta,
|
||||
)
|
||||
|
||||
# Artikel pub_date aufbereiten
|
||||
@@ -461,6 +726,7 @@ async def generate_pdf(
|
||||
art["pub_date"] = pub[:10] if pub else ""
|
||||
|
||||
pdf_bytes = HTML(string=html_content).write_pdf()
|
||||
pdf_bytes = _enrich_pdf_metadata(pdf_bytes, meta)
|
||||
return pdf_bytes
|
||||
|
||||
|
||||
@@ -468,6 +734,9 @@ async def generate_docx(
|
||||
incident: dict, articles: list, fact_checks: list, snapshots: list,
|
||||
scope: str, creator: str, executive_summary_text: str,
|
||||
sections: set[str] | None = None,
|
||||
organization_name: str | None = None,
|
||||
top_locations: list[str] | None = None,
|
||||
snapshot_count: int = 0,
|
||||
) -> bytes:
|
||||
"""Word-Report via python-docx generieren."""
|
||||
doc = Document()
|
||||
@@ -485,7 +754,7 @@ async def generate_docx(
|
||||
is_research = incident.get("type") == "research"
|
||||
all_sources = _prepare_sources(incident)
|
||||
zusammenfassung_text = executive_summary_text
|
||||
bericht_summary = incident.get("summary") or "Keine Zusammenfassung verfuegbar."
|
||||
bericht_summary = incident.get("summary") or "Keine Zusammenfassung verfügbar."
|
||||
zusammenfassung_title = "Zusammenfassung"
|
||||
zusammenfassung_lines: list[str] = []
|
||||
|
||||
@@ -496,6 +765,28 @@ async def generate_docx(
|
||||
zusammenfassung_title = "Zusammenfassung"
|
||||
bericht_summary = remaining
|
||||
|
||||
meta = _build_export_metadata(
|
||||
incident, articles, fact_checks, all_sources, creator, scope, sections,
|
||||
organization_name, top_locations, snapshot_count=snapshot_count,
|
||||
)
|
||||
|
||||
# Dateimetadaten setzen (sichtbar in Explorer/Finder, DMS-Systemen)
|
||||
cp = doc.core_properties
|
||||
cp.title = meta["title"]
|
||||
cp.author = meta["author"]
|
||||
cp.subject = meta["subject"]
|
||||
cp.keywords = meta["keywords_semicolon"]
|
||||
cp.comments = meta["comments"]
|
||||
cp.category = meta["category"]
|
||||
cp.last_modified_by = meta["author"]
|
||||
cp.language = meta["language"]
|
||||
cp.content_status = "Final"
|
||||
try:
|
||||
cp.created = meta["created"]
|
||||
cp.modified = meta["modified"]
|
||||
except (ValueError, TypeError) as e:
|
||||
logger.warning(f"DOCX created/modified konnte nicht gesetzt werden: {e}")
|
||||
|
||||
# Styles
|
||||
style = doc.styles['Normal']
|
||||
style.font.size = Pt(10)
|
||||
|
||||
@@ -1,7 +1,19 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<html lang="{{ meta.language if meta else 'de-DE' }}">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
{% if meta %}
|
||||
<title>{{ meta.title }}</title>
|
||||
<meta name="author" content="{{ meta.author }}">
|
||||
<meta name="description" content="{{ meta.subject }}">
|
||||
<meta name="keywords" content="{{ meta.keywords_comma }}">
|
||||
<meta name="subject" content="{{ meta.subject }}">
|
||||
<meta name="generator" content="{{ meta.creator_app }}">
|
||||
<meta name="dcterms.created" content="{{ meta.created_iso }}">
|
||||
<meta name="dcterms.modified" content="{{ meta.modified_iso }}">
|
||||
{% else %}
|
||||
<title>{{ incident.title }}</title>
|
||||
{% endif %}
|
||||
<style>
|
||||
@page { margin: 20mm 18mm 20mm 18mm; size: A4; @bottom-center { content: "Seite " counter(page) " von " counter(pages); font-size: 8pt; color: #0a1832; } }
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
|
||||
@@ -12,6 +12,11 @@ from pydantic import BaseModel, Field
|
||||
|
||||
from auth import get_current_user
|
||||
from config import CLAUDE_PATH, CLAUDE_MODEL_FAST
|
||||
from database import db_dependency
|
||||
from middleware.license_check import require_writable_license
|
||||
from services.license_service import charge_usage_to_tenant
|
||||
from agents.claude_client import ClaudeUsage, ClaudeCliError, _classify_cli_error
|
||||
import aiosqlite
|
||||
|
||||
logger = logging.getLogger("osint.chat")
|
||||
|
||||
@@ -21,8 +26,8 @@ router = APIRouter(tags=["chat"])
|
||||
# Claude CLI Aufruf (Chat-spezifisch, kein JSON-Modus)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def _call_claude_chat(prompt: str) -> tuple[str, int]:
|
||||
"""Ruft Claude CLI fuer Chat auf. Gibt (text, duration_ms) zurueck.
|
||||
async def _call_claude_chat(prompt: str) -> tuple[str, int, ClaudeUsage]:
|
||||
"""Ruft Claude CLI fuer Chat auf. Gibt (text, duration_ms, usage) zurueck.
|
||||
|
||||
Anders als call_claude(): kein JSON-Output-Modus, kein append-system-prompt.
|
||||
"""
|
||||
@@ -46,7 +51,7 @@ async def _call_claude_chat(prompt: str) -> tuple[str, int]:
|
||||
)
|
||||
try:
|
||||
stdout, stderr = await asyncio.wait_for(
|
||||
process.communicate(input=prompt.encode("utf-8")), timeout=60
|
||||
process.communicate(input=prompt.encode("utf-8")), timeout=120
|
||||
)
|
||||
except asyncio.TimeoutError:
|
||||
process.kill()
|
||||
@@ -54,29 +59,44 @@ async def _call_claude_chat(prompt: str) -> tuple[str, int]:
|
||||
|
||||
if process.returncode != 0:
|
||||
err_msg = stderr.decode("utf-8", errors="replace").strip()
|
||||
logger.error(f"Chat Claude CLI Fehler (rc={process.returncode}): {err_msg[:500]}")
|
||||
if "rate_limit" in err_msg.lower() or "overloaded" in err_msg.lower():
|
||||
raise RuntimeError("rate_limit")
|
||||
raise RuntimeError(f"Claude CLI Fehler: {err_msg[:200]}")
|
||||
stdout_msg = stdout.decode("utf-8", errors="replace").strip()
|
||||
combined = f"{err_msg} {stdout_msg}"
|
||||
error_type = _classify_cli_error(combined)
|
||||
logger.error(f"Chat Claude CLI Fehler [{error_type}] (rc={process.returncode}): {(stdout_msg or err_msg)[:500]}")
|
||||
raise ClaudeCliError(error_type, stdout_msg or err_msg)
|
||||
|
||||
raw = stdout.decode("utf-8", errors="replace").strip()
|
||||
duration_ms = 0
|
||||
result_text = raw
|
||||
usage = ClaudeUsage()
|
||||
|
||||
try:
|
||||
data = _json.loads(raw)
|
||||
if data.get("is_error"):
|
||||
error_text = str(data.get("result", ""))
|
||||
error_type = _classify_cli_error(error_text)
|
||||
logger.error(f"Chat Claude CLI Fehler [{error_type}] (is_error): {error_text[:500]}")
|
||||
raise ClaudeCliError(error_type, error_text)
|
||||
|
||||
result_text = data.get("result", raw)
|
||||
duration_ms = data.get("duration_ms", 0)
|
||||
cost = data.get("total_cost_usd", 0.0)
|
||||
u = data.get("usage", {})
|
||||
usage = ClaudeUsage(
|
||||
input_tokens=u.get("input_tokens", 0),
|
||||
output_tokens=u.get("output_tokens", 0),
|
||||
cache_creation_tokens=u.get("cache_creation_input_tokens", 0),
|
||||
cache_read_tokens=u.get("cache_read_input_tokens", 0),
|
||||
cost_usd=data.get("total_cost_usd", 0.0),
|
||||
duration_ms=duration_ms,
|
||||
)
|
||||
logger.info(
|
||||
f"Chat Claude: {u.get('input_tokens', 0)} in / {u.get('output_tokens', 0)} out / "
|
||||
f"${cost:.4f} / {duration_ms}ms"
|
||||
f"Chat Claude: {usage.input_tokens} in / {usage.output_tokens} out / "
|
||||
f"${usage.cost_usd:.4f} / {duration_ms}ms"
|
||||
)
|
||||
except _json.JSONDecodeError:
|
||||
logger.warning("Chat Claude CLI Antwort kein JSON, nutze raw output")
|
||||
|
||||
return result_text, duration_ms
|
||||
return result_text, duration_ms, usage
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Models
|
||||
@@ -298,7 +318,7 @@ Typische Fragen die du beantworten kannst:
|
||||
FEATURE-DOKUMENTATION:
|
||||
|
||||
Lage/Recherche erstellen:
|
||||
Oben im Dashboard gibt es den Button "Neue Lage". Dort waehlt der Nutzer unter "Art der Lage" zwischen zwei Typen. "Live-Monitoring, Ereignis beobachten" durchsucht laufend hunderte Nachrichtenquellen nach neuen Meldungen zu einem aktuellen Ereignis, hier reicht eine kurze, praegnante Beschreibung. Empfohlen ist die automatische Aktualisierung. "Recherche, Thema analysieren" ist fuer tiefergehende Analysen gedacht, hier sollte eine ausfuehrlichere Beschreibung mit Kontext, Zeitraum und Fokus eingegeben werden, das System nutzt dann KI-gestuetzte Quellenauswahl und eine breitere Suche. Empfohlen ist manuelles Starten und bei Bedarf vertiefen. Bei beiden Typen gibt der Nutzer Titel und Beschreibung ein und klickt "Lage anlegen". Der erste Refresh startet automatisch und sammelt passende Artikel. In der Sidebar werden Live-Monitoring Lagen unter "Live-Monitoring" und Recherchen unter "Recherchen" gruppiert angezeigt.
|
||||
Oben im Dashboard gibt es den Button "Neue Lage". Dort waehlt der Nutzer unter "Art der Lage" zwischen zwei Typen. "Live-Monitoring, Ereignis beobachten" eignet sich fuer aktuelle Ereignisse, die der Nutzer laufend verfolgen moechte, hier reicht eine kurze, praegnante Beschreibung. Empfohlen ist die automatische Aktualisierung. "Recherche, Thema analysieren" ist fuer tiefergehende Analysen gedacht, hier sollte eine ausfuehrlichere Beschreibung mit Kontext, Zeitraum und Fokus eingegeben werden. Empfohlen ist manuelles Starten und bei Bedarf vertiefen. Bei beiden Typen gibt der Nutzer Titel und Beschreibung ein und klickt "Lage anlegen". Nach dem Anlegen startet die erste Aktualisierung automatisch. In der Sidebar werden Live-Monitoring Lagen unter "Live-Monitoring" und Recherchen unter "Recherchen" gruppiert angezeigt.
|
||||
|
||||
Wichtiger Unterschied bei Kacheln: Bei Live-Monitoring heisst die Zusammenfassungs-Kachel "Lagebild", bei Recherche-Lagen heisst sie "Recherchebericht". Auch im PDF-Export, in den Layout-Toggles und bei E-Mail-Benachrichtigungen passt sich die Bezeichnung entsprechend an.
|
||||
|
||||
@@ -308,17 +328,17 @@ Je praeziser die Beschreibung, desto relevantere Ergebnisse liefert das System.
|
||||
Quellen:
|
||||
Quellen werden automatisch vom System verwaltet. Es gibt verschiedene Kategorien: oeffentlich-rechtlich, Qualitaetszeitung, Nachrichtenagentur, international, Behoerde, Telegram und sonstige. Unter den Quellen-Einstellungen koennen bestimmte Domains blockiert werden, damit deren Artikel nicht mehr in Lagen erscheinen. Das System schlaegt auch automatisch neue relevante Quellen vor basierend auf den Themen der Lagen. Die Quellenansicht zeigt fuer jede Quelle Name, Kategorie, Typ, Artikelanzahl und wann zuletzt Artikel gefunden wurden.
|
||||
|
||||
Refresh-Modi:
|
||||
Jede Lage hat einen Refresh-Modus. "Manuell" bedeutet, der Nutzer klickt selbst auf "Aktualisieren" wenn er neue Artikel suchen moechte. "Automatisch" laesst das System in einem einstellbaren Intervall automatisch nach neuen Artikeln suchen. Das Intervall ist pro Lage einstellbar, z.B. alle 15, 30, 60 oder 180 Minuten. Bei einem Refresh durchsucht das System alle konfigurierten Quellen nach neuen relevanten Artikeln, erstellt oder aktualisiert die Zusammenfassung und fuehrt Faktenchecks durch.
|
||||
Aktualisierungs-Modi:
|
||||
Jede Lage hat einen Aktualisierungs-Modus. "Manuell" bedeutet, der Nutzer klickt selbst auf "Aktualisieren" wenn er neue Artikel suchen moechte. "Automatisch" laesst die Lage in einem selbst gewaehlten Intervall turnusmaessig nach neuen Artikeln suchen. Das Intervall kann in Minuten, Stunden, Tagen oder Wochen angegeben werden, mindestens 10 Minuten. Im Automatik-Modus laesst sich ausserdem eine Uhrzeit fuer die erste Aktualisierung festlegen, danach laeuft es im gewaehlten Takt weiter. Bei jeder Aktualisierung kommen neue Artikel hinzu, die Zusammenfassung wird aktualisiert und die Faktenchecks werden neu bewertet.
|
||||
|
||||
Faktenchecks:
|
||||
Das System prueft automatisch Behauptungen aus den gesammelten Artikeln. Es gibt vier Status: "Bestaetigt" bedeutet mehrere unabhaengige Quellen bestaetigen die Information. "Umstritten" heisst Quellen widersprechen sich und die Faktenlage ist unklar. "Widerlegt" bedeutet die Information wurde durch zuverlaessige Quellen widerlegt. "In Entwicklung" zeigt an dass noch nicht genug Informationen fuer eine Einschaetzung vorliegen. Die Faktenchecks werden bei jedem Refresh automatisch aktualisiert und koennen sich im Laufe der Zeit aendern wenn neue Evidenz hinzukommt.
|
||||
In der Faktencheck-Kachel werden zentrale Behauptungen aus den Artikeln mit einem Status markiert. Es gibt fuenf Status: "Bestaetigt" (gruenes Haekchen) heisst, mindestens zwei unabhaengige, serioese Quellen stuetzen die Aussage uebereinstimmend. "Gesichert" (gruenes Haekchen) bedeutet, drei oder mehr unabhaengige Quellen belegen den Sachverhalt, hohe Verlaesslichkeit. "Unbestaetigt" (Fragezeichen) zeigt an, dass die Aussage bisher nur aus einer Quelle stammt und eine unabhaengige Bestaetigung aussteht. "Umstritten" (Warndreieck) bedeutet, Quellen widersprechen sich, es gibt sowohl stuetzende als auch widersprechende Belege. "Widerlegt" (rotes Kreuz) heisst, zuverlaessige Quellen widersprechen der Aussage und sie ist wahrscheinlich falsch. Der Status kann sich bei spaeteren Aktualisierungen aendern, wenn neue Belege hinzukommen.
|
||||
|
||||
Benachrichtigungen und Abos:
|
||||
Lagen koennen ueber das Glocken-Symbol abonniert werden. Es gibt verschiedene E-Mail-Benachrichtigungstypen: Zusammenfassung nach einem Refresh, Benachrichtigung bei neuen Artikeln und Benachrichtigung bei Statusaenderungen von Faktenchecks. Im Dashboard erscheinen neue Benachrichtigungen als Badge am Glocken-Symbol. Welche Benachrichtigungstypen gewuenscht sind, laesst sich pro Lage einzeln einstellen.
|
||||
Lagen koennen ueber das Glocken-Symbol abonniert werden. Beim Anlegen oder Bearbeiten einer Lage koennen drei E-Mail-Benachrichtigungen einzeln aktiviert werden: "Neues Lagebild" (bzw. Recherchebericht) informiert nach einer Aktualisierung ueber die neue Zusammenfassung, "Neue Artikel" meldet gefundene Artikel und "Statusaenderung Faktencheck" meldet, wenn sich der Status einer geprueften Aussage aendert. Im Dashboard erscheinen neue Benachrichtigungen zusaetzlich als Badge am Glocken-Symbol.
|
||||
|
||||
Export:
|
||||
Im Lage-Detail gibt es einen Export-Button. Der Markdown-Export erzeugt einen vollstaendigen Lagebericht als .md-Datei mit Zusammenfassung, Artikeln und Faktenchecks. Der JSON-Export liefert strukturierte Daten zur Weiterverarbeitung in anderen Systemen.
|
||||
Im Lage-Detail gibt es einen Export-Button. Der Nutzer waehlt im Export-Dialog zunaechst aus, welche Bereiche enthalten sein sollen: "Zusammenfassung", "Recherchebericht / Lagebild", "Faktencheck" und "Quellen". Als Format stehen "PDF" und "Word (DOCX)" zur Verfuegung. Mit "Exportieren" wird die Datei erzeugt und heruntergeladen.
|
||||
|
||||
Sichtbarkeit:
|
||||
Jede Lage kann "oeffentlich" oder "privat" sein. Oeffentliche Lagen sind fuer alle Nutzer der Organisation sichtbar. Private Lagen kann nur der Ersteller sehen und bearbeiten. Die Sichtbarkeit laesst sich ueber das Einstellungs-Menue der jeweiligen Lage aendern.
|
||||
@@ -326,8 +346,8 @@ Jede Lage kann "oeffentlich" oder "privat" sein. Oeffentliche Lagen sind fuer al
|
||||
Retention (Aufbewahrung):
|
||||
Standardmaessig werden Lagen unbegrenzt aufbewahrt. Es kann aber eine Aufbewahrungsdauer in Tagen eingestellt werden. Nach Ablauf wird die Lage automatisch archiviert. Archivierte Lagen bleiben lesbar, werden aber nicht mehr automatisch aktualisiert.
|
||||
|
||||
Kartenansicht (Geoparsing):
|
||||
Artikel werden automatisch auf geografische Erwahnungen analysiert. Erkannte Orte erscheinen auf einer interaktiven Karte mit farbigen Markern. Die Farben zeigen die Relevanz: Rot fuer Hauptgeschehen, Orange fuer Reaktionen, Blau fuer Beteiligte und Grau fuer erwaehnte Orte. Bei vielen Markern werden diese zu Clustern zusammengefasst. Ein Klick auf einen Marker zeigt die zugehoerigen Artikel. Die Karte hat einen Vollbildmodus und die Kategorien lassen sich ueber Checkboxen in der Legende ein- und ausblenden.
|
||||
Kartenansicht:
|
||||
In der Karten-Kachel erscheinen alle zur Lage erkannten Orte als farbige Marker. Die Farben zeigen die Relevanz: Rot fuer Hauptgeschehen, Orange fuer Reaktionen, Blau fuer Beteiligte und Grau fuer erwaehnte Orte. Bei vielen Markern werden diese zu Clustern zusammengefasst, ein Klick auf einen Marker oeffnet die zugehoerigen Artikel. Ueber das Vollbild-Symbol laesst sich die Karte grossformatig anzeigen, die Kategorien koennen ueber Checkboxen in der Legende ein- und ausgeblendet werden.
|
||||
|
||||
Quellenausschluss:
|
||||
Bestimmte Domains koennen ueber die Quellen-Einstellungen blockiert werden. Blockierte Quellen tauchen dann in keiner Lage mehr auf. So lassen sich unerwuenschte oder unzuverlaessige Quellen dauerhaft ausschliessen.
|
||||
@@ -395,7 +415,8 @@ def _build_prompt(user_message: str, history: list[dict]) -> str:
|
||||
@router.post("", response_model=ChatResponse)
|
||||
async def chat(
|
||||
req: ChatRequest,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
current_user: dict = Depends(require_writable_license),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Chat-Nachricht verarbeiten und Antwort generieren."""
|
||||
user_id = current_user["id"]
|
||||
@@ -420,15 +441,23 @@ async def chat(
|
||||
|
||||
# Claude CLI aufrufen
|
||||
try:
|
||||
result, duration_ms = await _call_claude_chat(prompt)
|
||||
result, duration_ms, usage = await _call_claude_chat(prompt)
|
||||
except TimeoutError:
|
||||
raise HTTPException(status_code=504, detail="Der Assistent antwortet gerade nicht. Bitte versuche es erneut.")
|
||||
except RuntimeError as e:
|
||||
error_str = str(e)
|
||||
if "rate_limit" in error_str:
|
||||
except ClaudeCliError as e:
|
||||
if e.error_type == "rate_limit":
|
||||
raise HTTPException(status_code=429, detail="Der Assistent ist gerade ausgelastet. Bitte versuche es in einer Minute erneut.")
|
||||
logger.error(f"Chat Claude-Fehler: {e}")
|
||||
if e.error_type == "auth_error":
|
||||
raise HTTPException(status_code=503, detail="KI-Zugang aktuell nicht verfuegbar. Bitte Administrator kontaktieren.")
|
||||
logger.error(f"Chat Claude-Fehler [{e.error_type}]: {e}")
|
||||
raise HTTPException(status_code=502, detail="Der Assistent ist voruebergehend nicht erreichbar.")
|
||||
except RuntimeError as e:
|
||||
logger.error(f"Chat Claude-Fehler (unspezifisch): {e}")
|
||||
raise HTTPException(status_code=502, detail="Der Assistent ist voruebergehend nicht erreichbar.")
|
||||
|
||||
# Credits buchen
|
||||
await charge_usage_to_tenant(db, current_user.get("tenant_id"), usage, source="chat")
|
||||
await db.commit()
|
||||
|
||||
# Output sanitieren
|
||||
reply = _sanitize_output(result)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"""Incidents-Router: Lagen verwalten (Multi-Tenant)."""
|
||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query, status
|
||||
from fastapi.responses import StreamingResponse
|
||||
from models import IncidentCreate, IncidentUpdate, IncidentResponse, SubscriptionUpdate, SubscriptionResponse, DescriptionEnhanceRequest
|
||||
from models import IncidentCreate, IncidentUpdate, IncidentResponse, IncidentListItem, SubscriptionUpdate, SubscriptionResponse, DescriptionEnhanceRequest
|
||||
from auth import get_current_user
|
||||
from middleware.license_check import require_writable_license
|
||||
from database import db_dependency, get_db
|
||||
@@ -69,17 +69,30 @@ async def _enrich_incident(db: aiosqlite.Connection, row: aiosqlite.Row) -> dict
|
||||
return incident
|
||||
|
||||
|
||||
@router.get("", response_model=list[IncidentResponse])
|
||||
@router.get("", response_model=list[IncidentListItem])
|
||||
async def list_incidents(
|
||||
status_filter: str = None,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Alle Lagen des Tenants auflisten (oeffentliche + eigene private)."""
|
||||
"""Alle Lagen des Tenants auflisten (oeffentliche + eigene private).
|
||||
|
||||
Liefert schlanke Sidebar-Items — ohne summary, description, sources_json.
|
||||
Volltexte kommen erst beim Oeffnen der Lage per GET /incidents/{id}.
|
||||
"""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
user_id = current_user["id"]
|
||||
|
||||
query = "SELECT * FROM incidents WHERE tenant_id = ? AND (visibility = 'public' OR created_by = ?)"
|
||||
# Nur die fuer Sidebar + Edit-Dialog noetigen Spalten selektieren
|
||||
# (spart bei Iran: 324 KB sources_json + 32 KB summary).
|
||||
# has_summary als Bit — Frontend nutzt es zur Erkennung "erster Refresh".
|
||||
query = (
|
||||
"SELECT id, title, description, type, status, refresh_mode, refresh_interval, "
|
||||
"refresh_start_time, retention_days, visibility, "
|
||||
"international_sources, include_telegram, created_by, created_at, updated_at, "
|
||||
"CASE WHEN summary IS NOT NULL AND summary != '' THEN 1 ELSE 0 END AS has_summary "
|
||||
"FROM incidents WHERE tenant_id = ? AND (visibility = 'public' OR created_by = ?)"
|
||||
)
|
||||
params = [tenant_id, user_id]
|
||||
|
||||
if status_filter:
|
||||
@@ -155,43 +168,60 @@ async def get_refreshing_incidents(
|
||||
from agents.orchestrator import orchestrator
|
||||
queued_ids = list(orchestrator._queued_ids) if hasattr(orchestrator, '_queued_ids') else []
|
||||
current_task = orchestrator._current_task if hasattr(orchestrator, '_current_task') else None
|
||||
# Session-Start des aktuell laufenden Tasks — stabil ueber Multi-Pass/Retry hinweg.
|
||||
# Verhindert, dass der Frontend-Timer beim Reload auf den letzten Log-Eintrag
|
||||
# (pass 2/3 oder retry n) zurueckspringt.
|
||||
current_started_at = (
|
||||
orchestrator._current_task_started_at
|
||||
if hasattr(orchestrator, '_current_task_started_at') else None
|
||||
)
|
||||
|
||||
details = {}
|
||||
for row in rows:
|
||||
iid = row["incident_id"]
|
||||
started_at = (
|
||||
current_started_at
|
||||
if (iid == current_task and current_started_at)
|
||||
else row["started_at"]
|
||||
)
|
||||
details[str(iid)] = {"started_at": started_at}
|
||||
|
||||
return {
|
||||
"refreshing": [row["incident_id"] for row in rows],
|
||||
"queued": queued_ids,
|
||||
"current": current_task,
|
||||
"details": {str(row["incident_id"]): {"started_at": row["started_at"]} for row in rows},
|
||||
"details": details,
|
||||
}
|
||||
|
||||
|
||||
# --- Beschreibung generieren (Prompt Enhancement) ---
|
||||
|
||||
ENHANCE_PROMPT_RESEARCH = """Du bist ein Recherche-Planer in einem OSINT-Lagemonitoring-System.
|
||||
Deine Aufgabe: Strukturiere ein Recherche-Briefing, das Analysten als Leitfaden fuer ihre Suche verwenden.
|
||||
Deine Aufgabe: Strukturiere ein Recherche-Briefing, das Analysten als Leitfaden für ihre Suche verwenden.
|
||||
Du behauptest KEINE Fakten und musst das Thema NICHT kennen oder verifizieren.
|
||||
Der Nutzer gibt das Thema vor -- du definierst Suchrichtungen, Schwerpunkte und Stichworte.
|
||||
Erstelle das Briefing IMMER, auch wenn dir das Thema unbekannt ist.
|
||||
|
||||
WICHTIG: Verwende IMMER echte UTF-8-Umlaute (ae, oe, ue, ss) und KEINE Umschreibungen.
|
||||
WICHTIG: Verwende IMMER echte Umlaute (ä, ö, ü, ß) und KEINE Umschreibungen.
|
||||
|
||||
Titel: {title}
|
||||
Vorhandener Kontext: {context}
|
||||
Typ: Hintergrundrecherche
|
||||
|
||||
Erstelle ein praezises Recherche-Briefing mit:
|
||||
1. Fallbezeichnung (vollstaendige Benennung des Themas basierend auf Titel und Kontext)
|
||||
2. Recherche-Schwerpunkte (5-8 thematische Punkte, z.B. Sachverhalt, beteiligte Parteien, rechtliche Aspekte, mediale Rezeption, Hintergruende, Chronologie)
|
||||
3. Relevante Suchbegriffe (deutsch + englisch, inkl. Abkuerzungen und alternative Schreibweisen)
|
||||
Erstelle ein präzises Recherche-Briefing mit:
|
||||
1. Fallbezeichnung (vollständige Benennung des Themas basierend auf Titel und Kontext)
|
||||
2. Recherche-Schwerpunkte (5-8 thematische Punkte, z.B. Sachverhalt, beteiligte Parteien, rechtliche Aspekte, mediale Rezeption, Hintergründe, Chronologie)
|
||||
3. Relevante Suchbegriffe (deutsch + englisch, inkl. Abkürzungen und alternative Schreibweisen)
|
||||
|
||||
Schreibe NUR das Briefing als Fliesstext mit Aufzaehlungen. Keine Erklaerungen, Rueckfragen oder Disclaimer."""
|
||||
Schreibe NUR das Briefing als Fließtext mit Aufzählungen. Keine Erklärungen, Rückfragen oder Disclaimer."""
|
||||
|
||||
ENHANCE_PROMPT_ADHOC = """Du bist ein Recherche-Planer in einem OSINT-Lagemonitoring-System.
|
||||
Deine Aufgabe: Erstelle eine knappe Vorfallsbeschreibung, die als Suchauftrag fuer Live-Monitoring dient.
|
||||
Deine Aufgabe: Erstelle eine knappe Vorfallsbeschreibung, die als Suchauftrag für Live-Monitoring dient.
|
||||
Du behauptest KEINE Fakten und musst den Vorfall NICHT kennen oder verifizieren.
|
||||
Der Nutzer gibt das Thema vor -- du strukturierst, wonach gesucht werden soll.
|
||||
Erstelle die Beschreibung IMMER, auch wenn dir der Vorfall unbekannt ist.
|
||||
|
||||
WICHTIG: Verwende IMMER echte UTF-8-Umlaute (ae, oe, ue, ss) und KEINE Umschreibungen.
|
||||
WICHTIG: Verwende IMMER echte Umlaute (ä, ö, ü, ß) und KEINE Umschreibungen.
|
||||
|
||||
Titel: {title}
|
||||
Vorhandener Kontext: {context}
|
||||
@@ -200,10 +230,10 @@ Typ: Live-Monitoring (aktuelle Ereignisse)
|
||||
Erstelle eine knappe, informative Beschreibung mit:
|
||||
1. Was ist passiert / worum geht es (basierend auf Titel und Kontext)
|
||||
2. Wo (geographischer Kontext, falls ableitbar)
|
||||
3. Wer ist beteiligt (Akteure, Organisationen, Laender)
|
||||
4. Wonach soll gesucht werden (aktuelle Entwicklungen, Reaktionen, Hintergruende)
|
||||
3. Wer ist beteiligt (Akteure, Organisationen, Länder)
|
||||
4. Wonach soll gesucht werden (aktuelle Entwicklungen, Reaktionen, Hintergründe)
|
||||
|
||||
Schreibe NUR die Beschreibung als Fliesstext (3-5 Zeilen). Keine Erklaerungen, Rueckfragen oder Disclaimer."""
|
||||
Schreibe NUR die Beschreibung als Fließtext (3-5 Zeilen). Keine Erklärungen, Rückfragen oder Disclaimer."""
|
||||
|
||||
_enhance_logger = logging.getLogger("osint.enhance")
|
||||
|
||||
@@ -211,26 +241,43 @@ _enhance_logger = logging.getLogger("osint.enhance")
|
||||
@router.post("/enhance-description")
|
||||
async def enhance_description(
|
||||
data: DescriptionEnhanceRequest,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
current_user: dict = Depends(require_writable_license),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Generiert eine strukturierte Beschreibung per KI aus dem Titel."""
|
||||
from agents.claude_client import call_claude
|
||||
from agents.claude_client import call_claude, ClaudeCliError
|
||||
from config import CLAUDE_MODEL_FAST
|
||||
from services.license_service import charge_usage_to_tenant
|
||||
|
||||
template = ENHANCE_PROMPT_RESEARCH if data.type == "research" else ENHANCE_PROMPT_ADHOC
|
||||
context = data.description.strip() if data.description and data.description.strip() else "Kein Kontext angegeben"
|
||||
prompt = template.format(title=data.title.strip(), context=context)
|
||||
|
||||
try:
|
||||
result, usage = await call_claude(prompt, tools=None, model=CLAUDE_MODEL_FAST, raw_text=True)
|
||||
result, usage = await call_claude(prompt, tools=None, model=CLAUDE_MODEL_FAST, raw_text=True, timeout=60)
|
||||
except ClaudeCliError as e:
|
||||
_enhance_logger.error(f"Beschreibung generieren: ClaudeCliError [{e.error_type}]: {e.message}")
|
||||
if e.error_type == "auth_error":
|
||||
raise HTTPException(status_code=503, detail="KI-Zugang aktuell nicht verfuegbar. Bitte Administrator kontaktieren.")
|
||||
if e.error_type == "rate_limit":
|
||||
raise HTTPException(status_code=429, detail="KI ist gerade ausgelastet. Bitte in einer Minute erneut versuchen.")
|
||||
raise HTTPException(status_code=500, detail="Beschreibung konnte nicht generiert werden")
|
||||
except TimeoutError:
|
||||
_enhance_logger.error("Beschreibung generieren: Timeout")
|
||||
raise HTTPException(status_code=504, detail="Die KI antwortet gerade nicht. Bitte erneut versuchen.")
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
_enhance_logger.error(f"Beschreibung generieren fehlgeschlagen: {e}")
|
||||
raise HTTPException(status_code=500, detail="Beschreibung konnte nicht generiert werden")
|
||||
|
||||
_enhance_logger.info(
|
||||
f"Beschreibung generiert fuer \"{data.title[:50]}\": "
|
||||
f"{usage.input_tokens}in/{usage.output_tokens}out"
|
||||
)
|
||||
await charge_usage_to_tenant(db, current_user.get("tenant_id"), usage, source="enhance")
|
||||
await db.commit()
|
||||
return {"description": result.strip()}
|
||||
except Exception as e:
|
||||
_enhance_logger.error(f"Beschreibung generieren fehlgeschlagen: {e}")
|
||||
raise HTTPException(status_code=500, detail="Beschreibung konnte nicht generiert werden")
|
||||
|
||||
|
||||
@router.get("/{incident_id}", response_model=IncidentResponse)
|
||||
@@ -239,12 +286,41 @@ async def get_incident(
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Einzelne Lage abrufen."""
|
||||
"""Einzelne Lage abrufen.
|
||||
|
||||
sources_json wird NICHT mitgeliefert — fuer Zitate-Lookups
|
||||
stattdessen GET /incidents/{id}/sources verwenden (lazy).
|
||||
"""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
row = await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
return await _enrich_incident(db, row)
|
||||
|
||||
|
||||
@router.get("/{incident_id}/sources")
|
||||
async def get_incident_sources(
|
||||
incident_id: int,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Sources-Array einer Lage (geparst aus sources_json) fuer Zitate-Lookups."""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
cursor = await db.execute(
|
||||
"SELECT sources_json FROM incidents WHERE id = ?",
|
||||
(incident_id,),
|
||||
)
|
||||
row = await cursor.fetchone()
|
||||
sources: list = []
|
||||
if row and row["sources_json"]:
|
||||
try:
|
||||
parsed = json.loads(row["sources_json"])
|
||||
if isinstance(parsed, list):
|
||||
sources = parsed
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
sources = []
|
||||
return {"incident_id": incident_id, "sources": sources}
|
||||
|
||||
|
||||
@router.put("/{incident_id}", response_model=IncidentResponse)
|
||||
async def update_incident(
|
||||
incident_id: int,
|
||||
@@ -317,18 +393,133 @@ async def delete_incident(
|
||||
@router.get("/{incident_id}/articles")
|
||||
async def get_articles(
|
||||
incident_id: int,
|
||||
limit: int = Query(500, ge=1, le=1000),
|
||||
offset: int = Query(0, ge=0),
|
||||
search: str | None = Query(None, min_length=0, max_length=200),
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Alle Artikel einer Lage abrufen."""
|
||||
"""Artikel einer Lage paginiert abrufen.
|
||||
|
||||
Response: ``{"total": int, "articles": [...]}``.
|
||||
Optionaler ``search``-Param filtert per LIKE ueber
|
||||
headline, headline_de, source, content_de, content_original.
|
||||
"""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
|
||||
search_clean = (search or "").strip()
|
||||
if search_clean:
|
||||
like = f"%{search_clean}%"
|
||||
params = (incident_id, like, like, like, like, like)
|
||||
where = (
|
||||
"WHERE incident_id = ? AND ("
|
||||
"COALESCE(headline,'') LIKE ? OR "
|
||||
"COALESCE(headline_de,'') LIKE ? OR "
|
||||
"COALESCE(source,'') LIKE ? OR "
|
||||
"COALESCE(content_de,'') LIKE ? OR "
|
||||
"COALESCE(content_original,'') LIKE ?)"
|
||||
)
|
||||
else:
|
||||
params = (incident_id,)
|
||||
where = "WHERE incident_id = ?"
|
||||
|
||||
cursor = await db.execute(f"SELECT COUNT(*) AS cnt FROM articles {where}", params)
|
||||
total = (await cursor.fetchone())["cnt"]
|
||||
|
||||
cursor = await db.execute(
|
||||
f"SELECT * FROM articles {where} ORDER BY collected_at DESC LIMIT ? OFFSET ?",
|
||||
(*params, limit, offset),
|
||||
)
|
||||
rows = await cursor.fetchall()
|
||||
return {"total": total, "articles": [dict(row) for row in rows]}
|
||||
|
||||
|
||||
@router.get("/{incident_id}/articles/sources-summary")
|
||||
async def get_articles_sources_summary(
|
||||
incident_id: int,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Aggregierte Quellen-Statistik fuer eine Lage (fuer Quellenuebersicht)."""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
cursor = await db.execute(
|
||||
"SELECT * FROM articles WHERE incident_id = ? ORDER BY collected_at DESC",
|
||||
"""SELECT source,
|
||||
COUNT(*) AS article_count,
|
||||
GROUP_CONCAT(DISTINCT COALESCE(language,'de')) AS languages
|
||||
FROM articles WHERE incident_id = ?
|
||||
GROUP BY source ORDER BY article_count DESC""",
|
||||
(incident_id,),
|
||||
)
|
||||
rows = await cursor.fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
sources = []
|
||||
for r in await cursor.fetchall():
|
||||
d = dict(r)
|
||||
langs = (d.pop("languages") or "de").split(",")
|
||||
d["languages"] = sorted({(l or "de").strip() for l in langs if l is not None})
|
||||
sources.append(d)
|
||||
# Sprach-Verteilung gesamt
|
||||
cursor = await db.execute(
|
||||
"""SELECT COALESCE(language,'de') AS language, COUNT(*) AS cnt
|
||||
FROM articles WHERE incident_id = ?
|
||||
GROUP BY language ORDER BY cnt DESC""",
|
||||
(incident_id,),
|
||||
)
|
||||
lang_counts = [dict(r) for r in await cursor.fetchall()]
|
||||
total_cursor = await db.execute(
|
||||
"SELECT COUNT(*) AS cnt FROM articles WHERE incident_id = ?",
|
||||
(incident_id,),
|
||||
)
|
||||
total = (await total_cursor.fetchone())["cnt"]
|
||||
return {"total": total, "sources": sources, "language_counts": lang_counts}
|
||||
|
||||
|
||||
@router.get("/{incident_id}/articles/timeline-buckets")
|
||||
async def get_articles_timeline_buckets(
|
||||
incident_id: int,
|
||||
granularity: str = Query("day", pattern="^(hour|day|week|month)$"),
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Aggregierte Zeit-Buckets fuer die Timeline-Achse.
|
||||
|
||||
Zaehlt Artikel und Snapshots pro Bucket. Kein Inhalt, nur Counts.
|
||||
"""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
fmt_map = {
|
||||
"hour": "%Y-%m-%d %H:00",
|
||||
"day": "%Y-%m-%d",
|
||||
"week": "%Y-%W",
|
||||
"month": "%Y-%m",
|
||||
}
|
||||
fmt = fmt_map[granularity]
|
||||
cursor = await db.execute(
|
||||
f"""SELECT strftime(?, collected_at) AS bucket, COUNT(*) AS article_count
|
||||
FROM articles WHERE incident_id = ?
|
||||
GROUP BY bucket ORDER BY bucket""",
|
||||
(fmt, incident_id),
|
||||
)
|
||||
article_rows = {r["bucket"]: r["article_count"] for r in await cursor.fetchall()}
|
||||
cursor = await db.execute(
|
||||
f"""SELECT strftime(?, created_at) AS bucket, COUNT(*) AS snapshot_count
|
||||
FROM incident_snapshots WHERE incident_id = ?
|
||||
GROUP BY bucket ORDER BY bucket""",
|
||||
(fmt, incident_id),
|
||||
)
|
||||
snapshot_rows = {r["bucket"]: r["snapshot_count"] for r in await cursor.fetchall()}
|
||||
all_buckets = sorted(set(article_rows.keys()) | set(snapshot_rows.keys()))
|
||||
return {
|
||||
"granularity": granularity,
|
||||
"buckets": [
|
||||
{
|
||||
"bucket": b,
|
||||
"article_count": article_rows.get(b, 0),
|
||||
"snapshot_count": snapshot_rows.get(b, 0),
|
||||
}
|
||||
for b in all_buckets
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
@router.get("/{incident_id}/snapshots")
|
||||
@@ -337,12 +528,17 @@ async def get_snapshots(
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Lageberichte (Snapshots) einer Lage abrufen."""
|
||||
"""Lageberichte (Snapshots) einer Lage abrufen — schlanke Liste.
|
||||
|
||||
Liefert nur Metadaten und einen 300-Zeichen-Preview des Summary.
|
||||
Der Volltext (summary + sources_json) wird per Einzel-Endpunkt
|
||||
``GET /{incident_id}/snapshots/{snapshot_id}`` bei Bedarf geladen.
|
||||
"""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
cursor = await db.execute(
|
||||
"""SELECT id, incident_id, summary, sources_json,
|
||||
article_count, fact_check_count, created_at
|
||||
"""SELECT id, incident_id, article_count, fact_check_count, created_at,
|
||||
SUBSTR(summary, 1, 300) AS summary_preview
|
||||
FROM incident_snapshots WHERE incident_id = ?
|
||||
ORDER BY created_at DESC""",
|
||||
(incident_id,),
|
||||
@@ -351,6 +547,55 @@ async def get_snapshots(
|
||||
return [dict(row) for row in rows]
|
||||
|
||||
|
||||
@router.get("/{incident_id}/snapshots/search")
|
||||
async def search_snapshots(
|
||||
incident_id: int,
|
||||
q: str = Query(..., min_length=2, max_length=200),
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Volltextsuche über alle Snapshots einer Lage.
|
||||
|
||||
Liefert dieselbe schlanke Shape wie der Listen-Endpunkt,
|
||||
gefiltert per ``summary LIKE '%q%'``.
|
||||
"""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
like = f"%{q}%"
|
||||
cursor = await db.execute(
|
||||
"""SELECT id, incident_id, article_count, fact_check_count, created_at,
|
||||
SUBSTR(summary, 1, 300) AS summary_preview
|
||||
FROM incident_snapshots
|
||||
WHERE incident_id = ? AND summary LIKE ?
|
||||
ORDER BY created_at DESC""",
|
||||
(incident_id, like),
|
||||
)
|
||||
rows = await cursor.fetchall()
|
||||
return [dict(row) for row in rows]
|
||||
|
||||
|
||||
@router.get("/{incident_id}/snapshots/{snapshot_id}")
|
||||
async def get_snapshot(
|
||||
incident_id: int,
|
||||
snapshot_id: int,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Einzelnen Snapshot mit vollem Summary + sources_json abrufen (Lazy-Load)."""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
cursor = await db.execute(
|
||||
"""SELECT id, incident_id, summary, sources_json,
|
||||
article_count, fact_check_count, created_at
|
||||
FROM incident_snapshots WHERE id = ? AND incident_id = ?""",
|
||||
(snapshot_id, incident_id),
|
||||
)
|
||||
row = await cursor.fetchone()
|
||||
if not row:
|
||||
raise HTTPException(status_code=404, detail="Snapshot nicht gefunden")
|
||||
return dict(row)
|
||||
|
||||
|
||||
@router.get("/{incident_id}/factchecks")
|
||||
async def get_factchecks(
|
||||
incident_id: int,
|
||||
@@ -368,66 +613,198 @@ async def get_factchecks(
|
||||
return [dict(row) for row in rows]
|
||||
|
||||
|
||||
@router.get("/{incident_id}/pipeline")
|
||||
async def get_pipeline(
|
||||
incident_id: int,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Analysepipeline-Status der Lage: Definition aller Schritte + Stand des
|
||||
letzten (oder gerade laufenden) Refreshs.
|
||||
|
||||
Antwort:
|
||||
{
|
||||
"is_research": bool,
|
||||
"is_running": bool,
|
||||
"last_refresh": {started_at, completed_at, duration_sec, status, pass_total} | null,
|
||||
"steps_definition": [{key, label, icon, tooltip}, ...],
|
||||
"steps": [{step_key, status, count_value, count_secondary, pass_number}, ...]
|
||||
}
|
||||
"""
|
||||
from services.pipeline_tracker import PIPELINE_STEPS
|
||||
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
incident_row = await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
is_research = (incident_row["type"] or "adhoc") == "research"
|
||||
|
||||
# Jüngsten Refresh-Log wählen: bevorzugt running, sonst der letzte completed
|
||||
cursor = await db.execute(
|
||||
"""SELECT id, started_at, completed_at, status, retry_count
|
||||
FROM refresh_log
|
||||
WHERE incident_id = ? AND status = 'running'
|
||||
ORDER BY started_at DESC LIMIT 1""",
|
||||
(incident_id,),
|
||||
)
|
||||
row = await cursor.fetchone()
|
||||
if not row:
|
||||
cursor = await db.execute(
|
||||
"""SELECT id, started_at, completed_at, status, retry_count
|
||||
FROM refresh_log
|
||||
WHERE incident_id = ?
|
||||
ORDER BY started_at DESC LIMIT 1""",
|
||||
(incident_id,),
|
||||
)
|
||||
row = await cursor.fetchone()
|
||||
|
||||
last_refresh = None
|
||||
steps = []
|
||||
is_running = False
|
||||
if row:
|
||||
is_running = row["status"] == "running"
|
||||
# Pipeline-Steps zu diesem Refresh laden
|
||||
sc = await db.execute(
|
||||
"""SELECT step_key, pass_number, status, count_value, count_secondary,
|
||||
started_at, completed_at
|
||||
FROM refresh_pipeline_steps
|
||||
WHERE refresh_log_id = ?
|
||||
ORDER BY pass_number ASC, id ASC""",
|
||||
(row["id"],),
|
||||
)
|
||||
steps = [dict(r) for r in await sc.fetchall()]
|
||||
|
||||
# Pass-Total: bei Research-Lagen mit Multi-Pass-Daten ermitteln
|
||||
max_pass = 1
|
||||
for s in steps:
|
||||
if s["pass_number"] and s["pass_number"] > max_pass:
|
||||
max_pass = s["pass_number"]
|
||||
|
||||
# Dauer berechnen (nur wenn completed)
|
||||
duration_sec = None
|
||||
try:
|
||||
if row["started_at"] and row["completed_at"]:
|
||||
t0 = datetime.strptime(row["started_at"], "%Y-%m-%d %H:%M:%S")
|
||||
t1 = datetime.strptime(row["completed_at"], "%Y-%m-%d %H:%M:%S")
|
||||
duration_sec = max(0, int((t1 - t0).total_seconds()))
|
||||
except Exception:
|
||||
duration_sec = None
|
||||
|
||||
last_refresh = {
|
||||
"started_at": row["started_at"],
|
||||
"completed_at": row["completed_at"],
|
||||
"status": row["status"],
|
||||
"duration_sec": duration_sec,
|
||||
"pass_total": max_pass,
|
||||
}
|
||||
|
||||
return {
|
||||
"is_research": is_research,
|
||||
"is_running": is_running,
|
||||
"last_refresh": last_refresh,
|
||||
"steps_definition": PIPELINE_STEPS,
|
||||
"steps": steps,
|
||||
}
|
||||
|
||||
|
||||
@router.get("/{incident_id}/locations")
|
||||
async def get_locations(
|
||||
incident_id: int,
|
||||
current_user: dict = Depends(get_current_user),
|
||||
db: aiosqlite.Connection = Depends(db_dependency),
|
||||
):
|
||||
"""Geografische Orte einer Lage abrufen (aggregiert nach Ort)."""
|
||||
"""Geografische Orte einer Lage abrufen (serverseitig aggregiert nach Ort).
|
||||
|
||||
Drei getrennte Queries (alle klein) statt eines 21k-Zeilen-JOINs:
|
||||
1. Orte-Aggregate per GROUP BY (name, lat, lon) — liefert direkt ~Ergebnismenge.
|
||||
2. Kategorien pro Ort per GROUP BY (name, lat, lon, category) — fuer dominante Kategorie.
|
||||
3. Sample-Artikel pro Ort via ROW_NUMBER() — max. 10 pro Ort.
|
||||
"""
|
||||
tenant_id = current_user.get("tenant_id")
|
||||
await _check_incident_access(db, incident_id, current_user["id"], tenant_id)
|
||||
|
||||
# 1. Orte-Aggregate
|
||||
cursor = await db.execute(
|
||||
"""SELECT al.location_name, al.location_name_normalized, al.country_code,
|
||||
al.latitude, al.longitude, al.confidence, al.category,
|
||||
a.id as article_id, a.headline, a.headline_de, a.source, a.source_url
|
||||
"""SELECT
|
||||
COALESCE(location_name_normalized, location_name) AS name,
|
||||
ROUND(latitude, 2) AS lat,
|
||||
ROUND(longitude, 2) AS lon,
|
||||
MIN(country_code) AS country_code,
|
||||
MAX(confidence) AS confidence,
|
||||
COUNT(*) AS article_count
|
||||
FROM article_locations
|
||||
WHERE incident_id = ?
|
||||
GROUP BY name, lat, lon
|
||||
ORDER BY article_count DESC""",
|
||||
(incident_id,),
|
||||
)
|
||||
loc_rows = [dict(r) for r in await cursor.fetchall()]
|
||||
|
||||
# 2. Kategorien pro Ort
|
||||
cursor = await db.execute(
|
||||
"""SELECT
|
||||
COALESCE(location_name_normalized, location_name) AS name,
|
||||
ROUND(latitude, 2) AS lat,
|
||||
ROUND(longitude, 2) AS lon,
|
||||
COALESCE(category, 'mentioned') AS category,
|
||||
COUNT(*) AS cnt
|
||||
FROM article_locations
|
||||
WHERE incident_id = ?
|
||||
GROUP BY name, lat, lon, category""",
|
||||
(incident_id,),
|
||||
)
|
||||
cat_map: dict[tuple, dict[str, int]] = {}
|
||||
for r in await cursor.fetchall():
|
||||
key = (r["name"], r["lat"], r["lon"])
|
||||
cat_map.setdefault(key, {})[r["category"]] = r["cnt"]
|
||||
|
||||
# 3. Sample-Artikel pro Ort (max. 10, neueste zuerst)
|
||||
cursor = await db.execute(
|
||||
"""SELECT name, lat, lon, article_id, headline, headline_de, source, source_url
|
||||
FROM (
|
||||
SELECT
|
||||
COALESCE(al.location_name_normalized, al.location_name) AS name,
|
||||
ROUND(al.latitude, 2) AS lat,
|
||||
ROUND(al.longitude, 2) AS lon,
|
||||
a.id AS article_id,
|
||||
a.headline, a.headline_de, a.source, a.source_url,
|
||||
ROW_NUMBER() OVER (
|
||||
PARTITION BY COALESCE(al.location_name_normalized, al.location_name),
|
||||
ROUND(al.latitude, 2), ROUND(al.longitude, 2)
|
||||
ORDER BY a.collected_at DESC
|
||||
) AS rn
|
||||
FROM article_locations al
|
||||
JOIN articles a ON a.id = al.article_id
|
||||
WHERE al.incident_id = ?
|
||||
ORDER BY al.location_name_normalized, a.collected_at DESC""",
|
||||
)
|
||||
WHERE rn <= 10""",
|
||||
(incident_id,),
|
||||
)
|
||||
rows = await cursor.fetchall()
|
||||
|
||||
# Aggregierung nach normalisiertem Ortsnamen + Koordinaten
|
||||
loc_map = {}
|
||||
for row in rows:
|
||||
row = dict(row)
|
||||
key = (row["location_name_normalized"] or row["location_name"], round(row["latitude"], 2), round(row["longitude"], 2))
|
||||
if key not in loc_map:
|
||||
loc_map[key] = {
|
||||
"location_name": row["location_name_normalized"] or row["location_name"],
|
||||
"lat": row["latitude"],
|
||||
"lon": row["longitude"],
|
||||
"country_code": row["country_code"],
|
||||
"confidence": row["confidence"],
|
||||
"article_count": 0,
|
||||
"articles": [],
|
||||
"categories": {},
|
||||
}
|
||||
loc_map[key]["article_count"] += 1
|
||||
cat = row["category"] or "mentioned"
|
||||
loc_map[key]["categories"][cat] = loc_map[key]["categories"].get(cat, 0) + 1
|
||||
# Maximal 10 Artikel pro Ort mitliefern
|
||||
if len(loc_map[key]["articles"]) < 10:
|
||||
loc_map[key]["articles"].append({
|
||||
"id": row["article_id"],
|
||||
"headline": row["headline_de"] or row["headline"],
|
||||
"source": row["source"],
|
||||
"source_url": row["source_url"],
|
||||
sample_map: dict[tuple, list[dict]] = {}
|
||||
for r in await cursor.fetchall():
|
||||
key = (r["name"], r["lat"], r["lon"])
|
||||
sample_map.setdefault(key, []).append({
|
||||
"id": r["article_id"],
|
||||
"headline": r["headline_de"] or r["headline"],
|
||||
"source": r["source"],
|
||||
"source_url": r["source_url"],
|
||||
})
|
||||
|
||||
# Dominanteste Kategorie pro Ort bestimmen (Prioritaet: primary > secondary > tertiary > mentioned)
|
||||
# Zusammensetzen
|
||||
priority = {"primary": 4, "secondary": 3, "tertiary": 2, "mentioned": 1}
|
||||
result = []
|
||||
for loc in loc_map.values():
|
||||
cats = loc.pop("categories")
|
||||
if cats:
|
||||
best_cat = max(cats, key=lambda c: (priority.get(c, 0), cats[c]))
|
||||
else:
|
||||
best_cat = "mentioned"
|
||||
loc["category"] = best_cat
|
||||
result.append(loc)
|
||||
for loc in loc_rows:
|
||||
key = (loc["name"], loc["lat"], loc["lon"])
|
||||
cats = cat_map.get(key, {})
|
||||
best_cat = max(cats, key=lambda c: (priority.get(c, 0), cats[c])) if cats else "mentioned"
|
||||
result.append({
|
||||
"location_name": loc["name"],
|
||||
"lat": loc["lat"],
|
||||
"lon": loc["lon"],
|
||||
"country_code": loc["country_code"],
|
||||
"confidence": loc["confidence"],
|
||||
"article_count": loc["article_count"],
|
||||
"articles": sample_map.get(key, []),
|
||||
"category": best_cat,
|
||||
})
|
||||
|
||||
# Category-Labels aus Incident laden
|
||||
cursor = await db.execute(
|
||||
@@ -737,6 +1114,34 @@ async def export_incident(
|
||||
user_row = await cursor.fetchone()
|
||||
creator = user_row["email"] if user_row else "Unbekannt"
|
||||
|
||||
# Organisation (fuer Dateimetadaten)
|
||||
organization_name = None
|
||||
if incident.get("tenant_id"):
|
||||
cursor = await db.execute(
|
||||
"SELECT name FROM organizations WHERE id = ?", (incident["tenant_id"],)
|
||||
)
|
||||
org_row = await cursor.fetchone()
|
||||
organization_name = org_row["name"] if org_row else None
|
||||
|
||||
# Top-Orte (fuer Keyword-Metadaten)
|
||||
cursor = await db.execute(
|
||||
"""SELECT location_name, COUNT(*) AS cnt
|
||||
FROM article_locations
|
||||
WHERE incident_id = ?
|
||||
GROUP BY COALESCE(location_name_normalized, location_name)
|
||||
ORDER BY cnt DESC
|
||||
LIMIT 5""",
|
||||
(incident_id,),
|
||||
)
|
||||
top_locations = [r["location_name"] for r in await cursor.fetchall() if r["location_name"]]
|
||||
|
||||
# Snapshot-Count (als xmpMM:VersionID im PDF)
|
||||
cursor = await db.execute(
|
||||
"SELECT COUNT(*) AS cnt FROM incident_snapshots WHERE incident_id = ?",
|
||||
(incident_id,),
|
||||
)
|
||||
snapshot_count = (await cursor.fetchone())["cnt"] or 0
|
||||
|
||||
# Artikel
|
||||
cursor = await db.execute(
|
||||
"SELECT * FROM articles WHERE incident_id = ? ORDER BY collected_at DESC",
|
||||
@@ -786,7 +1191,13 @@ async def export_incident(
|
||||
scope_labels_key = scope_labels.get(scope, "lagebericht")
|
||||
|
||||
if format == "pdf":
|
||||
pdf_bytes = await generate_pdf(incident, articles, fact_checks, snapshots, scope, creator, exec_summary, sections=sections_set)
|
||||
pdf_bytes = await generate_pdf(
|
||||
incident, articles, fact_checks, snapshots, scope, creator, exec_summary,
|
||||
sections=sections_set,
|
||||
organization_name=organization_name,
|
||||
top_locations=top_locations,
|
||||
snapshot_count=snapshot_count,
|
||||
)
|
||||
filename = f"{slug}_{scope_labels_key}_{date_str}.pdf"
|
||||
return StreamingResponse(
|
||||
io.BytesIO(pdf_bytes),
|
||||
@@ -794,7 +1205,13 @@ async def export_incident(
|
||||
headers={"Content-Disposition": f'attachment; filename="{filename}"'},
|
||||
)
|
||||
else:
|
||||
docx_bytes = await generate_docx(incident, articles, fact_checks, snapshots, scope, creator, exec_summary, sections=sections_set)
|
||||
docx_bytes = await generate_docx(
|
||||
incident, articles, fact_checks, snapshots, scope, creator, exec_summary,
|
||||
sections=sections_set,
|
||||
organization_name=organization_name,
|
||||
top_locations=top_locations,
|
||||
snapshot_count=snapshot_count,
|
||||
)
|
||||
filename = f"{slug}_{scope_labels_key}_{date_str}.docx"
|
||||
return StreamingResponse(
|
||||
io.BytesIO(docx_bytes),
|
||||
|
||||
0
src/routes/__init__.py
Normale Datei
0
src/routes/__init__.py
Normale Datei
54
src/routes/version_router.py
Normale Datei
54
src/routes/version_router.py
Normale Datei
@@ -0,0 +1,54 @@
|
||||
"""Version + Release-Notes-Endpoints fuer das Frontend-Update-System."""
|
||||
import json
|
||||
import subprocess
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from fastapi import APIRouter
|
||||
|
||||
REPO_ROOT = Path(__file__).resolve().parent.parent.parent
|
||||
RELEASES_FILE = REPO_ROOT / 'RELEASES.json'
|
||||
|
||||
# Version-Hash beim Boot einmalig auslesen.
|
||||
try:
|
||||
COMMIT_HASH = subprocess.check_output(
|
||||
['git', 'rev-parse', '--short=10', 'HEAD'],
|
||||
cwd=str(REPO_ROOT), text=True, timeout=5
|
||||
).strip()
|
||||
except Exception:
|
||||
COMMIT_HASH = 'unknown'
|
||||
|
||||
DEPLOYED_AT = datetime.now(timezone.utc).isoformat()
|
||||
|
||||
router = APIRouter(tags=['version'])
|
||||
|
||||
|
||||
@router.get('/api/version')
|
||||
def version():
|
||||
return {'commit': COMMIT_HASH, 'deployed_at': DEPLOYED_AT}
|
||||
|
||||
|
||||
@router.get('/api/release-notes')
|
||||
def release_notes(since: str = '', limit: int = 5):
|
||||
"""Liefert Release-Notes seit der gegebenen Version.
|
||||
|
||||
'since' = letzte vom User gesehene Version. Liefert alle Eintraege NEUER
|
||||
als diese Version. Ohne 'since' werden die letzten 'limit' Eintraege
|
||||
geliefert.
|
||||
"""
|
||||
if not RELEASES_FILE.exists():
|
||||
return {'entries': [], 'current': COMMIT_HASH}
|
||||
try:
|
||||
with open(RELEASES_FILE, 'r', encoding='utf-8') as f:
|
||||
data = json.load(f)
|
||||
except Exception as e:
|
||||
return {'entries': [], 'error': f'parse-failed: {e}'}
|
||||
|
||||
if since:
|
||||
result = []
|
||||
for entry in data:
|
||||
if entry.get('version') == since:
|
||||
break
|
||||
result.append(entry)
|
||||
return {'entries': result[:limit], 'current': COMMIT_HASH}
|
||||
|
||||
return {'entries': data[:limit], 'current': COMMIT_HASH}
|
||||
@@ -91,6 +91,92 @@ async def can_add_user(db: aiosqlite.Connection, organization_id: int) -> tuple[
|
||||
return True, ""
|
||||
|
||||
|
||||
async def charge_usage_to_tenant(
|
||||
db: aiosqlite.Connection,
|
||||
tenant_id: int | None,
|
||||
usage,
|
||||
source: str,
|
||||
) -> None:
|
||||
"""Verbucht Token-Verbrauch auf einen Tenant.
|
||||
|
||||
Aktualisiert `token_usage_monthly` (UPSERT pro organization_id+year_month+source)
|
||||
und zieht Credits von der aktiven Lizenz ab (wenn cost_per_credit gesetzt).
|
||||
|
||||
Args:
|
||||
db: offene aiosqlite.Connection
|
||||
tenant_id: Organisations-ID oder None (dann nur geloggt, keine DB-Buchung)
|
||||
usage: ClaudeUsage oder UsageAccumulator mit input_tokens/output_tokens/
|
||||
cache_creation_tokens/cache_read_tokens/total_cost_usd/call_count
|
||||
source: 'monitor' | 'enhance' | 'chat'
|
||||
|
||||
Der Helper ruft KEIN db.commit() auf — die Transaktionsgrenzen bestimmt der Caller.
|
||||
Ohne Verbrauch (total_cost_usd == 0) oder ohne tenant_id wird nichts gebucht.
|
||||
"""
|
||||
total_cost = getattr(usage, "total_cost_usd", None)
|
||||
if total_cost is None:
|
||||
total_cost = getattr(usage, "cost_usd", 0.0)
|
||||
|
||||
if not tenant_id:
|
||||
logger.info(
|
||||
f"charge_usage_to_tenant[{source}]: kein tenant_id, uebersprungen "
|
||||
f"(cost=${total_cost:.4f})"
|
||||
)
|
||||
return
|
||||
|
||||
if total_cost <= 0:
|
||||
return
|
||||
|
||||
input_tokens = getattr(usage, "input_tokens", 0)
|
||||
output_tokens = getattr(usage, "output_tokens", 0)
|
||||
cache_creation = getattr(usage, "cache_creation_tokens", 0)
|
||||
cache_read = getattr(usage, "cache_read_tokens", 0)
|
||||
api_calls = getattr(usage, "call_count", 1)
|
||||
refresh_increment = 1 if source == "monitor" else 0
|
||||
|
||||
year_month = datetime.now(TIMEZONE).strftime("%Y-%m")
|
||||
|
||||
await db.execute(
|
||||
"""
|
||||
INSERT INTO token_usage_monthly
|
||||
(organization_id, year_month, source, input_tokens, output_tokens,
|
||||
cache_creation_tokens, cache_read_tokens, total_cost_usd, api_calls, refresh_count)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT(organization_id, year_month, source) DO UPDATE SET
|
||||
input_tokens = input_tokens + excluded.input_tokens,
|
||||
output_tokens = output_tokens + excluded.output_tokens,
|
||||
cache_creation_tokens = cache_creation_tokens + excluded.cache_creation_tokens,
|
||||
cache_read_tokens = cache_read_tokens + excluded.cache_read_tokens,
|
||||
total_cost_usd = total_cost_usd + excluded.total_cost_usd,
|
||||
api_calls = api_calls + excluded.api_calls,
|
||||
refresh_count = refresh_count + excluded.refresh_count,
|
||||
updated_at = CURRENT_TIMESTAMP
|
||||
""",
|
||||
(
|
||||
tenant_id, year_month, source,
|
||||
input_tokens, output_tokens, cache_creation, cache_read,
|
||||
round(total_cost, 7), api_calls, refresh_increment,
|
||||
),
|
||||
)
|
||||
|
||||
lic_cursor = await db.execute(
|
||||
"SELECT cost_per_credit FROM licenses WHERE organization_id = ? AND status = 'active' ORDER BY id DESC LIMIT 1",
|
||||
(tenant_id,),
|
||||
)
|
||||
lic = await lic_cursor.fetchone()
|
||||
credits_consumed = 0.0
|
||||
if lic and lic["cost_per_credit"] and lic["cost_per_credit"] > 0:
|
||||
credits_consumed = total_cost / lic["cost_per_credit"]
|
||||
await db.execute(
|
||||
"UPDATE licenses SET credits_used = COALESCE(credits_used, 0) + ? WHERE organization_id = ? AND status = 'active'",
|
||||
(round(credits_consumed, 2), tenant_id),
|
||||
)
|
||||
|
||||
logger.info(
|
||||
f"charge_usage_to_tenant[{source}] Tenant {tenant_id}: "
|
||||
f"${total_cost:.4f} -> {round(credits_consumed, 2)} Credits"
|
||||
)
|
||||
|
||||
|
||||
async def expire_licenses(db: aiosqlite.Connection):
|
||||
"""Setzt abgelaufene Lizenzen auf 'expired'. Taeglich aufrufen."""
|
||||
cursor = await db.execute(
|
||||
|
||||
230
src/services/pipeline_tracker.py
Normale Datei
230
src/services/pipeline_tracker.py
Normale Datei
@@ -0,0 +1,230 @@
|
||||
"""Analysepipeline-Tracking: persistiert Pipeline-Schritte pro Refresh und sendet
|
||||
Live-Status an die Frontend-Visualisierung.
|
||||
|
||||
Die Pipeline hat 9 Schritte und ist eine bewusst vereinfachte Außensicht der
|
||||
internen Refresh-Pipeline (siehe orchestrator.py). Sie verschweigt Internas
|
||||
(Modellnamen, Tools, Phasen, Multi-Pass-Labels) und beschreibt jeden Schritt in
|
||||
verständlicher Sprache.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from config import TIMEZONE
|
||||
|
||||
logger = logging.getLogger("osint.pipeline")
|
||||
|
||||
|
||||
# Single Source of Truth für die Pipeline-Definition.
|
||||
# Reihenfolge bestimmt die Anzeige im Frontend.
|
||||
PIPELINE_STEPS = [
|
||||
{
|
||||
"key": "sources_review",
|
||||
"label": "Quellen sichten",
|
||||
"icon": "search",
|
||||
"tooltip": "Wir prüfen alle deine Nachrichtenquellen, ob sie aktuell erreichbar sind und was sie zu deiner Lage melden.",
|
||||
},
|
||||
{
|
||||
"key": "collect",
|
||||
"label": "Nachrichten sammeln",
|
||||
"icon": "rss",
|
||||
"tooltip": "Aus den passenden Quellen werden alle relevanten Meldungen eingesammelt - aus deinen RSS-Feeds, dem Web und optional Telegram-Kanälen.",
|
||||
},
|
||||
{
|
||||
"key": "dedup",
|
||||
"label": "Doppeltes filtern",
|
||||
"icon": "copy-x",
|
||||
"tooltip": "Mehrfach gemeldete Nachrichten werden zusammengefasst, damit nichts doppelt im Lagebild auftaucht.",
|
||||
},
|
||||
{
|
||||
"key": "relevance",
|
||||
"label": "Relevanz bewerten",
|
||||
"icon": "scale",
|
||||
"tooltip": "Jede Meldung wird darauf geprüft, ob sie wirklich zu deiner Lage passt. Themenfremdes wird aussortiert.",
|
||||
},
|
||||
{
|
||||
"key": "geoparsing",
|
||||
"label": "Orte erkennen",
|
||||
"icon": "map-pin",
|
||||
"tooltip": "Aus den Meldungen werden Ortsangaben erkannt und auf der Karte verortet.",
|
||||
},
|
||||
{
|
||||
"key": "summary",
|
||||
"label": "Lagebild verfassen",
|
||||
"icon": "file-text",
|
||||
"tooltip": "Aus allen geprüften Meldungen wird ein zusammenhängendes Lagebild geschrieben, mit Quellenangaben am Text.",
|
||||
},
|
||||
{
|
||||
"key": "factcheck",
|
||||
"label": "Fakten prüfen",
|
||||
"icon": "shield",
|
||||
"tooltip": "Behauptungen aus den Meldungen werden gegeneinander abgeglichen: Bestätigt? Umstritten? Noch unklar?",
|
||||
},
|
||||
{
|
||||
"key": "qc",
|
||||
"label": "Qualitätscheck",
|
||||
"icon": "check-circle",
|
||||
"tooltip": "Eine letzte Kontrollprüfung am Ergebnis: Doppelte Fakten zusammenführen, Karten-Verortung prüfen, bevor du benachrichtigt wirst.",
|
||||
},
|
||||
{
|
||||
"key": "notify",
|
||||
"label": "Benachrichtigen",
|
||||
"icon": "bell",
|
||||
"tooltip": "Wenn etwas Wichtiges dabei war, gehen Benachrichtigungen raus, im Glockensymbol oben rechts und optional per E-Mail.",
|
||||
},
|
||||
]
|
||||
|
||||
VALID_KEYS = {s["key"] for s in PIPELINE_STEPS}
|
||||
|
||||
|
||||
def _now_db() -> str:
|
||||
"""Aktuelle Zeit im DB-Format (lokal)."""
|
||||
return datetime.now(TIMEZONE).strftime("%Y-%m-%d %H:%M:%S")
|
||||
|
||||
|
||||
async def _broadcast(ws_manager, incident_id: int, payload: dict,
|
||||
visibility: str, created_by: Optional[int], tenant_id: Optional[int]):
|
||||
"""Sendet ein pipeline_step-Event an verbundene Clients der Lage."""
|
||||
if not ws_manager:
|
||||
return
|
||||
try:
|
||||
await ws_manager.broadcast_for_incident(
|
||||
{"type": "pipeline_step", "incident_id": incident_id, "data": payload},
|
||||
visibility, created_by, tenant_id,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(f"Pipeline-WS-Broadcast fehlgeschlagen: {e}")
|
||||
|
||||
|
||||
async def start_step(db, ws_manager, *, refresh_log_id: int, incident_id: int,
|
||||
step_key: str, pass_number: int = 1, tenant_id: Optional[int] = None,
|
||||
visibility: str = "public", created_by: Optional[int] = None) -> Optional[int]:
|
||||
"""Markiert einen Pipeline-Schritt als aktiv.
|
||||
|
||||
Returns die DB-ID der Step-Zeile (für späteres Update via complete_step), oder None bei Fehler.
|
||||
"""
|
||||
if step_key not in VALID_KEYS:
|
||||
logger.warning(f"Unbekannter Pipeline-Schritt: {step_key}")
|
||||
return None
|
||||
|
||||
try:
|
||||
cursor = await db.execute(
|
||||
"""INSERT INTO refresh_pipeline_steps
|
||||
(refresh_log_id, incident_id, step_key, pass_number, started_at, status, tenant_id)
|
||||
VALUES (?, ?, ?, ?, ?, 'active', ?)""",
|
||||
(refresh_log_id, incident_id, step_key, pass_number, _now_db(), tenant_id),
|
||||
)
|
||||
await db.commit()
|
||||
step_id = cursor.lastrowid
|
||||
except Exception as e:
|
||||
logger.warning(f"Pipeline start_step({step_key}) DB-Fehler: {e}")
|
||||
step_id = None
|
||||
|
||||
await _broadcast(ws_manager, incident_id, {
|
||||
"step_key": step_key,
|
||||
"status": "active",
|
||||
"pass_number": pass_number,
|
||||
}, visibility, created_by, tenant_id)
|
||||
|
||||
return step_id
|
||||
|
||||
|
||||
async def complete_step(db, ws_manager, *, step_id: Optional[int], refresh_log_id: int,
|
||||
incident_id: int, step_key: str, pass_number: int = 1,
|
||||
count_value: Optional[int] = None, count_secondary: Optional[int] = None,
|
||||
tenant_id: Optional[int] = None, visibility: str = "public",
|
||||
created_by: Optional[int] = None):
|
||||
"""Markiert einen Pipeline-Schritt als abgeschlossen, mit Zahlen."""
|
||||
if step_key not in VALID_KEYS:
|
||||
return
|
||||
|
||||
try:
|
||||
if step_id:
|
||||
await db.execute(
|
||||
"""UPDATE refresh_pipeline_steps
|
||||
SET status = 'done', completed_at = ?, count_value = ?, count_secondary = ?
|
||||
WHERE id = ?""",
|
||||
(_now_db(), count_value, count_secondary, step_id),
|
||||
)
|
||||
else:
|
||||
# Fallback wenn start_step keine ID lieferte
|
||||
await db.execute(
|
||||
"""INSERT INTO refresh_pipeline_steps
|
||||
(refresh_log_id, incident_id, step_key, pass_number, started_at, completed_at,
|
||||
status, count_value, count_secondary, tenant_id)
|
||||
VALUES (?, ?, ?, ?, ?, ?, 'done', ?, ?, ?)""",
|
||||
(refresh_log_id, incident_id, step_key, pass_number, _now_db(), _now_db(),
|
||||
count_value, count_secondary, tenant_id),
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
logger.warning(f"Pipeline complete_step({step_key}) DB-Fehler: {e}")
|
||||
|
||||
await _broadcast(ws_manager, incident_id, {
|
||||
"step_key": step_key,
|
||||
"status": "done",
|
||||
"pass_number": pass_number,
|
||||
"count_value": count_value,
|
||||
"count_secondary": count_secondary,
|
||||
}, visibility, created_by, tenant_id)
|
||||
|
||||
|
||||
async def skip_step(db, ws_manager, *, refresh_log_id: int, incident_id: int,
|
||||
step_key: str, pass_number: int = 1, tenant_id: Optional[int] = None,
|
||||
visibility: str = "public", created_by: Optional[int] = None):
|
||||
"""Markiert einen Schritt als übersprungen (z.B. Geoparsing ohne neue Artikel)."""
|
||||
if step_key not in VALID_KEYS:
|
||||
return
|
||||
try:
|
||||
await db.execute(
|
||||
"""INSERT INTO refresh_pipeline_steps
|
||||
(refresh_log_id, incident_id, step_key, pass_number, started_at, completed_at,
|
||||
status, tenant_id)
|
||||
VALUES (?, ?, ?, ?, ?, ?, 'skipped', ?)""",
|
||||
(refresh_log_id, incident_id, step_key, pass_number, _now_db(), _now_db(), tenant_id),
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
logger.warning(f"Pipeline skip_step({step_key}) DB-Fehler: {e}")
|
||||
|
||||
await _broadcast(ws_manager, incident_id, {
|
||||
"step_key": step_key,
|
||||
"status": "skipped",
|
||||
"pass_number": pass_number,
|
||||
}, visibility, created_by, tenant_id)
|
||||
|
||||
|
||||
async def error_step(db, ws_manager, *, step_id: Optional[int], refresh_log_id: int,
|
||||
incident_id: int, step_key: str, pass_number: int = 1,
|
||||
tenant_id: Optional[int] = None, visibility: str = "public",
|
||||
created_by: Optional[int] = None):
|
||||
"""Markiert einen Schritt als fehlgeschlagen."""
|
||||
if step_key not in VALID_KEYS:
|
||||
return
|
||||
try:
|
||||
if step_id:
|
||||
await db.execute(
|
||||
"""UPDATE refresh_pipeline_steps
|
||||
SET status = 'error', completed_at = ?
|
||||
WHERE id = ?""",
|
||||
(_now_db(), step_id),
|
||||
)
|
||||
else:
|
||||
await db.execute(
|
||||
"""INSERT INTO refresh_pipeline_steps
|
||||
(refresh_log_id, incident_id, step_key, pass_number, started_at, completed_at,
|
||||
status, tenant_id)
|
||||
VALUES (?, ?, ?, ?, ?, ?, 'error', ?)""",
|
||||
(refresh_log_id, incident_id, step_key, pass_number, _now_db(), _now_db(), tenant_id),
|
||||
)
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
logger.warning(f"Pipeline error_step({step_key}) DB-Fehler: {e}")
|
||||
|
||||
await _broadcast(ws_manager, incident_id, {
|
||||
"step_key": step_key,
|
||||
"status": "error",
|
||||
"pass_number": pass_number,
|
||||
}, visibility, created_by, tenant_id)
|
||||
@@ -2133,12 +2133,19 @@ a.dev-source-pill:hover {
|
||||
font-size: 12px; color: var(--accent); font-weight: 600;
|
||||
}
|
||||
|
||||
/* === Blur for First Refresh === */
|
||||
.tab-panels.blurred .tab-panel {
|
||||
/* === Blur for First Refresh ===
|
||||
* Liegt auf #incident-view, damit Header (Titel/Aktionen/Beschreibung) und
|
||||
* Tab-Panels gemeinsam unscharf werden. will-change + translateZ erzwingen
|
||||
* einen persistenten GPU-Composite-Layer, sodass der Effekt bei Window-Resize
|
||||
* und Reflow nicht zerschossen wird. Keine Transition: Blur soll schlagartig
|
||||
* kommen und schlagartig gehen, sonst sieht man waehrend des Reflows einen
|
||||
* lesbaren Zwischenzustand. */
|
||||
#incident-view.refresh-blurred {
|
||||
filter: blur(8px);
|
||||
pointer-events: none;
|
||||
user-select: none;
|
||||
transition: filter 0.4s ease;
|
||||
will-change: filter;
|
||||
transform: translateZ(0);
|
||||
}
|
||||
|
||||
/* === Disabled Actions During First Refresh === */
|
||||
@@ -4035,7 +4042,6 @@ a.dev-source-pill:hover {
|
||||
.tab-panel .ht-timeline-container {
|
||||
min-height: 200px;
|
||||
}
|
||||
.tab-panels.blurred { filter: blur(4px); pointer-events: none; }
|
||||
|
||||
.grid-stack .card-header:active {
|
||||
cursor: grabbing;
|
||||
@@ -5632,3 +5638,420 @@ body.tutorial-active .tutorial-cursor {
|
||||
border-color: var(--accent);
|
||||
box-shadow: 0 0 0 2px rgba(var(--accent-rgb, 59, 130, 246), 0.15);
|
||||
}
|
||||
|
||||
/* === Analysepipeline (Visualisierung n8n-Stil) === */
|
||||
.pipeline-card { padding: 0; overflow: hidden; }
|
||||
.pipeline-card .card-header { padding: var(--sp-lg) var(--sp-xl); border-bottom: 1px solid var(--border); }
|
||||
.pipeline-header-meta { font-size: 12px; color: var(--text-secondary); }
|
||||
.pipeline-body {
|
||||
position: relative;
|
||||
padding: var(--sp-3xl) var(--sp-xl);
|
||||
background-color: var(--bg-card);
|
||||
background-image:
|
||||
linear-gradient(var(--pipeline-circuit, rgba(150, 121, 26, 0.045)) 1px, transparent 1px),
|
||||
linear-gradient(90deg, var(--pipeline-circuit, rgba(150, 121, 26, 0.045)) 1px, transparent 1px),
|
||||
radial-gradient(circle at 30px 30px, var(--pipeline-circuit-dot, rgba(150, 121, 26, 0.10)) 1.5px, transparent 2px);
|
||||
background-size: 60px 60px, 60px 60px, 60px 60px;
|
||||
}
|
||||
[data-theme="light"] .pipeline-body {
|
||||
--pipeline-circuit: rgba(31, 51, 89, 0.05);
|
||||
--pipeline-circuit-dot: rgba(31, 51, 89, 0.10);
|
||||
}
|
||||
.pipeline-stage {
|
||||
position: relative;
|
||||
overflow: visible;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
.pipeline-track {
|
||||
display: inline-flex;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 0;
|
||||
padding: var(--sp-md) 0;
|
||||
}
|
||||
.pipeline-row {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
gap: var(--sp-md);
|
||||
flex-wrap: nowrap;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.pipeline-row[data-direction="rtl"] {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
.pipeline-empty {
|
||||
text-align: center;
|
||||
color: var(--text-secondary);
|
||||
padding: var(--sp-4xl) var(--sp-xl);
|
||||
font-style: italic;
|
||||
}
|
||||
.pipeline-sidenote {
|
||||
margin-top: var(--sp-xl);
|
||||
padding: var(--sp-lg) var(--sp-xl);
|
||||
border-left: 3px solid var(--accent);
|
||||
background: var(--tint-accent-faint);
|
||||
border-radius: 0 var(--radius-lg) var(--radius-lg) 0;
|
||||
font-size: 13px;
|
||||
color: var(--text-secondary);
|
||||
max-width: 720px;
|
||||
}
|
||||
|
||||
.pipeline-block {
|
||||
position: relative;
|
||||
flex: 0 0 168px;
|
||||
min-height: 132px;
|
||||
padding: var(--sp-lg) var(--sp-md);
|
||||
background: var(--bg-elevated);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: var(--radius-lg);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease, border-color 0.2s ease;
|
||||
outline: none;
|
||||
}
|
||||
.pipeline-block:hover { transform: translateY(-2px); border-color: var(--accent); }
|
||||
.pipeline-block:focus-visible { box-shadow: 0 0 0 3px var(--tint-accent-strong); }
|
||||
.pipeline-block-icon {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
color: var(--text-secondary);
|
||||
margin-bottom: var(--sp-sm);
|
||||
transition: color 0.3s ease;
|
||||
}
|
||||
.pipeline-block-icon svg { width: 100%; height: 100%; }
|
||||
.pipeline-block-title {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: var(--text-primary);
|
||||
margin-bottom: var(--sp-xs);
|
||||
line-height: 1.2;
|
||||
}
|
||||
.pipeline-block-count {
|
||||
font-size: 11px;
|
||||
color: var(--text-secondary);
|
||||
line-height: 1.3;
|
||||
}
|
||||
.pipeline-block-count small { display: block; opacity: 0.75; font-size: 10px; }
|
||||
.pipeline-block-count .count-status { font-style: italic; opacity: 0.7; }
|
||||
.pipeline-block-check {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
right: 6px;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
color: var(--success);
|
||||
opacity: 0;
|
||||
transform: scale(0.6);
|
||||
transition: opacity 0.3s ease, transform 0.3s ease;
|
||||
}
|
||||
.pipeline-block-check svg { width: 100%; height: 100%; }
|
||||
|
||||
.pipeline-block.status-pending { opacity: 0.55; }
|
||||
.pipeline-block.status-pending .pipeline-block-icon { color: var(--text-tertiary); }
|
||||
|
||||
.pipeline-block.status-active {
|
||||
border-color: var(--accent);
|
||||
box-shadow: var(--glow-accent-strong);
|
||||
animation: pipelinePulse 1.6s ease-in-out infinite;
|
||||
}
|
||||
.pipeline-block.status-active .pipeline-block-icon { color: var(--accent); }
|
||||
@keyframes pipelinePulse {
|
||||
0%, 100% { box-shadow: 0 0 8px rgba(150, 121, 26, 0.35), 0 0 0 1px var(--accent); }
|
||||
50% { box-shadow: 0 0 22px rgba(150, 121, 26, 0.65), 0 0 0 2px var(--accent); }
|
||||
}
|
||||
|
||||
.pipeline-block.status-done {
|
||||
border-color: var(--success);
|
||||
background: linear-gradient(180deg, var(--bg-elevated) 0%, var(--tint-success) 100%);
|
||||
}
|
||||
.pipeline-block.status-done .pipeline-block-icon { color: var(--success); }
|
||||
.pipeline-block.status-done .pipeline-block-check { opacity: 1; transform: scale(1); }
|
||||
|
||||
.pipeline-block.status-error {
|
||||
border-color: var(--error);
|
||||
background: linear-gradient(180deg, var(--bg-elevated) 0%, var(--tint-error) 100%);
|
||||
}
|
||||
.pipeline-block.status-error .pipeline-block-icon { color: var(--error); }
|
||||
|
||||
.pipeline-arrow {
|
||||
flex: 0 0 28px;
|
||||
align-self: center;
|
||||
height: 2px;
|
||||
position: relative;
|
||||
background: var(--border);
|
||||
}
|
||||
.pipeline-arrow::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
right: -4px;
|
||||
top: 50%;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-top: 4px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
border-left: 6px solid var(--border);
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
.pipeline-arrow.is-flowing {
|
||||
background: linear-gradient(90deg, var(--accent), var(--accent) 50%, transparent 50%, transparent);
|
||||
background-size: 12px 100%;
|
||||
animation: pipelineFlow 0.8s linear infinite;
|
||||
}
|
||||
.pipeline-arrow.is-flowing::after { border-left-color: var(--accent); }
|
||||
@keyframes pipelineFlow {
|
||||
from { background-position: 0 0; }
|
||||
to { background-position: 12px 0; }
|
||||
}
|
||||
|
||||
/* Pfeil in rtl-Reihe: Pfeilkopf nach links, Animation rückwärts */
|
||||
.pipeline-row[data-direction="rtl"] .pipeline-arrow::after {
|
||||
border-left: none;
|
||||
border-right: 6px solid var(--border);
|
||||
right: auto;
|
||||
left: -4px;
|
||||
}
|
||||
.pipeline-row[data-direction="rtl"] .pipeline-arrow.is-flowing::after {
|
||||
border-right-color: var(--accent);
|
||||
border-left-color: transparent;
|
||||
}
|
||||
.pipeline-row[data-direction="rtl"] .pipeline-arrow.is-flowing {
|
||||
animation: pipelineFlowReverse 0.8s linear infinite;
|
||||
}
|
||||
@keyframes pipelineFlowReverse {
|
||||
from { background-position: 12px 0; }
|
||||
to { background-position: 0 0; }
|
||||
}
|
||||
|
||||
/* Reihenwechsel-Pfeil (kompakter ↓ direkt unter dem letzten Block) */
|
||||
.pipeline-uturn {
|
||||
display: flex;
|
||||
gap: var(--sp-md);
|
||||
align-items: stretch;
|
||||
height: 32px;
|
||||
width: 100%;
|
||||
margin: var(--sp-xs) 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
.uturn-spacer { flex: 0 0 168px; }
|
||||
.uturn-arrow {
|
||||
flex: 0 0 168px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: stretch;
|
||||
}
|
||||
.uturn-arrow svg {
|
||||
width: 24px;
|
||||
height: 100%;
|
||||
overflow: visible;
|
||||
}
|
||||
.pipeline-uturn-path,
|
||||
.pipeline-uturn-head {
|
||||
fill: none;
|
||||
stroke: var(--border);
|
||||
stroke-width: 2;
|
||||
stroke-linecap: round;
|
||||
stroke-linejoin: round;
|
||||
}
|
||||
.pipeline-uturn.is-flowing .pipeline-uturn-path {
|
||||
stroke: var(--accent);
|
||||
stroke-dasharray: 6 4;
|
||||
animation: pipelineUturnDash 0.7s linear infinite;
|
||||
}
|
||||
.pipeline-uturn.is-flowing .pipeline-uturn-head { stroke: var(--accent); }
|
||||
@keyframes pipelineUturnDash {
|
||||
to { stroke-dashoffset: -20; }
|
||||
}
|
||||
|
||||
.pipeline-loop {
|
||||
position: absolute;
|
||||
bottom: -10px;
|
||||
right: -10px;
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
color: var(--accent);
|
||||
background: var(--bg-card);
|
||||
border-radius: 50%;
|
||||
padding: 4px;
|
||||
border: 1px solid var(--border);
|
||||
opacity: 0.5;
|
||||
transition: opacity 0.3s ease;
|
||||
}
|
||||
.pipeline-loop svg { width: 100%; height: 100%; }
|
||||
.pipeline-stage.is-looping .pipeline-loop {
|
||||
opacity: 1;
|
||||
animation: pipelineLoop 1.2s ease-in-out;
|
||||
}
|
||||
@keyframes pipelineLoop {
|
||||
0% { transform: rotate(0deg) scale(1); }
|
||||
50% { transform: rotate(180deg) scale(1.3); }
|
||||
100% { transform: rotate(360deg) scale(1); }
|
||||
}
|
||||
|
||||
.pipeline-tooltip {
|
||||
position: fixed;
|
||||
background: var(--bg-card);
|
||||
color: var(--text-primary);
|
||||
border: 1px solid var(--accent);
|
||||
padding: var(--sp-md) var(--sp-lg);
|
||||
border-radius: var(--radius);
|
||||
font-size: 12px;
|
||||
line-height: 1.4;
|
||||
width: 280px;
|
||||
box-shadow: var(--shadow-md);
|
||||
pointer-events: none;
|
||||
opacity: 0;
|
||||
transition: opacity 0.15s ease;
|
||||
z-index: 9999;
|
||||
}
|
||||
.pipeline-tooltip.visible { opacity: 1; }
|
||||
|
||||
.pipeline-popup {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
background: var(--backdrop);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 9998;
|
||||
}
|
||||
.pipeline-popup-inner {
|
||||
background: var(--bg-card);
|
||||
border: 1px solid var(--accent);
|
||||
border-radius: var(--radius-lg);
|
||||
padding: var(--sp-3xl);
|
||||
max-width: 480px;
|
||||
width: 90%;
|
||||
box-shadow: var(--shadow-lg);
|
||||
position: relative;
|
||||
}
|
||||
.pipeline-popup-title {
|
||||
font-family: var(--font-title);
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
color: var(--text-primary);
|
||||
margin-bottom: var(--sp-lg);
|
||||
}
|
||||
.pipeline-popup-text { color: var(--text-secondary); line-height: 1.6; font-size: 14px; }
|
||||
.pipeline-popup-close {
|
||||
position: absolute;
|
||||
top: 8px;
|
||||
right: 8px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
color: var(--text-secondary);
|
||||
font-size: 22px;
|
||||
cursor: pointer;
|
||||
border-radius: var(--radius);
|
||||
}
|
||||
.pipeline-popup-close:hover { background: var(--bg-hover); color: var(--text-primary); }
|
||||
|
||||
.pipeline-mini {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-wrap: wrap;
|
||||
gap: var(--sp-xs);
|
||||
padding: var(--sp-md) 0;
|
||||
margin-bottom: var(--sp-md);
|
||||
}
|
||||
.pipeline-mini-block {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
padding: 5px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 50%;
|
||||
color: var(--text-tertiary);
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
transition: all 0.3s ease;
|
||||
}
|
||||
.pipeline-mini-block svg { width: 100%; height: 100%; }
|
||||
.pipeline-mini-block.status-pending { opacity: 0.4; }
|
||||
.pipeline-mini-block.status-active {
|
||||
color: var(--accent);
|
||||
border-color: var(--accent);
|
||||
box-shadow: var(--glow-accent);
|
||||
animation: pipelinePulse 1.6s ease-in-out infinite;
|
||||
}
|
||||
.pipeline-mini-block.status-done {
|
||||
color: var(--success);
|
||||
border-color: var(--success);
|
||||
background: var(--tint-success);
|
||||
}
|
||||
.pipeline-mini-block.status-error {
|
||||
color: var(--error);
|
||||
border-color: var(--error);
|
||||
background: var(--tint-error);
|
||||
}
|
||||
.pipeline-mini-sep {
|
||||
width: 12px;
|
||||
height: 1px;
|
||||
background: var(--border);
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
/* Snake auflösen, alle Reihen werden vertikal gestapelt */
|
||||
.pipeline-row,
|
||||
.pipeline-row[data-direction="rtl"] {
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
}
|
||||
.pipeline-uturn { display: none; }
|
||||
|
||||
.pipeline-block { flex: 0 0 auto; width: 100%; min-height: auto; flex-direction: row; padding: var(--sp-md); text-align: left; gap: var(--sp-md); }
|
||||
.pipeline-block-icon { width: 28px; height: 28px; margin-bottom: 0; flex-shrink: 0; }
|
||||
.pipeline-block-title { margin-bottom: 2px; }
|
||||
.pipeline-block-count { font-size: 11px; }
|
||||
.pipeline-arrow {
|
||||
flex: 0 0 18px;
|
||||
width: 2px;
|
||||
height: 18px;
|
||||
margin: 0 auto;
|
||||
align-self: center;
|
||||
background: var(--border);
|
||||
}
|
||||
.pipeline-arrow::after,
|
||||
.pipeline-row[data-direction="rtl"] .pipeline-arrow::after {
|
||||
right: 50%;
|
||||
left: auto;
|
||||
top: auto;
|
||||
bottom: -4px;
|
||||
border-top: 6px solid var(--border);
|
||||
border-bottom: none;
|
||||
border-left: 4px solid transparent;
|
||||
border-right: 4px solid transparent;
|
||||
transform: translateX(50%);
|
||||
}
|
||||
.pipeline-arrow.is-flowing,
|
||||
.pipeline-row[data-direction="rtl"] .pipeline-arrow.is-flowing {
|
||||
background: linear-gradient(180deg, var(--accent), var(--accent) 50%, transparent 50%, transparent);
|
||||
background-size: 100% 12px;
|
||||
animation: pipelineFlowVertical 0.8s linear infinite;
|
||||
}
|
||||
.pipeline-arrow.is-flowing::after,
|
||||
.pipeline-row[data-direction="rtl"] .pipeline-arrow.is-flowing::after {
|
||||
border-top-color: var(--accent);
|
||||
border-right-color: transparent;
|
||||
border-left-color: transparent;
|
||||
}
|
||||
@keyframes pipelineFlowVertical {
|
||||
from { background-position: 0 0; }
|
||||
to { background-position: 0 12px; }
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.pipeline-block,
|
||||
.pipeline-mini-block { animation: none !important; }
|
||||
.pipeline-arrow.is-flowing { animation: none !important; }
|
||||
.pipeline-block.status-active { box-shadow: var(--glow-accent); }
|
||||
.pipeline-stage.is-looping .pipeline-loop { animation: none !important; opacity: 1; }
|
||||
}
|
||||
|
||||
@@ -120,7 +120,9 @@
|
||||
<div class="sidebar-sources-link">
|
||||
<button class="btn btn-secondary btn-full btn-small" onclick="App.openSourceManagement()">Quellen verwalten</button>
|
||||
<button class="btn btn-secondary btn-full btn-small sidebar-feedback-btn" onclick="App.openFeedback()">Feedback senden</button>
|
||||
<!-- Tutorial-Einstieg temporaer deaktiviert (Ueberarbeitung) - reaktivieren durch Entfernen der Kommentarzeichen:
|
||||
<button class="btn btn-secondary btn-full btn-small" onclick="Tutorial.start()" title="Interaktiven Rundgang starten">Rundgang starten</button>
|
||||
-->
|
||||
<div class="sidebar-stats-mini">
|
||||
<span id="stat-sources-count">0 Quellen</span> · <span id="stat-articles-count">0 Artikel</span>
|
||||
</div>
|
||||
@@ -196,6 +198,7 @@
|
||||
<button class="tab-btn" data-tab="timeline">Ereignis-Timeline</button>
|
||||
<button class="tab-btn" data-tab="karte">Geografische Verteilung</button>
|
||||
<button class="tab-btn" data-tab="faktencheck">Faktencheck</button>
|
||||
<button class="tab-btn" data-tab="pipeline">Analysepipeline</button>
|
||||
<button class="tab-btn" data-tab="quellen">Quellenübersicht</button>
|
||||
</div>
|
||||
|
||||
@@ -279,6 +282,23 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-panel" id="panel-pipeline">
|
||||
<div class="card pipeline-card" id="pipeline-card">
|
||||
<div class="card-header">
|
||||
<div class="card-title">Analysepipeline</div>
|
||||
<span class="pipeline-header-meta" id="pipeline-header-meta"></span>
|
||||
</div>
|
||||
<div class="pipeline-body">
|
||||
<div class="pipeline-stage" id="pipeline-stage" aria-label="Analysepipeline-Visualisierung">
|
||||
<div class="pipeline-empty" id="pipeline-empty">Noch nie aktualisiert. Starte den ersten Refresh.</div>
|
||||
</div>
|
||||
<aside class="pipeline-sidenote" id="pipeline-sidenote" hidden>
|
||||
Recherche-Lagen werden mehrfach evaluiert, um das Bild Schritt für Schritt aufzubauen.
|
||||
</aside>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-panel" id="panel-quellen">
|
||||
<div class="card source-overview-card">
|
||||
<div class="card-header">
|
||||
@@ -622,14 +642,15 @@
|
||||
<script src="https://cdn.jsdelivr.net/npm/d3@7/dist/d3.min.js"></script>
|
||||
<script src="/static/vendor/leaflet.js"></script>
|
||||
<script src="/static/vendor/leaflet.markercluster.js"></script>
|
||||
<script src="/static/js/api.js?v=20260316c"></script>
|
||||
<script src="/static/js/api.js?v=20260423a"></script>
|
||||
<script src="/static/js/ws.js?v=20260316b"></script>
|
||||
<script src="/static/js/components.js?v=20260316d"></script>
|
||||
<script src="/static/js/components.js?v=20260427a"></script>
|
||||
<script src="/static/js/layout.js?v=20260316b"></script>
|
||||
<script src="/static/js/app.js?v=20260316b"></script>
|
||||
<script src="/static/js/pipeline.js?v=20260501a"></script>
|
||||
<script src="/static/js/app.js?v=20260427c"></script>
|
||||
<script src="/static/js/cluster-data.js?v=20260322f"></script>
|
||||
<script src="/static/js/tutorial.js?v=20260316z"></script>
|
||||
<script src="/static/js/chat.js?v=20260316i"></script>
|
||||
<script src="/static/js/chat.js?v=20260422a"></script>
|
||||
<script>document.addEventListener("DOMContentLoaded",function(){Chat.init();Tutorial.init()});</script>
|
||||
|
||||
<!-- Map Fullscreen Overlay -->
|
||||
@@ -685,7 +706,8 @@
|
||||
</div>
|
||||
<div class="progress-popup-body">
|
||||
<div class="progress-popup-pass" id="progress-popup-pass" style="display:none;"></div>
|
||||
<div class="progress-checklist" id="progress-checklist">
|
||||
<div class="pipeline-mini" id="progress-pipeline-mini" aria-label="Analyseschritte"></div>
|
||||
<div class="progress-checklist" id="progress-checklist" style="display:none;">
|
||||
<div class="progress-check-item" data-step="queued">
|
||||
<span class="progress-check-icon">○</span>
|
||||
<span class="progress-check-label">In Warteschlange</span>
|
||||
@@ -715,5 +737,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="/static/js/update-system.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,6 +1,16 @@
|
||||
/**
|
||||
* API-Client für den OSINT Lagemonitor.
|
||||
*/
|
||||
|
||||
class ApiError extends Error {
|
||||
constructor(status, detail) {
|
||||
super(detail || `Fehler ${status}`);
|
||||
this.name = 'ApiError';
|
||||
this.status = status;
|
||||
this.detail = detail;
|
||||
}
|
||||
}
|
||||
|
||||
const API = {
|
||||
baseUrl: '/api',
|
||||
|
||||
@@ -57,7 +67,7 @@ const API = {
|
||||
} else if (typeof detail === 'object' && detail !== null) {
|
||||
detail = JSON.stringify(detail);
|
||||
}
|
||||
throw new Error(detail || `Fehler ${response.status}`);
|
||||
throw new ApiError(response.status, detail);
|
||||
}
|
||||
|
||||
if (response.status === 204) return null;
|
||||
@@ -91,6 +101,10 @@ const API = {
|
||||
return this._request('GET', `/incidents/${id}`);
|
||||
},
|
||||
|
||||
getIncidentSources(id) {
|
||||
return this._request('GET', `/incidents/${id}/sources`);
|
||||
},
|
||||
|
||||
updateIncident(id, data) {
|
||||
return this._request('PUT', `/incidents/${id}`, data);
|
||||
},
|
||||
@@ -99,18 +113,42 @@ const API = {
|
||||
return this._request('DELETE', `/incidents/${id}`);
|
||||
},
|
||||
|
||||
getArticles(incidentId) {
|
||||
return this._request('GET', `/incidents/${incidentId}/articles`);
|
||||
getArticles(incidentId, { limit = 500, offset = 0, search = null } = {}) {
|
||||
const params = new URLSearchParams();
|
||||
params.set('limit', String(limit));
|
||||
params.set('offset', String(offset));
|
||||
if (search) params.set('search', search);
|
||||
return this._request('GET', `/incidents/${incidentId}/articles?${params.toString()}`);
|
||||
},
|
||||
|
||||
getArticlesSourcesSummary(incidentId) {
|
||||
return this._request('GET', `/incidents/${incidentId}/articles/sources-summary`);
|
||||
},
|
||||
|
||||
getArticlesTimelineBuckets(incidentId, granularity = 'day') {
|
||||
return this._request('GET', `/incidents/${incidentId}/articles/timeline-buckets?granularity=${encodeURIComponent(granularity)}`);
|
||||
},
|
||||
|
||||
getFactChecks(incidentId) {
|
||||
return this._request('GET', `/incidents/${incidentId}/factchecks`);
|
||||
},
|
||||
|
||||
getPipeline(incidentId) {
|
||||
return this._request('GET', `/incidents/${incidentId}/pipeline`);
|
||||
},
|
||||
|
||||
getSnapshots(incidentId) {
|
||||
return this._request('GET', `/incidents/${incidentId}/snapshots`);
|
||||
},
|
||||
|
||||
getSnapshot(incidentId, snapshotId) {
|
||||
return this._request('GET', `/incidents/${incidentId}/snapshots/${snapshotId}`);
|
||||
},
|
||||
|
||||
searchSnapshots(incidentId, query) {
|
||||
return this._request('GET', `/incidents/${incidentId}/snapshots/search?q=${encodeURIComponent(query)}`);
|
||||
},
|
||||
|
||||
getLocations(incidentId) {
|
||||
return this._request('GET', `/incidents/${incidentId}/locations`);
|
||||
},
|
||||
|
||||
@@ -420,6 +420,9 @@ const App = {
|
||||
_refreshingIncidents: new Set(),
|
||||
_editingIncidentId: null,
|
||||
_currentArticles: [],
|
||||
_currentSnapshots: [],
|
||||
_snapshotFullCache: new Map(),
|
||||
_currentSources: [],
|
||||
_currentIncidentType: 'adhoc',
|
||||
_sidebarFilter: 'all',
|
||||
_currentUsername: '',
|
||||
@@ -584,7 +587,7 @@ const App = {
|
||||
this._refreshingIncidents.add(id);
|
||||
const d = details[String(id)] || {};
|
||||
const inc = this.incidents.find(i => i.id === id);
|
||||
const isFirst = inc && !inc.summary;
|
||||
const isFirst = inc && !inc.has_summary;
|
||||
const isCurrent = (id === currentTask);
|
||||
// Use 'researching' as default step for the actively running task
|
||||
UI.showProgress(isCurrent ? 'researching' : 'queued', { started_at: d.started_at }, id, isFirst);
|
||||
@@ -596,7 +599,7 @@ const App = {
|
||||
queuedIds.forEach((id, idx) => {
|
||||
this._refreshingIncidents.add(id);
|
||||
const inc = this.incidents.find(i => i.id === id);
|
||||
const isFirst = inc && !inc.summary;
|
||||
const isFirst = inc && !inc.has_summary;
|
||||
UI.showProgress('queued', { queue_position: idx + 1 }, id, isFirst);
|
||||
});
|
||||
}
|
||||
@@ -732,8 +735,12 @@ const App = {
|
||||
if (prevOverlay) prevOverlay.style.display = 'none';
|
||||
const prevMini = document.getElementById('progress-mini');
|
||||
if (prevMini) prevMini.style.display = 'none';
|
||||
const grid = document.querySelector('.tab-panels');
|
||||
if (grid) grid.classList.remove('blurred');
|
||||
const blurTarget = document.getElementById('incident-view');
|
||||
// Wenn gerade ein erster Refresh laeuft, Blur stehen lassen statt
|
||||
// remove+add im selben Tick — CSS filter:blur greift sonst nicht.
|
||||
const _restState = isRefreshing ? UI._progressState[id] : null;
|
||||
const _willReBlur = _restState && _restState.isFirst && !_restState.minimized;
|
||||
if (blurTarget && !_willReBlur) blurTarget.classList.remove('refresh-blurred');
|
||||
|
||||
if (isRefreshing) {
|
||||
const state = UI._progressState[id];
|
||||
@@ -785,15 +792,29 @@ const App = {
|
||||
|
||||
async loadIncidentDetail(id) {
|
||||
try {
|
||||
const [incident, articles, factchecks, snapshots, locationsResponse] = await Promise.all([
|
||||
const [incident, articlesResponse, factchecks, snapshots, locationsResponse, sourcesResponse] = await Promise.all([
|
||||
API.getIncident(id),
|
||||
API.getArticles(id),
|
||||
API.getArticles(id, { limit: 500, offset: 0 }),
|
||||
API.getFactChecks(id),
|
||||
API.getSnapshots(id),
|
||||
API.getLocations(id).catch(() => []),
|
||||
API.getIncidentSources(id).catch(() => ({ sources: [] })),
|
||||
]);
|
||||
|
||||
// Locations-API gibt jetzt {category_labels, locations} oder Array (Rückwärtskompatibel)
|
||||
// Sources-Array (ersetzt frueheres incident.sources_json — lazy via /sources-Endpunkt)
|
||||
this._currentSources = (sourcesResponse && sourcesResponse.sources) || [];
|
||||
|
||||
// Articles: neue Shape {total, articles} oder alter nackter Array (Rueckwaertskompatibel)
|
||||
let articles, articlesTotal;
|
||||
if (Array.isArray(articlesResponse)) {
|
||||
articles = articlesResponse;
|
||||
articlesTotal = articlesResponse.length;
|
||||
} else {
|
||||
articles = articlesResponse.articles || [];
|
||||
articlesTotal = articlesResponse.total || articles.length;
|
||||
}
|
||||
|
||||
// Locations-API gibt jetzt {category_labels, locations} oder Array (Rueckwaertskompatibel)
|
||||
let locations, categoryLabels;
|
||||
if (Array.isArray(locationsResponse)) {
|
||||
locations = locationsResponse;
|
||||
@@ -806,13 +827,68 @@ const App = {
|
||||
categoryLabels = null;
|
||||
}
|
||||
|
||||
this._currentArticlesTotal = articlesTotal;
|
||||
this._currentArticlesLoaded = articles.length;
|
||||
this._currentIncidentIdForLoad = id;
|
||||
|
||||
this.renderIncidentDetail(incident, articles, factchecks, snapshots, locations, categoryLabels);
|
||||
|
||||
// Pipeline an die geladene Lage binden (laedt /api/incidents/{id}/pipeline)
|
||||
if (typeof Pipeline !== 'undefined' && Pipeline.bindToIncident) {
|
||||
Pipeline.bindToIncident(id).catch(err => console.warn('pipeline-bind:', err));
|
||||
}
|
||||
|
||||
// Quellenuebersicht aus Aggregat-Endpunkt (alle Quellen, nicht nur erste Seite)
|
||||
this._loadSourcesSummary(id).catch(err => console.warn('sources-summary:', err));
|
||||
|
||||
// Wenn mehr Artikel existieren als initial geladen: progressiver Hintergrund-Load
|
||||
if (articlesTotal > articles.length) {
|
||||
this._loadRemainingArticlesInBackground(id).catch(err => console.warn('bg-articles:', err));
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('loadIncidentDetail Fehler:', err);
|
||||
UI.showToast('Fehler beim Laden: ' + err.message, 'error');
|
||||
}
|
||||
},
|
||||
|
||||
/** Quellenuebersicht aus Aggregat-Endpunkt nachladen (ersetzt Client-Zaehlung). */
|
||||
async _loadSourcesSummary(incidentId) {
|
||||
const data = await API.getArticlesSourcesSummary(incidentId);
|
||||
if (this.currentIncidentId !== incidentId) return; // User hat gewechselt
|
||||
this._currentSourcesSummary = data;
|
||||
const soEl = document.getElementById('source-overview-content');
|
||||
const statsEl = document.getElementById('source-overview-header-stats');
|
||||
if (soEl && typeof UI.renderSourceOverviewFromSummary === 'function') {
|
||||
soEl.innerHTML = UI.renderSourceOverviewFromSummary(data);
|
||||
}
|
||||
if (statsEl && data) {
|
||||
statsEl.textContent = `${data.total} Artikel aus ${data.sources.length} Quellen`;
|
||||
}
|
||||
},
|
||||
|
||||
/** Restliche Artikel seitenweise im Hintergrund nachladen und in _currentArticles mergen. */
|
||||
async _loadRemainingArticlesInBackground(incidentId) {
|
||||
const BATCH = 500;
|
||||
while (this.currentIncidentId === incidentId
|
||||
&& this._currentArticlesLoaded < this._currentArticlesTotal) {
|
||||
let resp;
|
||||
try {
|
||||
resp = await API.getArticles(incidentId, { limit: BATCH, offset: this._currentArticlesLoaded });
|
||||
} catch (err) {
|
||||
console.warn('Hintergrund-Load Artikel fehlgeschlagen:', err);
|
||||
return;
|
||||
}
|
||||
if (this.currentIncidentId !== incidentId) return;
|
||||
const batch = (resp && resp.articles) ? resp.articles : (Array.isArray(resp) ? resp : []);
|
||||
if (!batch.length) break;
|
||||
this._currentArticles = (this._currentArticles || []).concat(batch);
|
||||
this._currentArticlesLoaded += batch.length;
|
||||
this.rerenderTimeline();
|
||||
// Kleiner Yield, damit das UI reaktiv bleibt
|
||||
await new Promise(r => setTimeout(r, 30));
|
||||
}
|
||||
},
|
||||
|
||||
renderIncidentDetail(incident, articles, factchecks, snapshots, locations, categoryLabels) {
|
||||
// Header Strip
|
||||
{ const _e = document.getElementById('incident-title'); if (_e) _e.textContent = incident.title; }
|
||||
@@ -859,13 +935,13 @@ const App = {
|
||||
if (incident.summary) {
|
||||
const { zusammenfassung, remaining } = UI.extractZusammenfassung(incident.summary);
|
||||
if (zusammenfassung) {
|
||||
if (zusammenfassungText) zusammenfassungText.innerHTML = UI.renderZusammenfassung(zusammenfassung, incident.sources_json);
|
||||
if (zusammenfassungText) zusammenfassungText.innerHTML = UI.renderZusammenfassung(zusammenfassung, this._currentSources);
|
||||
if (zusammenfassungCard) zusammenfassungCard.style.display = '';
|
||||
summaryText.innerHTML = UI.renderSummary(remaining, incident.sources_json, incident.type);
|
||||
summaryText.innerHTML = UI.renderSummary(remaining, this._currentSources, incident.type);
|
||||
} else {
|
||||
if (zusammenfassungText) zusammenfassungText.innerHTML = '<span style="color:var(--text-disabled);">Zusammenfassung wird beim n\u00e4chsten Refresh generiert.</span>';
|
||||
if (zusammenfassungCard) zusammenfassungCard.style.display = '';
|
||||
summaryText.innerHTML = UI.renderSummary(incident.summary, incident.sources_json, incident.type);
|
||||
summaryText.innerHTML = UI.renderSummary(incident.summary, this._currentSources, incident.type);
|
||||
}
|
||||
} else {
|
||||
if (zusammenfassungCard) zusammenfassungCard.style.display = 'none';
|
||||
@@ -877,12 +953,12 @@ const App = {
|
||||
if (zusammenfassungCard) zusammenfassungCard.style.display = '';
|
||||
const devText = (incident.latest_developments || '').trim();
|
||||
if (devText) {
|
||||
if (zusammenfassungText) zusammenfassungText.innerHTML = UI.renderLatestDevelopments(devText, incident.sources_json);
|
||||
if (zusammenfassungText) zusammenfassungText.innerHTML = UI.renderLatestDevelopments(devText, this._currentSources);
|
||||
} else if (zusammenfassungText) {
|
||||
zusammenfassungText.innerHTML = '<span style="color:var(--text-disabled);">Noch keine Entwicklungen erfasst. Wird beim n\u00e4chsten Refresh generiert.</span>';
|
||||
}
|
||||
if (incident.summary) {
|
||||
summaryText.innerHTML = UI.renderSummary(incident.summary, incident.sources_json, incident.type);
|
||||
summaryText.innerHTML = UI.renderSummary(incident.summary, this._currentSources, incident.type);
|
||||
} else {
|
||||
summaryText.innerHTML = '<span style="color:var(--text-disabled);">Noch kein Lagebild. Klicke auf "Aktualisieren" um die Recherche zu starten.</span>';
|
||||
}
|
||||
@@ -938,22 +1014,22 @@ const App = {
|
||||
factcheckList.innerHTML = '<div style="padding:12px;font-size:13px;color:var(--text-tertiary);">Noch keine Fakten geprüft</div>';
|
||||
}
|
||||
|
||||
// Quellenübersicht
|
||||
// Quellenuebersicht wird aus dem Aggregat-Endpunkt (_loadSourcesSummary) gefuellt,
|
||||
// damit sie immer alle Artikel der Lage zeigt — unabhaengig von Paginierung.
|
||||
const sourceOverview = document.getElementById('source-overview-content');
|
||||
if (sourceOverview) {
|
||||
sourceOverview.innerHTML = UI.renderSourceOverview(articles);
|
||||
// Stats im Header aktualisieren (sichtbar im zugeklappten Zustand)
|
||||
sourceOverview.innerHTML = '<div style="padding:12px;font-size:13px;color:var(--text-tertiary);">Quellenübersicht wird geladen…</div>';
|
||||
}
|
||||
const _soStats = document.getElementById("source-overview-header-stats");
|
||||
if (_soStats) {
|
||||
const _soSources = new Set(articles.map(a => a.source).filter(Boolean));
|
||||
_soStats.textContent = articles.length + " Artikel aus " + _soSources.size + " Quellen";
|
||||
}
|
||||
// Im Tab-Modus wird die Kachel vom Seiten-Layout bestimmt — kein Resize noetig
|
||||
const total = (this._currentArticlesTotal != null) ? this._currentArticlesTotal : articles.length;
|
||||
_soStats.textContent = total + " Artikel";
|
||||
}
|
||||
|
||||
// Timeline - Artikel + Snapshots zwischenspeichern und rendern
|
||||
this._currentArticles = articles;
|
||||
this._currentSnapshots = snapshots || [];
|
||||
this._snapshotFullCache = new Map();
|
||||
this._currentIncidentType = incident.type;
|
||||
|
||||
// Tab-Auswahl: gemerkt pro Lage (localStorage), Default = erster Tab
|
||||
@@ -1001,7 +1077,9 @@ const App = {
|
||||
if (filterType === 'all' || filterType === 'snapshots') {
|
||||
let snapshots = this._currentSnapshots || [];
|
||||
if (searchTerm) {
|
||||
snapshots = snapshots.filter(s => (s.summary || '').toLowerCase().includes(searchTerm));
|
||||
// Suche erfolgt clientseitig ueber Preview (Snapshots-Liste enthaelt keinen Volltext mehr).
|
||||
// Die asynchrone Volltext-Server-Suche wird separat ausgeloest (rerenderTimeline).
|
||||
snapshots = snapshots.filter(s => (s.summary_preview || s.summary || '').toLowerCase().includes(searchTerm));
|
||||
}
|
||||
snapshots.forEach(s => entries.push({ kind: 'snapshot', data: s, timestamp: s.created_at || '' }));
|
||||
}
|
||||
@@ -1503,6 +1581,7 @@ const App = {
|
||||
|
||||
/**
|
||||
* Snapshot/Lagebericht-Eintrag für den Zeitstrahl rendern.
|
||||
* Volltext + sources_json werden erst beim Aufklappen lazy nachgeladen.
|
||||
*/
|
||||
_renderSnapshotEntry(snapshot) {
|
||||
const time = snapshot.created_at
|
||||
@@ -1514,24 +1593,58 @@ const App = {
|
||||
if (snapshot.fact_check_count) stats.push(`${snapshot.fact_check_count} Fakten`);
|
||||
const statsText = stats.join(', ');
|
||||
|
||||
// Vorschau: erste 200 Zeichen der Zusammenfassung
|
||||
const summaryText = snapshot.summary || '';
|
||||
const preview = summaryText.length > 200 ? summaryText.substring(0, 200) + '...' : summaryText;
|
||||
// Vorschau: erste 200 Zeichen aus summary_preview (vom Server gekuerzt) oder Fallback summary
|
||||
const previewText = snapshot.summary_preview || snapshot.summary || '';
|
||||
const preview = previewText.length > 200 ? previewText.substring(0, 200) + '...' : previewText;
|
||||
|
||||
// Vollständige Zusammenfassung via UI.renderSummary
|
||||
const fullSummary = UI.renderSummary(snapshot.summary, snapshot.sources_json, this._currentIncidentType);
|
||||
// Volltext aus Cache (falls bereits geladen), sonst Platzhalter fuer Lazy-Load
|
||||
const cached = this._snapshotFullCache && this._snapshotFullCache.get(snapshot.id);
|
||||
const detailHtml = cached
|
||||
? UI.renderSummary(cached.summary, cached.sources_json, this._currentIncidentType)
|
||||
: '<div class="vt-snapshot-loading">Lagebericht wird geladen…</div>';
|
||||
const loadedAttr = cached ? ' data-loaded="yes"' : '';
|
||||
|
||||
return `<div class="vt-entry vt-snapshot expandable" onclick="App.toggleTimelineEntry(this)">
|
||||
return `<div class="vt-entry vt-snapshot expandable" data-snapshot-id="${snapshot.id}"${loadedAttr} onclick="App.toggleTimelineEntry(this)">
|
||||
<div class="vt-snapshot-header">
|
||||
<span class="vt-snapshot-badge">Lagebericht</span>
|
||||
<span class="vt-snapshot-time">${time}</span>
|
||||
<span class="vt-snapshot-stats">${UI.escape(statsText)}</span>
|
||||
</div>
|
||||
<div class="vt-snapshot-preview">${UI.escape(preview)}</div>
|
||||
<div class="vt-snapshot-detail">${fullSummary}</div>
|
||||
<div class="vt-snapshot-detail">${detailHtml}</div>
|
||||
</div>`;
|
||||
},
|
||||
|
||||
/**
|
||||
* Volltext eines Snapshots bei Bedarf nachladen und in das DOM einsetzen.
|
||||
* Ergebnis wird in _snapshotFullCache gecacht.
|
||||
*/
|
||||
async lazyLoadSnapshotDetail(el) {
|
||||
if (!el || el.dataset.loaded === 'yes' || el.dataset.loaded === 'loading') return;
|
||||
const snapId = parseInt(el.dataset.snapshotId || '0', 10);
|
||||
if (!snapId || !this.currentIncidentId) return;
|
||||
el.dataset.loaded = 'loading';
|
||||
try {
|
||||
let snap = this._snapshotFullCache.get(snapId);
|
||||
if (!snap) {
|
||||
snap = await API.getSnapshot(this.currentIncidentId, snapId);
|
||||
this._snapshotFullCache.set(snapId, snap);
|
||||
}
|
||||
const detailEl = el.querySelector('.vt-snapshot-detail');
|
||||
if (detailEl) {
|
||||
detailEl.innerHTML = UI.renderSummary(snap.summary, snap.sources_json, this._currentIncidentType);
|
||||
}
|
||||
el.dataset.loaded = 'yes';
|
||||
// Nach dem Laden die Timeline-Kachel an neue Hoehe anpassen
|
||||
if (el.classList.contains('expanded')) this._resizeTimelineTile();
|
||||
} catch (err) {
|
||||
console.error('Snapshot-Volltext laden fehlgeschlagen:', err);
|
||||
el.dataset.loaded = '';
|
||||
const detailEl = el.querySelector('.vt-snapshot-detail');
|
||||
if (detailEl) detailEl.innerHTML = '<div class="vt-snapshot-error">Fehler beim Laden des Lageberichts.</div>';
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Timeline-Eintrag auf-/zuklappen (mutual-exclusive pro Zeitgruppe).
|
||||
*/
|
||||
@@ -1544,6 +1657,10 @@ const App = {
|
||||
}
|
||||
el.classList.toggle('expanded');
|
||||
if (el.classList.contains('expanded')) {
|
||||
// Snapshots: Volltext lazy nachladen (nur wenn noch nicht geladen)
|
||||
if (el.classList.contains('vt-snapshot') && el.dataset.snapshotId) {
|
||||
this.lazyLoadSnapshotDetail(el);
|
||||
}
|
||||
requestAnimationFrame(() => {
|
||||
var scrollParent = el.closest('.ht-detail-content');
|
||||
if (scrollParent && el.classList.contains('vt-snapshot')) {
|
||||
@@ -1658,12 +1775,19 @@ const App = {
|
||||
closeModal('modal-new');
|
||||
|
||||
await this.loadIncidents();
|
||||
|
||||
// Refresh-Status VOR selectIncident setzen, damit selectIncident
|
||||
// beim Oeffnen sofort Blur + Aktions-Lock setzt (statt sie erst
|
||||
// per WebSocket-Nachricht spaeter wieder zu aktivieren — dazwischen
|
||||
// war der Fallinhalt kurzzeitig unblurred und klickbar).
|
||||
this._refreshingIncidents.add(incident.id);
|
||||
UI._progressState[incident.id] = {
|
||||
step: 'queued', isFirst: true, startTime: null, minimized: false,
|
||||
};
|
||||
|
||||
await this.selectIncident(incident.id);
|
||||
|
||||
// Sofort ersten Refresh starten
|
||||
this._refreshingIncidents.add(incident.id);
|
||||
this._updateRefreshButton(true);
|
||||
// showProgress called via handleStatusUpdate
|
||||
await API.refreshIncident(incident.id);
|
||||
UI.showToast(`Lage "${incident.title}" angelegt. Recherche gestartet.`, 'success');
|
||||
}
|
||||
@@ -1701,8 +1825,15 @@ async generateDescription() {
|
||||
textarea.value = result.description;
|
||||
_autoResizeTextarea(textarea);
|
||||
} catch (err) {
|
||||
if (err.name !== 'AbortError') {
|
||||
UI.showToast('Beschreibung konnte nicht generiert werden', 'error');
|
||||
if (err.name === 'AbortError') {
|
||||
// still
|
||||
} else {
|
||||
let msg = 'Beschreibung konnte nicht generiert werden';
|
||||
if (err.status === 503) msg = 'KI-Zugang aktuell nicht verfügbar. Bitte Administrator kontaktieren.';
|
||||
else if (err.status === 429) msg = 'KI ist gerade ausgelastet. Bitte kurz warten und erneut versuchen.';
|
||||
else if (err.status === 504) msg = 'KI antwortet gerade nicht. Bitte erneut versuchen.';
|
||||
else if (err.status === 403) msg = err.detail || 'Zugriff verweigert.';
|
||||
UI.showToast(msg, 'error');
|
||||
}
|
||||
} finally {
|
||||
btnText.textContent = 'Beschreibung generieren';
|
||||
@@ -1730,7 +1861,7 @@ async handleRefresh() {
|
||||
} else {
|
||||
UI.showToast('Aktualisierung gestartet.', 'success');
|
||||
var _inc2 = this.incidents.find(function(i) { return i.id === this.currentIncidentId; }.bind(this));
|
||||
UI.showProgress('queued', {}, this.currentIncidentId, _inc2 && !_inc2.summary);
|
||||
UI.showProgress('queued', {}, this.currentIncidentId, _inc2 && !_inc2.has_summary);
|
||||
}
|
||||
} catch (err) {
|
||||
this._refreshingIncidents.delete(this.currentIncidentId);
|
||||
@@ -2073,7 +2204,7 @@ async handleRefresh() {
|
||||
this._updateSidebarDot(msg.incident_id);
|
||||
// Detect first refresh: no summary means first run
|
||||
const inc = this.incidents.find(i => i.id === msg.incident_id);
|
||||
const isFirst = inc && !inc.summary;
|
||||
const isFirst = inc && !inc.has_summary;
|
||||
// Update progress state for ALL incidents (sidebar + popup if current)
|
||||
UI.showProgress(status, msg.data, msg.incident_id, isFirst);
|
||||
// Re-render sidebar so status is baked into HTML (survives future re-renders)
|
||||
|
||||
@@ -67,12 +67,12 @@ const Chat = {
|
||||
this.addMessage('assistant', 'Hallo! Ich bin der AegisSight Assistent. Stell mir gerne jede Frage rund um die Bedienung des Monitors, ich helfe dir weiter.');
|
||||
}
|
||||
|
||||
// Tutorial-Hinweis bei jedem Oeffnen aktualisieren (wenn nicht dismissed)
|
||||
if (typeof Tutorial !== 'undefined' && !this._tutorialHintDismissed) {
|
||||
var oldHint = document.getElementById('chat-tutorial-hint');
|
||||
if (oldHint) oldHint.remove();
|
||||
this._showTutorialHint();
|
||||
}
|
||||
// Tutorial-Hinweis temporaer deaktiviert (Ueberarbeitung) - reaktivieren durch Entfernen der Kommentarzeichen:
|
||||
// if (typeof Tutorial !== 'undefined' && !this._tutorialHintDismissed) {
|
||||
// var oldHint = document.getElementById('chat-tutorial-hint');
|
||||
// if (oldHint) oldHint.remove();
|
||||
// this._showTutorialHint();
|
||||
// }
|
||||
|
||||
// Focus auf Input
|
||||
setTimeout(() => {
|
||||
@@ -137,15 +137,15 @@ const Chat = {
|
||||
this._showTyping();
|
||||
this._isLoading = true;
|
||||
|
||||
// Tutorial-Keywords abfangen
|
||||
var lowerText = text.toLowerCase();
|
||||
if (lowerText === 'rundgang' || lowerText === 'tutorial' || lowerText === 'tour' || lowerText === 'f\u00fchrung') {
|
||||
this._hideTyping();
|
||||
this._isLoading = false;
|
||||
this.close();
|
||||
if (typeof Tutorial !== 'undefined') Tutorial.start();
|
||||
return;
|
||||
}
|
||||
// Tutorial-Keywords temporaer deaktiviert (Ueberarbeitung) - reaktivieren durch Entfernen der Kommentarzeichen:
|
||||
// var lowerText = text.toLowerCase();
|
||||
// if (lowerText === 'rundgang' || lowerText === 'tutorial' || lowerText === 'tour' || lowerText === 'f\u00fchrung') {
|
||||
// this._hideTyping();
|
||||
// this._isLoading = false;
|
||||
// this.close();
|
||||
// if (typeof Tutorial !== 'undefined') Tutorial.start();
|
||||
// return;
|
||||
// }
|
||||
|
||||
try {
|
||||
const body = {
|
||||
|
||||
@@ -334,9 +334,18 @@ const UI = {
|
||||
// Blocking (no close) for first refresh
|
||||
if (state.isFirst) {
|
||||
overlay.classList.add('blocking');
|
||||
// Apply blur to grid
|
||||
const grid = document.querySelector('.tab-panels');
|
||||
if (grid) grid.classList.add('blurred');
|
||||
// Apply blur to incident-view (Header + Tab-Panels gemeinsam).
|
||||
const blurTarget = document.getElementById('incident-view');
|
||||
if (blurTarget) {
|
||||
blurTarget.classList.add('refresh-blurred');
|
||||
// Sicherheitsnetz: bei viel DOM-Reshuffle im selben Tick
|
||||
// (Display-Wechsel, renderSidebar, leere innerHTML) greift
|
||||
// CSS filter:blur erst beim naechsten Layout-Pass. Im
|
||||
// naechsten Frame nochmal setzen — idempotent.
|
||||
requestAnimationFrame(() => {
|
||||
if (state && state.isFirst) blurTarget.classList.add('refresh-blurred');
|
||||
});
|
||||
}
|
||||
} else {
|
||||
overlay.classList.remove('blocking');
|
||||
}
|
||||
@@ -465,8 +474,8 @@ const UI = {
|
||||
|
||||
if (incidentId === App.currentIncidentId) {
|
||||
// Remove blur
|
||||
const grid = document.querySelector('.tab-panels');
|
||||
if (grid) grid.classList.remove('blurred');
|
||||
const blurTarget = document.getElementById('incident-view');
|
||||
if (blurTarget) blurTarget.classList.remove('refresh-blurred');
|
||||
|
||||
const overlay = document.getElementById('progress-overlay');
|
||||
if (overlay) {
|
||||
@@ -559,8 +568,8 @@ const UI = {
|
||||
if (!incidentId) incidentId = App.currentIncidentId;
|
||||
|
||||
// Remove blur
|
||||
const grid = document.querySelector('.tab-panels');
|
||||
if (grid) grid.classList.remove('blurred');
|
||||
const blurTarget = document.getElementById('incident-view');
|
||||
if (blurTarget) blurTarget.classList.remove('refresh-blurred');
|
||||
|
||||
if (incidentId === App.currentIncidentId) {
|
||||
const overlay = document.getElementById('progress-overlay');
|
||||
@@ -709,13 +718,27 @@ const UI = {
|
||||
return { zusammenfassung, remaining: remaining.trim() };
|
||||
},
|
||||
|
||||
/**
|
||||
* Parst sources: akzeptiert Array (neu, vom /sources-Endpunkt) ODER
|
||||
* JSON-String (alt, aus sources_json) fuer Rueckwaertskompatibilitaet.
|
||||
*/
|
||||
_parseSources(input) {
|
||||
if (!input) return [];
|
||||
if (Array.isArray(input)) return input;
|
||||
try {
|
||||
const parsed = JSON.parse(input);
|
||||
return Array.isArray(parsed) ? parsed : [];
|
||||
} catch (e) {
|
||||
return [];
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Rendert die Zusammenfassung als HTML (Bullet Points).
|
||||
*/
|
||||
renderZusammenfassung(text, sourcesJson) {
|
||||
if (!text) return '<span style="color:var(--text-disabled);">Noch keine Zusammenfassung.</span>';
|
||||
let sources = [];
|
||||
try { sources = JSON.parse(sourcesJson || '[]'); } catch(e) {}
|
||||
const sources = this._parseSources(sourcesJson);
|
||||
// Nur Bullet-Point-Zeilen behalten, Fliesstext herausfiltern
|
||||
const bulletLines = text.split("\n").filter(line => line.trim().startsWith("- "));
|
||||
const bulletText = bulletLines.length > 0 ? bulletLines.join("\n") : text;
|
||||
@@ -751,8 +774,7 @@ const UI = {
|
||||
*/
|
||||
renderLatestDevelopments(text, sourcesJson) {
|
||||
if (!text) return '<span style="color:var(--text-disabled);">Noch keine Entwicklungen erfasst.</span>';
|
||||
let sources = [];
|
||||
try { sources = JSON.parse(sourcesJson || '[]'); } catch(e) {}
|
||||
const sources = this._parseSources(sourcesJson);
|
||||
|
||||
const bulletLines = text.split("\n").map(l => l.trim()).filter(l => l && (l.startsWith("- ") || l.startsWith("[")));
|
||||
if (bulletLines.length === 0) {
|
||||
@@ -869,8 +891,7 @@ const UI = {
|
||||
renderSummary(summary, sourcesJson, incidentType) {
|
||||
if (!summary) return '<span style="color:var(--text-tertiary);">Noch keine Zusammenfassung.</span>';
|
||||
|
||||
let sources = [];
|
||||
try { sources = JSON.parse(sourcesJson || '[]'); } catch(e) {}
|
||||
const sources = this._parseSources(sourcesJson);
|
||||
|
||||
// Markdown-Rendering
|
||||
let html = this.escape(summary);
|
||||
@@ -930,6 +951,37 @@ const UI = {
|
||||
/**
|
||||
* Quellenübersicht für eine Lage rendern.
|
||||
*/
|
||||
/**
|
||||
* Quellenuebersicht aus Aggregat-Endpunkt rendern (alle Artikel der Lage,
|
||||
* unabhaengig von Paginierung im Frontend).
|
||||
* data: {total, sources: [{source, article_count, languages: []}], language_counts: [{language, cnt}]}
|
||||
*/
|
||||
renderSourceOverviewFromSummary(data) {
|
||||
if (!data || !data.sources || data.sources.length === 0) return '';
|
||||
|
||||
const langChips = (data.language_counts || [])
|
||||
.map(l => `<span class="source-lang-chip">${(l.language || 'de').toUpperCase()} <strong>${l.cnt}</strong></span>`)
|
||||
.join('');
|
||||
|
||||
let html = `<div class="source-overview-header">`;
|
||||
html += `<span class="source-overview-stat">${data.total} Artikel aus ${data.sources.length} Quellen</span>`;
|
||||
html += `<div class="source-lang-chips">${langChips}</div>`;
|
||||
html += `</div>`;
|
||||
|
||||
html += '<div class="source-overview-grid">';
|
||||
data.sources.forEach(s => {
|
||||
const langs = (s.languages || ['de']).map(l => (l || 'de').toUpperCase()).join('/');
|
||||
html += `<div class="source-overview-item">
|
||||
<span class="source-overview-name">${this.escape(s.source || 'Unbekannt')}</span>
|
||||
<span class="source-overview-lang">${langs}</span>
|
||||
<span class="source-overview-count">${s.article_count}</span>
|
||||
</div>`;
|
||||
});
|
||||
html += '</div>';
|
||||
|
||||
return html;
|
||||
},
|
||||
|
||||
renderSourceOverview(articles) {
|
||||
if (!articles || articles.length === 0) return '';
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Nur ein Tab-Panel gleichzeitig sichtbar, pro Lage gemerkt in localStorage.
|
||||
*/
|
||||
const LayoutManager = {
|
||||
TAB_ORDER: ['zusammenfassung', 'lagebild', 'timeline', 'karte', 'faktencheck', 'quellen'],
|
||||
TAB_ORDER: ['zusammenfassung', 'lagebild', 'timeline', 'karte', 'faktencheck', 'pipeline', 'quellen'],
|
||||
_currentIncidentId: null,
|
||||
_initialized: false,
|
||||
|
||||
|
||||
515
src/static/js/pipeline.js
Normale Datei
515
src/static/js/pipeline.js
Normale Datei
@@ -0,0 +1,515 @@
|
||||
/**
|
||||
* Pipeline-Modul: Visualisierung der Analysepipeline pro Lage.
|
||||
*
|
||||
* - Liest Pipeline-Definition + letzten Refresh-Stand vom Backend
|
||||
* (GET /api/incidents/{id}/pipeline)
|
||||
* - Hört auf WebSocket-Events vom Typ "pipeline_step" und animiert Live
|
||||
* den jeweils aktiven Schritt
|
||||
* - Bei Lagen-Wechsel wird die Visualisierung an die neue Lage neu gebunden
|
||||
*
|
||||
* Stilkonzept:
|
||||
* - Blöcke = Karten mit Icon + Titel + Zahl
|
||||
* - Verbindungspfeile als SVG zwischen den Blöcken
|
||||
* - Aktiver Block: pulsierender Glow (CSS-Klasse .is-active)
|
||||
* - Fertiger Block: Häkchen + dezente Outline (.is-done)
|
||||
* - Übersprungener Block: ausgeblendet (laut Anforderung)
|
||||
* - Multi-Pass (Research): am letzten Block leuchtet ein Schleifen-Pfeil auf
|
||||
*/
|
||||
const Pipeline = {
|
||||
_incidentId: null,
|
||||
_definition: null, // PIPELINE_STEPS vom Backend
|
||||
_stateByKey: {}, // step_key -> {status, count_value, count_secondary, pass_number}
|
||||
_isResearch: false,
|
||||
_passTotal: 1,
|
||||
_lastRefreshHeader: null,
|
||||
_hoverTooltipEl: null,
|
||||
_isLoading: false,
|
||||
_wsBound: false,
|
||||
_icons: {
|
||||
search: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.3-4.3"/></svg>',
|
||||
rss: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 11a9 9 0 0 1 9 9"/><path d="M4 4a16 16 0 0 1 16 16"/><circle cx="5" cy="19" r="1.5"/></svg>',
|
||||
'copy-x': '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="13" height="13" rx="2"/><path d="M8 21h11a2 2 0 0 0 2-2V8"/><path d="M11 11l4 4M15 11l-4 4"/></svg>',
|
||||
scale: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 3v18"/><path d="M5 8h14"/><path d="M5 8l-3 7h6z"/><path d="M19 8l-3 7h6z"/></svg>',
|
||||
'map-pin': '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s7-7 7-13a7 7 0 0 0-14 0c0 6 7 13 7 13z"/><circle cx="12" cy="9" r="2.5"/></svg>',
|
||||
'file-text': '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 3H6a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9z"/><path d="M14 3v6h6"/><path d="M8 13h8M8 17h8M8 9h2"/></svg>',
|
||||
shield: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 2l8 4v6c0 5-3.5 9-8 10-4.5-1-8-5-8-10V6z"/><path d="M9 12l2 2 4-4"/></svg>',
|
||||
'check-circle': '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M8 12l3 3 5-6"/></svg>',
|
||||
bell: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M6 8a6 6 0 0 1 12 0c0 7 3 9 3 9H3s3-2 3-9"/><path d="M10 21a2 2 0 0 0 4 0"/></svg>',
|
||||
},
|
||||
|
||||
/** Wird einmal beim Seitenstart aufgerufen, hängt sich an WebSocket. */
|
||||
init() {
|
||||
if (this._wsBound) return;
|
||||
if (typeof WS !== 'undefined' && WS.on) {
|
||||
WS.on('pipeline_step', (msg) => this._onWsStep(msg));
|
||||
// Bei Refresh-Complete den finalen Stand neu laden, damit Zahlen gefroren sichtbar bleiben
|
||||
WS.on('refresh_complete', (msg) => this._onRefreshDone(msg));
|
||||
WS.on('refresh_cancelled', (msg) => this._onRefreshDone(msg));
|
||||
WS.on('refresh_error', (msg) => this._onRefreshDone(msg));
|
||||
this._wsBound = true;
|
||||
}
|
||||
// Hover-Tooltip-Element vorbereiten
|
||||
if (!this._hoverTooltipEl) {
|
||||
const t = document.createElement('div');
|
||||
t.className = 'pipeline-tooltip';
|
||||
t.setAttribute('role', 'tooltip');
|
||||
document.body.appendChild(t);
|
||||
this._hoverTooltipEl = t;
|
||||
}
|
||||
// Klick auf Body schliesst Tooltip-Popup
|
||||
document.addEventListener('click', (e) => {
|
||||
if (!e.target.closest('.pipeline-block') && !e.target.closest('.pipeline-popup')) {
|
||||
this._closePopup();
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/** Bindet die Pipeline an eine Lage. Lädt Daten und rendert. */
|
||||
async bindToIncident(incidentId) {
|
||||
this._incidentId = incidentId;
|
||||
this._stateByKey = {};
|
||||
this._isResearch = false;
|
||||
this._passTotal = 1;
|
||||
this._lastRefreshHeader = null;
|
||||
this._renderEmpty('Lade...');
|
||||
if (incidentId == null) return;
|
||||
|
||||
this._isLoading = true;
|
||||
try {
|
||||
const data = await API.getPipeline(incidentId);
|
||||
// Lagen-Wechsel waehrend Request: alte Antwort verwerfen
|
||||
if (this._incidentId !== incidentId) return;
|
||||
|
||||
this._definition = data.steps_definition || [];
|
||||
this._isResearch = !!data.is_research;
|
||||
this._lastRefreshHeader = data.last_refresh || null;
|
||||
this._passTotal = (data.last_refresh && data.last_refresh.pass_total) || 1;
|
||||
|
||||
// Letzten Stand pro step_key konsolidieren (bei Multi-Pass: letzter Pass-Eintrag gewinnt)
|
||||
(data.steps || []).forEach(s => {
|
||||
const key = s.step_key;
|
||||
const prev = this._stateByKey[key];
|
||||
if (!prev || (s.pass_number || 1) >= (prev.pass_number || 1)) {
|
||||
this._stateByKey[key] = {
|
||||
status: s.status,
|
||||
count_value: s.count_value,
|
||||
count_secondary: s.count_secondary,
|
||||
pass_number: s.pass_number || 1,
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
this._render();
|
||||
this._renderMini();
|
||||
} catch (e) {
|
||||
console.warn('Pipeline laden fehlgeschlagen:', e);
|
||||
this._renderEmpty('Pipeline-Daten konnten nicht geladen werden.');
|
||||
} finally {
|
||||
this._isLoading = false;
|
||||
}
|
||||
},
|
||||
|
||||
/** WebSocket: einzelner Pipeline-Schritt-Status. */
|
||||
_onWsStep(msg) {
|
||||
if (!msg || !msg.data) return;
|
||||
if (this._incidentId == null || msg.incident_id !== this._incidentId) return;
|
||||
|
||||
const d = msg.data;
|
||||
const key = d.step_key;
|
||||
if (!key) return;
|
||||
|
||||
// State aktualisieren, letzter Pass gewinnt
|
||||
const prev = this._stateByKey[key];
|
||||
const passNr = d.pass_number || 1;
|
||||
if (!prev || passNr >= (prev.pass_number || 1)) {
|
||||
this._stateByKey[key] = {
|
||||
status: d.status,
|
||||
count_value: d.count_value !== undefined ? d.count_value : (prev ? prev.count_value : null),
|
||||
count_secondary: d.count_secondary !== undefined ? d.count_secondary : (prev ? prev.count_secondary : null),
|
||||
pass_number: passNr,
|
||||
};
|
||||
}
|
||||
|
||||
// Multi-Pass-Erkennung: pass_number > _passTotal -> erweitern + Loop-Animation triggern
|
||||
if (passNr > this._passTotal) {
|
||||
this._passTotal = passNr;
|
||||
// Schleifen-Pfeil aufflackern
|
||||
const stage = document.getElementById('pipeline-stage');
|
||||
if (stage) {
|
||||
stage.classList.add('is-looping');
|
||||
setTimeout(() => stage.classList.remove('is-looping'), 1500);
|
||||
}
|
||||
}
|
||||
|
||||
// Wenn ein neuer Pass startet (pass_number > prev und status="active" beim ERSTEN step):
|
||||
// alle Schritte zurück auf pending setzen, damit die Animation neu durchläuft.
|
||||
if (d.status === 'active' && this._definition && this._definition.length
|
||||
&& key === this._definition[0].key && passNr > 1 && (!prev || prev.pass_number < passNr)) {
|
||||
// Alle anderen Steps in "pending" zurueck (visuell), Werte behalten wir
|
||||
this._definition.forEach(s => {
|
||||
if (s.key !== key && this._stateByKey[s.key]) {
|
||||
this._stateByKey[s.key].status = 'pending';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this._patchBlock(key);
|
||||
this._patchMiniBlock(key);
|
||||
},
|
||||
|
||||
_onRefreshDone(msg) {
|
||||
if (this._incidentId == null || (msg && msg.incident_id !== this._incidentId)) return;
|
||||
// Daten frisch nachladen, damit Header (Dauer) und finale Zahlen passen
|
||||
setTimeout(() => {
|
||||
if (this._incidentId != null) this.bindToIncident(this._incidentId);
|
||||
}, 600);
|
||||
},
|
||||
|
||||
/** Vollbild-Pipeline (Tab "Analysepipeline") als 3x3-Snake rendern. */
|
||||
_render() {
|
||||
const stage = document.getElementById('pipeline-stage');
|
||||
const meta = document.getElementById('pipeline-header-meta');
|
||||
const sidenote = document.getElementById('pipeline-sidenote');
|
||||
if (!stage) return;
|
||||
|
||||
if (meta) meta.textContent = this._formatHeader();
|
||||
if (sidenote) sidenote.hidden = !this._isResearch;
|
||||
|
||||
// Brandneue Lage ohne Refresh
|
||||
if (!this._lastRefreshHeader) {
|
||||
this._renderEmpty('Noch nie aktualisiert. Starte den ersten Refresh.');
|
||||
return;
|
||||
}
|
||||
|
||||
// Sichtbare Blöcke (skipped komplett ausgeblendet, Anforderung 4b)
|
||||
const visible = (this._definition || []).filter(s => {
|
||||
const st = this._stateByKey[s.key];
|
||||
return !st || st.status !== 'skipped';
|
||||
});
|
||||
|
||||
// In Dreier-Reihen aufteilen, Snake-Direction abwechselnd
|
||||
const ROW_SIZE = 3;
|
||||
const rows = [];
|
||||
for (let i = 0; i < visible.length; i += ROW_SIZE) {
|
||||
rows.push({
|
||||
steps: visible.slice(i, i + ROW_SIZE),
|
||||
direction: (rows.length % 2 === 0) ? 'ltr' : 'rtl',
|
||||
});
|
||||
}
|
||||
|
||||
let trackHtml = '';
|
||||
rows.forEach((row, rowIdx) => {
|
||||
const isLastRow = rowIdx === rows.length - 1;
|
||||
let rowHtml = `<div class="pipeline-row" data-direction="${row.direction}">`;
|
||||
row.steps.forEach((s, i) => {
|
||||
const isLastBlockOverall = isLastRow && i === row.steps.length - 1;
|
||||
rowHtml += this._renderBlock(s, isLastBlockOverall);
|
||||
// Inner-Pfeil zwischen Blöcken einer Reihe (nicht hinter dem letzten)
|
||||
if (i < row.steps.length - 1) {
|
||||
rowHtml += `<div class="pipeline-arrow" data-from="${s.key}" data-arrow-type="inner"></div>`;
|
||||
}
|
||||
});
|
||||
rowHtml += '</div>';
|
||||
trackHtml += rowHtml;
|
||||
|
||||
// U-Turn-Pfeil zwischen dieser und der nächsten Reihe
|
||||
if (!isLastRow) {
|
||||
const lastInRow = row.steps[row.steps.length - 1];
|
||||
const side = row.direction === 'ltr' ? 'right' : 'left';
|
||||
trackHtml += this._renderUturn(side, lastInRow.key);
|
||||
}
|
||||
});
|
||||
|
||||
stage.innerHTML = `<div class="pipeline-track">${trackHtml}</div>`;
|
||||
this._bindBlockEvents(stage);
|
||||
},
|
||||
|
||||
_renderBlock(stepDef, isLastOverall) {
|
||||
const st = this._stateByKey[stepDef.key];
|
||||
const status = (st && st.status) || 'pending';
|
||||
const cv = st ? st.count_value : null;
|
||||
const cs = st ? st.count_secondary : null;
|
||||
const loopMark = isLastOverall && this._isResearch
|
||||
? `<div class="pipeline-loop" title="Mehrfach-Durchlauf"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12a9 9 0 1 1-3-6.7"/><path d="M21 4v5h-5"/></svg></div>`
|
||||
: '';
|
||||
const icon = this._icons[stepDef.icon] || this._icons.search;
|
||||
return `
|
||||
<div class="pipeline-block status-${status}" data-step-key="${stepDef.key}" tabindex="0" aria-label="${this._escape(stepDef.label)}">
|
||||
<div class="pipeline-block-icon">${icon}</div>
|
||||
<div class="pipeline-block-title">${this._escape(stepDef.label)}</div>
|
||||
<div class="pipeline-block-count">${this._formatCount(stepDef.key, cv, cs, status)}</div>
|
||||
<div class="pipeline-block-check" aria-hidden="true">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><path d="M5 12l5 5 9-11"/></svg>
|
||||
</div>
|
||||
${loopMark}
|
||||
</div>
|
||||
`;
|
||||
},
|
||||
|
||||
/** Kompakter Reihenwechsel-Pfeil: kurzer ↓ direkt unter dem letzten Block der oberen Reihe. */
|
||||
_renderUturn(side, fromKey) {
|
||||
const arrowSvg = `
|
||||
<div class="uturn-arrow">
|
||||
<svg viewBox="0 0 24 32" preserveAspectRatio="xMidYMid meet">
|
||||
<path d="M 12 2 L 12 24" class="pipeline-uturn-path"/>
|
||||
<polyline points="6,18 12,24 18,18" class="pipeline-uturn-head"/>
|
||||
</svg>
|
||||
</div>`;
|
||||
const spacers = '<span class="uturn-spacer"></span><span class="uturn-spacer"></span>';
|
||||
const inner = side === 'right' ? (spacers + arrowSvg) : (arrowSvg + spacers);
|
||||
return `
|
||||
<div class="pipeline-uturn" data-side="${side}" data-from="${fromKey}" data-arrow-type="uturn" aria-hidden="true">
|
||||
${inner}
|
||||
</div>
|
||||
`;
|
||||
},
|
||||
|
||||
/** Einzelnen Block neu zeichnen (ohne kompletten Re-Render). */
|
||||
_patchBlock(stepKey) {
|
||||
const stage = document.getElementById('pipeline-stage');
|
||||
if (!stage) return;
|
||||
const def = (this._definition || []).find(s => s.key === stepKey);
|
||||
if (!def) return;
|
||||
const st = this._stateByKey[stepKey];
|
||||
const status = (st && st.status) || 'pending';
|
||||
|
||||
// Übersprungene komplett ausblenden -> kompletter Re-Render
|
||||
if (status === 'skipped') {
|
||||
this._render();
|
||||
return;
|
||||
}
|
||||
|
||||
const block = stage.querySelector(`.pipeline-block[data-step-key="${stepKey}"]`);
|
||||
if (!block) {
|
||||
// Block fehlt im DOM (z.B. vorher skipped): kompletter Re-Render
|
||||
this._render();
|
||||
return;
|
||||
}
|
||||
block.className = `pipeline-block status-${status}`;
|
||||
block.setAttribute('tabindex', '0');
|
||||
const cv = st ? st.count_value : null;
|
||||
const cs = st ? st.count_secondary : null;
|
||||
const cEl = block.querySelector('.pipeline-block-count');
|
||||
if (cEl) cEl.innerHTML = this._formatCount(stepKey, cv, cs, status);
|
||||
|
||||
// Aktiven Pfeil/U-Turn zum nächsten Block markieren (alles mit data-from)
|
||||
stage.querySelectorAll('.pipeline-arrow, .pipeline-uturn')
|
||||
.forEach(a => a.classList.remove('is-flowing'));
|
||||
if (status === 'done') {
|
||||
const next = stage.querySelector(`[data-from="${stepKey}"]`);
|
||||
if (next) next.classList.add('is-flowing');
|
||||
}
|
||||
},
|
||||
|
||||
_bindBlockEvents(stage) {
|
||||
stage.querySelectorAll('.pipeline-block').forEach(block => {
|
||||
const key = block.getAttribute('data-step-key');
|
||||
const def = (this._definition || []).find(s => s.key === key);
|
||||
if (!def) return;
|
||||
|
||||
block.addEventListener('mouseenter', (e) => this._showTooltip(e, def));
|
||||
block.addEventListener('mouseleave', () => this._hideTooltip());
|
||||
block.addEventListener('focus', (e) => this._showTooltip(e, def));
|
||||
block.addEventListener('blur', () => this._hideTooltip());
|
||||
block.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
this._openPopup(def);
|
||||
});
|
||||
block.addEventListener('keydown', (e) => {
|
||||
if (e.key === 'Enter' || e.key === ' ') {
|
||||
e.preventDefault();
|
||||
this._openPopup(def);
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
_showTooltip(evt, def) {
|
||||
if (!this._hoverTooltipEl) return;
|
||||
this._hoverTooltipEl.textContent = def.tooltip || def.label;
|
||||
this._hoverTooltipEl.classList.add('visible');
|
||||
const rect = evt.currentTarget.getBoundingClientRect();
|
||||
const tipW = 280;
|
||||
let left = rect.left + rect.width / 2 - tipW / 2;
|
||||
if (left < 8) left = 8;
|
||||
if (left + tipW > window.innerWidth - 8) left = window.innerWidth - tipW - 8;
|
||||
this._hoverTooltipEl.style.left = left + 'px';
|
||||
this._hoverTooltipEl.style.top = (rect.top - 8) + 'px';
|
||||
this._hoverTooltipEl.style.transform = 'translateY(-100%)';
|
||||
},
|
||||
|
||||
_hideTooltip() {
|
||||
if (!this._hoverTooltipEl) return;
|
||||
this._hoverTooltipEl.classList.remove('visible');
|
||||
},
|
||||
|
||||
_openPopup(def) {
|
||||
this._closePopup();
|
||||
const popup = document.createElement('div');
|
||||
popup.className = 'pipeline-popup';
|
||||
popup.setAttribute('role', 'dialog');
|
||||
popup.innerHTML = `
|
||||
<div class="pipeline-popup-inner">
|
||||
<div class="pipeline-popup-title">${this._escape(def.label)}</div>
|
||||
<div class="pipeline-popup-text">${this._escape(def.tooltip || '')}</div>
|
||||
<button class="pipeline-popup-close" aria-label="Schliessen">×</button>
|
||||
</div>
|
||||
`;
|
||||
popup.querySelector('.pipeline-popup-close').addEventListener('click', () => this._closePopup());
|
||||
document.body.appendChild(popup);
|
||||
// ESC schliesst
|
||||
this._escListener = (e) => { if (e.key === 'Escape') this._closePopup(); };
|
||||
document.addEventListener('keydown', this._escListener);
|
||||
},
|
||||
|
||||
_closePopup() {
|
||||
const existing = document.querySelector('.pipeline-popup');
|
||||
if (existing) existing.remove();
|
||||
if (this._escListener) {
|
||||
document.removeEventListener('keydown', this._escListener);
|
||||
this._escListener = null;
|
||||
}
|
||||
},
|
||||
|
||||
/** Mini-Variante (Refresh-Popup): Icons + Status, keine Zahlen, keine Tooltips. */
|
||||
_renderMini() {
|
||||
const mini = document.getElementById('progress-pipeline-mini');
|
||||
if (!mini) return;
|
||||
if (!this._definition || !this._definition.length) {
|
||||
mini.innerHTML = '';
|
||||
return;
|
||||
}
|
||||
const visible = this._definition.filter(s => {
|
||||
const st = this._stateByKey[s.key];
|
||||
return !st || st.status !== 'skipped';
|
||||
});
|
||||
const html = visible.map((s, i) => {
|
||||
const st = this._stateByKey[s.key];
|
||||
const status = (st && st.status) || 'pending';
|
||||
const icon = this._icons[s.icon] || this._icons.search;
|
||||
const sep = (i < visible.length - 1) ? '<span class="pipeline-mini-sep" aria-hidden="true"></span>' : '';
|
||||
return `<span class="pipeline-mini-block status-${status}" data-step-key="${s.key}" title="${this._escape(s.label)}">${icon}</span>${sep}`;
|
||||
}).join('');
|
||||
mini.innerHTML = html;
|
||||
},
|
||||
|
||||
_patchMiniBlock(stepKey) {
|
||||
const mini = document.getElementById('progress-pipeline-mini');
|
||||
if (!mini) return;
|
||||
const st = this._stateByKey[stepKey];
|
||||
const status = (st && st.status) || 'pending';
|
||||
if (status === 'skipped') {
|
||||
this._renderMini();
|
||||
return;
|
||||
}
|
||||
const el = mini.querySelector(`.pipeline-mini-block[data-step-key="${stepKey}"]`);
|
||||
if (!el) {
|
||||
this._renderMini();
|
||||
return;
|
||||
}
|
||||
el.className = `pipeline-mini-block status-${status}`;
|
||||
},
|
||||
|
||||
_renderEmpty(msg) {
|
||||
const stage = document.getElementById('pipeline-stage');
|
||||
const meta = document.getElementById('pipeline-header-meta');
|
||||
const sidenote = document.getElementById('pipeline-sidenote');
|
||||
if (meta) meta.textContent = '';
|
||||
if (sidenote) sidenote.hidden = true;
|
||||
if (stage) stage.innerHTML = `<div class="pipeline-empty">${msg}</div>`;
|
||||
// Mini im Refresh-Popup zuruecksetzen
|
||||
const mini = document.getElementById('progress-pipeline-mini');
|
||||
if (mini) mini.innerHTML = '';
|
||||
},
|
||||
|
||||
_formatHeader() {
|
||||
const r = this._lastRefreshHeader;
|
||||
if (!r) return '';
|
||||
let parts = [];
|
||||
if (r.started_at) {
|
||||
const rel = this._relativeTime(r.started_at);
|
||||
parts.push(rel ? `Letzter Refresh: ${rel}` : `Letzter Refresh: ${r.started_at}`);
|
||||
}
|
||||
if (r.duration_sec != null) {
|
||||
parts.push(`Dauer: ${r.duration_sec} s`);
|
||||
}
|
||||
if (r.status === 'running') {
|
||||
parts = ['Aktualisierung läuft...'];
|
||||
} else if (r.status === 'cancelled') {
|
||||
parts.push('abgebrochen');
|
||||
} else if (r.status === 'error') {
|
||||
parts.push('mit Fehler beendet');
|
||||
}
|
||||
return parts.join(' · ');
|
||||
},
|
||||
|
||||
_relativeTime(dbStr) {
|
||||
try {
|
||||
// dbStr ist lokal "YYYY-MM-DD HH:MM:SS"
|
||||
const d = new Date(dbStr.replace(' ', 'T'));
|
||||
if (isNaN(d.getTime())) return '';
|
||||
const diffMs = Date.now() - d.getTime();
|
||||
const min = Math.floor(diffMs / 60000);
|
||||
if (min < 1) return 'gerade eben';
|
||||
if (min < 60) return `vor ${min} Min`;
|
||||
const h = Math.floor(min / 60);
|
||||
if (h < 24) return `vor ${h} Std`;
|
||||
const days = Math.floor(h / 24);
|
||||
return `vor ${days} Tag${days === 1 ? '' : 'en'}`;
|
||||
} catch (e) {
|
||||
return '';
|
||||
}
|
||||
},
|
||||
|
||||
_formatCount(stepKey, cv, cs, status) {
|
||||
// Qualitaetscheck: KEINE Zahlen, nur Status (Anforderung 3 vom User)
|
||||
if (stepKey === 'qc' || stepKey === 'summary') {
|
||||
if (status === 'done') return '<span class="count-status">erledigt</span>';
|
||||
if (status === 'active') return '<span class="count-status">läuft...</span>';
|
||||
if (status === 'error') return '<span class="count-status">Fehler</span>';
|
||||
return '<span class="count-status">-</span>';
|
||||
}
|
||||
if (status === 'pending') return '<span class="count-status">-</span>';
|
||||
if (status === 'active') return '<span class="count-status">läuft...</span>';
|
||||
if (status === 'error') return '<span class="count-status">Fehler</span>';
|
||||
if (cv == null) return '<span class="count-status">-</span>';
|
||||
|
||||
switch (stepKey) {
|
||||
case 'sources_review':
|
||||
return `${cv} Quellen geprüft`;
|
||||
case 'collect':
|
||||
return cs != null
|
||||
? `${cv} Meldungen<small> aus ${cs} Quellen</small>`
|
||||
: `${cv} Meldungen`;
|
||||
case 'dedup':
|
||||
return cs != null
|
||||
? `${cv} Duplikate<small> (${cs} verbleiben)</small>`
|
||||
: `${cv} Duplikate`;
|
||||
case 'relevance':
|
||||
return cs != null && cs > 0
|
||||
? `${cv} relevant<small> von ${cs}</small>`
|
||||
: `${cv} relevant`;
|
||||
case 'geoparsing':
|
||||
return cs != null
|
||||
? `${cv} Orte<small> aus ${cs} Meldungen</small>`
|
||||
: `${cv} Orte erkannt`;
|
||||
case 'factcheck':
|
||||
return cs != null
|
||||
? `${cv} neue Fakten<small> (${cs} gesamt)</small>`
|
||||
: `${cv} Fakten geprüft`;
|
||||
case 'notify':
|
||||
return cv === 0 ? 'keine versendet' : `${cv} Hinweis${cv === 1 ? '' : 'e'} versendet`;
|
||||
default:
|
||||
return `${cv}`;
|
||||
}
|
||||
},
|
||||
|
||||
_escape(s) {
|
||||
if (s == null) return '';
|
||||
return String(s).replace(/[&<>"']/g, c => ({
|
||||
'&': '&', '<': '<', '>': '>', '"': '"', "'": '''
|
||||
}[c]));
|
||||
},
|
||||
};
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => Pipeline.init());
|
||||
265
src/static/js/update-system.js
Normale Datei
265
src/static/js/update-system.js
Normale Datei
@@ -0,0 +1,265 @@
|
||||
/**
|
||||
* Update-System fuer den AegisSight Monitor.
|
||||
*
|
||||
* Zeigt zwei Dinge:
|
||||
* 1) Beim ersten Page-Load nach einem Update -> Modal "Was ist neu?"
|
||||
* mit den Eintraegen aus RELEASES.json, die der User noch nicht gesehen hat.
|
||||
*
|
||||
* 2) Wenn der User die Seite offen hat und im Hintergrund ein neues Update
|
||||
* live geht -> kleiner Banner unten rechts:
|
||||
* "Eine neue Version ist verfuegbar. [Jetzt aktualisieren]"
|
||||
*
|
||||
* Datenquellen (Backend):
|
||||
* GET /api/version -> { commit, deployed_at }
|
||||
* GET /api/release-notes -> { entries: [...], current }
|
||||
*
|
||||
* Persistenz im Browser:
|
||||
* localStorage 'aegis_last_seen_release' -> "version"-Feld des zuletzt
|
||||
* gesehenen Eintrags
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
const POLL_INTERVAL_MS = 60_000; // alle 60 Sekunden
|
||||
const STORAGE_KEY = 'aegis_last_seen_release';
|
||||
|
||||
let initialBootCommit = null; // Commit-Hash beim Page-Load
|
||||
let pollTimer = null;
|
||||
let updateBannerShown = false;
|
||||
|
||||
// ---- Mini-DOM-Helpers ----
|
||||
function el(tag, attrs, ...children) {
|
||||
const e = document.createElement(tag);
|
||||
for (const k in (attrs || {})) {
|
||||
if (k === 'class') e.className = attrs[k];
|
||||
else if (k === 'html') e.innerHTML = attrs[k];
|
||||
else if (k.startsWith('on')) e.addEventListener(k.slice(2), attrs[k]);
|
||||
else e.setAttribute(k, attrs[k]);
|
||||
}
|
||||
for (const c of children) {
|
||||
if (c == null) continue;
|
||||
e.appendChild(typeof c === 'string' ? document.createTextNode(c) : c);
|
||||
}
|
||||
return e;
|
||||
}
|
||||
|
||||
// ---- Styles inline injecten (kein zusaetzlicher CSS-File noetig) ----
|
||||
// Nutzt die globalen Theme-Variablen aus style.css, damit Banner und
|
||||
// Modal automatisch dem Hell-/Dunkelmodus folgen.
|
||||
function injectStyles() {
|
||||
if (document.getElementById('aegis-update-styles')) return;
|
||||
const css = `
|
||||
#aegis-update-banner {
|
||||
position: fixed; bottom: 24px; right: 24px; z-index: 99999;
|
||||
background: var(--bg-card);
|
||||
color: var(--text-primary);
|
||||
border: 1px solid var(--border);
|
||||
border-left: 4px solid var(--accent);
|
||||
padding: 14px 18px; border-radius: 10px;
|
||||
box-shadow: 0 8px 32px rgba(0,0,0,0.25);
|
||||
font-family: 'Inter', -apple-system, sans-serif; font-size: 0.92rem;
|
||||
display: flex; align-items: center; gap: 12px; max-width: 380px;
|
||||
animation: aegis-slide-in 0.4s cubic-bezier(0.4,0,0.2,1);
|
||||
}
|
||||
@keyframes aegis-slide-in {
|
||||
from { transform: translateX(420px); opacity: 0; }
|
||||
to { transform: translateX(0); opacity: 1; }
|
||||
}
|
||||
#aegis-update-banner b { font-weight: 700; color: var(--accent); }
|
||||
#aegis-update-banner button {
|
||||
background: var(--accent); color: #fff; border: 0; padding: 7px 14px;
|
||||
border-radius: 6px; font: inherit; font-size: 0.86rem; font-weight: 600;
|
||||
cursor: pointer; flex-shrink: 0;
|
||||
}
|
||||
#aegis-update-banner button:hover { background: var(--accent-hover); }
|
||||
#aegis-update-banner .close {
|
||||
background: transparent; color: var(--text-secondary); padding: 0 4px;
|
||||
font-size: 1.2rem; line-height: 1;
|
||||
}
|
||||
#aegis-update-banner .close:hover { color: var(--text-primary); background: transparent; }
|
||||
|
||||
#aegis-update-modal-overlay {
|
||||
position: fixed; inset: 0; background: rgba(0,0,0,0.55); z-index: 99998;
|
||||
backdrop-filter: blur(3px);
|
||||
display: flex; align-items: center; justify-content: center; padding: 24px;
|
||||
animation: aegis-fade-in 0.25s ease;
|
||||
}
|
||||
@keyframes aegis-fade-in { from { opacity: 0; } to { opacity: 1; } }
|
||||
#aegis-update-modal {
|
||||
background: var(--bg-card);
|
||||
color: var(--text-primary);
|
||||
border-radius: 14px;
|
||||
border: 1px solid var(--border);
|
||||
box-shadow: 0 24px 80px rgba(0,0,0,0.4);
|
||||
font-family: 'Inter', -apple-system, sans-serif;
|
||||
max-width: 540px; width: 100%; max-height: 80vh; overflow: hidden;
|
||||
display: flex; flex-direction: column;
|
||||
}
|
||||
#aegis-update-modal header {
|
||||
padding: 22px 28px 18px; border-bottom: 1px solid var(--border);
|
||||
}
|
||||
#aegis-update-modal h2 { margin: 0 0 4px; color: var(--accent); font-size: 1.25rem; font-weight: 700; }
|
||||
#aegis-update-modal header p { margin: 0; color: var(--text-secondary); font-size: 0.88rem; }
|
||||
#aegis-update-modal .body { padding: 8px 28px; overflow-y: auto; }
|
||||
.aegis-release { padding: 16px 0; border-bottom: 1px solid var(--border); }
|
||||
.aegis-release:last-child { border: 0; }
|
||||
.aegis-release-head { display: flex; align-items: baseline; gap: 12px; margin-bottom: 8px; }
|
||||
.aegis-release-title { font-size: 1rem; font-weight: 600; color: var(--text-primary); }
|
||||
.aegis-release-date { font-size: 0.78rem; color: var(--text-tertiary); }
|
||||
.aegis-release-items { margin: 0; padding-left: 20px; color: var(--text-secondary); font-size: 0.92rem; line-height: 1.6; }
|
||||
.aegis-release-items li { margin-bottom: 4px; }
|
||||
#aegis-update-modal footer {
|
||||
padding: 16px 28px 20px; border-top: 1px solid var(--border);
|
||||
display: flex; justify-content: flex-end;
|
||||
}
|
||||
#aegis-update-modal footer button {
|
||||
background: var(--accent); color: #fff; border: 0; padding: 10px 22px;
|
||||
border-radius: 6px; font: inherit; font-size: 0.92rem; font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
#aegis-update-modal footer button:hover { background: var(--accent-hover); }
|
||||
|
||||
@media (max-width: 600px) {
|
||||
#aegis-update-banner { left: 12px; right: 12px; bottom: 12px; max-width: none; }
|
||||
}`;
|
||||
document.head.appendChild(el('style', { id: 'aegis-update-styles', html: css }));
|
||||
}
|
||||
|
||||
// ---- Backend-Kommunikation ----
|
||||
async function fetchVersion() {
|
||||
try {
|
||||
const r = await fetch('/api/version', { cache: 'no-store' });
|
||||
if (!r.ok) return null;
|
||||
return await r.json();
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchReleaseNotes(since) {
|
||||
try {
|
||||
const url = '/api/release-notes' + (since ? '?since=' + encodeURIComponent(since) : '');
|
||||
const r = await fetch(url, { cache: 'no-store' });
|
||||
if (!r.ok) return null;
|
||||
return await r.json();
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Banner ----
|
||||
function showUpdateBanner() {
|
||||
if (updateBannerShown) return;
|
||||
if (document.getElementById('aegis-update-banner')) return;
|
||||
updateBannerShown = true;
|
||||
|
||||
const banner = el('div', { id: 'aegis-update-banner' },
|
||||
el('div', null,
|
||||
el('b', null, 'Update verfügbar'),
|
||||
document.createElement('br'),
|
||||
el('span', { style: 'font-size:0.85rem;opacity:0.85' },
|
||||
'Eine neue Version ist live. Bitte Seite neu laden, um sie zu nutzen.')
|
||||
),
|
||||
el('button', { onclick: () => location.reload() }, 'Aktualisieren'),
|
||||
el('button', {
|
||||
class: 'close', title: 'Schließen',
|
||||
onclick: () => banner.remove()
|
||||
}, '×')
|
||||
);
|
||||
document.body.appendChild(banner);
|
||||
}
|
||||
|
||||
// ---- Modal ----
|
||||
function showWhatsNewModal(entries, currentVersion) {
|
||||
if (document.getElementById('aegis-update-modal-overlay')) return;
|
||||
if (!entries || !entries.length) return;
|
||||
|
||||
const releases = entries.map(e => {
|
||||
const items = (e.items || []).map(i => el('li', null, i));
|
||||
return el('div', { class: 'aegis-release' },
|
||||
el('div', { class: 'aegis-release-head' },
|
||||
el('span', { class: 'aegis-release-title' }, e.title || 'Update'),
|
||||
el('span', { class: 'aegis-release-date' }, e.date || '')
|
||||
),
|
||||
items.length ? el('ul', { class: 'aegis-release-items' }, ...items) : null
|
||||
);
|
||||
});
|
||||
|
||||
const overlay = el('div', { id: 'aegis-update-modal-overlay' },
|
||||
el('div', { id: 'aegis-update-modal' },
|
||||
el('header', null,
|
||||
el('h2', null, 'Was ist neu?'),
|
||||
el('p', null, 'Diese Änderungen sind seit deinem letzten Besuch dazugekommen.')
|
||||
),
|
||||
el('div', { class: 'body' }, ...releases),
|
||||
el('footer', null,
|
||||
el('button', {
|
||||
onclick: () => {
|
||||
// Hoechste (= neueste) Version als gesehen markieren
|
||||
const newest = entries[0]?.version;
|
||||
if (newest) localStorage.setItem(STORAGE_KEY, newest);
|
||||
overlay.remove();
|
||||
}
|
||||
}, 'Verstanden')
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
// ESC oder Klick auf Hintergrund -> wie "Verstanden"
|
||||
overlay.addEventListener('click', (ev) => {
|
||||
if (ev.target === overlay) {
|
||||
const newest = entries[0]?.version;
|
||||
if (newest) localStorage.setItem(STORAGE_KEY, newest);
|
||||
overlay.remove();
|
||||
}
|
||||
});
|
||||
document.addEventListener('keydown', function escHandler(ev) {
|
||||
if (ev.key === 'Escape' && document.getElementById('aegis-update-modal-overlay')) {
|
||||
const newest = entries[0]?.version;
|
||||
if (newest) localStorage.setItem(STORAGE_KEY, newest);
|
||||
overlay.remove();
|
||||
document.removeEventListener('keydown', escHandler);
|
||||
}
|
||||
});
|
||||
|
||||
document.body.appendChild(overlay);
|
||||
}
|
||||
|
||||
// ---- Polling ----
|
||||
async function pollVersion() {
|
||||
const v = await fetchVersion();
|
||||
if (v && v.commit && initialBootCommit && v.commit !== initialBootCommit) {
|
||||
showUpdateBanner();
|
||||
// Polling beenden, sobald Banner gezeigt
|
||||
if (pollTimer) { clearInterval(pollTimer); pollTimer = null; }
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Initial-Boot ----
|
||||
async function init() {
|
||||
injectStyles();
|
||||
|
||||
const v = await fetchVersion();
|
||||
if (v && v.commit) initialBootCommit = v.commit;
|
||||
|
||||
// Was-ist-neu-Modal: nur wenn Eintraege NEUER als 'lastSeen' existieren
|
||||
const lastSeen = localStorage.getItem(STORAGE_KEY);
|
||||
const notes = await fetchReleaseNotes(lastSeen);
|
||||
if (notes && notes.entries && notes.entries.length > 0) {
|
||||
// Modal mit etwas Verzoegerung zeigen, damit das Dashboard erst rendert.
|
||||
// Auch beim allerersten Besuch wird das Modal gezeigt — damit Kunden
|
||||
// beim Onboarding sehen, was das Update-System leistet bzw. welche
|
||||
// Highlights aktuell live sind.
|
||||
setTimeout(() => showWhatsNewModal(notes.entries, v?.commit), 800);
|
||||
}
|
||||
|
||||
// Polling starten
|
||||
pollTimer = setInterval(pollVersion, POLL_INTERVAL_MS);
|
||||
}
|
||||
|
||||
if (document.readyState === 'loading') {
|
||||
document.addEventListener('DOMContentLoaded', init);
|
||||
} else {
|
||||
init();
|
||||
}
|
||||
})();
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren