elkay: lesson.py, quiz.py, api.py

phase/Student_view/lesson.py

@@ -14,7 +14,6 @@ USE_LOCAL_DB = os.getenv("DISABLE_DB", "1") != "1"
 
 FALLBACK_TAG = "<!--fallback-->"
 
-
 # ---------------------------------------------
 # Page state helpers
 # ---------------------------------------------
@@ -30,7 +29,6 @@ _SS_DEFAULTS = {
     "chatbot_feedback": None,          # str
 }
 
-
 def _ensure_state():
     for k, v in _SS_DEFAULTS.items():
         if k not in st.session_state:
@@ -137,9 +135,6 @@ MODULES_META: Dict[str, List[Dict[str, Any]]] = {
     "advanced": [],
 }
 
-
-# Helper to read topic titles regardless of whether metadata uses `topics` or `topic_labels`
-
 def _topic_plan(level: str, module_id: int):
     """
     Returns a list of (title, backend_ordinal) after filtering:
@@ -159,7 +154,6 @@ def _topic_plan(level: str, module_id: int):
 
     # Ensure at most 6 topics: first five + Summary if present
     if len(plan) > 6:
-        # Prefer keeping a 'Summary' entry last if it exists
         summary_pos = next((idx for idx, (title, _) in enumerate(plan)
                             if title.strip().lower().startswith("summary")), None)
         if summary_pos is not None:
@@ -171,7 +165,6 @@ def _topic_plan(level: str, module_id: int):
 def _topic_titles(level: str, module_id: int):
     return [t for (t, _) in _topic_plan(level, module_id)]
 
-
 # ---------------------------------------------
 # Backend integrations
 # ---------------------------------------------
@@ -220,7 +213,6 @@ def _fetch_topic_from_backend(level: str, module_id: int, topic_idx: int) -> Tup
 
     return ui_title, content
 
-
 def _extract_takeaways(text: str, max_items: int = 5) -> List[str]:
     """Heuristic key-takeaway extractor from raw lesson text."""
     if not text:
@@ -248,7 +240,6 @@ def _extract_takeaways(text: str, max_items: int = 5) -> List[str]:
     sents = re.split(r"(?<=[.!?])\s+", text.strip())
     return [s for s in sents if len(s) > 20][:min(max_items, 3)]
 
-
 def _start_quiz(level: str, module_id: int) -> Optional[List[Dict[str, Any]]]:
     """Ask backend to generate a 5-question mini quiz for this module."""
     module_conf = next(m for m in MODULES_META[level] if m["id"] == module_id)
@@ -265,7 +256,6 @@ def _start_quiz(level: str, module_id: int) -> Optional[List[Dict[str, Any]]]:
         st.error(f"Could not generate quiz: {e}")
         return None
 
-
 def _submit_quiz(level: str, module_id: int, original_quiz: List[Dict[str, Any]], answers_map: Dict[int, str]) -> Optional[Dict[str, Any]]:
     """Submit answers and get score + tutor feedback."""
     user_answers = []
@@ -363,7 +353,6 @@ def _fallback_text(title: str, module_id: int, topic_ordinal: int) -> str:
     return (f"This unit will be populated from lesson_{module_id}/topic_{topic_ordinal}.txt. "
             "For now, review the key idea and write one example from daily life.") + "\n" + FALLBACK_TAG
 
-
 # ---------------------------------------------
 # UI building blocks
 # ---------------------------------------------
@@ -396,8 +385,6 @@ def _render_catalog():
                 st.session_state.mode = "lesson"
                 st.rerun()
 
-
-
 def _render_lesson():
     level = st.session_state.level
     module_id = st.session_state.module_id
@@ -497,7 +484,6 @@ def _render_lesson():
                 st.session_state.topic_idx += 1
                 st.rerun()
 
-
     with st.expander("Module Units", expanded=False):
         for i, (tt, _) in enumerate(topics):
             label = f"{i+1}. {tt}"
@@ -527,7 +513,6 @@ def _get_topics(level: str, module_id: int) -> List[Tuple[str, str]]:
 def _letter_for(i: int) -> str:
     return chr(ord("A") + i)
 
-
 def _render_quiz():
     quiz: List[Dict[str, Any]] = st.session_state.quiz_data or []
     if not quiz:
@@ -561,7 +546,6 @@ def _render_quiz():
         )
         st.divider()
 
-        # Submit
     all_answered = len(st.session_state.quiz_answers) == len(quiz)
     if st.button("Submit Quiz", disabled=not all_answered):
         with st.spinner("Grading…"):
@@ -578,8 +562,6 @@ def _render_quiz():
             _send_quiz_summary_to_chatbot(result)
             st.rerun()
 
-
-
 def _render_results():
     result = st.session_state.quiz_result or {}
     score = result.get("score", {})
@@ -628,7 +610,6 @@ def _render_results():
                 st.session_state.topic_idx = quiz_index + 1
                 st.rerun()
 
-
 # ---------------------------------------------
 # Public entry point(s)
 # ---------------------------------------------
@@ -703,7 +684,6 @@ def _render_assigned_lesson(lesson_id: int, assignment_id: Optional[int] = None)
                 st.session_state[key] = idx + 1
                 st.rerun()
 
-
 def render():
     _ensure_state()
     # If we were routed here from the Teacher Link, skip the catalog flow.
@@ -712,7 +692,6 @@ def render():
         _render_assigned_lesson(int(route.get("lesson_id", 0)), route.get("assignment_id"))
         return
 
-
     # Breadcrumb
     st.caption("Learning Path · " + st.session_state.level.capitalize())
 
@@ -729,14 +708,10 @@ def render():
         st.session_state.mode = "catalog"
         _render_catalog()
 
-
 # Some parts of the app import pages and call a conventional `show()`
 show_page = render
 
-
 if __name__ == "__main__":
     # Allow standalone run for local testing
     st.set_page_config(page_title="Lesson", page_icon="📘", layout="centered")
-    render()
-
-#comment
+    render()

phase/Student_view/quiz.py

@@ -29,7 +29,6 @@ def _submit_quiz_result(student_id: int, assignment_id: int, quiz_id: int,
                                  quiz_id=quiz_id,
                                  score=score, total=total, details=details)
     # backend: POST /quizzes/submit (or your route of choice)
-    # utils.api should wrap that route; below assumes api.submit_quiz exists.
     return api.submit_quiz(student_id=student_id,
                            assignment_id=assignment_id,
                            quiz_id=quiz_id,
@@ -144,7 +143,6 @@ def get_level_style(level):
     else:
         return ("#6c757d", level)
 
-
 # --- Sidebar Progress ---
 def show_quiz_progress_sidebar(quiz_id):
     qobj = _load_quiz_obj(quiz_id)
@@ -267,8 +265,6 @@ def show_quiz(quiz_id):
         st.session_state.current_q += 1
         st.rerun()
 
-
-
 # --- Quiz Results ---
 def show_results(quiz_id):
     qobj = _load_quiz_obj(quiz_id)
@@ -391,7 +387,6 @@ def show_quiz_list():
                 st.session_state.answers = {}
                 st.rerun()
 
-
 # --- Main Router for Quiz Page ---
 def show_page():
     if "selected_quiz" not in st.session_state:
@@ -411,3 +406,6 @@ def show_page():
             show_quiz(quiz_id)
         else:
             show_results(quiz_id)
+
+# Note: No changes needed here as this file handles pre-loaded quizzes and teacher-assigned quizzes,
+# which use /quizzes/{quiz_id} and /quizzes/submit, not /generate_quiz.

utils/api.py

@@ -1,9 +1,7 @@
-# utils/api.py
 import os, json, requests
 from urllib3.util.retry import Retry
 from requests.adapters import HTTPAdapter
 
-
 # ---- Setup ----
 BACKEND = (os.getenv("BACKEND_URL") or "").strip().rstrip("/")
 if not BACKEND:
@@ -87,8 +85,6 @@ def health():
         except Exception:
             return {"ok": False}
         
-#---helpers
-
 # --- Optional API prefix (e.g., "/api" or "/v1")
 API_PREFIX_ENV = (os.getenv("BACKEND_API_PREFIX") or "").strip().rstrip("/")
 
@@ -123,8 +119,7 @@ def _try_candidates(method: str, candidates: list[tuple[str, dict]]):
             # 404/405/etc.: try next candidate
     raise RuntimeError("No matching endpoint for this operation. Tried:\n- " + "\n- ".join(tried))
 
-
-#--helpers for student_db.py
+# -- Helpers for student_db.py
 def user_stats(student_id: int):
     return _req("GET", f"/students/{student_id}/stats").json()
 def list_assignments_for_student(student_id: int):
@@ -150,38 +145,56 @@ def student_quiz_average(student_id: int):
 def recent_lessons_for_student(student_id: int, limit: int = 5):
     return _req("GET", f"/students/{student_id}/recent", params={"limit": limit}).json()
 
-# # --- Teacher endpoints (backend Space) ---
-# def create_class(teacher_id: int, name: str):
-#     return _json_or_raise(_req("POST", f"/teachers/{teacher_id}/classes",
-#                                json={"name": name}))
+# -- Teacher endpoints (backend Space)
+def create_class(teacher_id: int, name: str):
+    return _try_candidates("POST", [
+        (f"/teachers/{teacher_id}/classes", {"json": {"name": name}}),
+        # fallbacks if you ever rename:
+        ("/classes", {"json": {"teacher_id": teacher_id, "name": name}}),
+    ])
 
-# def teacher_tiles(teacher_id: int):
-#     return _json_or_raise(_req("GET", f"/teachers/{teacher_id}/tiles"))
+def teacher_tiles(teacher_id: int):
+    return _json_or_raise(_req("GET", f"/teachers/{teacher_id}/tiles"))
 
-# def list_classes_by_teacher(teacher_id: int):
-#     return _json_or_raise(_req("GET", f"/teachers/{teacher_id}/classes"))
+def list_classes_by_teacher(teacher_id: int):
+    return _try_candidates("GET", [
+        (f"/teachers/{teacher_id}/classes", {}),
+    ])
 
-# def class_student_metrics(class_id: int):
-#     return _json_or_raise(_req("GET", f"/classes/{class_id}/student_metrics"))
+def class_student_metrics(class_id: int):
+    return _try_candidates("GET", [
+        (f"/classes/{class_id}/students/metrics", {}),
+        # tolerant fallbacks:
+        (f"/classes/{class_id}/student_metrics", {}),
+        (f"/classes/{class_id}/students", {}),   # older shape (list of students)
+    ])
 
-# def class_weekly_activity(class_id: int):
-#     return _json_or_raise(_req("GET", f"/classes/{class_id}/weekly_activity"))
+def class_weekly_activity(class_id: int):
+    return _try_candidates("GET", [
+        (f"/classes/{class_id}/activity/weekly", {}),
+        (f"/classes/{class_id}/weekly_activity", {}),
+    ])
 
-# def class_progress_overview(class_id: int):
-#     return _json_or_raise(_req("GET", f"/classes/{class_id}/progress_overview"))
+def class_progress_overview(class_id: int):
+    return _try_candidates("GET", [
+        (f"/classes/{class_id}/progress", {}),
+        (f"/classes/{class_id}/progress_overview", {}),
+    ])
 
-# def class_recent_activity(class_id: int, limit=6, days=30):
-#     return _json_or_raise(_req("GET", f"/classes/{class_id}/recent_activity",
-#                                params={"limit": limit, "days": days}))
+def class_recent_activity(class_id: int, limit=6, days=30):
+    return _try_candidates("GET", [
+        (f"/classes/{class_id}/activity/recent", {"params": {"limit": limit, "days": days}}),
+        (f"/classes/{class_id}/recent_activity", {"params": {"limit": limit, "days": days}}),
+    ])
 
-# def list_students_in_class(class_id: int):
-#     return _json_or_raise(_req("GET", f"/classes/{class_id}/students"))
+def list_students_in_class(class_id: int):
+    return _json_or_raise(_req("GET", f"/classes/{class_id}/students"))
 
 # Optional if you want to compute levels server-side
 def level_from_xp(xp: int):
     return _json_or_raise(_req("GET", "/levels/from_xp", params={"xp": xp}))["level"]
 
-#--teacherlink.py helpers
+# -- teacherlink.py helpers
 def join_class_by_code(student_id: int, code: str):
     d = _json_or_raise(_req("POST", f"/students/{student_id}/classes/join", json={"code": code}))
     # backend may return {"class_id": ...} or full class object; both are fine
@@ -191,7 +204,10 @@ def list_classes_for_student(student_id: int):
     return _json_or_raise(_req("GET", f"/students/{student_id}/classes"))
 
 def class_content_counts(class_id: int):
-    return _json_or_raise(_req("GET", f"/classes/{class_id}/counts"))
+    return _try_candidates("GET", [
+        (f"/classes/{class_id}/content_counts", {}),
+        (f"/classes/{class_id}/counts", {}),
+    ])
 
 def student_class_progress(student_id: int, class_id: int):
     return _json_or_raise(_req("GET", f"/classes/{class_id}/students/{student_id}/progress"))
@@ -204,14 +220,10 @@ def leave_class(student_id: int, class_id: int):
 def student_assignments_for_class(student_id: int, class_id: int):
     return _json_or_raise(_req("GET", f"/classes/{class_id}/students/{student_id}/assignments"))
 
-
-
-
 # ---------- TEACHERS / CLASSES / CONTENT (BACKEND ROUTES THAT EXIST) ----------
 
 # Classes
 def create_class(teacher_id: int, name: str):
-    # Backend has POST /teachers/{teacher_id}/classes with body {name}
     return _try_candidates("POST", [
         (f"/teachers/{teacher_id}/classes", {"json": {"name": name}}),
         # fallbacks if you ever rename:
@@ -243,7 +255,6 @@ def teacher_tiles(teacher_id: int):
     return _json_or_raise(_req("GET", f"/teachers/{teacher_id}/tiles"))
 
 def class_student_metrics(class_id: int):
-    # backend: /classes/{id}/students/metrics
     return _try_candidates("GET", [
         (f"/classes/{class_id}/students/metrics", {}),
         # tolerant fallbacks:
@@ -252,21 +263,18 @@ def class_student_metrics(class_id: int):
     ])
 
 def class_weekly_activity(class_id: int):
-    # backend: /classes/{id}/activity/weekly
     return _try_candidates("GET", [
         (f"/classes/{class_id}/activity/weekly", {}),
         (f"/classes/{class_id}/weekly_activity", {}),
     ])
 
 def class_progress_overview(class_id: int):
-    # backend: /classes/{id}/progress
     return _try_candidates("GET", [
         (f"/classes/{class_id}/progress", {}),
         (f"/classes/{class_id}/progress_overview", {}),
     ])
 
 def class_recent_activity(class_id: int, limit=6, days=30):
-    # backend: /classes/{id}/activity/recent
     return _try_candidates("GET", [
         (f"/classes/{class_id}/activity/recent", {"params": {"limit": limit, "days": days}}),
         (f"/classes/{class_id}/recent_activity", {"params": {"limit": limit, "days": days}}),
@@ -285,13 +293,11 @@ def create_lesson(teacher_id: int, title: str, description: str,
         "level": level,
         "sections": sections,
     }
-    # backend route:
     d = _try_candidates("POST", [
         (f"/teachers/{teacher_id}/lessons", {"json": payload}),
         # fallback if you later add a flat /lessons route:
         ("/lessons", {"json": {"teacher_id": teacher_id, **payload}}),
     ])
-    # tolerate both {"lesson_id": N} or full object with id
     return d.get("lesson_id", d.get("id", d))
 
 def get_lesson(lesson_id: int):
@@ -333,26 +339,28 @@ def set_assignment_progress(student_id: int, assignment_id: int, current_pos: in
                 f"/assignments/{assignment_id}/progress",
                 json={"student_id": student_id, "current_pos": current_pos, "progress": progress}).json()
 
-
-
-# def get_quiz(quiz_id: int):
-#     return _json_or_raise(_req("GET", f"/quizzes/{quiz_id}"))
-
-# def get_quiz(quiz_id: int):
-#     # NEW wrapper that hits GET /quizzes/{quiz_id}
-#     return _req("GET", f"/quizzes/{quiz_id}")
-
 def get_quiz(quiz_id: int):
     """Fetch a teacher-created quiz (GET /quizzes/{quiz_id}) and return JSON."""
     return _json_or_raise(_req("GET", f"/quizzes/{quiz_id}"))
 
-def submit_quiz(student_id, assignment_id, quiz_id, score, total, details):
-    payload = {"student_id": student_id, "assignment_id": assignment_id,
-               "quiz_id": quiz_id, "score": score, "total": total, "details": details}
-    return _req("POST", "/quizzes/submit", json=payload)
+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,     # [{"question":"...", "answer":"A"}...]
+        "original_quiz": original_quiz,   # [{"question","options","answer_key"}...]
+    }
+    return _try_candidates("POST", [
+        ("/quiz/submit", {"json": payload}),  # Updated to match backend
+    ])
 
 def update_quiz(quiz_id: int,
- teacher_id: int, title: str, items: list[dict], settings: dict):
+                teacher_id: int, title: str, items: list[dict], settings: dict):
     d = _req("PUT", f"/quizzes/{quiz_id}", json={
         "teacher_id": teacher_id, "title": title, "items": items, "settings": settings
     }).json()
@@ -370,7 +378,6 @@ def list_assigned_students_for_quiz(quiz_id: int):
 
 # Assignments
 def assign_to_class(lesson_id: int | None, quiz_id: int | None, class_id: int, teacher_id: int, due_at: str | None = None):
-    # backend route name is /assign (not /assignments)
     d = _try_candidates("POST", [
         ("/assign", {"json": {
             "lesson_id": lesson_id, "quiz_id": quiz_id,
@@ -383,132 +390,6 @@ def assign_to_class(lesson_id: int | None, quiz_id: int | None, class_id: int, t
     ])
     return bool(d.get("ok", True))
 
-
-
-
-# # ---- Classes / Teacher endpoints (tolerant) ----
-# def create_class(teacher_id: int, name: str):
-#     return _try_candidates("POST", [
-#         (f"/teachers/{teacher_id}/classes",   {"json": {"name": name}}),
-#         (f"/teachers/{teacher_id}/classrooms",{"json": {"name": name}}),
-#         ("/classes",                           {"json": {"teacher_id": teacher_id, "name": name}}),
-#         ("/classrooms",                        {"json": {"teacher_id": teacher_id, "name": name}}),
-#     ])
-
-# def list_classes_by_teacher(teacher_id: int):
-#     return _try_candidates("GET", [
-#         (f"/teachers/{teacher_id}/classes",    {}),
-#         (f"/teachers/{teacher_id}/classrooms", {}),
-#         (f"/classes/by-teacher/{teacher_id}",  {}),
-#         (f"/classrooms/by-teacher/{teacher_id}", {}),
-#         ("/classes",                            {"params": {"teacher_id": teacher_id}}),
-#         ("/classrooms",                         {"params": {"teacher_id": teacher_id}}),
-#     ])
-
-# def list_students_in_class(class_id: int):
-#     return _try_candidates("GET", [
-#         (f"/classes/{class_id}/students",     {}),
-#         (f"/classrooms/{class_id}/students",  {}),
-#         ("/students",                         {"params": {"class_id": class_id}}),
-#     ])
-
-# def class_content_counts(class_id: int):
-#     return _try_candidates("GET", [
-#         (f"/classes/{class_id}/content_counts",    {}),
-#         (f"/classrooms/{class_id}/content_counts", {}),
-#         (f"/classes/{class_id}/counts",            {}),
-#         (f"/classrooms/{class_id}/counts",         {}),
-#     ])
-
-# def list_class_assignments(class_id: int):
-#     return _try_candidates("GET", [
-#         (f"/classes/{class_id}/assignments",     {}),
-#         (f"/classrooms/{class_id}/assignments",  {}),
-#         ("/assignments",                         {"params": {"class_id": class_id}}),
-#     ])
-
-# def class_analytics(class_id: int):
-#     return _try_candidates("GET", [
-#         (f"/classes/{class_id}/analytics",     {}),
-#         (f"/classrooms/{class_id}/analytics",  {}),
-#     ])
-
-
-# #--contentmanage.py helpers
-
-# # ---------- Teacher/content management endpoints (backend Space) ----------
-# def list_classes_by_teacher(teacher_id: int):
-#     return _req("GET", f"/teachers/{teacher_id}/classes").json()
-
-# def list_all_students_for_teacher(teacher_id: int):
-#     return _req("GET", f"/teachers/{teacher_id}/students").json()
-
-# def list_lessons_by_teacher(teacher_id: int):
-#     return _req("GET", f"/teachers/{teacher_id}/lessons").json()
-
-# def list_quizzes_by_teacher(teacher_id: int):
-#     return _req("GET", f"/teachers/{teacher_id}/quizzes").json()
-
-# def create_lesson(teacher_id: int, title: str, description: str, subject: str, level: str, sections: list[dict]):
-#     d = _req("POST", "/lessons", json={
-#         "teacher_id": teacher_id, "title": title, "description": description,
-#         "subject": subject, "level": level, "sections": sections
-#     }).json()
-#     return d["lesson_id"]
-
-# def update_lesson(lesson_id: int, teacher_id: int, title: str, description: str, subject: str, level: str, sections: list[dict]):
-#     d = _req("PUT", f"/lessons/{lesson_id}", json={
-#         "teacher_id": teacher_id, "title": title, "description": description,
-#         "subject": subject, "level": level, "sections": sections
-#     }).json()
-#     return bool(d.get("ok", True))
-
-# def delete_lesson(lesson_id: int, teacher_id: int):
-#     d = _req("DELETE", f"/lessons/{lesson_id}", json={"teacher_id": teacher_id}).json()
-#     return bool(d.get("ok", True)), d.get("message", "")
-
-# def get_lesson(lesson_id: int):
-#     return _req("GET", f"/lessons/{lesson_id}").json()  # {"lesson":{...}, "sections":[...]}
-
-# def create_quiz(lesson_id: int, title: str, items: list[dict], settings: dict):
-#     d = _req("POST", "/quizzes", json={"lesson_id": lesson_id, "title": title, "items": items, "settings": settings}).json()
-#     return d["quiz_id"]
-
-# def update_quiz(quiz_id: int, teacher_id: int, title: str, items: list[dict], settings: dict):
-#     d = _req("PUT", f"/quizzes/{quiz_id}", json={"teacher_id": teacher_id, "title": title, "items": items, "settings": settings}).json()
-#     return bool(d.get("ok", True))
-
-# def delete_quiz(quiz_id: int, teacher_id: int):
-#     d = _req("DELETE", f"/quizzes/{quiz_id}", json={"teacher_id": teacher_id}).json()
-#     return bool(d.get("ok", True)), d.get("message", "")
-
-# def list_assigned_students_for_lesson(lesson_id: int):
-#     return _req("GET", f"/lessons/{lesson_id}/assignees").json()
-
-# def list_assigned_students_for_quiz(quiz_id: int):
-#     return _req("GET", f"/quizzes/{quiz_id}/assignees").json()
-
-# def assign_to_class(lesson_id: int | None, quiz_id: int | None, class_id: int, teacher_id: int):
-#     d = _req("POST", "/assignments", json={
-#         "lesson_id": lesson_id, "quiz_id": quiz_id, "class_id": class_id, "teacher_id": teacher_id
-#     }).json()
-#     return bool(d.get("ok", True))
-
-# #-- studentlist helpers
-
-# def list_classes_by_teacher(teacher_id: int):
-#     return _req("GET", f"/teachers/{teacher_id}/classes").json()
-
-# def get_class(class_id: int):
-#     return _req("GET", f"/classes/{class_id}").json()
-
-# def class_student_metrics(class_id: int):
-#     # expected to return list of rows with fields used in the UI
-#     return _req("GET", f"/classes/{class_id}/students").json()
-
-# def list_assignments_for_student(student_id: int):
-#     return _req("GET", f"/students/{student_id}/assignments").json()
-
 # ---------- LLM-based quiz generation (backend uses GEN_MODEL) ----------
 def generate_quiz_from_text(content: str, n_questions: int = 5, subject: str = "finance", level: str = "beginner"):
     """
@@ -519,6 +400,23 @@ def generate_quiz_from_text(content: str, n_questions: int = 5, subject: str = "
         "content": content, "n_questions": n_questions, "subject": subject, "level": level
     }).json()
 
+def generate_quiz(*, lesson_id: int | None, level_slug: str | None, lesson_title: str | None):
+    payload = {
+        "lesson_id": int(lesson_id) if lesson_id is not None else None,
+        "level_slug": level_slug,
+        "lesson_title": lesson_title,
+    }
+
+    try:
+        resp = _try_candidates("POST", [
+            ("/quiz/auto", {"json": payload}),
+        ])
+    except RuntimeError as e:
+        raise RuntimeError(f"Failed to generate quiz: {str(e)}")
+
+    if isinstance(resp, dict):
+        return resp.get("items") or resp.get("quiz") or []
+    return resp if isinstance(resp, list) else []
 
 # ---- Legacy agent endpoints (keep) ----
 def start_agent(student_id: int, lesson_id: int, level_slug: str):
@@ -526,9 +424,9 @@ def start_agent(student_id: int, lesson_id: int, level_slug: str):
                                json={"student_id": student_id, "lesson_id": lesson_id, "level_slug": level_slug}))
 
 def get_agent_quiz(student_id: int, lesson_id: int, level_slug: str):
-      d = _json_or_raise(_req("POST", "/agent/quiz",
-                              json={"student_id": student_id, "lesson_id": lesson_id, "level_slug": level_slug}))
-      return d["items"]
+    d = _json_or_raise(_req("POST", "/agent/quiz",
+                            json={"student_id": student_id, "lesson_id": lesson_id, "level_slug": level_slug}))
+    return d["items"]
 
 def grade_quiz(student_id: int, lesson_id: int, level_slug: str,
                answers: list[str], assignment_id: int | None = None):
@@ -552,7 +450,6 @@ def signup_student(name: str, email: str, password: str, level_label: str, count
         "name": name, "email": email, "password": password,
         "level_label": level_label, "country_label": country_label
     }
-    # Prefer dedicated route; fall back to /auth/register with role
     return _try_candidates("POST", [
         ("/auth/signup/student", {"json": payload_student}),
         ("/auth/register", {"json": {
@@ -587,9 +484,7 @@ def submit_practice_quiz(lesson: str, responses: dict):
 def send_to_chatbot(messages: list[dict]):
     return _json_or_raise(_req("POST", "/chatbot", json={"messages": messages}))
 
-
 # --- Game API helpers ---
-
 def record_money_match_play(user_id: int, target: int, total: int,
                             elapsed_ms: int, matched: bool, gained_xp: int):
     payload = {
@@ -614,7 +509,6 @@ def record_budget_builder_play(user_id: int, weekly_allowance: int, budget_score
         ("/games/budget_builder/record", {"json": payload}),
     ])
 
-
 def record_debt_dilemma_play(user_id: int, loans_cleared: int,
                              mistakes: int, elapsed_ms: int, gained_xp: int):
     payload = {
@@ -628,68 +522,17 @@ def record_debt_dilemma_play(user_id: int, loans_cleared: int,
         ("/games/debt_dilemma/record", {"json": payload}),
     ])
 
-
 def record_profit_puzzler_play(user_id: int, puzzles_solved: int, mistakes: int, elapsed_ms: int, gained_xp: int | None = None):
     payload = {"user_id": user_id, "puzzles_solved": puzzles_solved, "mistakes": mistakes, "elapsed_ms": elapsed_ms}
     if gained_xp is not None:
         payload["gained_xp"] = gained_xp
     return _try_candidates("POST", [("/games/profit_puzzler/record", {"json": payload})])
 
-
-def generate_quiz(*, lesson_id: int | None, level_slug: str | None, lesson_title: str | None):
-    payload = {
-        "lesson_id": int(lesson_id) if lesson_id is not None else None,
-        "level_slug": level_slug,
-        "lesson_title": lesson_title,
-        "k": 12,
-    }
-
-    try:
-        resp = _try_candidates("POST", [
-            ("/quiz/auto", {"json": payload}),
-        ])
-    except RuntimeError:
-        # Fallback for older backend that only has /generate_quiz
-        resp = _try_candidates("POST", [
-            ("/generate_quiz", {"json": {
-                "lesson_id": payload["lesson_id"],
-                "level_slug": payload["level_slug"],
-                "lesson_title": payload["lesson_title"],  # REQUIRED
-                "k": payload["k"],                        # REQUIRED
-            }}),
-        ])
-
-
-    if isinstance(resp, dict):
-        return resp.get("items") or resp.get("quiz") or []
-    return resp if isinstance(resp, list) else []
-
-
-
-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,     # [{"question":"...", "answer":"A"}...]
-        "original_quiz": original_quiz,   # [{"question","options","answer_key"}...]
-    }
-
-    return _try_candidates("POST", [
-    ("/quiz/grade", {"json": payload}),  # only this
-    ])
-
-
-
+# --- Tutor Explanation ---
 def tutor_explain(lesson_id: int, level_slug: str, wrong: list[dict]):
-    r = requests.post(f"{BACKEND}/tutor/explain", json={
+    payload = {
         "lesson_id": lesson_id,
         "level_slug": level_slug,
         "wrong": wrong
-    }, timeout=60)
-    r.raise_for_status()
-    return r.json()["feedback"]
+    }
+    return _json_or_raise(_req("POST", "/tutor/explain", json=payload, timeout=60))