Update app.py

app.py

@@ -179,21 +179,32 @@ def create_deepseek_interface():
     
     # Function to call DeepSeek API with streaming
     def query_deepseek_streaming(message, history, use_deep_research):
+        print(f"\n=== Starting query_deepseek_streaming ===")
+        print(f"Message: {message}")
+        print(f"History length: {len(history)}")
+        print(f"Deep Research: {use_deep_research}")
+        
         if not api_key:
-            yield history, "Environment variable FW_API_KEY is not set. Please check the environment variables on the server."
+            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
             return
         
         search_context = ""
         search_info = ""
+        
+        # Create new history with the user message
+        new_history = history + [(message, "")]
+        
         if use_deep_research:
             try:
-                # Start search (first message)
-                yield history + [(message, "🔍 Extracting optimal keywords and searching the web...")], ""
+                # Update with search status
+                new_history[-1] = (message, "🔍 Extracting optimal keywords and searching the web...")
+                yield new_history, ""
                 
-                # Execute search - add logs for debugging
+                # Execute search
                 print(f"Deep Research activated: Starting search for '{message}'")
                 search_results = search_with_serphouse(message)
-                print(f"Search results received: {search_results[:100]}...")  # Output first part of results
+                print(f"Search results received: {search_results[:100]}...")
                 
                 if not search_results.startswith("Error during search") and not search_results.startswith("SERPHOUSE_API_KEY"):
                     search_context = f"""
@@ -202,22 +213,27 @@ Here are recent search results related to the user's question. Use this informat
 Based on the above search results, answer the user's question. If you cannot find a clear answer in the search results, use your knowledge to provide the best answer.
 When citing search results, mention the source, and ensure your answer reflects the latest information.
 """
-                    search_info = f"🔍 Deep Research feature activated: Generating response based on relevant web search results..."
+                    search_info = "🔍 Deep Research feature activated: Generating response based on relevant web search results...\n\n"
                 else:
                     print(f"Search failed or no results: {search_results}")
+                    search_info = f"🔍 Search error: {search_results}\n\n"
             except Exception as e:
                 print(f"Exception occurred during Deep Research: {str(e)}")
-                search_info = f"🔍 Deep Research feature error: {str(e)}"
+                search_info = f"🔍 Deep Research feature error: {str(e)}\n\n"
+        
+        # Update history with search info
+        new_history[-1] = (message, search_info)
+        yield new_history, ""
         
         # Prepare conversation history for API request
         messages = []
         for user, assistant in history:
-            messages.append({"role": "user", "content": user})
-            messages.append({"role": "assistant", "content": assistant})
+            if user and assistant:  # Only add non-empty messages
+                messages.append({"role": "user", "content": user})
+                messages.append({"role": "assistant", "content": assistant})
         
         # Add system message with search context if available
         if search_context:
-            # DeepSeek model supports system messages
             messages.insert(0, {"role": "system", "content": search_context})
         
         # Add new user message
@@ -234,7 +250,7 @@ When citing search results, mention the source, and ensure your answer reflects
             "frequency_penalty": 0,
             "temperature": 0.6,
             "messages": messages,
-            "stream": True  # Enable streaming
+            "stream": True
         }
         headers = {
             "Accept": "application/json",
@@ -242,20 +258,18 @@ When citing search results, mention the source, and ensure your answer reflects
             "Authorization": f"Bearer {api_key}"
         }
         
+        print(f"Calling DeepSeek API...")
+        print(f"Number of messages in conversation: {len(messages)}")
+        
         try:
-            # Request streaming response
-            response = requests.request("POST", url, headers=headers, data=json.dumps(payload), stream=True)
-            response.raise_for_status()  # Raise exception for HTTP errors
-            
-            # Add message and start with initial response
-            new_history = history.copy()
+            response = requests.post(url, headers=headers, json=payload, stream=True)
+            response.raise_for_status()
             
-            # Include search_info in starting message if available
-            start_msg = search_info if search_info else ""
-            new_history.append((message, start_msg))
+            print(f"API Response Status: {response.status_code}")
             
             # Full response text
-            full_response = start_msg
+            full_response = search_info
+            chunk_count = 0
             
             # Process streaming response
             for line in response.iter_lines():
@@ -268,29 +282,61 @@ When citing search results, mention the source, and ensure your answer reflects
                     
                     # Check for stream end message
                     if line_text == "[DONE]":
+                        print(f"Stream completed. Total chunks: {chunk_count}")
                         break
                     
                     try:
                         # Parse JSON
                         chunk = json.loads(line_text)
-                        chunk_content = chunk.get("choices", [{}])[0].get("delta", {}).get("content", "")
                         
-                        if chunk_content:
-                            full_response += chunk_content
-                            # Update chat history
-                            new_history[-1] = (message, full_response)
-                            yield new_history, ""
-                    except json.JSONDecodeError:
+                        # Check if there's content in the chunk
+                        if "choices" in chunk and len(chunk["choices"]) > 0:
+                            delta = chunk["choices"][0].get("delta", {})
+                            chunk_content = delta.get("content", "")
+                            
+                            if chunk_content:
+                                chunk_count += 1
+                                full_response += chunk_content
+                                
+                                # Update chat history
+                                new_history[-1] = (message, full_response)
+                                
+                                # Debug: Print first few chunks
+                                if chunk_count <= 5:
+                                    print(f"Chunk {chunk_count}: {repr(chunk_content[:50])}")
+                                
+                                # Yield updated history
+                                yield new_history, ""
+                        
+                    except json.JSONDecodeError as e:
+                        print(f"JSON decode error: {e}")
+                        print(f"Line content: {repr(line_text[:100])}")
                         continue
             
-            # Return final response
+            # Final update
+            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)
+            
+            print(f"Final response length: {len(full_response)}")
             yield new_history, ""
             
         except requests.exceptions.RequestException as e:
             error_msg = f"API error: {str(e)}"
             if hasattr(e, 'response') and e.response and e.response.status_code == 401:
                 error_msg = "Authentication failed. Please check your FW_API_KEY environment variable."
-            yield history, error_msg
+            
+            print(f"Request error: {error_msg}")
+            new_history[-1] = (message, 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)
+            yield new_history, error_msg
     
     # Create Gradio interface
     with gr.Blocks(theme="soft", fill_height=True) as demo:
@@ -310,7 +356,8 @@ When citing search results, mention the source, and ensure your answer reflects
                 chatbot = gr.Chatbot(
                     height=500,
                     show_label=False,
-                    container=True
+                    container=True,
+                    type="tuples"  # Explicitly set type
                 )
                 
                 # Add Deep Research toggle and status display
@@ -325,12 +372,14 @@ When citing search results, mention the source, and ensure your answer reflects
                         api_status = gr.Markdown("API Status: Ready")
                 
                 # Check and display API key status
+                status_text = ""
                 if not serphouse_api_key:
-                    api_status.value = "⚠️ SERPHOUSE_API_KEY is not set"
+                    status_text = "⚠️ SERPHOUSE_API_KEY is not set"
                 if not api_key:
-                    api_status.value = "⚠️ FW_API_KEY is not set"
+                    status_text = "⚠️ FW_API_KEY is not set"
                 if api_key and serphouse_api_key:
-                    api_status.value = "✅ API keys configured"
+                    status_text = "✅ API keys configured"
+                api_status.value = status_text
                 
                 # Input area
                 with gr.Row():
@@ -338,7 +387,8 @@ When citing search results, mention the source, and ensure your answer reflects
                         label="Message",
                         placeholder="Enter your prompt here...",
                         show_label=False,
-                        scale=9
+                        scale=9,
+                        lines=2
                     )
                     submit = gr.Button("Send", variant="primary", scale=1)
                 
@@ -363,7 +413,8 @@ When citing search results, mention the source, and ensure your answer reflects
         submit.click(
             query_deepseek_streaming,
             inputs=[msg, chatbot, use_deep_research],
-            outputs=[chatbot, error_box]
+            outputs=[chatbot, error_box],
+            queue=True  # Enable queue for streaming
         ).then(
             lambda: "",
             None,
@@ -374,7 +425,8 @@ When citing search results, mention the source, and ensure your answer reflects
         msg.submit(
             query_deepseek_streaming,
             inputs=[msg, chatbot, use_deep_research],
-            outputs=[chatbot, error_box]
+            outputs=[chatbot, error_box],
+            queue=True  # Enable queue for streaming
         ).then(
             lambda: "",
             None,
@@ -386,4 +438,4 @@ When citing search results, mention the source, and ensure your answer reflects
 # Run interface
 if __name__ == "__main__":
     demo = create_deepseek_interface()
-    demo.launch(debug=True)
+    demo.launch(debug=True, share=False, server_name="0.0.0.0", server_port=7860)