http client is now a separate module, refactor and update tests

Author: purificant

src/bubble_data_api_client/http_client.py

@@ -0,0 +1,27 @@
+"""HTTP client factory for Bubble Data API."""
+
+import httpx
+
+DEFAULT_USER_AGENT = "bubble-data-api-client"
+DEFAULT_TIMEOUT_SECONDS = 60.0
+DEFAULT_RETRY_COUNT = 3
+
+
+def httpx_client_factory(
+    *,
+    base_url: str,
+    api_key: str,
+    user_agent: str = DEFAULT_USER_AGENT,
+    timeout: float = DEFAULT_TIMEOUT_SECONDS,
+    retries: int = DEFAULT_RETRY_COUNT,
+) -> httpx.AsyncClient:
+    """Create a configured async HTTP client for the Bubble Data API."""
+    return httpx.AsyncClient(
+        base_url=base_url,
+        headers={
+            "Authorization": f"Bearer {api_key}",
+            "User-Agent": user_agent,
+        },
+        transport=httpx.AsyncHTTPTransport(retries=retries),
+        timeout=httpx.Timeout(timeout),
+    )

src/bubble_data_api_client/pool.py

@@ -10,7 +10,7 @@
 
 from bubble_data_api_client.config import get_config
 from bubble_data_api_client.exceptions import ConfigurationError
-from bubble_data_api_client.transport import httpx_client_factory
+from bubble_data_api_client.http_client import httpx_client_factory
 
 # global client pool keyed by config
 _clients: dict[tuple[str, str], httpx.AsyncClient] = {}

src/bubble_data_api_client/transport.py

@@ -1,33 +1,23 @@
+"""HTTP transport layer for Bubble Data API requests."""
+
 import types
 import typing
 
 import httpx
 
-DEFAULT_USER_AGENT = "bubble-data-api-client"
+from bubble_data_api_client.pool import get_client
 
 
-def httpx_client_factory(
-    base_url: str,
-    api_key: str,
-) -> httpx.AsyncClient:
-    return httpx.AsyncClient(
-        base_url=base_url,
-        headers={
-            "Authorization": f"Bearer {api_key}",
-            "User-Agent": DEFAULT_USER_AGENT,
-        },
-        transport=httpx.AsyncHTTPTransport(retries=3),
-        timeout=httpx.Timeout(60.0),
-    )
+class Transport:
+    """Async context manager for HTTP operations.
 
+    Responsibilities:
+    - Obtains a pooled httpx client on entry
+    - Provides HTTP verb methods (get, post, patch, put, delete)
+    - Raises on non-2xx responses
 
-class Transport:
-    """
-    Transport layer focuses on HTTP.
-    - authentication, headers, retries, timeouts: configured via httpx_client_factory
-    - connection lifecycle: managed by pool module
-    - HTTP verb methods: get, post, patch, put, delete
-    - error handling: raise_for_status on responses
+    HTTP client configuration (headers, retries, timeouts) is handled by
+    the http_client module. Connection pooling is handled by the pool module.
     """
 
     _http: httpx.AsyncClient
@@ -36,9 +26,6 @@ def __init__(self) -> None:
         pass
 
     async def __aenter__(self) -> typing.Self:
-        # deferred import to avoid circular dependency: pool imports transport
-        from bubble_data_api_client.pool import get_client
-
         self._http = get_client()
         return self
 

src/tests/conftest.py

@@ -9,6 +9,7 @@
 
 from bubble_data_api_client import configure, settings  # noqa: E402
 from bubble_data_api_client.client import raw_client  # noqa: E402
+from bubble_data_api_client.pool import close_clients  # noqa: E402
 
 
 @pytest.fixture
@@ -22,7 +23,7 @@ def test_api_key() -> str:
 
 
 @pytest.fixture(autouse=True)
-def auto_configure_client():
+async def auto_configure_client() -> AsyncGenerator[None]:
     """Automatically configure the client for every test run."""
     if not settings.BUBBLE_DATA_API_ROOT_URL:
         raise RuntimeError("BUBBLE_DATA_API_ROOT_URL")
@@ -34,19 +35,15 @@ def auto_configure_client():
         api_key=settings.BUBBLE_API_KEY,
     )
 
+    yield
+
+    await close_clients()
+
 
 @pytest.fixture
 async def bubble_raw_client() -> AsyncGenerator[raw_client.RawClient]:
     """Provide a raw client for testing the low-level API."""
-    if not settings.BUBBLE_DATA_API_ROOT_URL:
-        raise RuntimeError("BUBBLE_DATA_API_ROOT_URL")
-    if not settings.BUBBLE_API_KEY:
-        raise RuntimeError("BUBBLE_API_KEY")
-
-    async with raw_client.RawClient(
-        data_api_root_url=settings.BUBBLE_DATA_API_ROOT_URL,
-        api_key=settings.BUBBLE_API_KEY,
-    ) as client_instance:
+    async with raw_client.RawClient() as client_instance:
         yield client_instance
 
 

src/tests/unit/client/test_raw_client.py

@@ -1,23 +1,16 @@
 from bubble_data_api_client.client import raw_client
 
 
-async def test_raw_client_init(test_url: str, test_api_key: str):
-    """Test that client is instantiated."""
-
+async def test_raw_client_init() -> None:
+    """Test that RawClient can be instantiated and used as context manager."""
     # test creating an instance
-    client = raw_client.RawClient(
-        data_api_root_url=test_url,
-        api_key=test_api_key,
-    )
+    client = raw_client.RawClient()
     assert isinstance(client, raw_client.RawClient)
 
     # test async context manager
     async with client as client_instance:
         assert isinstance(client_instance, raw_client.RawClient)
 
     # test creating with async context manager
-    async with raw_client.RawClient(
-        data_api_root_url=test_url,
-        api_key=test_api_key,
-    ) as client_instance:
+    async with raw_client.RawClient() as client_instance:
         assert isinstance(client_instance, raw_client.RawClient)

src/tests/unit/test_transport.py

@@ -1,14 +1,15 @@
 import httpx
 
-from bubble_data_api_client import transport
+from bubble_data_api_client import http_client
 
 
-def test_httpx_client_factory(test_url: str, test_api_key: str):
-    """Test that http client is instantiated."""
-    httpx_client = transport.httpx_client_factory(
+def test_httpx_client_factory(test_url: str, test_api_key: str) -> None:
+    """Test that HTTP client is instantiated with correct configuration."""
+    client = http_client.httpx_client_factory(
         base_url=test_url,
         api_key=test_api_key,
     )
-    assert isinstance(httpx_client, httpx.AsyncClient)
-    assert httpx_client.base_url == test_url
-    assert httpx_client.headers["Authorization"] == f"Bearer {test_api_key}"
+    assert isinstance(client, httpx.AsyncClient)
+    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