Update app.py

app.py

@@ -9,29 +9,21 @@ def load_data():
 df = load_data()
 
 properties = ['Voicing', 'Place', 'Centrality', 'Oro-nasal', 'Manner']
-used_pairs = set()
+used_ipa_symbols = []
 
 def generate_question():
-    total_questions = len(df) * len(properties)
-    if len(used_pairs) >= total_questions:
-        return "All IPA symbols have been used. Quiz will restart.", "", 0
-
-    # Generate a unique pair that has not been used yet
-    while True:
+    current_ipa = df.sample(1).iloc[0]
+    while current_ipa['IPA'] in used_ipa_symbols:
         current_ipa = df.sample(1).iloc[0]
-        current_property_index = random.randint(0, len(properties) - 1)
-        property_name = properties[current_property_index]
-        pair = (current_ipa['IPA'], property_name)
-
-        if pair not in used_pairs:
-            used_pairs.add(pair)
-            question = f"IPA Symbol: {current_ipa['IPA']}\nWhat is the {property_name.lower()} of this IPA symbol?"
-            answer = current_ipa[property_name].lower()  # Convert answer to lowercase
-            return question, answer, current_property_index
+    used_ipa_symbols.append(current_ipa['IPA'])
+    current_property_index = random.randint(0, len(properties) - 1)
+    property_name = properties[current_property_index]
+    question = f"IPA Symbol: {current_ipa['IPA']}\nWhat is the {property_name.lower()} of this IPA symbol?"
+    answer = current_ipa[property_name].lower()
+    return question, answer, current_property_index
 
 def quiz_function(user_answer, score, trials, correct_answer):
-    user_answer = user_answer.lower()  # Convert user's answer to lowercase
-    if user_answer == correct_answer:
+    if user_answer.lower() == correct_answer:
         score[0] += 1
         result = f"Correct! The answer was '{correct_answer}'."
     else:
@@ -54,10 +46,8 @@ def gradio_interface():
     def submit_answer(user_answer):
         result = quiz_function(user_answer, score, trials, question_info['answer'])
         new_question, new_answer, new_property_index = generate_question()
-        if new_question == "All IPA symbols have been used. Quiz will restart.":
-            used_pairs.clear()  # Clear the set to restart the quiz
         question_info.update({'question': new_question, 'answer': new_answer, 'property_index': new_property_index})
-        return result, "", new_question
+        return result, new_question
 
     def quit_quiz():
         # Use the user's name stored in user_name list
@@ -74,7 +64,7 @@ def gradio_interface():
             quit_button = gr.Button("Quit")
 
             start_button.click(fn=start_quiz, inputs=[name_input], outputs=[question_label])
-            submit_button.click(fn=submit_answer, inputs=[answer_input], outputs=[output_label, answer_input, question_label])
+            submit_button.click(fn=submit_answer, inputs=[answer_input], outputs=[output_label, question_label])
             quit_button.click(fn=quit_quiz, outputs=[output_label])
 
     return app