Update app.py

app.py

@@ -3,7 +3,7 @@ import gradio as gr
 from dotenv import load_dotenv
 from openai import OpenAI
 from prompts.initial_prompt import INITIAL_PROMPT
-from prompts.main_prompt import MAIN_PROMPT, get_prompt_for_method, get_feedback_for_method
+from prompts.main_prompt import get_prompt_for_method, get_feedback_for_method
 
 # ✅ Load API key from .env file
 if os.path.exists(".env"):
@@ -18,31 +18,28 @@ if not OPENAI_API_KEY:
 client = OpenAI(api_key=OPENAI_API_KEY)
 
 # ✅ Chatbot Response Function
-def respond(user_message, history):
+def respond(user_message, history, selected_method):
     if not user_message:
-        return "", history
+        return "", history, selected_method
 
-    user_message = user_message.strip().lower()  # Normalize input for better handling
+    user_message = user_message.strip().lower()  # Normalize input
 
-    # ✅ Extract previous user input
-    last_user_input = history[-1][0].strip().lower() if history else ""
-
-    # ✅ Check if user selected a method
     valid_methods = ["bar model", "double number line", "equation"]
 
+    # ✅ If user selects a method, store it and provide the method-specific prompt
     if user_message in valid_methods:
-        prompt = get_prompt_for_method(user_message)
-        history.append((user_message, prompt))  # Update history
-        return prompt, history
+        selected_method = user_message  # Store the method
+        method_prompt = get_prompt_for_method(user_message)
+        history.append((user_message, method_prompt))  # Save to history
+        return method_prompt, history, selected_method
 
-    # ✅ Ensure the user has selected a method before receiving feedback
-    if last_user_input in valid_methods:
-        selected_method = last_user_input  # Keep track of last selected method
+    # ✅ If a method has already been selected, provide feedback
+    if selected_method:
         feedback = get_feedback_for_method(selected_method, user_message)
-        history.append((user_message, feedback))  # Update history
-        return feedback, history
+        history.append((user_message, feedback))  # Save user response and feedback
+        return feedback, history, selected_method
 
-    return "❌ I didn’t understand that. Please select a method first (Bar Model, Double Number Line, or Equation).", history
+    return "❌ Please select a method first (Bar Model, Double Number Line, or Equation).", history, selected_method
 
 # ✅ Gradio UI Setup
 with gr.Blocks() as demo:
@@ -50,18 +47,15 @@ with gr.Blocks() as demo:
 
     chatbot = gr.Chatbot(value=[(INITIAL_PROMPT, "")], height=500)
     state_history = gr.State([(INITIAL_PROMPT, "")])
+    state_selected_method = gr.State(None)  # ✅ New state to track selected method
 
     user_input = gr.Textbox(placeholder="Type your message here...", label="Your Input")
 
     # ✅ Handling user input and response logic
     user_input.submit(
         respond,
-        inputs=[user_input, state_history],
-        outputs=[user_input, chatbot]
-    ).then(
-        fn=lambda _, h: h,
-        inputs=[user_input, chatbot],
-        outputs=[state_history]
+        inputs=[user_input, state_history, state_selected_method],
+        outputs=[chatbot, state_history, state_selected_method]
     )
 
 if __name__ == "__main__":