Fix Gradio 5.8.0 compatibility issues

interface/app.py

@@ -16,78 +16,73 @@ class WellnessInterface:
         self.logger.info("Setting up interface components")
         
         try:
-            # Chat interface
-            self.chatbot = gr.Chatbot(
-                label="Mental Wellness Assistant",
-                type="messages",  # Using new message format
-                height=400
-            )
-            
-            # Text input
-            self.text_input = gr.Textbox(
-                label="Type your message",
-                placeholder="Enter your message here...",
-                lines=2
-            )
-            
-            # Audio input
-            self.audio_input = gr.Audio(
-                label="Voice Input",
-                type="filepath",  # Using filepath instead of source
-                format="wav"
-            )
-            
-            # Image input
-            self.image_input = gr.Image(
-                label="Image Upload",
-                type="filepath"
-            )
-            
-            # Control buttons
-            self.submit_btn = gr.Button("Send")
-            self.clear_btn = gr.Button("Clear Chat")
-            self.emergency_btn = gr.Button("Emergency Help", variant="secondary")
-            
-            # Setup interface layout
-            self.interface = gr.Interface(
-                fn=self.process_input,
-                inputs=[
-                    self.text_input,
-                    self.audio_input,
-                    self.image_input,
-                    self.chatbot
-                ],
-                outputs=[self.chatbot],
-                title="Mental Wellness Support",
-                description="A safe space for mental health support and guidance.",
-                theme=self.config["INTERFACE_CONFIG"]["theme"],
-                allow_flagging="never"
-            )
-            
-            # Setup event handlers
-            self.submit_btn.click(
-                fn=self.process_input,
-                inputs=[
-                    self.text_input,
-                    self.audio_input,
-                    self.image_input,
-                    self.chatbot
-                ],
-                outputs=[self.chatbot]
-            )
-            
-            self.clear_btn.click(
-                fn=self.clear_chat,
-                inputs=[],
-                outputs=[self.chatbot]
-            )
-            
-            self.emergency_btn.click(
-                fn=self.emergency_help,
-                inputs=[],
-                outputs=[self.chatbot]
-            )
-            
+            with gr.Blocks(theme=gr.themes.Default()) as self.interface:
+                gr.Markdown("# Mental Wellness Support")
+                gr.Markdown("A safe space for mental health support and guidance.")
+                
+                with gr.Row():
+                    with gr.Column(scale=3):
+                        self.chatbot = gr.Chatbot(
+                            label="Mental Wellness Assistant",
+                            height=400,
+                            value=[],
+                            elem_id="wellness_chat"
+                        )
+                        
+                        with gr.Row():
+                            self.text_input = gr.Textbox(
+                                label="Type your message",
+                                placeholder="Enter your message here...",
+                                lines=2,
+                                scale=4
+                            )
+                            self.submit_btn = gr.Button("Send", scale=1)
+                            
+                        with gr.Row():
+                            self.audio_input = gr.Audio(
+                                label="Voice Input",
+                                type="filepath",
+                                format="wav"
+                            )
+                            
+                            self.image_input = gr.Image(
+                                label="Image Upload",
+                                type="filepath"
+                            )
+                            
+                    with gr.Column(scale=1):
+                        with gr.Group():
+                            gr.Markdown("### Quick Actions")
+                            self.clear_btn = gr.Button("Clear Chat")
+                            self.emergency_btn = gr.Button(
+                                "Emergency Help",
+                                variant="secondary"
+                            )
+                
+                # Event handlers
+                self.submit_btn.click(
+                    fn=self.process_input,
+                    inputs=[
+                        self.text_input,
+                        self.audio_input,
+                        self.image_input,
+                        self.chatbot
+                    ],
+                    outputs=[self.chatbot]
+                )
+                
+                self.clear_btn.click(
+                    fn=self.clear_chat,
+                    inputs=[],
+                    outputs=[self.chatbot]
+                )
+                
+                self.emergency_btn.click(
+                    fn=self.emergency_help,
+                    inputs=[],
+                    outputs=[self.chatbot]
+                )
+                
             self.logger.info("Interface setup completed successfully")
             
         except Exception as e:
@@ -114,41 +109,35 @@ class WellnessInterface:
             # Process the input (placeholder)
             response = "I understand and I'm here to help. Could you tell me more about how you're feeling?"
             
-            # Add to chat history using the new message format
-            history.append({"role": "user", "content": text if text else "Sent media"})
-            history.append({"role": "assistant", "content": response})
+            # Add to chat history
+            history = history or []
+            history.append([text if text else "Sent media", response])
             
             return history
             
         except Exception as e:
             self.logger.error(f"Error processing input: {str(e)}")
-            return history + [
-                {"role": "assistant", "content": "I apologize, but I encountered an error. Please try again."}
-            ]
+            history = history or []
+            history.append([None, "I apologize, but I encountered an error. Please try again."])
+            return history
             
     def clear_chat(self):
         """Clear the chat history"""
         self.logger.info("Clearing chat history")
-        return []
+        return None
         
     def emergency_help(self):
         """Provide emergency help information"""
         self.logger.info("Emergency help requested")
         
-        emergency_message = [
-            {"role": "assistant", "content": """
-            If you're experiencing a mental health emergency:
-            
-            🚨 Emergency Services: 911 (US)
-            🆘 National Crisis Hotline: 988
-            💭 Crisis Text Line: Text HOME to 741741
-            
-            These services are available 24/7 and are staffed by trained professionals.
-            Your life matters, and help is available.
-            """}
-        ]
-        
-        return emergency_message
+        return [[None, """If you're experiencing a mental health emergency:
+
+🚨 Emergency Services: 911 (US)
+🆘 National Crisis Hotline: 988
+💭 Crisis Text Line: Text HOME to 741741
+
+These services are available 24/7 and are staffed by trained professionals.
+Your life matters, and help is available."""]]
         
     def launch(self, **kwargs):
         """Launch the interface"""