Updated integration with Google Gemini AI, replacing the library with the new google-genai. Added new AI models, updated provider configuration, and improved query processing. Fixed bugs in response generation and logging. Changed default values for models in the configuration. Testing was successful.

ai_client.py

@@ -21,8 +21,8 @@ from ai_providers_config import (
 
 # Import provider-specific clients
 try:
-    import google.generativeai as genai
-    from google.generativeai import types
+    import google.genai as genai
+    from google.genai import types
     GEMINI_AVAILABLE = True
 except ImportError:
     GEMINI_AVAILABLE = False
@@ -93,52 +93,66 @@ class BaseAIClient(ABC):
         logger.info(log_message)
 
 class GeminiClient(BaseAIClient):
-    """Google Gemini AI client"""
+    """Google Gemini AI client using the new google-genai library"""
     
     def __init__(self, model: AIModel, temperature: float = 0.3):
         super().__init__(AIProvider.GEMINI, model, temperature)
         
         if not GEMINI_AVAILABLE:
-            raise ImportError("Google Generative AI library not available. Install with: pip install google-generativeai")
-        
+            raise ImportError("Google GenAI library not available. Install with: pip install google-genai")
+            
         api_key = os.getenv("GEMINI_API_KEY")
         if not api_key:
             raise ValueError("GEMINI_API_KEY environment variable not set")
             
         self.client = genai.Client(api_key=api_key)
+        self.model_name = model.value
         
     def generate_response(self, system_prompt: str, user_prompt: str, temperature: Optional[float] = None) -> str:
-        """Generate response from Gemini"""
-        temp = temperature if temperature is not None else self.temperature
-        
+        """Generate response from Gemini using the new API"""
+        if temperature is None:
+            temperature = self.temperature
+            
         try:
+            # Prepare the content parts
             contents = [
                 types.Content(
                     role="user",
                     parts=[types.Part.from_text(text=user_prompt)],
-                ),
+                )
             ]
             
+            # Configure generation settings
             config = types.GenerateContentConfig(
-                temperature=temp,
-                system_instruction=[
-                    types.Part.from_text(text=system_prompt),
-                ],
+                temperature=temperature,
+                thinking_config=types.ThinkingConfig(thinking_budget=0),
             )
             
-            response = ""
+            # Add system prompt if provided
+            if system_prompt:
+                config.system_instruction = [
+                    types.Part.from_text(text=system_prompt)
+                ]
+            
+            # Generate the response
+            response_text = ""
             for chunk in self.client.models.generate_content_stream(
-                model=self.model.value,
+                model=self.model_name,
                 contents=contents,
                 config=config,
             ):
-                response += chunk.text
+                if chunk.text:
+                    response_text += chunk.text
             
-            response = response.strip()
-            return response
+            # Log the interaction
+            self._log_interaction(system_prompt, user_prompt, response_text, "gemini")
+            
+            return response_text
             
         except Exception as e:
-            raise RuntimeError(f"Gemini API error: {str(e)}")
+            error_msg = f"Gemini API error: {str(e)}"
+            logging.error(error_msg)
+            raise RuntimeError(error_msg) from e
 
 class AnthropicClient(BaseAIClient):
     """Anthropic Claude AI client"""

ai_providers_config.py

@@ -19,11 +19,13 @@ class AIModel(Enum):
     """Supported AI models"""
     # Gemini models
     GEMINI_2_5_FLASH = "gemini-2.5-flash"
+    GEMINI_2_0_FLASH = "gemini-2.0-flash"
     GEMINI_2_5_PRO = "gemini-2.5-pro"
     GEMINI_1_5_PRO = "gemini-1.5-pro"
     
     # Anthropic models
     CLAUDE_SONNET_4 = "claude-sonnet-4-20250514"
+    CLAUDE_SONNET_3_7 = "claude-3-7-sonnet-20250219"
     CLAUDE_SONNET_3_5 = "claude-3-5-sonnet-20241022"
     CLAUDE_HAIKU_3_5 = "claude-3-5-haiku-20241022"
 
@@ -31,11 +33,12 @@ class AIModel(Enum):
 PROVIDER_CONFIGS = {
     AIProvider.GEMINI: {
         "api_key_env": "GEMINI_API_KEY",
-        "default_model": AIModel.GEMINI_2_5_FLASH,
+        "default_model": AIModel.GEMINI_2_0_FLASH,
         "default_temperature": 0.3,
         "max_tokens": None,  # Gemini handles this automatically
         "available_models": [
             AIModel.GEMINI_2_5_FLASH,
+            AIModel.GEMINI_2_0_FLASH,
             AIModel.GEMINI_2_5_PRO,
             AIModel.GEMINI_1_5_PRO
         ]
@@ -47,6 +50,7 @@ PROVIDER_CONFIGS = {
         "max_tokens": 20000,
         "available_models": [
             AIModel.CLAUDE_SONNET_4,
+            AIModel.CLAUDE_SONNET_3_7,
             AIModel.CLAUDE_SONNET_3_5,
             AIModel.CLAUDE_HAIKU_3_5
         ]
@@ -59,42 +63,42 @@ AGENT_CONFIGURATIONS = {
     "MainLifestyleAssistant": {
         "provider": AIProvider.ANTHROPIC,
         "model": AIModel.CLAUDE_SONNET_4,
-        "temperature": 0.3,
+        "temperature": 0.2,
         "reasoning": "Complex lifestyle coaching requires advanced reasoning capabilities"
     },
     
     # All other agents use Google Gemini
     "EntryClassifier": {
         "provider": AIProvider.GEMINI,
-        "model": AIModel.GEMINI_2_5_FLASH,
+        "model": AIModel.GEMINI_2_0_FLASH,
         "temperature": 0.1,
         "reasoning": "Fast classification task, optimized for speed"
     },
     
     "TriageExitClassifier": {
         "provider": AIProvider.GEMINI,
-        "model": AIModel.GEMINI_2_5_FLASH,
+        "model": AIModel.GEMINI_2_0_FLASH,
         "temperature": 0.2,
         "reasoning": "Medical triage decisions require consistency"
     },
     
     "MedicalAssistant": {
-        "provider": AIProvider.GEMINI,
-        "model": AIModel.GEMINI_2_5_PRO,
+        "provider": AIProvider.ANTHROPIC,
+        "model": AIModel.CLAUDE_SONNET_4,
         "temperature": 0.2,
         "reasoning": "Medical guidance requires reliable, consistent responses"
     },
     
     "SoftMedicalTriage": {
         "provider": AIProvider.GEMINI,
-        "model": AIModel.GEMINI_2_5_FLASH,
+        "model": AIModel.GEMINI_2_0_FLASH,
         "temperature": 0.3,
         "reasoning": "Gentle triage can use faster model"
     },
     
     "LifestyleProfileUpdater": {
         "provider": AIProvider.GEMINI,
-        "model": AIModel.GEMINI_2_5_PRO,
+        "model": AIModel.GEMINI_2_5_FLASH,
         "temperature": 0.2,
         "reasoning": "Profile analysis requires detailed processing"
     }