This commit is contained in:
team3
2026-06-21 20:00:13 +02:00
parent 885c4811d0
commit 8ba4b94498
18 changed files with 537 additions and 1188 deletions

View File

@@ -33,13 +33,13 @@ from pipeline import (
is_guide_cancelled, run_single_slot,
)
from textkit import (
_eindeutige_titel, _lade_bausteine, _parse_fragment, _parse_grafik, _split_chunks,
_eindeutige_titel, _lade_bausteine, _parse_fragment, _split_chunks,
_titel, _titel_aufloesen, _titel_index, _zuteilung_text,
)
log = logging.getLogger("creator.guide")
GUIDE_STEPS = ("Auswahl", "Gliederung", "Inhalte", "Inhalts-Check", "Schreiben", "Lese-Prüfung", "Grafik", "Grafik-Check")
GUIDE_STEPS = ("Auswahl", "Gliederung", "Inhalte", "Inhalts-Check", "Schreiben", "Lese-Prüfung")
# Writer skalieren mit der Section-Zahl: 1 Writer je ~30 Sections (gedeckelt).
# Kleine Pakete vermeiden Lazy-Output bei langen Listen und begrenzen den Schaden
@@ -764,100 +764,12 @@ async def _generate_sections(
break
scope = [[num for num in nums if num in ersetzt] for nums in chunk_nums]
# Schritt 6: Grafik — pro Chunk ein Agent erzeugt je Section ein Mermaid-Diagramm (Resume).
grafik_paths = [content_path.parent / f"{content_path.stem}.grafik-{i}.md" for i in range(1, writer_count + 1)]
offen_g = [i for i, p in enumerate(grafik_paths) if chunk_nums[i] and not p.exists()]
if offen_g:
await _set_step(guide_id, 6, f"Erstelle Grafiken ({writer_count})…" if writer_count > 1 else "Erstelle Grafiken…")
results = await asyncio.gather(*[
run_agent(
f"{guide_id}-g{i + 1}",
_prompt("Guide-Grafik", topic=topic, format_name=format_name,
sections=sections_text(chunk_nums[i]), out_path=grafik_paths[i], extra=_extra(instructions)),
_timeout("grafik", chunk_sizes[i]), provider=provider, role="guide", capabilities="files",
)
for i in offen_g
], return_exceptions=True)
if is_cancelled():
return None
for i, r in zip(offen_g, results):
if isinstance(r, BaseException) or (not isinstance(r, BaseException) and r[0] != 0):
_log(topic, f"Grafik {i + 1} fehlgeschlagen — Section ohne Grafik")
for p in grafik_paths:
if not p.exists():
continue
for titel, code in _parse_grafik(p.read_text(encoding="utf-8")).items():
num = _titel_aufloesen(idx, titel)
if num in by_num and code.strip():
by_num[num]["grafik"] = code.strip()
# Schritt 7: Grafik-Check — Kritiker je Chunk (Syntax + Inhalt), Fix für beanstandete (eine Runde).
def grafik_text(nums):
return "\n\n".join(
f"SECTION: {_titel(entries[num])}\n```mermaid\n{by_num[num].get('grafik', '')}\n```"
for num in nums if by_num.get(num, {}).get("grafik")
)
def grafik_auftraege(nums, probleme):
return "\n\n".join(
f"SECTION: {_titel(entries[num])}\nPROBLEM: {probleme[num]}\nAKTUELLE GRAFIK:\n```mermaid\n{by_num[num].get('grafik', '')}\n```"
for num in nums
)
g_scope = [[num for num in nums if by_num.get(num, {}).get("grafik")] for nums in chunk_nums]
gcheck_paths = [content_path.parent / f"{content_path.stem}.grafik-check-{i}.json" for i in range(1, writer_count + 1)]
g_offen = [i for i, p in enumerate(gcheck_paths) if g_scope[i] and _lese_probleme_schema(_json_datei(p)) is None]
if g_offen:
await _set_step(guide_id, 7, "Prüfe Grafiken…")
slots = [{
"key": f"{guide_id}-gcheck-{i + 1}",
"prompt": _prompt("Guide-Grafik-Check", topic=topic, format_name=format_name,
sections=grafik_text(g_scope[i]), out_path=gcheck_paths[i]),
"role": "judge", "capabilities": "files",
"payload": (lambda result, p=gcheck_paths[i]: _lese_probleme_schema(_json_datei(p))),
} for i in g_offen]
if await _race(topic, "Grafik-Check", slots, len(slots), _timeout("grafik_check", max(chunk_sizes)), provider, cancelled=is_cancelled) is None:
_log(topic, "Grafik-Check fehlgeschlagen — Grafiken bleiben ungeprüft")
if is_cancelled():
return None
g_probleme: dict[int, str] = {}
for i, p in enumerate(gcheck_paths):
geltung = set(g_scope[i])
for item in (_lese_probleme_schema(_json_datei(p)) or []):
num = _titel_aufloesen(idx, item["section"])
if num in geltung and num not in g_probleme:
g_probleme[num] = item["problem"]
if g_probleme:
_log(topic, f"Grafik-Check: {len(g_probleme)} Grafik(en) beanstandet")
await _set_step(guide_id, 7, f"Überarbeite {len(g_probleme)} Grafik(en)…")
gfix_chunks = [[num for num in nums if num in g_probleme] for nums in chunk_nums]
gfix_paths = [content_path.parent / f"{content_path.stem}.grafik-fix-{i + 1}.md" for i in range(writer_count)]
gfix_offen = [i for i, nums in enumerate(gfix_chunks) if nums and not gfix_paths[i].exists()]
results = await asyncio.gather(*[
run_agent(
f"{guide_id}-gfix-w{i + 1}",
_prompt("Guide-Grafik-Fix", topic=topic, format_name=format_name,
auftraege=grafik_auftraege(gfix_chunks[i], g_probleme), out_path=gfix_paths[i], extra=_extra(instructions)),
_timeout("grafik_check", len(gfix_chunks[i])), provider=provider, role="guide", capabilities="files",
)
for i in gfix_offen
], return_exceptions=True)
if is_cancelled():
return None
for p in gfix_paths:
if not p.exists():
continue
for titel, code in _parse_grafik(p.read_text(encoding="utf-8")).items():
num = _titel_aufloesen(idx, titel)
if num in g_probleme and code.strip():
by_num[num]["grafik"] = code.strip()
await _set_progress(guide_id, "Setze zusammen…")
chapters: list[dict] = []
for ch in plan:
sections = [
{"num": num, "title": _titel(entries[num]), "md": by_num[num]["md"],
"kompakt": by_num[num].get("kompakt", ""), "grafik": by_num[num].get("grafik", "")}
"kompakt": by_num[num].get("kompakt", "")}
for num in ch["nums"] if num in by_num
]
if sections: