elkay frontend lesson.py

phase/Student_view/lesson.py

@@ -6,8 +6,38 @@ from typing import List, Dict, Tuple, Optional
 
 import streamlit as st
 from utils import db as dbapi
+import utils.api as api
 
+USE_LOCAL_DB = os.getenv("DISABLE_DB", "1") != "1"
 
+def _api_post(path: str, payload: dict):
+    # try to reuse your utils.api client; gracefully no-op if unavailable
+    try:
+        if hasattr(api, "_req"):
+            return api._req("POST", path, json=payload)
+    except Exception:
+        pass
+    return None
+
+def _get_lesson(lesson_id: int):
+    """Fetch a lesson from local DB if enabled, otherwise from the backend API."""
+    if USE_LOCAL_DB and hasattr(dbapi, "get_lesson"):
+        return dbapi.get_lesson(lesson_id)
+    return api.get_lesson(lesson_id)
+
+def _save_progress(user_id: int, lesson_id: int, current_pos: int, status: str):
+    """Best-effort save; don’t crash the UI if the backend route is missing."""
+    try:
+        if USE_LOCAL_DB and hasattr(dbapi, "save_progress"):
+            return dbapi.save_progress(user_id, lesson_id, current_pos, status)
+        # If you exposed an HTTP route in the backend (see note below), you can call it here.
+        # Otherwise we silently skip saving when the DB is disabled.
+        return True
+    except Exception:
+        # Keep the lesson page usable even if the save call fails.
+        return False
+    
+    
 # ========== Optional direct agent imports (same process) ==========
 AGENTS_AVAILABLE = False
 try:
@@ -316,25 +346,27 @@ def _backend_post(path: str, payload: dict, timeout=6) -> dict | None:
         pass
     return None
 
-def fetch_auto_quiz_from_backend() -> List[Dict] | None:
-    # Uses your legacy stub: /agent/quiz returns {"items":[{question,options,answer_key,points}...]}
-    resp = _backend_post("/agents/quiz/auto",
-                         {"lesson": lesson_title, "module": module_id, "topic": topic_name}) \
-           or _backend_post("/agent/quiz", {"lesson_id": module_id, "level_slug": "beginner"})
-    items = None
-    if resp:
-        items = resp.get("questions") or resp.get("items")
-    if items and isinstance(items, list):
-        out = []
-        for i, it in enumerate(items, start=1):
-            out.append({
-                "id": it.get("id") or f"auto_{i}",
-                "question": it.get("question",""),
-                "options": it.get("options", []),
-                "answer_key": it.get("answer_key","A")
-            })
-        return out
-    return None
+def fetch_auto_quiz_from_backend(lesson_title: str, module_id: str, topic_name: str):
+    # Try new agents path first; fall back to legacy if present; else None
+    resp = _api_post("/agents/quiz/auto",
+                     {"lesson": lesson_title, "module": module_id, "topic": topic_name}) \
+           or _api_post("/agent/quiz", {"lesson_id": module_id, "level_slug": "beginner"})
+    if not resp:
+        return None
+
+    items = resp.get("questions") or resp.get("items")
+    if not isinstance(items, list):
+        return None
+
+    out = []
+    for i, it in enumerate(items, start=1):
+        out.append({
+            "id": it.get("id") or f"auto_{i}",
+            "question": it.get("question", ""),
+            "options": it.get("options", []),
+            "answer_key": (it.get("answer_key") or "A").strip().upper()
+        })
+    return out
 
 def grade_and_chat_via_backend(lesson_title: str, module_id: str, topic_name: str,
                                responses: Dict[str, str]) -> Tuple[int, int, str]:
@@ -848,7 +880,7 @@ def render_assigned_lesson(lesson_id: int, assignment_id: int | None = None):
     user = st.session_state.user
     user_id = user["user_id"]
 
-    data = dbapi.get_lesson(lesson_id)   # {"lesson": {...}, "sections":[...] }
+    data = _get_lesson(lesson_id)       # {"lesson": {...}, "sections":[...] }
     if not data or not data.get("lesson"):
         st.error("Lesson not found.")
         if st.button("⬅ Back to classes"):