.......

app.py

@@ -273,9 +273,11 @@ class CacheManager:
 class SearchProvider(ABC):
     def __init__(self, config_dict: Dict):
         self.provider_config = config_dict.get('search', {})
-        self._enabled = False
-        self._quota_limit = self.provider_config.get("quota_limit", float('inf'))
+        self._enabled = False  # Initial default
         self._quota_used = 0
+        # This call to self.provider_name will invoke the subclass's implementation.
+        raw_quota = self.provider_config.get(f'{self.provider_name.lower()}_quota', float('inf'))
+        self._quota_limit = float(raw_quota) if raw_quota is not None else float('inf')
 
     @property
     @abstractmethod
@@ -309,7 +311,7 @@ class GoogleProvider(SearchProvider):
         return "Google"
 
     def __init__(self, config_dict: Dict):
-        super().__init__(config_dict)
+        super().__init__(config_dict)  # Sets self._enabled = False initially via SearchProvider
         self._api_key = self.provider_config.get("google_api_key")
         self._cse_id = self.provider_config.get("google_cse_id")
         self._timeout = self.provider_config.get("google_timeout", 8)
@@ -317,7 +319,7 @@ class GoogleProvider(SearchProvider):
             self._enabled = True
             gaia_logger.info(f"✓ {self.provider_name} API configured.")
         else:
-            self._enabled = False
+            self._enabled = False # Explicitly ensure it's false if keys are missing
             gaia_logger.warning(f"✗ {self.provider_name} API key/CSE ID missing in RAG config.")
 
     def _perform_search(self, query: str, max_results: int) -> Optional[List[Dict[str, str]]]:
@@ -361,33 +363,32 @@ class TavilyProvider(SearchProvider):
         return "Tavily"
 
     def __init__(self, config_dict: Dict):
-        super().__init__(config_dict)
+        super().__init__(config_dict) # Sets self._enabled = False initially
         self._api_key = self.provider_config.get("tavily_api_key")
         self._search_depth = self.provider_config.get("tavily_depth", "basic")
         if self._api_key and TavilyClient:
-            self._enabled = True
-            gaia_logger.info(f"✓ {self.provider_name} API configured.")
+            try:
+                self._client = TavilyClient(api_key=self._api_key)
+                self._enabled = True
+                gaia_logger.info(f"✓ {self.provider_name} API initialized.")
+            except Exception as e:
+                self._enabled = False # Explicitly ensure it's false on init fail
+                gaia_logger.warning(f"✗ {self.provider_name} init fail: {e}", exc_info=False)
+        elif not TavilyClient:
+            self._enabled = False # Explicitly ensure it's false if lib missing
+            gaia_logger.warning(f"✗ {self.provider_name}: TavilyClient lib missing.")
         else:
-            self._enabled = False
-            gaia_logger.warning(f"✗ {self.provider_name} API key missing or TavilyClient not available in config.")
+            self._enabled = False # Explicitly ensure it's false if API key missing
+            gaia_logger.warning(f"✗ {self.provider_name}: API key missing in RAG config.")
 
     def _perform_search(self, query: str, max_results: int) -> Optional[List[Dict[str, str]]]:
-        if not self._enabled: 
-            return None
+        if not self._enabled: return None # Should be caught by SearchProvider.search, but good for safety
         try:
             response = self._client.search(query=query, max_results=max_results, search_depth=self._search_depth)
             hits = response.get('results', [])
-            if not hits:
-                gaia_logger.info(f"[{self.provider_name}] No results: '{query[:70]}'")
-                return []
-            return [{
-                'href': h.get('url'),
-                'title': h.get('title',''),
-                'body': h.get('content','')
-            } for h in hits]
-        except Exception as e:
-            gaia_logger.warning(f"[{self.provider_name}] Search fail: '{query[:70]}': {e}")
-            return None
+            if not hits: gaia_logger.info(f"[{self.provider_name}] No results: '{query[:70]}'"); return []
+            return [{'href': h.get('url'), 'title': h.get('title',''), 'body': h.get('content','')} for h in hits]
+        except Exception as e: gaia_logger.warning(f"[{self.provider_name}] Search fail: '{query[:70]}': {e}"); return None
 
 class DuckDuckGoProvider(SearchProvider):
     @property
@@ -395,34 +396,26 @@ class DuckDuckGoProvider(SearchProvider):
         return "DuckDuckGo"
 
     def __init__(self, config_dict: Dict):
-        super().__init__(config_dict)
+        super().__init__(config_dict) # Sets self._enabled = False initially
         if DDGS:
             try:
                 self._client = DDGS(timeout=10)
                 self._enabled = True
                 gaia_logger.info(f"✓ {self.provider_name} Search initialized.")
             except Exception as e:
+                self._enabled = False # Explicitly ensure it's false on init fail
                 gaia_logger.warning(f"✗ {self.provider_name} init fail: {e}", exc_info=False)
         else:
+            self._enabled = False # Explicitly ensure it's false if lib missing
             gaia_logger.warning(f"✗ {self.provider_name}: DDGS lib missing.")
-        self._quota_limit = float('inf')
 
     def _perform_search(self, query: str, max_results: int) -> Optional[List[Dict[str, str]]]:
-        if not self._enabled:
-            return None
+        if not self._enabled: return None # Should be caught by SearchProvider.search
         try:
             hits = list(self._client.text(query, region='wt-wt', max_results=max_results))[:max_results]
-            if not hits:
-                gaia_logger.info(f"[{self.provider_name}] No results: '{query[:70]}'")
-                return []
-            return [{
-                'href': r.get('href'),
-                'title': r.get('title',''),
-                'body': r.get('body','')
-            } for r in hits]
-        except Exception as e:
-            gaia_logger.warning(f"[{self.provider_name}] Search fail: '{query[:70]}': {e}")
-            return None
+            if not hits: gaia_logger.info(f"[{self.provider_name}] No results: '{query[:70]}'"); return []
+            return [{'href': r.get('href'), 'title': r.get('title',''), 'body': r.get('body','')} for r in hits]
+        except Exception as e: gaia_logger.warning(f"[{self.provider_name}] Search fail: '{query[:70]}': {e}"); return None
 
 class CompositeSearchClient:
     def __init__(self, config_dict: Dict):
@@ -681,7 +674,7 @@ class GaiaLevel1Agent:
         if genai and GOOGLE_GEMINI_API_KEY:
             try:
                 genai.configure(api_key=GOOGLE_GEMINI_API_KEY)
-                model_name = 'gemini-1.0-pro'
+                model_name = 'gemini-2.0-flash'
                 self.llm_model = genai.GenerativeModel(model_name)
                 gaia_logger.info(f"Gemini LLM ('{model_name}') initialized.")
             except Exception as e: