feature/error-handling

src/api_client.py

@@ -1,13 +1,18 @@
 """HTTP client for the Cube.js API of Indicateurs Territoriaux."""
 
+import asyncio
 import os
-from typing import Any
+from typing import Any, Literal
 
 import httpx
 from dotenv import load_dotenv
 
 load_dotenv()
 
+_MAX_ATTEMPTS = 3
+_BACKOFF_SECONDS = (0.5, 1.0, 2.0)
+_RETRYABLE_STATUS = frozenset({502, 503, 504})
+
 
 class CubeJsClientError(Exception):
     """Base exception for Cube.js client errors."""
@@ -123,6 +128,46 @@ class CubeJsClient:
         
         return response.json()
 
+    async def _request(
+        self,
+        method: Literal["GET", "POST"],
+        path: str,
+        **kwargs: Any,
+    ) -> dict[str, Any]:
+        client = await self._get_client()
+
+        for attempt in range(_MAX_ATTEMPTS):
+            try:
+                response = await client.request(method, path, **kwargs)
+            except httpx.TimeoutException as e:
+                if attempt < _MAX_ATTEMPTS - 1:
+                    await asyncio.sleep(_BACKOFF_SECONDS[attempt])
+                    continue
+                raise CubeJsClientError(
+                    f"Indicators API did not respond within {self.timeout}s"
+                ) from e
+            except httpx.ConnectError as e:
+                if attempt < _MAX_ATTEMPTS - 1:
+                    await asyncio.sleep(_BACKOFF_SECONDS[attempt])
+                    continue
+                raise CubeJsClientError("Indicators API unreachable") from e
+            except httpx.HTTPError as e:
+                if attempt < _MAX_ATTEMPTS - 1:
+                    await asyncio.sleep(_BACKOFF_SECONDS[attempt])
+                    continue
+                raise CubeJsClientError(f"Indicators API network error: {e}") from e
+
+            if (
+                response.status_code in _RETRYABLE_STATUS
+                and attempt < _MAX_ATTEMPTS - 1
+            ):
+                await asyncio.sleep(_BACKOFF_SECONDS[attempt])
+                continue
+
+            return await self._handle_response(response)
+
+        raise CubeJsClientError("Indicators API unavailable")
+
     async def get_meta(self) -> dict[str, Any]:
         """Fetch the API schema metadata.
         
@@ -136,9 +181,7 @@ class CubeJsClient:
             AuthenticationError: If authentication fails.
             CubeJsClientError: For other API errors.
         """
-        client = await self._get_client()
-        response = await client.get("/cubejs-api/v1/meta")
-        return await self._handle_response(response)
+        return await self._request("GET", "/cubejs-api/v1/meta")
 
     async def load(self, query: dict[str, Any]) -> dict[str, Any]:
         """Execute a data query against the Cube.js API.
@@ -163,12 +206,11 @@ class CubeJsClient:
             ... }
             >>> result = await client.load(query)
         """
-        client = await self._get_client()
-        response = await client.post(
+        return await self._request(
+            "POST",
             "/cubejs-api/v1/load",
             json={"query": query},
         )
-        return await self._handle_response(response)
 
     async def load_indicators_metadata(
         self,

src/tools.py

@@ -16,6 +16,8 @@ from dataclasses import dataclass, field
 from functools import wraps
 from typing import Any, Callable
 
+import httpx
+
 from .api_client import get_client, CubeJsClientError
 from .cache import fold_text, get_cache, initialize_cache, refresh_cache_if_needed
 from .cube_resolver import get_resolver
@@ -285,7 +287,7 @@ async def _ensure_cache_initialized() -> str | None:
             await refresh_cache_if_needed()
     except ValueError as e:  # missing token
         return _error(f"Server misconfigured: {e}")
-    except CubeJsClientError as e:
+    except (CubeJsClientError, httpx.HTTPError) as e:
         if cache.is_initialized:
             return None  # stale cache is better than no answer
         return _error(f"Indicators API unavailable: {e}", hint="Retry in a few seconds.")
@@ -416,7 +418,7 @@ async def get_indicator_details(indicator_id: str) -> str:
             src = SourceMetadata.from_api_response(row).model_dump(exclude_none=True)
             src.pop("id_indicateur", None)
             sources.append(src)
-    except CubeJsClientError as e:
+    except (CubeJsClientError, httpx.HTTPError) as e:
         sources_warning = f"Could not fetch sources: {e}"
 
     metadata = {
@@ -534,7 +536,7 @@ async def query_indicator_data(
     try:
         result = await client.load(query)
         data_rows = result.get("data", [])
-    except CubeJsClientError as e:
+    except (CubeJsClientError, httpx.HTTPError) as e:
         return _error(f"Query failed: {e}", cube=cube_name)
 
     data_points = [
@@ -631,7 +633,7 @@ async def find_territory(name: str, geographic_level: str = "") -> str:
                 rows = await client.find_territories(
                     cube_name, patterns["geocode"], patterns["libelle"], search, limit=TERRITORY_MAX * 3
                 )
-            except CubeJsClientError as e:
+            except (CubeJsClientError, httpx.HTTPError) as e:
                 warnings.append(f"{lv}: lookup failed ({e})")
                 continue
             geocode_dim = f"{cube_name}.{patterns['geocode']}"