Update app.py

app.py

@@ -67,77 +67,72 @@ def get_solution(topic, exercise):
     except Exception as e:
         return f"Error: {str(e)}"
 
-def respond(message, chat_history, topic):
+def process_input(user_input, code_input, chat_history, current_topic):
     if not chat_history:
-        topic = message
-        question = generate_exercise_question(topic)
-        chat_history.append((message, question))
-        return "", chat_history, topic, gr.update(visible=True), gr.update(visible=True)
-    else:
-        if message.lower() == "next":
-            question = generate_exercise_question(topic)
-            chat_history.append((message, question))
-            return "", chat_history, topic, gr.update(visible=True), gr.update(visible=True)
+        # First interaction: set topic and generate question
+        current_topic = user_input
+        question = generate_exercise_question(current_topic)
+        chat_history.append((user_input, question))
+        return "", chat_history, current_topic, gr.update(visible=True, value="")
+    elif user_input.lower() == "next":
+        # Generate new question for the same topic
+        question = generate_exercise_question(current_topic)
+        chat_history.append((user_input, question))
+        return "", chat_history, current_topic, gr.update(visible=True, value="")
+    elif code_input.strip():
+        # User submitted code
+        exercise = chat_history[-1][1]  # Get the last exercise question
+        feedback = check_answer(current_topic, exercise, code_input)
+        
+        if "correct" in feedback.lower():
+            response = f"{feedback}\n\nGreat job! Type 'next' to see the next question."
         else:
-            chat_history.append((message, "Please submit your code using the code editor below."))
-            return "", chat_history, topic, gr.update(visible=True), gr.update(visible=True)
-
-def submit_code(topic, user_code, chat_history):
-    exercise = chat_history[-2][1]  # Get the last exercise question
-    feedback = check_answer(topic, exercise, user_code)
-    
-    if "correct" in feedback.lower():
-        response = f"{feedback}\n\nGreat job! Type 'next' to see the next question."
+            solution = get_solution(current_topic, exercise)
+            response = f"{feedback}\n\nHere's the correct solution:\n\n{solution}\n\nType 'next' to see the next question."
+        
+        chat_history.append((code_input, response))
+        return "", chat_history, current_topic, gr.update(visible=True, value="")
     else:
-        solution = get_solution(topic, exercise)
-        response = f"{feedback}\n\nHere's the correct solution:\n\n{solution}\n\nType 'next' to see the next question."
-    
-    chat_history.append((user_code, response))
-    return "", chat_history, gr.update(visible=True), gr.update(visible=True)
+        # Invalid input
+        chat_history.append((user_input, "Please enter your code in the code editor or type 'next' for a new question."))
+        return "", chat_history, current_topic, gr.update(visible=True)
 
-def undo(chat_history):
+def undo(chat_history, current_topic):
     if chat_history:
         chat_history.pop()
-    return chat_history
+    return chat_history, current_topic, gr.update(visible=bool(chat_history))
 
 def clear():
-    return [], "", gr.update(visible=False), gr.update(visible=False)
+    return [], "", gr.update(visible=False, value="")
 
 with gr.Blocks() as demo:
     gr.Markdown("# Python Practice Bot")
     gr.Markdown("Learn Python through exercises. Start by entering a topic you want to practice.")
 
     chatbot = gr.Chatbot(label="Python Tutor")
-    topic = gr.State("")
+    current_topic = gr.State("")
 
     with gr.Row():
         with gr.Column(scale=3):
             user_input = gr.Textbox(
                 show_label=False,
-                placeholder="Enter a Python topic or type 'next' for a new question...",
+                placeholder="Enter a Python topic, type 'next' for a new question, or submit your code...",
                 lines=1
             )
             code_input = gr.Code(language="python", label="Your Solution", visible=False)
         with gr.Column(scale=1):
             submit_button = gr.Button("Submit")
-            code_submit_button = gr.Button("Submit Code", visible=False)
             undo_button = gr.Button("Undo")
             clear_button = gr.Button("Clear")
 
     submit_button.click(
-        respond,
-        [user_input, chatbot, topic],
-        [user_input, chatbot, topic, code_input, code_submit_button]
-    )
-
-    code_submit_button.click(
-        submit_code,
-        [topic, code_input, chatbot],
-        [code_input, chatbot, code_input, code_submit_button]
+        process_input,
+        [user_input, code_input, chatbot, current_topic],
+        [user_input, chatbot, current_topic, code_input]
     )
 
-    undo_button.click(undo, [chatbot], [chatbot])
-    clear_button.click(clear, None, [chatbot, topic, code_input, code_submit_button])
+    undo_button.click(undo, [chatbot, current_topic], [chatbot, current_topic, code_input])
+    clear_button.click(clear, None, [chatbot, current_topic, code_input])
 
     gr.Examples(
         examples=[["lists"], ["decorators"], ["dictionaries"], ["file handling"], ["classes and objects"]],