elkay: api.py submit_quiz generate_quiz

utils/api.py

@@ -643,46 +643,50 @@ def record_profit_puzzler_play(user_id: int, puzzles_solved: int, mistakes: int,
     return _try_candidates("POST", [("/games/profit_puzzler/record", {"json": payload})])
 
 
-def generate_quiz(lesson_id: int, level_slug: str, lesson_title: str):
+def generate_quiz(*, lesson_id: int | None, level_slug: str | None, lesson_title: str | None):
     """
-    Robustly call the backend to generate a quiz.
-
-    This uses _try_candidates so the code will automatically try likely prefixes
-    (e.g. "", "/api", "/v1", "/api/v1") and also fallback to the compatible
-    /quiz/generate endpoint (which returns {"items": [...]})
+    Ask the backend to build a quiz from lesson chunks.
+    Returns a list of items: [{question, options:[...], answer_key:"A"}]
     """
     payload = {
-        "lesson_id": int(lesson_id),
+        "lesson_id": int(lesson_id) if lesson_id is not None else None,
         "level_slug": level_slug,
-        "lesson_title": lesson_title
+        "lesson_title": lesson_title,
+        "k": 12,  # how many chunks to pull server-side (optional)
     }
 
-    # Try the preferred route first; _try_candidates will also try prefix variants
-    try:
-        resp = _try_candidates("POST", [
-            ("/generate_quiz", {"json": payload}),
-            # compatibility fallback that the backend exposes (/quiz/generate)
-            ("/quiz/generate", {"json": {"content": lesson_title, "n_questions": 5, "subject": "finance", "level": level_slug}})
-        ])
-    except Exception as e:
-        # Re-raise with helpful context (Streamlit UI will show this)
-        raise RuntimeError(f"generate_quiz failed when contacting backend {BACKEND}: {e}") from e
-
-    # backend may return {"quiz": [...]} or {"items": [...]} or directly the list
+    resp = _try_candidates("POST", [
+        ("/quiz/auto", {"json": payload}),
+        # optional alias if you add one later:
+        ("/api/quiz/auto", {"json": payload}),
+    ])
+
+    # Normalize shapes: {"items":[...]} or just [...]
     if isinstance(resp, dict):
-        return resp.get("quiz") or resp.get("items") or resp
-    return resp
+        return resp.get("items") or resp.get("quiz") or []
+    return resp if isinstance(resp, list) else []
 
 
-def submit_quiz(lesson_id: int, level_slug: str, user_answers: list[dict], original_quiz: list[dict]):
-    r = requests.post(f"{BACKEND}/submit_quiz", json={
-        "lesson_id": lesson_id,
+
+def submit_quiz(*, lesson_id: int | None, level_slug: str | None,
+                user_answers: list[dict], original_quiz: list[dict]):
+    """
+    Grade the quiz on the backend. Returns:
+      {"score":{"correct":int,"total":int}, "wrong":[...], "feedback":str}
+    """
+    payload = {
+        "lesson_id": int(lesson_id) if lesson_id is not None else None,
         "level_slug": level_slug,
-        "user_answers": user_answers,
-        "original_quiz": original_quiz
-    }, timeout=90)
-    r.raise_for_status()
-    return r.json()
+        "user_answers": user_answers,     # [{"question":"...", "answer":"A"}...]
+        "original_quiz": original_quiz,   # [{"question","options","answer_key"}...]
+    }
+
+    return _try_candidates("POST", [
+        ("/quiz/grade", {"json": payload}),
+        # optional alias if you add one later:
+        ("/api/quiz/grade", {"json": payload}),
+    ])
+
 
 def tutor_explain(lesson_id: int, level_slug: str, wrong: list[dict]):
     r = requests.post(f"{BACKEND}/tutor/explain", json={