Backend: regeln.py (Lernregeln zentral), Stats O(n), GET /guides/locks, _norm_titel gehärtet
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import asyncio
|
||||
import json
|
||||
import shutil
|
||||
import uuid
|
||||
from datetime import datetime, timezone
|
||||
@@ -19,6 +18,7 @@ from bausteine import generate_bausteine, cancel_bausteine, bausteine_status, ac
|
||||
from elements import generate_element, chat_with_guide, chat_with_element, check_element, style_element, refine_suggestion
|
||||
from guide import generate_guide, guide_slot_dateien
|
||||
from pipeline import cancel_guide
|
||||
from regeln import FORMATE, formate_stats, guide_lock, ist_absolviert, lade_lernstand
|
||||
from models import (
|
||||
GuideCreateRequest, GuideResponse,
|
||||
TopicCreateRequest,
|
||||
@@ -29,7 +29,7 @@ from models import (
|
||||
ElementRefineRequest, ElementRefineResponse,
|
||||
ProgressUpdate, ProgressResponse, ProjectResponse, ProviderInfo,
|
||||
)
|
||||
from paths import bausteine_path, bausteine_topics, guide_content_path, project_dir, topic_dir
|
||||
from paths import bausteine_topics, guide_content_path, project_dir, topic_dir
|
||||
|
||||
router = APIRouter(prefix="/api")
|
||||
|
||||
@@ -50,73 +50,21 @@ async def get_topics():
|
||||
return db_topics + sorted(derived - set(db_topics))
|
||||
|
||||
|
||||
# Lernschulden-Regeln (nur Neu-Erstellungen; Themen, Bausteine, OnePager unbegrenzt):
|
||||
# - JE Format (MiniGuide/Guide/FullGuide) höchstens 3 erstellte, nicht absolvierte Guides
|
||||
# - Progression pro Thema: Guide erst nach absolviertem MiniGuide, FullGuide erst nach absolviertem Guide
|
||||
MAX_OFFENE_GUIDES = 3
|
||||
VORSTUFE = {"Guide": "MiniGuide", "FullGuide": "Guide"}
|
||||
|
||||
|
||||
async def _ist_absolviert(topic: str, fmt: str) -> bool:
|
||||
"""Alle Kapitel des neuesten fertigen Guides (Thema+Format) abgehakt?"""
|
||||
neueste = None
|
||||
for g in await list_guides():
|
||||
if g["topic"] == topic and g["format"] == fmt and g["status"] == "done":
|
||||
if neueste is None or g["created_at"] > neueste["created_at"]:
|
||||
neueste = g
|
||||
if neueste is None:
|
||||
return False
|
||||
path = guide_content_path(topic, fmt)
|
||||
if not path.exists():
|
||||
return False
|
||||
try:
|
||||
chapters = json.loads(path.read_text(encoding="utf-8")).get("chapters", [])
|
||||
except ValueError:
|
||||
return False
|
||||
titles = {c.get("title") for c in chapters}
|
||||
return bool(titles) and titles <= set(await list_progress(neueste["id"]))
|
||||
|
||||
|
||||
async def _formate_stats() -> dict:
|
||||
"""Pro Format erstellt/absolviert (alle Kapitel abgehakt) — pro Thema zählt nur der neueste fertige Guide."""
|
||||
guides = await list_guides()
|
||||
formate = {}
|
||||
for fmt in ("MiniGuide", "Guide", "FullGuide"):
|
||||
neueste: dict[str, dict] = {}
|
||||
for g in guides:
|
||||
if g["format"] == fmt and g["status"] == "done":
|
||||
if g["topic"] not in neueste or g["created_at"] > neueste[g["topic"]]["created_at"]:
|
||||
neueste[g["topic"]] = g
|
||||
absolviert = 0
|
||||
for g in neueste.values():
|
||||
path = guide_content_path(g["topic"], fmt)
|
||||
if not path.exists():
|
||||
continue
|
||||
try:
|
||||
chapters = json.loads(path.read_text(encoding="utf-8")).get("chapters", [])
|
||||
except ValueError:
|
||||
continue
|
||||
titles = {c.get("title") for c in chapters}
|
||||
if titles and titles <= set(await list_progress(g["id"])):
|
||||
absolviert += 1
|
||||
formate[fmt] = {"erstellt": len(neueste), "absolviert": absolviert}
|
||||
return formate
|
||||
|
||||
|
||||
@router.get("/stats")
|
||||
async def get_stats():
|
||||
"""Tracker: Themen-Anzahl + pro Format erstellt/absolviert."""
|
||||
guides = await list_guides()
|
||||
guides, progress = await lade_lernstand()
|
||||
themen = set(await db_list_topics()) | {g["topic"] for g in guides} | set(bausteine_topics())
|
||||
if PROJECTS_DIR.is_dir():
|
||||
themen |= {e.name for e in PROJECTS_DIR.iterdir() if e.is_dir()}
|
||||
return {"themen": len(themen), "formate": await _formate_stats()}
|
||||
return {"themen": len(themen), "formate": formate_stats(guides, progress)}
|
||||
|
||||
|
||||
@router.get("/topics/fortschritt")
|
||||
async def topic_fortschritt(topic: str):
|
||||
"""Absolviert-Status pro Format — fürs Freischalten der nächsten Ausbaustufe."""
|
||||
return {fmt: await _ist_absolviert(topic, fmt) for fmt in ("MiniGuide", "Guide", "FullGuide")}
|
||||
guides, progress = await lade_lernstand()
|
||||
return {fmt: ist_absolviert(topic, fmt, guides, progress) for fmt in FORMATE}
|
||||
|
||||
|
||||
@router.post("/topics")
|
||||
@@ -194,23 +142,10 @@ async def remove_bausteine(topic: str):
|
||||
|
||||
@router.post("/guides", response_model=GuideResponse)
|
||||
async def create(req: GuideCreateRequest):
|
||||
if req.format != "OnePager" and not bausteine_path(req.topic.strip()).exists():
|
||||
raise HTTPException(400, "Erst Bausteine erstellen")
|
||||
# Kein Duplikat-Start: pro Thema+Format höchstens eine laufende Generierung
|
||||
for g in await list_guides():
|
||||
if g["topic"] == req.topic.strip() and g["format"] == req.format and g["status"] in ("queued", "generating"):
|
||||
raise HTTPException(409, "Generierung läuft bereits")
|
||||
# Lernschulden-Regeln — nur für Neu-Erstellungen; Resume (Schritt-Dateien
|
||||
# vorhanden) und Neu-Generieren bestehender Guides sind ausgenommen.
|
||||
content = guide_content_path(req.topic.strip(), req.format)
|
||||
if req.format != "OnePager" and not content.exists() and not guide_slot_dateien(content):
|
||||
vorstufe = VORSTUFE.get(req.format)
|
||||
if vorstufe and not await _ist_absolviert(req.topic.strip(), vorstufe):
|
||||
raise HTTPException(409, f"Erst den {vorstufe} dieses Themas absolvieren")
|
||||
stat = (await _formate_stats()).get(req.format, {"erstellt": 0, "absolviert": 0})
|
||||
offen = stat["erstellt"] - stat["absolviert"]
|
||||
if offen >= MAX_OFFENE_GUIDES:
|
||||
raise HTTPException(409, f"Erst {req.format}s absolvieren — maximal {MAX_OFFENE_GUIDES} offene erlaubt ({offen} offen)")
|
||||
guides, progress = await lade_lernstand()
|
||||
grund = guide_lock(req.topic.strip(), req.format, guides, progress)
|
||||
if grund:
|
||||
raise HTTPException(400 if grund == "Erst Bausteine erstellen" else 409, grund)
|
||||
await create_topic(req.topic.strip())
|
||||
now = datetime.now(timezone.utc).isoformat()
|
||||
guide = {
|
||||
@@ -233,6 +168,13 @@ async def list_all():
|
||||
return await list_guides()
|
||||
|
||||
|
||||
@router.get("/guides/locks")
|
||||
async def guide_locks(topic: str):
|
||||
"""Sperr-Gründe pro Format für den ▶-Button — None = erstellbar."""
|
||||
guides, progress = await lade_lernstand()
|
||||
return {fmt: guide_lock(topic, fmt, guides, progress) for fmt in ("OnePager", *FORMATE)}
|
||||
|
||||
|
||||
@router.get("/guides/{guide_id}", response_model=GuideResponse)
|
||||
async def get_one(guide_id: str):
|
||||
guide = await get_guide(guide_id)
|
||||
|
||||
Reference in New Issue
Block a user