Update app.py

app.py

@@ -1,116 +1,127 @@
 import os
 import random
 import gradio as gr
-
-from demo_questions import QUESTIONS  # 60 demo questions
-
-# ===============================
-# Utilities
-# ===============================
-def get_questions(subject):
-    """Return 10 random questions for the selected subject."""
-    if subject not in QUESTIONS or len(QUESTIONS[subject]) == 0:
-        return []
-    return random.sample(QUESTIONS[subject], min(10, len(QUESTIONS)))
-
-
-def grade_exam(answers, questions):
-    """Grade answers, return score + analysis."""
-    correct = 0
-    analysis = []
-    for idx, (ans, q) in enumerate(zip(answers, questions), start=1):
-        if ans == q["answer"]:
-            correct += 1
-            analysis.append(f"✅ Q{idx}: Correct")
+from demo_questions import QUESTIONS  # demo 60 questions
+
+# =====================================================
+# Load Exam
+# =====================================================
+def load_exam(subject):
+    """Load 10 random questions for a subject (from demo_questions)."""
+    try:
+        if subject in QUESTIONS:
+            qlist = random.sample(QUESTIONS[subject], min(10, len(QUESTIONS[subject])))
+        else:
+            qlist = []
+    except Exception as e:
+        print(f"⚠️ Error loading questions for {subject}: {e}")
+        qlist = []
+
+    outputs = []
+
+    # Generate 10 question slots
+    for i in range(10):
+        if i < len(qlist):
+            q = qlist[i]
+            outputs.append(gr.Markdown.update(value=f"**Q{i+1}:** {q['text']}"))
+            outputs.append(gr.Radio.update(choices=q['choices'], value=None))
         else:
-            analysis.append(
-                f"❌ Q{idx}: Your answer: {ans or 'No Answer'} | Correct: {q['answer']}"
-            )
+            outputs.append(gr.Markdown.update(value=f"Q{i+1}: (No Question)"))
+            outputs.append(gr.Radio.update(choices=[], value=None))
+
+    # Show submit button
+    outputs.append(gr.Button.update(visible=True))
+
+    # Save state with selected questions
+    outputs.append(qlist)
+
+    return outputs
+
+
+# =====================================================
+# Submit Answers
+# =====================================================
+def submit_exam_answers(*args):
+    """
+    Args:
+        First 20 are answers (from radios)
+        Last one is the state (qlist with correct answers)
+    """
+    answers = args[:-1]
+    qlist = args[-1]
+
+    if not qlist:
+        return "⚠️ No questions loaded.", "", "", ""
+
+    score = 0
+    results = []
+    for i, q in enumerate(qlist):
+        user_ans = answers[i]
+        correct = q.get("answer", None)
+        if user_ans == correct:
+            score += 1
+            results.append(f"✅ Q{i+1}: Correct")
+        else:
+            results.append(f"❌ Q{i+1}: Your answer: {user_ans}, Correct: {correct}")
 
-    score = f"🎯 Final Score: {correct} / {len(questions)}"
-    return score, "\n".join(analysis)
+    total = len(qlist)
+    analysis = "\n".join(results)
+    coach = f"Your Score: {score}/{total}\nKeep practicing to improve!"
 
+    # Placeholder for predictive agent
+    predictions = "📊 Predictive Agent: Future hot topics may include grammar, peribahasa, algebra, and world history."
 
-# ===============================
-# Gradio UI
-# ===============================
-with gr.Blocks(title="SPM Exam Simulator") as demo:
-    gr.Markdown(
-        """
-        # 📘 SPM Exam Simulator (Demo Version)
+    return f"✅ Final Score: {score}/{total}", analysis, coach, predictions
 
-        Welcome! This platform allows Form 5 students to practice **real-world SPM-style exam papers**.  
-        👉 Select a subject, click **Start Exam**, and answer **10 questions** just like in the actual exam.
-        """
-    )
+
+# =====================================================
+# Build Gradio UI
+# =====================================================
+with gr.Blocks(title="SPM Exam Simulator (Form 5)") as demo:
+    gr.Markdown("# 🎓 SPM Exam Simulator (Form 5)")
+    gr.Markdown("Practice core subjects for upcoming SPM exam (2018–2024 past papers, AI-predicted questions, and OCR upload support).")
 
     with gr.Row():
-        subject_dd = gr.Dropdown(
-            choices=list(QUESTIONS.keys()),
-            label="Select Subject",
-            value="BM",
+        subject = gr.Dropdown(
+            ["BM", "English", "Math", "History", "Science", "MoralStudies"],
+            label="Choose Subject",
+            value="BM"
         )
-        start_btn = gr.Button("🚀 Start Exam", variant="primary")
-
-    with gr.Column() as exam_area:
-        gr.Markdown("### 📝 Exam Section")
-        gr.Markdown("Answer all questions below:")
-
-        question_boxes = []
-        answer_boxes = []
-
-        for i in range(10):
-            q_text = gr.Markdown(f"Q{i+1}: (Will load after Start)")
-            q_opts = gr.Radio(choices=[], label=f"Answer Q{i+1}", type="value")
-            question_boxes.append(q_text)
-            answer_boxes.append(q_opts)
-
-        submit_btn = gr.Button("✅ Submit Answers", visible=False, variant="primary")
-
-    with gr.Column():
-        gr.Markdown("### 📊 Results Section")
-        score_out = gr.Textbox(label="Score", interactive=False)
-        analysis_out = gr.Textbox(label="Answer Analysis", lines=15, interactive=False)
-
-    # ===========================
-    # Handlers
-    # ===========================
-    def load_exam(subject):
-        qs = get_questions(subject)
-        updates = []
-        for i, q in enumerate(qs):
-            updates.append(gr.update(value=f"**Q{i+1}:** {q['text']}"))
-            updates.append(gr.update(choices=q["choices"], value=None))
-        # Fill remaining slots if less than 10
-        for j in range(len(qs), 10):
-            updates.append(gr.update(value=f"Q{j+1}: (No Question)"))
-            updates.append(gr.update(choices=[], value=None))
-        return updates + [gr.update(visible=True)], qs
-
-    def submit_exam(*answers, subject, questions):
-        score, analysis = grade_exam(list(answers), questions)
-        return score, analysis
-
-    # ===========================
-    # Events
-    # ===========================
-    exam_state = gr.State([])
+        load_btn = gr.Button("📘 Load Exam")
+
+    # Question placeholders (10 questions × text + radio)
+    q_markdowns = [gr.Markdown(f"Q{i+1}: (Not Loaded)") for i in range(10)]
+    q_radios = [gr.Radio(choices=[], label=f"Answer Q{i+1}") for i in range(10)]
 
-    start_btn.click(
+    # Submit
+    submit_btn = gr.Button("✅ Submit Answers", visible=False)
+
+    # Outputs
+    score_out = gr.Markdown()
+    analysis_out = gr.Markdown()
+    coach_out = gr.Markdown()
+    pred_out = gr.Markdown()
+
+    # Hidden state for selected questions
+    state = gr.State([])
+
+    # Events
+    load_btn.click(
         fn=load_exam,
-        inputs=subject_dd,
-        outputs=[*question_boxes, *answer_boxes, submit_btn, exam_state],
+        inputs=[subject],
+        outputs=q_markdowns + q_radios + [submit_btn, state]
     )
 
     submit_btn.click(
-        fn=submit_exam,
-        inputs=[*answer_boxes, subject_dd, exam_state],
-        outputs=[score_out, analysis_out],
+        fn=submit_exam_answers,
+        inputs=q_radios + [state],
+        outputs=[score_out, analysis_out, coach_out, pred_out]
     )
 
-# ===============================
+
+# =====================================================
 # Launch
-# ===============================
+# =====================================================
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=7860)
 
@@ -130,3 +141,4 @@ if __name__ == "__main__":
 
 
 
+