Update app.py

app.py

@@ -66,40 +66,40 @@ def display_mock_question(index, score, incorrect_questions):
     return question, all_answers[0], all_answers[1], all_answers[2], all_answers[3], correct_answer
 
 
-def handle_answer(answer, mock_index, score, incorrect_questions):
+def handle_answer(answer, mock_index, score, question_answers):
     data = load_mocktest()
     correct_answer = data[mock_index]["correct-answer"]
+    current_question = data[mock_index]["question"]
     
     if answer == correct_answer:
         score += 1
-    else:
-        incorrect_questions.append(data[mock_index]["question"])
+    
+    question_answers.append((current_question, correct_answer))
     
     mock_index += 1
     if mock_index >= len(data):
-        incorrect_str = "Questions to review:\n\n" + "\n\n".join(incorrect_questions) if incorrect_questions else "No questions to review."
-        result = f"Your score: {score}/{len(data)}\n\n{incorrect_str}"
-        return gr.update(value=result), gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), mock_index, score, incorrect_questions
+        result = generate_test_result(score, len(data), question_answers)
+        return gr.update(value=result), gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), mock_index, score, question_answers
     
-    return gr.update(), gr.update(visible=False), gr.update(), gr.update(), gr.update(), gr.update(), mock_index, score, incorrect_questions
+    return gr.update(), gr.update(visible=False), gr.update(), gr.update(), gr.update(), gr.update(), mock_index, score, question_answers
+
+def generate_test_result(score, total_questions, question_answers):
+    result = f"Your score: {score}/{total_questions}\n\n"
+    result += "Questions and Correct Answers:\n\n"
+    for i, (question, answer) in enumerate(question_answers, 1):
+        result += f"{i}. Question: {question}\n   Correct Answer: {answer}\n\n"
+    return result
 
 def restart_test():
-    mock_index = 0
-    score = 0
-    incorrect_questions = []
-    data = load_mocktest()
-    if data:
-        question, ans1, ans2, ans3, ans4, _ = display_mock_question(mock_index, score, incorrect_questions)
-        return mock_index, score, incorrect_questions, question, ans1, ans2, ans3, ans4, gr.update(visible=False), gr.update(visible=False)
-    else:
-        return mock_index, score, incorrect_questions, "Error loading mock test data", "", "", "", "", gr.update(visible=False), gr.update(visible=False)
+    return 0, 0, [], gr.update(value=""), gr.update(value="", visible=True), gr.update(value="", visible=True), gr.update(value="", visible=True), gr.update(value="", visible=True), gr.update(value="", visible=False), gr.update(visible=False)
 
-def update_question(mock_index, score, incorrect_questions):
+def update_question(mock_index, score, question_answers):
     data = load_mocktest()
     if mock_index >= len(data):
-        return gr.update(), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+        result = generate_test_result(score, len(data), question_answers)
+        return gr.update(value=result), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
     
-    question, ans1, ans2, ans3, ans4, correct = display_mock_question(mock_index, score, incorrect_questions)
+    question, ans1, ans2, ans3, ans4, correct = display_mock_question(mock_index, score, question_answers)
     return gr.update(value=question), gr.update(value=ans1, visible=True), gr.update(value=ans2, visible=True), gr.update(value=ans3, visible=True), gr.update(value=ans4, visible=True)
 
 
@@ -136,7 +136,7 @@ with gr.Blocks() as demo:
         with gr.TabItem("Mock Test"):
             mock_index = gr.State(0)
             score = gr.State(0)
-            incorrect_questions = gr.State([])
+            question_answers = gr.State([])
 
             question_output = gr.Markdown(label="Question")
             with gr.Row():
@@ -150,17 +150,17 @@ with gr.Blocks() as demo:
             restart_button = gr.Button("Restart Test", visible=False)
             
             # Initialize the first question
-            demo.load(update_question, inputs=[mock_index, score, incorrect_questions], outputs=[question_output, answer_1, answer_2, answer_3, answer_4])
+            demo.load(update_question, inputs=[mock_index, score, question_answers], outputs=[question_output, answer_1, answer_2, answer_3, answer_4])
 
             # Handle answer selection
             for answer_btn in [answer_1, answer_2, answer_3, answer_4]:
                 answer_btn.click(
                     handle_answer, 
-                    inputs=[answer_btn, mock_index, score, incorrect_questions],
-                    outputs=[question_output, restart_button, answer_1, answer_2, answer_3, answer_4, mock_index, score, incorrect_questions]
+                    inputs=[answer_btn, mock_index, score, question_answers],
+                    outputs=[question_output, restart_button, answer_1, answer_2, answer_3, answer_4, mock_index, score, question_answers]
                 ).then(
                     update_question,
-                    inputs=[mock_index, score, incorrect_questions],
+                    inputs=[mock_index, score, question_answers],
                     outputs=[question_output, answer_1, answer_2, answer_3, answer_4]
                 )
 
@@ -168,10 +168,10 @@ with gr.Blocks() as demo:
             restart_button.click(
                 restart_test, 
                 inputs=[], 
-                outputs=[mock_index, score, incorrect_questions, question_output, answer_1, answer_2, answer_3, answer_4, result_output, restart_button]
+                outputs=[mock_index, score, question_answers, question_output, answer_1, answer_2, answer_3, answer_4, result_output, restart_button]
             ).then(
                 update_question,
-                inputs=[mock_index, score, incorrect_questions],
+                inputs=[mock_index, score, question_answers],
                 outputs=[question_output, answer_1, answer_2, answer_3, answer_4]
             )