Update app.py

app.py

@@ -641,49 +641,51 @@ class AdaptiveMedicalBot:
             logger.error(f"Error updating learning system: {e}")
 
 def create_demo():
-    """Create Gradio interface with proper initialization"""
+    """Create Gradio interface with proper message formatting"""
     try:
         bot = AdaptiveMedicalBot()
         
-        def chat(message, history, feedback=None):
+        def chat(message: str, history: List[Dict[str, str]]):
             try:
-                # Handle feedback if provided
-                if feedback and history:
-                    last_interaction = history[-1]
-                    bot.update_from_feedback(
-                        last_interaction[0],
-                        last_interaction[1],
-                        1 if feedback == "👍" else -1
-                    )
-
-                # Generate response using the correct method
-                response_data = bot.generate_adaptive_response(message, history)
+                # Convert history to the format expected by the bot
+                bot_history = [(h["user"], h["bot"]) for h in history] if history else []
+                
+                # Generate response
+                response_data = bot.generate_adaptive_response(message, bot_history)
                 response = response_data['response']
-
-                # Update the chat history
-                history = history + [(message, response)]
-
-                # Return both the response and the updated history for Gradio
-                return response, history
+                
+                # Format response for Gradio chat
+                history.append({"role": "user", "content": message})
+                history.append({"role": "assistant", "content": response})
+                
+                return history
 
             except Exception as e:
                 logger.error(f"Chat error: {e}")
-                return "I apologize, but I'm experiencing technical difficulties. For emergencies, please call 999.", history
+                return history + [
+                    {"role": "user", "content": message},
+                    {"role": "assistant", "content": "I apologize, but I'm experiencing technical difficulties. For emergencies, please call 999."}
+                ]
+
+        def process_feedback(feedback: str, history: List[Dict[str, str]]):
+            """Process feedback when received"""
+            try:
+                if history and len(history) >= 2:
+                    last_user_msg = history[-2]["content"]
+                    last_bot_msg = history[-1]["content"]
+                    bot.update_from_feedback(
+                        last_user_msg,
+                        last_bot_msg,
+                        1 if feedback == "👍" else -1
+                    )
+            except Exception as e:
+                logger.error(f"Error processing feedback: {e}")
 
-        # Create Gradio interface with proper state management and updated type
-        demo = gr.Interface(
-            fn=chat,
-            inputs=[
-                gr.Textbox(label="Your message", placeholder="Type your message here...", lines=2),
-                gr.State([]),  # For chat history (input)
-                gr.Radio(choices=["👍", "👎"], label="Was this response helpful?", visible=True, value=None)
-            ],
-            outputs=[
-                gr.Chatbot(label="GP Medical Triage Assistant", height=500, type='messages'),
-                gr.State([])  # For chat history (output)
-            ],
-            title="GP Medical Triage Assistant - Pearly",
-            description="""
+        # Create Gradio interface with proper message handling
+        with gr.Blocks(theme="soft") as demo:
+            gr.Markdown("""
+            # GP Medical Triage Assistant - Pearly
+            
             👋 Hello! I'm Pearly, your GP medical assistant.
             
             I can help you with:
@@ -696,14 +698,75 @@ def create_demo():
             For urgent concerns, call 111.
             
             Please describe your concerns below.
-            """,
-            examples=[
-                ["I've been having headaches recently"],
-                ["I need to book a routine checkup"],
-                ["I'm feeling very anxious lately"]
-            ],
-            theme="soft"
-        )
+            """)
+            
+            # Initialize chat components
+            chatbot = gr.Chatbot(
+                value=[{"role": "assistant", "content": "Hello! I'm Pearly, your GP medical assistant. How can I help you today?"}],
+                height=500,
+                type="messages"
+            )
+            msg = gr.Textbox(
+                label="Your message",
+                placeholder="Type your message here...",
+                lines=2
+            )
+            with gr.Row():
+                submit = gr.Button("Submit")
+                clear = gr.Button("Clear")
+                
+            feedback = gr.Radio(
+                choices=["👍", "👎"],
+                label="Was this response helpful?",
+                visible=True
+            )
+            
+            # Set up event handlers
+            submit.click(
+                chat,
+                inputs=[msg, chatbot],
+                outputs=[chatbot],
+                queue=False
+            ).then(
+                lambda: "",
+                None,
+                msg  # Clear input box after sending
+            )
+            
+            msg.submit(
+                chat,
+                inputs=[msg, chatbot],
+                outputs=[chatbot],
+                queue=False
+            ).then(
+                lambda: "",
+                None,
+                msg  # Clear input box after sending
+            )
+            
+            clear.click(
+                lambda: [[], ""],
+                None,
+                [chatbot, msg],
+                queue=False
+            )
+            
+            feedback.change(
+                process_feedback,
+                inputs=[feedback, chatbot],
+                outputs=[],
+                queue=False
+            )
+            
+            # Add example messages
+            gr.Examples(
+                examples=[
+                    "I've been having headaches recently",
+                    "I need to book a routine checkup",
+                    "I'm feeling very anxious lately"
+                ],
+                inputs=msg
+            )
         
         return demo