Update app.py

app.py

@@ -641,100 +641,47 @@ Please select one answer:""",
             }
 
         def navigate(direction, current_idx, questions, answers, current_answer):
-            # Save current answer
-            new_answers = list(answers)
-            if 0 <= current_idx < len(new_answers):
-                new_answers[current_idx] = current_answer
-            
-            # Calculate new index
-            new_idx = max(0, min(len(questions) - 1, current_idx + direction))
-            display_updates = update_question_display(questions, new_idx, new_answers)
-            
-            return (
-                new_idx,
-                new_answers,
-                *display_updates.values()
-            )
-
-        def on_generate_questions(text, num_questions):
-            success, questions = quiz_app.generate_questions(text, num_questions)
-            if not success:
+            """
+            Handle navigation between questions
+            """
+            if not questions:  # No questions available
                 return {
+                    current_question_idx: 0,
+                    answer_state: answers,
                     question_display: "",
-                    current_options: gr.update(choices=[], visible=False),
+                    current_options: gr.update(choices=[], value=None, visible=False),
                     question_counter: "",
-                    question_box: gr.update(visible=False),
-                    current_questions: [],
-                    current_question_idx: 0,
-                    answer_state: [None] * 5,
-                    tabs: gr.update(selected=1),
-                    results_group: gr.update(visible=False)
-                }
-            
-            # Initialize first question
-            initial_answers = [None] * len(questions)
-            return {
-                **update_question_display(questions, 0, initial_answers),
-                current_questions: questions,
-                current_question_idx: 0,
-                answer_state: initial_answers,
-                tabs: gr.update(selected=1),
-                results_group: gr.update(visible=False)
-            }
-
-        def on_submit(questions, answers, current_idx, current_answer):
-            # Update the current answer in the answers list
-            final_answers = list(answers)
-            if 0 <= current_idx < len(final_answers):
-                final_answers[current_idx] = current_answer
-            
-            # Validate all answers are provided
-            if not all(a is not None for a in final_answers[:len(questions)]):
-                return {
-                    feedback_box: "⚠️ Please answer all questions before submitting.",
-                    results_group: gr.update(visible=True),
-                    score_display: 0,
-                    result_message: "",
-                    question_box: gr.update(visible=True),
-                    tabs: gr.update(selected=1)
+                    question_box: gr.update(visible=False)
                 }
             
-            score, passed, feedback = quiz_app.calculate_score(final_answers[:len(questions)])
+            # Save current answer
+            new_answers = list(answers)
+            if current_answer and 0 <= current_idx < len(new_answers):
+                new_answers[current_idx] = current_answer
             
-            # Generate feedback HTML
-            feedback_html = "# Assessment Results\n\n"
-            for i, (q, f) in enumerate(zip(questions, feedback)):
-                color = "green" if f.is_correct else "red"
-                symbol = "✅" if f.is_correct else "❌"
-                feedback_html += f"""
-                ### Question {i+1}
-                {q.question}
-                
-                <div style="color: {color}; padding: 10px; margin: 5px 0; border-left: 3px solid {color};">
-                    {symbol} Your answer: {f.selected or "No answer"}
-                    {'' if f.is_correct else f'<br>Correct answer: {f.correct_answer}'}
-                </div>
-                """
+            # Calculate new index
+            new_idx = max(0, min(len(questions) - 1, current_idx + direction))
             
-            result_msg = "🎉 Passed!" if passed else "Please try again"
-            if not passed:
-                feedback_html += f"""
-                <div style="background-color: #ffe6e6; padding: 20px; margin-top: 20px; border-radius: 10px;">
-                    <h3 style="color: #cc0000;">Please Try Again</h3>
-                    <p>Your score: {score:.1f}%</p>
-                    <p>You need 80% or higher to pass and receive a certificate.</p>
-                </div>
-                """
+            # Get current question
+            question = questions[new_idx]
             
             return {
-                feedback_box: feedback_html,
-                results_group: gr.update(visible=True),
-                score_display: score,
-                result_message: result_msg,
-                question_box: gr.update(visible=False),
-                tabs: gr.update(selected=2) if passed else gr.update()
+                current_question_idx: new_idx,
+                answer_state: new_answers,
+                question_display: f"""## Question {new_idx + 1}
+    {question.question}
+    
+    Please select one answer:""",
+                current_options: gr.update(
+                    choices=question.options,
+                    value=new_answers[new_idx] if new_idx < len(new_answers) else None,
+                    visible=True,
+                    label=f"Select your answer for Question {new_idx + 1}:"
+                ),
+                question_counter: f"Question {new_idx + 1} of {len(questions)}",
+                question_box: gr.update(visible=True)
             }
-
+    
         # Event handlers
         generate_btn.click(
             fn=on_generate_questions,
@@ -751,53 +698,63 @@ Please select one answer:""",
                 results_group
             ]
         )
-
-        # Navigation event handlers
+    
+        # Navigation event handlers with dictionary returns
+        def handle_prev(current_idx, questions, answers, current_answer):
+            return navigate(-1, current_idx, questions, answers, current_answer)
+    
+        def handle_next(current_idx, questions, answers, current_answer):
+            return navigate(1, current_idx, questions, answers, current_answer)
+    
         prev_btn.click(
-            fn=navigate,
+            fn=handle_prev,
             inputs=[
-                -1,
                 current_question_idx,
                 current_questions,
                 answer_state,
                 current_options
             ],
-            outputs=[
-                current_question_idx,
-                answer_state,
-                question_display,
-                current_options,
-                question_counter,
-                question_box
-            ]
+            outputs={
+                current_question_idx: "value",
+                answer_state: "value",
+                question_display: "value",
+                current_options: "value",
+                question_counter: "value",
+                question_box: "visible"
+            }
         )
-
+    
         next_btn.click(
-            fn=navigate,
+            fn=handle_next,
             inputs=[
-                1,
                 current_question_idx,
                 current_questions,
                 answer_state,
                 current_options
             ],
-            outputs=[
-                current_question_idx,
-                answer_state,
-                question_display,
-                current_options,
-                question_counter,
-                question_box
-            ]
+            outputs={
+                current_question_idx: "value",
+                answer_state: "value",
+                question_display: "value",
+                current_options: "value",
+                question_counter: "value",
+                question_box: "visible"
+            }
         )
-
+    
         # Update answer state when radio button changes
+        def update_answer_state(answer, idx, current_answers):
+            new_answers = list(current_answers)
+            if 0 <= idx < len(new_answers):
+                new_answers[idx] = answer
+            return new_answers
+    
         current_options.change(
-            lambda a, i, old: [old[j] if j != i else a for j in range(len(old))],
+            fn=update_answer_state,
             inputs=[current_options, current_question_idx, answer_state],
-            outputs=[answer_state]
+            outputs=answer_state
         )
-
+    
         # Submission handler
         submit_btn.click(
             fn=on_submit,
@@ -807,16 +764,16 @@ Please select one answer:""",
                 current_question_idx,
                 current_options
             ],
-            outputs=[
-                feedback_box,
-                results_group,
-                score_display,
-                result_message,
-                question_box,
-                tabs
-            ]
+            outputs={
+                feedback_box: "value",
+                results_group: "visible",
+                score_display: "value",
+                result_message: "value",
+                question_box: "visible",
+                tabs: "selected"
+            }
         )
-
+    
         # Certificate generation
         score_display.change(
             fn=quiz_app.certificate_generator.generate,
@@ -824,7 +781,8 @@ Please select one answer:""",
             outputs=certificate_display
         )
     
-    return demo
+        return demo
+        
 
 if __name__ == "__main__":
     demo = create_quiz_interface()