miniquiz try

phase/Student_view/lesson.py

@@ -1,7 +1,6 @@
 import streamlit as st
 from typing import List, Dict, Any, Optional, Tuple
 import re
-import datetime
 import os
 from utils import db as dbapi
 from utils import api as backend_api # unified backend client
@@ -28,10 +27,7 @@ _SS_DEFAULTS = {
     "topic_idx": 0,                   # 0-based within module
     "mode": "catalog",                # catalog | lesson | quiz | results
     "topics_cache": {},               # {(level, module_id): [(title, text), ...]}
-#     "quiz_data": None,                # original quiz payload (list[dict])
-#     "quiz_answers": {},               # q_index -> "A"|"B"|"C"|"D"
-#     "quiz_result": None,              # backend result dict
-#     "chatbot_feedback": None,         # str
+
 }
 
 def _ensure_state():
@@ -219,90 +215,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)
-#     try:
-#         quiz = backend_api.generate_quiz(
-#             lesson_id=module_id,
-#             level_slug=level,
-#             lesson_title=module_conf["title"],
-#         )
-#         if isinstance(quiz, list) and quiz:
-#             return quiz
-#         return None
-#     except Exception as e:
-#         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 = []
-#     for i, q in enumerate(original_quiz):
-#         user_answers.append({
-#             "question": q.get("question", f"Q{i+1}"),
-#             "answer": answers_map.get(i, ""),  # "A".."D"
-#         })
-
-#     # student_id is required by utils/api.submit_quiz
-#     student_id = int(((st.session_state.get("user") or {}).get("user_id") or 0))
-
-#     try:
-#         result = backend_api.submit_quiz(
-#             student_id=student_id,
-#             lesson_id=module_id,
-#             level_slug=level,
-#             user_answers=user_answers,
-#             original_quiz=original_quiz,
-#         )
-#         return result
-#     except Exception as e:
-#         st.error(f"Could not submit quiz: {e}")
-#         return None
-
-# def _send_quiz_summary_to_chatbot(result: Dict[str, Any]):
-#     """
-#     Send a concise, actionable summary of the quiz outcome to the chatbot,
-#     then navigate to the Chatbot page with the conversation pre-seeded.
-#     """
-#     level = st.session_state.level
-#     module_id = st.session_state.module_id
-#     mod = next(m for m in MODULES_META[level] if m["id"] == module_id)
-
-#     score = result.get("score", {})
-#     correct = int(score.get("correct", 0))
-#     total = int(score.get("total", 0))
-#     feedback = (result.get("feedback") or st.session_state.get("chatbot_feedback") or "").strip()
-
-#     user_prompt = (
-#         f"I just finished the quiz for '{mod['title']}' (module {module_id}) "
-#         f"and scored {correct}/{total}. Please give me 2–3 targeted tips and 1 tiny action "
-#         f"to improve before the next lesson. If there were wrong answers, explain them simply.\n\n"
-#         f"Context from grader:\n{feedback}"
-#     )
-
-#     try:
-#         # Call FastAPI /chat via utils.api.chat_ai
-#         bot_reply = (backend_api.chat_ai(
-#             query=user_prompt,
-#             lesson_id=module_id,
-#             level_slug=level,
-#             history=[]
-#         ) or "").strip()
-#     except Exception:
-#         bot_reply = f"(Chatbot unavailable) Based on your result: {feedback or 'Nice work!'}"
-
-#     # Seed Chatbot page
-#     msgs = st.session_state.get("messages") or [{
-#         "id": "1",
-#         "text": "Hi! I'm your AI Financial Tutor. What would you like to learn today?",
-#         "sender": "assistant",
-#         "timestamp": datetime.datetime.now(),
-#     }]
-#     msgs.append({"text": user_prompt, "sender": "user", "timestamp": datetime.datetime.now()})
-#     msgs.append({"text": bot_reply,   "sender": "assistant", "timestamp": datetime.datetime.now()})
-#     st.session_state.messages = msgs
-#     st.session_state.current_page = "Chatbot"
 
 def _fallback_text(title: str, module_id: int, topic_ordinal: int) -> str:
     """
@@ -387,8 +299,6 @@ def _get_topics(level: str, module_id: int) -> List[Tuple[str, str]]:
     st.session_state.topics_cache[cache_key] = out
     return out
 
-# def _letter_for(i: int) -> str:
-#     return chr(ord("A") + i)
 
 def _render_lesson():
     ensure_quiz_state()  # make sure quiz keys exist
@@ -483,51 +393,6 @@ def _render_lesson():
             st.button(label, key=f"jump_{i}", on_click=lambda j=i: st.session_state.update({"topic_idx": j}) or st.rerun())
 
 
-# def _render_quiz():
-#     quiz: List[Dict[str, Any]] = st.session_state.quiz_data or []
-#     if not quiz:
-#         st.session_state.mode = "lesson"
-#         st.rerun()
-
-#     st.markdown("### Lesson Quiz")
-
-#     # Render each question (single page)
-#     for q_idx, q in enumerate(quiz):
-#         st.markdown(f"**Q{q_idx+1}. {q.get('question','').strip()}**")
-#         opts = q.get("options") or []
-
-#         def _on_select():
-#             sel = st.session_state[f"ans_{q_idx}"]  # "A. option text"
-#             letter = sel.split(".", 1)[0] if isinstance(sel, str) else ""
-#             st.session_state.quiz_answers[q_idx] = letter
-
-#         labels = [f"{_letter_for(i)}. {opt}" for i, opt in enumerate(opts)]
-#         saved_letter = st.session_state.quiz_answers.get(q_idx)
-#         pre_idx = next((i for i, l in enumerate(labels) if saved_letter and l.startswith(f"{saved_letter}.")), None)
-
-#         st.radio(
-#             "",
-#             labels,
-#             index=pre_idx,
-#             key=f"ans_{q_idx}",
-#             on_change=_on_select,
-#         )
-#         st.divider()
-
-#     all_answered = len(st.session_state.quiz_answers) == len(quiz)
-#     if st.button("Submit Quiz", disabled=not all_answered):
-#         with st.spinner("Grading…"):
-#             result = _submit_quiz(
-#                 st.session_state.level,
-#                 st.session_state.module_id,
-#                 quiz,
-#                 st.session_state.quiz_answers,
-#             )
-#         if result:
-#             st.session_state.quiz_result = result
-#             st.session_state.chatbot_feedback = result.get("feedback")
-#             _send_quiz_summary_to_chatbot(result)
-#             st.rerun()
 
 def _render_results():
     result = st.session_state.quiz_result or {}
@@ -557,10 +422,7 @@ def _render_results():
 
     # Let mini_quiz handle the full results UI (review, feedback, nav)
     quiz_results(planned_topics=planned)
-    # try:
-    #     quiz_index = [t.strip().lower() for t in planned].index("quiz")
-    # except ValueError:
-    #     quiz_index = None
+   
 
     c1, c2, c3 = st.columns([1, 1, 1])
     with c1:

phase/Student_view/mini_quiz.py

@@ -29,11 +29,11 @@ def ensure_quiz_state():
 # Backend calls (isolated here)
 # ---------------------------------------------
 
+# --- in start_quiz() ---
 def start_quiz(level: str, module_id: int, lesson_title: str) -> bool:
-    """Generate and stage a quiz for the given module. Returns True on success."""
     ensure_quiz_state()
     try:
-        quiz = backend_api.generate_quiz(
+        resp = backend_api.generate_quiz(
             lesson_id=module_id,
             level_slug=level,
             lesson_title=lesson_title,
@@ -42,24 +42,38 @@ def start_quiz(level: str, module_id: int, lesson_title: str) -> bool:
         st.error(f"Could not generate quiz: {e}")
         return False
 
-    if isinstance(quiz, list) and quiz:
-        st.session_state.quiz_data = quiz
-        st.session_state.quiz_answers = {}
-        st.session_state.mode = "quiz"
-        return True
+    # Accept both the old (list) and new (dict with 'items') shapes
+    items = resp.get("items") if isinstance(resp, dict) else resp
+    if not isinstance(items, list) or not items:
+        st.error("Quiz could not be generated. Please try again.")
+        return False
+
+    # Normalize: ensure id + answer_key are present
+    normalized = []
+    for i, q in enumerate(items, start=1):
+        qid = q.get("id") or q.get("qid") or q.get("position") or f"q{i}"
+        answer_key = q.get("answer_key") or q.get("answer")  # backend may send either
+        normalized.append({
+            "id": qid,
+            "question": (q.get("question") or "").strip(),
+            "options": q.get("options") or [],
+            "answer_key": answer_key,  # keep for grading payload
+        })
 
-    st.error("Quiz could not be generated. Please try again.")
-    return False
+    st.session_state.quiz_data = normalized
+    st.session_state.quiz_answers = {}
+    st.session_state.mode = "quiz"
+    return True
 
 
 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 return the grading result dict."""
+    # --- in submit_quiz() ---
     user_answers = []
-    for i, q in enumerate(original_quiz):
-        user_answers.append({
-            "question": q.get("question", f"Q{i+1}"),
-            "answer": answers_map.get(i, ""),  # "A".."D"
-        })
+    for q in original_quiz:
+        qid = q.get("id") or q.get("question")  # fallback
+        user_answers.append({"id": qid, "answer": answers_map.get(original_quiz.index(q), "")})
+
 
     # student_id is required by utils.api.submit_quiz
     student_id = int(((st.session_state.get("user") or {}).get("user_id") or 0))

utils/api.py

@@ -27,7 +27,7 @@ _session.mount("https://", HTTPAdapter(max_retries=retry))
 _session.mount("http://", HTTPAdapter(max_retries=retry))
 _session.headers.update({
     "Accept": "application/json, */*;q=0.1",
-    "User-Agent": "FinEdu-Frontend/1.0 (+spaces)",
+    "User-Agent": "FInFront/1.0 (+spaces)",
 })
 if TOKEN:
     _session.headers["Authorization"] = f"Bearer {TOKEN}"