Update app.py

app.py

@@ -22,7 +22,8 @@ def create_deepseek_interface():
     def extract_keywords_with_llm(query):
         if not api_key:
             return "FW_API_KEY not set for LLM keyword extraction.", query
-        
+
+
         # Extract keywords using LLM (DeepSeek model)
         url = "https://api.fireworks.ai/inference/v1/chat/completions"
         payload = {
@@ -32,7 +33,7 @@ def create_deepseek_interface():
             "messages": [
                 {
                     "role": "system",
-                    "content": "You are a deep thinking AI, you may use extremely long chains of thought to deeply consider the problem and deliberate with yourself via systematic reasoning processes to help come to a correct solution prior to answering. You should enclose your thoughts and internal monologue inside tags, and then provide your solution or response to the problem. Extract key search terms from the user's question that would be effective for web searches. Provide these as a search query with words separated by spaces only, without commas. For example: 'Prime Minister Han Duck-soo impeachment results'"
+                    "content": "Extract key search terms from the user's question that would be effective for web searches. Provide these as a search query with words separated by spaces only, without commas. For example: 'Prime Minister Han Duck-soo impeachment results'"
                 },
                 {
                     "role": "user",
@@ -177,51 +178,49 @@ def create_deepseek_interface():
                    f"- **Search Term**: {search_query}\n" + \
                    f"- **Parameters**: {params}\n"
     
-    # Simple non-streaming version
-    def query_deepseek_no_stream(message, history, use_deep_research):
-        """Non-streaming version that returns complete response"""
-        print(f"\n=== Starting query_deepseek_no_stream ===")
-        print(f"Message: {message}")
-        print(f"History length: {len(history)}")
-        print(f"Deep Research: {use_deep_research}")
-        
+    # Function to call DeepSeek API with streaming
+    def query_deepseek_streaming(message, history, use_deep_research):
         if not api_key:
-            error_msg = "Environment variable FW_API_KEY is not set. Please check the environment variables on the server."
-            return history + [(message, error_msg)], ""
+            yield history, "Environment variable FW_API_KEY is not set. Please check the environment variables on the server."
+            return
         
         search_context = ""
         search_info = ""
-        
         if use_deep_research:
             try:
+                # Start search (first message)
+                yield history + [(message, "🔍 Extracting optimal keywords and searching the web...")], ""
+                
+                # Execute search - add logs for debugging
                 print(f"Deep Research activated: Starting search for '{message}'")
                 search_results = search_with_serphouse(message)
-                print(f"Search results received: {search_results[:100]}...")
+                print(f"Search results received: {search_results[:100]}...")  # Output first part of results
                 
                 if not search_results.startswith("Error during search") and not search_results.startswith("SERPHOUSE_API_KEY"):
                     search_context = f"""
 Here are recent search results related to the user's question. Use this information to provide an accurate response with the latest information:
+
 {search_results}
+
 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 = "🔍 Deep Research feature activated: Generating response based on relevant web search results...\n\n"
+                    search_info = f"🔍 Deep Research feature activated: Generating response based on relevant web search results..."
                 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)}\n\n"
+                search_info = f"🔍 Deep Research feature error: {str(e)}"
         
         # Prepare conversation history for API request
         messages = []
-        for user_msg, assistant_msg in history:
-            if user_msg and assistant_msg:  # Only add non-empty messages
-                messages.append({"role": "user", "content": user_msg})
-                messages.append({"role": "assistant", "content": assistant_msg})
+        for user, assistant in history:
+            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
@@ -230,7 +229,7 @@ When citing search results, mention the source, and ensure your answer reflects
         # Prepare API request
         url = "https://api.fireworks.ai/inference/v1/chat/completions"
         payload = {
-            "model": "accounts/fireworks/models/deepseek-r1-0528",
+            "model": "accounts/fireworks/models/deepseek-v3-0324",
             "max_tokens": 20480,
             "top_p": 1,
             "top_k": 40,
@@ -238,7 +237,7 @@ When citing search results, mention the source, and ensure your answer reflects
             "frequency_penalty": 0,
             "temperature": 0.6,
             "messages": messages,
-            "stream": False  # No streaming
+            "stream": True  # Enable streaming
         }
         headers = {
             "Accept": "application/json",
@@ -246,58 +245,63 @@ When citing search results, mention the source, and ensure your answer reflects
             "Authorization": f"Bearer {api_key}"
         }
         
-        print(f"Calling DeepSeek API (no streaming)...")
-        print(f"Number of messages in conversation: {len(messages)}")
-        
         try:
-            # Add temporary message while waiting
-            temp_history = history + [(message, search_info + "⏳ Generating response...")]
+            # 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
             
-            response = requests.post(url, headers=headers, json=payload)
-            response.raise_for_status()
+            # Add message and start with initial response
+            new_history = history.copy()
             
-            print(f"API Response Status: {response.status_code}")
+            # Include search_info in starting message if available
+            start_msg = search_info if search_info else ""
+            new_history.append((message, start_msg))
             
-            result = response.json()
-            full_response = search_info + result["choices"][0]["message"]["content"]
+            # Full response text
+            full_response = start_msg
             
-            print(f"Final response length: {len(full_response)}")
-            print(f"First 100 chars of response: {full_response[:100]}...")
+            # Process streaming response
+            for line in response.iter_lines():
+                if line:
+                    line_text = line.decode('utf-8')
+                    
+                    # Remove 'data: ' prefix
+                    if line_text.startswith("data: "):
+                        line_text = line_text[6:]
+                    
+                    # Check for stream end message
+                    if line_text == "[DONE]":
+                        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:
+                        continue
             
-            # Return the complete response
-            return history + [(message, full_response)], ""
+            # Return final 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."
-            
-            print(f"Request error: {error_msg}")
-            return history + [(message, search_info + error_msg)], ""
-        except Exception as e:
-            error_msg = f"Unexpected error: {str(e)}"
-            print(f"Unexpected error: {error_msg}")
-            import traceback
-            traceback.print_exc()
-            return history + [(message, search_info + error_msg)], ""
-    
-    # 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}")
-        
-        # For now, use non-streaming version
-        return query_deepseek_no_stream(message, history, use_deep_research)
+            yield history, error_msg
     
     # Create Gradio interface
     with gr.Blocks(theme="soft", fill_height=True) as demo:
         # Header section
         gr.Markdown(
             """
-            # 🤖 Deepseek r1 0528 + Research 
-            ### deepseek-r1-0528 Model + Real-time 'Deep Research' Agentic AI System @ https://discord.gg/openfreeai
+            # 🤖 DeepSeek V3-0324 + Research 
+            ### DeepSeek V3-0324 Latest Model + Real-time 'Deep Research' Agentic AI System @ https://discord.gg/openfreeai
             """
         )
         
@@ -310,7 +314,6 @@ When citing search results, mention the source, and ensure your answer reflects
                     height=500,
                     show_label=False,
                     container=True
-                    # Use default format
                 )
                 
                 # Add Deep Research toggle and status display
@@ -325,14 +328,12 @@ 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:
-                    status_text = "⚠️ SERPHOUSE_API_KEY is not set"
+                    api_status.value = "⚠️ SERPHOUSE_API_KEY is not set"
                 if not api_key:
-                    status_text = "⚠️ FW_API_KEY is not set"
+                    api_status.value = "⚠️ FW_API_KEY is not set"
                 if api_key and serphouse_api_key:
-                    status_text = "✅ API keys configured"
-                api_status.value = status_text
+                    api_status.value = "✅ API keys configured"
                 
                 # Input area
                 with gr.Row():
@@ -340,8 +341,7 @@ When citing search results, mention the source, and ensure your answer reflects
                         label="Message",
                         placeholder="Enter your prompt here...",
                         show_label=False,
-                        scale=9,
-                        lines=2
+                        scale=9
                     )
                     submit = gr.Button("Send", variant="primary", scale=1)
                 
@@ -362,15 +362,9 @@ When citing search results, mention the source, and ensure your answer reflects
                 # Error message display
                 error_box = gr.Markdown("")
         
-        # Function to handle submission
-        def handle_submit(message, history, use_deep_research):
-            if not message.strip():
-                return history, ""
-            return query_deepseek_no_stream(message, history, use_deep_research)
-        
         # Connect buttons to functions
         submit.click(
-            handle_submit,
+            query_deepseek_streaming,
             inputs=[msg, chatbot, use_deep_research],
             outputs=[chatbot, error_box]
         ).then(
@@ -381,7 +375,7 @@ When citing search results, mention the source, and ensure your answer reflects
         
         # Allow Enter key submission
         msg.submit(
-            handle_submit,
+            query_deepseek_streaming,
             inputs=[msg, chatbot, use_deep_research],
             outputs=[chatbot, error_box]
         ).then(
@@ -394,13 +388,5 @@ When citing search results, mention the source, and ensure your answer reflects
 
 # Run interface
 if __name__ == "__main__":
-    print("Starting Deepseek Interface...")
     demo = create_deepseek_interface()
-    print("Launching Gradio interface...")
-    demo.launch(
-        debug=True, 
-        share=False, 
-        server_name="0.0.0.0", 
-        server_port=7860, 
-        show_error=True
-    )
+    demo.launch(debug=True)