add optional retry

Author: purificant

src/bubble_data_api_client/__init__.py

@@ -1,4 +1,16 @@
-from bubble_data_api_client.config import configure, set_config_provider
+from bubble_data_api_client.config import (
+    BubbleConfig,
+    ConfigProvider,
+    configure,
+    set_config_provider,
+)
 from bubble_data_api_client.pool import client_scope, close_clients
 
-__all__ = ["configure", "set_config_provider", "client_scope", "close_clients"]
+__all__ = [
+    "BubbleConfig",
+    "ConfigProvider",
+    "configure",
+    "set_config_provider",
+    "client_scope",
+    "close_clients",
+]

src/bubble_data_api_client/config.py

@@ -4,13 +4,6 @@
 import tenacity
 
 
-class BubbleConfigError(RuntimeError):
-    """Raised when Bubble API is not configured."""
-
-    def __init__(self) -> None:
-        super().__init__("Bubble API not configured. Call configure() first.")
-
-
 class _NotSet:
     """Sentinel for configuration values that were not provided."""
 
@@ -39,7 +32,7 @@ class BubbleConfig(TypedDict):
 
 type ConfigProvider = Callable[[], BubbleConfig]
 
-_static_config: BubbleConfig | None = None
+_static_config: BubbleConfig = {"data_api_root_url": "", "api_key": ""}
 _config_provider: ConfigProvider | None = None
 
 
@@ -69,6 +62,4 @@ def get_config() -> BubbleConfig:
     """Get current configuration from provider if set, otherwise static config."""
     if _config_provider is not None:
         return _config_provider()
-    if _static_config is None:
-        raise BubbleConfigError
     return _static_config

src/bubble_data_api_client/pool.py

@@ -3,12 +3,12 @@
 import asyncio
 import atexit
 import threading
-from collections.abc import AsyncIterator, Mapping
+from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
 
 import httpx
 
-from bubble_data_api_client.config import get_config
+from bubble_data_api_client.config import BubbleConfig, get_config
 from bubble_data_api_client.exceptions import ConfigurationError
 from bubble_data_api_client.http_client import httpx_client_factory
 
@@ -17,11 +17,9 @@
 _lock = threading.Lock()
 
 
-def _make_client_key(config: Mapping[str, str | None]) -> tuple[str, str]:
+def _make_client_key(config: BubbleConfig) -> tuple[str, str]:
     """Generate a unique key for client pooling based on config."""
-    base_url = config.get("data_api_root_url") or ""
-    api_key = config.get("api_key") or ""
-    return (base_url, api_key)
+    return (config["data_api_root_url"], config["api_key"])
 
 
 def get_client() -> httpx.AsyncClient:
@@ -37,10 +35,10 @@ def get_client() -> httpx.AsyncClient:
     with _lock:
         # double-check after acquiring lock
         if key not in _clients:
-            base_url = config.get("data_api_root_url")
+            base_url = config["data_api_root_url"]
             if not base_url:
                 raise ConfigurationError("data_api_root_url")
-            api_key = config.get("api_key")
+            api_key = config["api_key"]
             if not api_key:
                 raise ConfigurationError("api_key")
             _clients[key] = httpx_client_factory(base_url=base_url, api_key=api_key)

src/bubble_data_api_client/transport.py

@@ -5,6 +5,7 @@
 
 import httpx
 
+from bubble_data_api_client.config import get_config
 from bubble_data_api_client.pool import get_client
 
 
@@ -47,16 +48,22 @@ async def request(
         params: dict[str, str] | None = None,
         headers: dict[str, str] | None = None,
     ) -> httpx.Response:
-        response: httpx.Response = await self._http.request(
-            method=method,
-            url=url,
-            content=content,
-            json=json,
-            params=params,
-            headers=headers,
-        )
-        response.raise_for_status()
-        return response
+        async def do_request() -> httpx.Response:
+            response: httpx.Response = await self._http.request(
+                method=method,
+                url=url,
+                content=content,
+                json=json,
+                params=params,
+                headers=headers,
+            )
+            response.raise_for_status()
+            return response
+
+        retry = get_config().get("retry")
+        if retry is not None:
+            return await retry(do_request)
+        return await do_request()
 
     async def get(
         self,

src/tests/unit/test_transport.py

@@ -1,6 +1,21 @@
+from collections.abc import AsyncGenerator
+
 import httpx
+import pytest
+import respx
+import tenacity
+
+from bubble_data_api_client import configure, http_client
+from bubble_data_api_client.pool import close_clients
+from bubble_data_api_client.transport import Transport
+
 
-from bubble_data_api_client import http_client
+@pytest.fixture
+async def clean_client_pool() -> AsyncGenerator[None]:
+    """Ensure client pool is clean before and after each test."""
+    await close_clients()
+    yield
+    await close_clients()
 
 
 def test_httpx_client_factory(test_url: str, test_api_key: str) -> None:
@@ -13,3 +28,72 @@ def test_httpx_client_factory(test_url: str, test_api_key: str) -> None:
     assert client.base_url == test_url
     assert client.headers["Authorization"] == f"Bearer {test_api_key}"
     assert client.headers["User-Agent"] == http_client.DEFAULT_USER_AGENT
+
+
+@respx.mock
+async def test_transport_no_retry_fails_immediately(clean_client_pool: None) -> None:
+    """Test that request fails immediately when no retry is configured."""
+    configure(
+        data_api_root_url="https://test.example.com",
+        api_key="test-key",
+        retry=None,
+    )
+
+    route = respx.get("https://test.example.com/test").mock(return_value=httpx.Response(500))
+
+    async with Transport() as transport:
+        with pytest.raises(httpx.HTTPStatusError) as exc_info:
+            await transport.get("/test")
+        assert exc_info.value.response.status_code == 500
+
+    assert route.call_count == 1
+
+
+@respx.mock
+async def test_transport_retry_succeeds_after_failures(clean_client_pool: None) -> None:
+    """Test that request retries and succeeds after transient failures."""
+    configure(
+        data_api_root_url="https://test.example.com",
+        api_key="test-key",
+        retry=tenacity.AsyncRetrying(
+            stop=tenacity.stop_after_attempt(3),
+            wait=tenacity.wait_none(),
+            retry=tenacity.retry_if_exception_type(httpx.HTTPStatusError),
+        ),
+    )
+
+    route = respx.get("https://test.example.com/test").mock(
+        side_effect=[
+            httpx.Response(500),
+            httpx.Response(500),
+            httpx.Response(200, json={"result": "ok"}),
+        ]
+    )
+
+    async with Transport() as transport:
+        response = await transport.get("/test")
+        assert response.status_code == 200
+
+    assert route.call_count == 3
+
+
+@respx.mock
+async def test_transport_retry_exhausted(clean_client_pool: None) -> None:
+    """Test that RetryError is raised when all retry attempts fail."""
+    configure(
+        data_api_root_url="https://test.example.com",
+        api_key="test-key",
+        retry=tenacity.AsyncRetrying(
+            stop=tenacity.stop_after_attempt(3),
+            wait=tenacity.wait_none(),
+            retry=tenacity.retry_if_exception_type(httpx.HTTPStatusError),
+        ),
+    )
+
+    route = respx.get("https://test.example.com/test").mock(return_value=httpx.Response(500))
+
+    async with Transport() as transport:
+        with pytest.raises(tenacity.RetryError):
+            await transport.get("/test")
+
+    assert route.call_count == 3