Update app.py

app.py

@@ -186,19 +186,24 @@ def create_deepseek_interface():
         
         if not api_key:
             error_msg = "Environment variable FW_API_KEY is not set. Please check the environment variables on the server."
-            yield history + [(message, error_msg)], error_msg
+            # Convert to messages format
+            new_history = history + [
+                {"role": "user", "content": message},
+                {"role": "assistant", "content": error_msg}
+            ]
+            yield new_history, error_msg
             return
         
         search_context = ""
         search_info = ""
         
-        # Create new history with the user message
-        new_history = history + [(message, "")]
+        # Create new history with the user message in messages format
+        new_history = history + [{"role": "user", "content": message}]
         
         if use_deep_research:
             try:
-                # Update with search status
-                new_history[-1] = (message, "🔍 Extracting optimal keywords and searching the web...")
+                # Add assistant message with search status
+                new_history.append({"role": "assistant", "content": "🔍 Extracting optimal keywords and searching the web..."})
                 yield new_history, ""
                 
                 # Execute search
@@ -220,17 +225,25 @@ When citing search results, mention the source, and ensure your answer reflects
             except Exception as e:
                 print(f"Exception occurred during Deep Research: {str(e)}")
                 search_info = f"🔍 Deep Research feature error: {str(e)}\n\n"
+        else:
+            # Add empty assistant message to start
+            new_history.append({"role": "assistant", "content": ""})
+            yield new_history, ""
         
-        # Update history with search info
-        new_history[-1] = (message, search_info)
-        yield new_history, ""
+        # Update last assistant message with search info
+        if search_info:
+            new_history[-1]["content"] = search_info
+            yield new_history, ""
         
         # Prepare conversation history for API request
         messages = []
-        for user, assistant in history:
-            if user and assistant:  # Only add non-empty messages
-                messages.append({"role": "user", "content": user})
-                messages.append({"role": "assistant", "content": assistant})
+        
+        # Convert history to API format
+        for msg in history:
+            if msg["role"] == "user":
+                messages.append({"role": "user", "content": msg["content"]})
+            elif msg["role"] == "assistant":
+                messages.append({"role": "assistant", "content": msg["content"]})
         
         # Add system message with search context if available
         if search_context:
@@ -298,8 +311,8 @@ When citing search results, mention the source, and ensure your answer reflects
                                 chunk_count += 1
                                 full_response += chunk_content
                                 
-                                # Update chat history
-                                new_history[-1] = (message, full_response)
+                                # Update last assistant message
+                                new_history[-1]["content"] = full_response
                                 
                                 # Debug: Print first few chunks
                                 if chunk_count <= 5:
@@ -320,7 +333,7 @@ When citing search results, mention the source, and ensure your answer reflects
             if not full_response or full_response == search_info:
                 # If no response was generated, add an error message
                 full_response = search_info + "Error: No response generated from the model. Please try again."
-                new_history[-1] = (message, full_response)
+                new_history[-1]["content"] = full_response
             
             print(f"Final response length: {len(full_response)}")
             # Always yield the final state
@@ -332,22 +345,24 @@ When citing search results, mention the source, and ensure your answer reflects
                 error_msg = "Authentication failed. Please check your FW_API_KEY environment variable."
             
             print(f"Request error: {error_msg}")
-            new_history[-1] = (message, search_info + error_msg)
+            new_history[-1]["content"] = search_info + error_msg
             yield new_history, error_msg
         except Exception as e:
             error_msg = f"Unexpected error: {str(e)}"
             print(f"Unexpected error: {error_msg}")
             import traceback
             traceback.print_exc()
-            new_history[-1] = (message, search_info + error_msg)
+            new_history[-1]["content"] = search_info + error_msg
             yield new_history, error_msg
     
     # Test function without streaming
     def test_simple_response(message, history):
         """Simple test function to verify UI is working"""
         print(f"Test function called with message: {message}")
-        new_history = history + [(message, f"Echo: {message}")]
-        return new_history, ""
+        # Convert to messages format
+        new_message = {"role": "user", "content": message}
+        response = {"role": "assistant", "content": f"Echo: {message}"}
+        return history + [new_message, response], ""
     with gr.Blocks(theme="soft", fill_height=True) as demo:
         # Header section
         gr.Markdown(
@@ -365,8 +380,9 @@ When citing search results, mention the source, and ensure your answer reflects
                 chatbot = gr.Chatbot(
                     height=500,
                     show_label=False,
-                    container=True
-                    # Remove type specification to use default
+                    container=True,
+                    type="messages"  # Explicitly set to messages format
+                )
                 )
                 
                 # Add Deep Research toggle and status display
@@ -455,12 +471,11 @@ When citing search results, mention the source, and ensure your answer reflects
 # Run interface
 if __name__ == "__main__":
     demo = create_deepseek_interface()
-    demo.queue(max_size=10, concurrency_count=1)  # Configure queue with limits
+    demo.queue()  # Enable queue with default settings
     demo.launch(
         debug=True, 
         share=False, 
         server_name="0.0.0.0", 
         server_port=7860, 
-        ssr_mode=False,
         show_error=True  # Show detailed errors
     )