Update services.py

services.py

@@ -8,7 +8,7 @@ This module has been refactored to support multiple LLM providers:
 - Fireworks AI
 - OpenAI
 - Google Gemini
-- DeepSeek (Direct API)
+- DeepSeek (Direct API via OpenAI client)
 """
 import os
 import logging
@@ -23,7 +23,8 @@ from groq import Groq
 import fireworks.client as Fireworks
 import openai
 import google.generativeai as genai
-from deepseek import OpenaiClient as DeepSeekClient
+
+# <--- FIX: REMOVED the incorrect 'from deepseek import ...' line ---
 
 # --- Setup Logging & Environment ---
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -38,7 +39,6 @@ OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
 GEMINI_API_KEY = os.getenv("GEMINI_API_KEY")
 DEEPSEEK_API_KEY = os.getenv("DEEPSEEK_API_KEY")
 
-
 # --- Type Definitions ---
 Messages = List[Dict[str, Any]]
 
@@ -50,8 +50,16 @@ class LLMService:
         self.hf_client = InferenceClient(token=HF_TOKEN) if HF_TOKEN else None
         self.groq_client = Groq(api_key=GROQ_API_KEY) if GROQ_API_KEY else None
         self.openai_client = openai.OpenAI(api_key=OPENAI_API_KEY) if OPENAI_API_KEY else None
-        self.deepseek_client = DeepSeekClient(api_key=DEEPSEEK_API_KEY) if DEEPSEEK_API_KEY else None
         
+        # <--- FIX: Correctly instantiate the DeepSeek client using the OpenAI library ---
+        if DEEPSEEK_API_KEY:
+            self.deepseek_client = openai.OpenAI(
+                api_key=DEEPSEEK_API_KEY,
+                base_url="https://api.deepseek.com/v1"
+            )
+        else:
+            self.deepseek_client = None
+
         if FIREWORKS_API_KEY:
             Fireworks.api_key = FIREWORKS_API_KEY
             self.fireworks_client = Fireworks
@@ -65,10 +73,9 @@ class LLMService:
             self.gemini_model = None
 
     def _prepare_messages_for_gemini(self, messages: Messages) -> List[Dict[str, Any]]:
-        """Gemini requires a slightly different message format."""
+        # This function remains the same
         gemini_messages = []
         for msg in messages:
-            # Gemini uses 'model' for assistant role
             role = 'model' if msg['role'] == 'assistant' else 'user'
             gemini_messages.append({'role': role, 'parts': [msg['content']]})
         return gemini_messages
@@ -76,14 +83,11 @@ class LLMService:
     def generate_code_stream(
         self, model_id: str, messages: Messages, max_tokens: int = 8192
     ) -> Generator[str, None, None]:
-        """
-        Streams code generation, dispatching to the correct provider based on model_id.
-        """
+        # This function remains the same, as the dispatcher logic is already correct
         provider, model_name = model_id.split('/', 1)
         logging.info(f"Dispatching to provider: {provider} for model: {model_name}")
 
         try:
-            # --- OpenAI, Groq, DeepSeek, Fireworks (OpenAI-compatible) ---
             if provider in ['openai', 'groq', 'deepseek', 'fireworks']:
                 client_map = {
                     'openai': self.openai_client,
@@ -95,7 +99,6 @@ class LLMService:
                 if not client:
                     raise ValueError(f"{provider.capitalize()} API key not configured.")
                 
-                # Fireworks has a slightly different call signature
                 if provider == 'fireworks':
                      stream = client.create(model=model_name, messages=messages, stream=True, max_tokens=max_tokens)
                 else:
@@ -105,7 +108,6 @@ class LLMService:
                     if chunk.choices and chunk.choices[0].delta and chunk.choices[0].delta.content:
                         yield chunk.choices[0].delta.content
 
-            # --- Google Gemini ---
             elif provider == 'gemini':
                 if not self.gemini_model:
                     raise ValueError("Gemini API key not configured.")
@@ -114,17 +116,14 @@ class LLMService:
                 for chunk in stream:
                     yield chunk.text
 
-            # --- Hugging Face ---
             elif provider == 'huggingface':
                 if not self.hf_client:
                     raise ValueError("Hugging Face API token not configured.")
-                # For HF, model_name is the rest of the ID, e.g., baidu/ERNIE...
                 hf_model_id = model_id.split('/', 1)[1]
                 stream = self.hf_client.chat_completion(model=hf_model_id, messages=messages, stream=True, max_tokens=max_tokens)
                 for chunk in stream:
                     if chunk.choices[0].delta.content:
                         yield chunk.choices[0].delta.content
-
             else:
                 raise ValueError(f"Unknown provider: {provider}")
 
@@ -132,35 +131,21 @@ class LLMService:
             logging.error(f"LLM API Error with provider {provider}: {e}")
             yield f"Error from {provider.capitalize()}: {str(e)}"
 
+# The SearchService class remains unchanged
 class SearchService:
-    """A wrapper for the Tavily Search API."""
     def __init__(self, api_key: str = TAVILY_API_KEY):
         if not api_key:
             logging.warning("TAVILY_API_KEY not set. Web search will be disabled.")
             self.client = None
         else:
-            try:
-                self.client = TavilyClient(api_key=api_key)
-            except Exception as e:
-                logging.error(f"Failed to initialize Tavily client: {e}")
-                self.client = None
-
+            self.client = TavilyClient(api_key=api_key)
     def is_available(self) -> bool:
-        """Checks if the search service is configured and available."""
         return self.client is not None
-
     def search(self, query: str, max_results: int = 5) -> str:
-        """Performs a web search and returns a formatted string of results."""
-        if not self.is_available():
-            return "Web search is not available."
+        if not self.is_available(): return "Web search is not available."
         try:
-            response = self.client.search(
-                query, search_depth="advanced", max_results=min(max(1, max_results), 10)
-            )
-            results = [
-                f"Title: {res.get('title', 'N/A')}\nURL: {res.get('url', 'N/A')}\nContent: {res.get('content', 'N/A')}"
-                for res in response.get('results', [])
-            ]
+            response = self.client.search(query, search_depth="advanced", max_results=min(max(1, max_results), 10))
+            results = [f"Title: {res.get('title', 'N/A')}\nURL: {res.get('url', 'N/A')}\nContent: {res.get('content', 'N/A')}" for res in response.get('results', [])]
             return "Web Search Results:\n\n" + "\n---\n".join(results) if results else "No search results found."
         except Exception as e:
             logging.error(f"Tavily search error: {e}")