refactor SearchProvider and its subclasses for improved readability and consistency

app.py

@@ -270,56 +270,99 @@ class CacheManager:
     def __contains__(self, key): return key in self._cache and (time.time()-self._timestamps.get(key,0)<self.ttl)
 
 class SearchProvider(ABC):
-    def __init__(self, config_dict: Dict):
-        self.provider_config = config_dict.get('search', {})
-        self._enabled = False; self._quota_used = 0
-        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
-    def provider_name(self) -> str: pass
+    @property
+    @abstractmethod
+    def provider_name(self) -> str:
+        pass
+
     @abstractmethod
-    def _perform_search(self, query: str, max_results: int) -> Optional[List[Dict[str, str]]]: pass
+    def _perform_search(self, query: str, max_results: int) -> Optional[List[Dict[str, str]]]:
+        pass
+
     def search(self, query: str, max_results: int) -> Optional[List[Dict[str, str]]]:
-         if not self._enabled: gaia_logger.debug(f"[{self.provider_name}] Skip: Not enabled."); return None
-         if self._quota_limit != float('inf') and self._quota_used >= self._quota_limit:
-             gaia_logger.warning(f"[{self.provider_name}] Skip: Quota ({self._quota_used}/{int(self._quota_limit)})"); return None
-         usage_str = ""
-         if self._quota_limit != float('inf'): self._quota_used += 1; usage_str = f"({self._quota_used}/{int(self._quota_limit)}) "
-         gaia_logger.info(f"[{self.provider_name}] {usage_str}Search: '{query[:70]}...'")
-         return self._perform_search(query, max_results)
-    def available(self) -> bool: return self._enabled
+        if not self._enabled:
+            gaia_logger.debug(f"[{self.provider_name}] Skip: Not enabled.")
+            return None
+        if self._quota_limit != float('inf') and self._quota_used >= self._quota_limit:
+            gaia_logger.warning(f"[{self.provider_name}] Skip: Quota ({self._quota_used}/{int(self._quota_limit)})")
+            return None
+        usage_str = ""
+        if self._quota_limit != float('inf'):
+            self._quota_used += 1
+            usage_str = f"({self._quota_used}/{int(self._quota_limit)}) "
+        gaia_logger.info(f"[{self.provider_name}] {usage_str}Search: '{query[:70]}...'")
+        return self._perform_search(query, max_results)
+
+    def available(self) -> bool:
+        return self._enabled
 
 class GoogleProvider(SearchProvider):
-    @property def provider_name(self) -> str: return "Google"
+    @property
+    def provider_name(self) -> str:
+        return "Google"
+
     def __init__(self, config_dict: Dict):
         super().__init__(config_dict)
         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)
-        if self._api_key and self._cse_id: self._enabled = True; gaia_logger.info(f"✓ {self.provider_name} API configured.")
-        else: gaia_logger.warning(f"✗ {self.provider_name} API key/CSE ID missing in RAG config.")
+        if self._api_key and self._cse_id:
+            self._enabled = True
+            gaia_logger.info(f"✓ {self.provider_name} API configured.")
+        else:
+            self._enabled = False
+            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]]]:
         try:
-            params = {'key': self._api_key, 'cx': self._cse_id, 'q': query, 'num': max_results, 'safe': 'active'}
-            response = requests.get("https://www.googleapis.com/customsearch/v1", params=params, timeout=self._timeout)
-            response.raise_for_status(); data = response.json(); items = data.get('items', [])
-            if not items: gaia_logger.info(f"[{self.provider_name}] No results for '{query[:70]}'"); return []
-            return [{'href': i.get('link'), 'title': i.get('title',''), 'body': i.get('snippet','')} for i in items]
-        except requests.exceptions.Timeout: gaia_logger.warning(f"[{self.provider_name}] Timeout: '{query[:70]}'"); return None
-        except requests.exceptions.RequestException as e: gaia_logger.warning(f"[{self.provider_name}] RequestEx: '{query[:70]}': {e}"); return None
-        except Exception as e: gaia_logger.error(f"[{self.provider_name}] Error: '{query[:70]}': {e}", exc_info=True); return None
+            params = {
+                'key': self._api_key,
+                'cx': self._cse_id,
+                'q': query,
+                'num': max_results,
+                'safe': 'active'
+            }
+            response = requests.get(
+                "https://www.googleapis.com/customsearch/v1",
+                params=params,
+                timeout=self._timeout
+            )
+            response.raise_for_status()
+            data = response.json()
+            items = data.get('items', [])
+            if not items:
+                gaia_logger.info(f"[{self.provider_name}] No results for '{query[:70]}'")
+                return []
+            return [{
+                'href': i.get('link'),
+                'title': i.get('title', ''),
+                'body': i.get('snippet', '')
+            } for i in items]
+        except requests.exceptions.Timeout:
+            gaia_logger.warning(f"[{self.provider_name}] Timeout: '{query[:70]}'")
+            return None
+        except requests.exceptions.RequestException as e:
+            gaia_logger.warning(f"[{self.provider_name}] RequestEx: '{query[:70]}': {e}")
+            return None
+        except Exception as e:
+            gaia_logger.error(f"[{self.provider_name}] Error: '{query[:70]}': {e}", exc_info=True)
+            return None
 
 class TavilyProvider(SearchProvider):
-    @property def provider_name(self) -> str: return "Tavily"
+    @property
+    def provider_name(self) -> str:
+        return "Tavily"
+
     def __init__(self, config_dict: Dict):
         super().__init__(config_dict)
         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:
-            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: gaia_logger.warning(f"✗ {self.provider_name} init fail: {e}", exc_info=False)
-        elif not TavilyClient: gaia_logger.warning(f"✗ {self.provider_name}: TavilyClient lib missing.")
-        else: gaia_logger.warning(f"✗ {self.provider_name}: API key missing in RAG config.")
+            self._enabled = True
+            gaia_logger.info(f"✓ {self.provider_name} API configured.")
+        else:
+            self._enabled = False
+            gaia_logger.warning(f"✗ {self.provider_name} API key missing or TavilyClient not available in config.")
     def _perform_search(self, query: str, max_results: int) -> Optional[List[Dict[str, str]]]:
         if not self._enabled: return None
         try:
@@ -330,7 +373,9 @@ class TavilyProvider(SearchProvider):
         except Exception as e: gaia_logger.warning(f"[{self.provider_name}] Search fail: '{query[:70]}': {e}"); return None
 
 class DuckDuckGoProvider(SearchProvider):
-    @property def provider_name(self) -> str: return "DuckDuckGo"
+    @property
+    def provider_name(self) -> str:
+        return "DuckDuckGo"
     def __init__(self, config_dict: Dict):
         super().__init__(config_dict)
         if DDGS: