Add OpenAIServerModel

agent.py

@@ -5,7 +5,7 @@ from smolagents import (
     VisitWebpageTool, 
     PythonInterpreterTool,
     InferenceClientModel,
-    HfApiModel, # import bug from smolagents after adding duckduckgo-search in requirements
+    # HfApiModel, # import bug from smolagents after adding duckduckgo-search in requirements
     tool
 )
 from typing import List, Dict, Any, Optional
@@ -31,22 +31,22 @@ class QAgent:
         self.system_prompt = system_prompt
 
 
-        if model_type == "HfApiModel":
-            if api_key is None:
-                api_key = os.getenv("SP_HF_TOK")
-                if not api_key:
-                    raise ValueError("No API Key found for HuggingFace. Please set SP_HF_TOK or pass api_key.")
-            
-            if self.verbose:
-                print(f"Using Hugging Face token: {api_key[:5]}... (HfApiModel mode)")
-                
-            self.model = HfApiModel(
-                model_id=model_id or "Qwen/Qwen2.5-Coder-32B-Instruct", # précédemment : or "meta-llama/Llama-3-70B-Instruct",
-                token=api_key
-                # temperature=temperature
-            )
-        
-        elif model_type == "InferenceClientModel":
+        # if model_type == "HfApiModel":
+        #     if api_key is None:
+        #         api_key = os.getenv("Q_NEB_TOK")
+        #         if not api_key:
+        #             raise ValueError("No API Key found for HuggingFace. Please set Q_NEB_TOK or pass api_key.")
+        #     
+        #     if self.verbose:
+        #         print(f"Using Hugging Face token: {api_key[:5]}... (HfApiModel mode)")
+        #         
+        #     self.model = HfApiModel(
+        #         model_id=model_id or "Qwen/Qwen2.5-Coder-32B-Instruct", # précédemment : or "meta-llama/Llama-3-70B-Instruct",
+        #         token=api_key
+        #         # temperature=temperature
+        #     )
+        # el
+        if model_type == "InferenceClientModel":
             if api_key is None:
                 api_key = os.getenv("Q_NEB_TOK")
                 if not api_key:
@@ -62,6 +62,42 @@ class QAgent:
                 timeout=timeout or 120
                 # temperature=temperature
             )
+        elif model_type == "OpenAIServerModel":
+            print(f"Trying to configure OpenAIServerModel.")
+            # Check for xAI API key and base URL first
+            xai_api_key = os.getenv("XAI_API_KEY")
+            # xai_api_base = os.getenv("XAI_API_BASE") # Ne sais pas à quoi ça sert..
+            
+            # If xAI credentials are available, use them
+            if xai_api_key and api_key is None:
+                api_key = xai_api_key
+                if self.verbose:
+                    print(f"Using xAI API key: {api_key[:5]}...")
+            
+            # If no API key specified, fall back to OPENAI_API_KEY
+            if api_key is None:
+                api_key = os.getenv("Q_OAI_TOK")
+                if not api_key:
+                    raise ValueError("No OpenAI API key provided. Please set Q_OAI_TOK or XAI_API_KEY environment variable or pass api_key parameter.")
+            
+            # If xAI API base is available and no api_base is provided, use it
+            if xai_api_base and api_base is None:
+                api_base = xai_api_base
+                if self.verbose:
+                    print(f"Using xAI API base URL: {api_base}")
+            
+            # If no API base specified but environment variable available, use it
+            if api_base is None:
+                api_base = os.getenv("AGENT_API_BASE")
+                if api_base and self.verbose:
+                    print(f"Using API base from AGENT_API_BASE: {api_base}")
+            
+            self.model = OpenAIServerModel(
+                model_id=model_id or "gpt-4o",
+                api_key=api_key,
+                # api_base=api_base,
+                temperature=temperature
+            )
         else:
             raise ValueError(f"Unknown model type: {model_type}")