requests->httpx

Author: mewwts

dune_client/api/base.py

@@ -11,9 +11,8 @@
 from json import JSONDecodeError
 from typing import IO, TYPE_CHECKING, Any
 
+import httpx
 from deprecated import deprecated
-from requests import Response, Session
-from requests.adapters import HTTPAdapter, Retry
 
 from dune_client.util import get_package_version
 
@@ -53,17 +52,14 @@ def __init__(
         self.performance = performance
         self.logger = logging.getLogger(__name__)
         logging.basicConfig(format="%(asctime)s %(levelname)s %(name)s %(message)s")
-        retry_strategy = Retry(
-            total=5,
-            backoff_factor=0.5,
-            status_forcelist={429, 502, 503, 504},
-            allowed_methods={"GET", "POST", "PATCH"},
-            raise_on_status=True,
+
+        # Configure retry transport for httpx
+        transport = httpx.HTTPTransport(retries=5)
+        self.http = httpx.Client(
+            base_url=base_url,
+            timeout=request_timeout,
+            transport=transport,
         )
-        adapter = HTTPAdapter(max_retries=retry_strategy)
-        self.http = Session()
-        self.http.mount("https://", adapter)
-        self.http.mount("http://", adapter)
 
     @classmethod
     @deprecated(
@@ -140,7 +136,7 @@ def _build_parameters(
 class BaseRouter(BaseDuneClient):
     """Extending the Base Client with elementary api routing"""
 
-    def _handle_response(self, response: Response) -> Any:
+    def _handle_response(self, response: httpx.Response) -> Any:
         """Generic response handler utilized by all Dune API routes"""
         try:
             # Some responses can be decoded and converted to DuneErrors
@@ -158,13 +154,12 @@ def _handle_response(self, response: Response) -> Any:
 
     def _route_url(self, route: str | None = None, url: str | None = None) -> str:
         if route is not None:
-            final_url = f"{self.base_url}{self.api_version}{route}"
-        elif url is not None:
-            final_url = url
-        else:
-            assert route is not None or url is not None
-
-        return final_url
+            # Return relative path - httpx.Client will prepend base_url
+            return f"{self.api_version}{route}"
+        if url is not None:
+            # Absolute URL provided (e.g., for pagination next_uri)
+            return url
+        raise ValueError("Either route or url must be provided")
 
     def _get(
         self,
@@ -197,12 +192,12 @@ def _post(
         """Generic interface for the POST method of a Dune API request"""
         url = self._route_url(route)
         self.logger.debug(f"POST received input url={url}, params={params}")
+        merged_headers = dict(self.default_headers(), **headers if headers else {})
         response = self.http.post(
             url=url,
             json=params,
-            headers=dict(self.default_headers(), **headers if headers else {}),
-            timeout=self.request_timeout,
-            data=data,
+            headers=merged_headers,
+            content=data,
         )
         return self._handle_response(response)
 
@@ -214,7 +209,6 @@ def _patch(self, route: str, params: Any) -> Any:
             url=url,
             json=params,
             headers=self.default_headers(),
-            timeout=self.request_timeout,
         )
         return self._handle_response(response)
 
@@ -225,6 +219,5 @@ def _delete(self, route: str) -> Any:
         response = self.http.delete(
             url=url,
             headers=self.default_headers(),
-            timeout=self.request_timeout,
         )
         return self._handle_response(response)

dune_client/api/execution.py

@@ -131,8 +131,6 @@ def _get_execution_results_by_url(
         """
         GET results from Dune API with a given URL. This is particularly useful for pagination.
         """
-        assert url.startswith(self.base_url)
-
         response_json = self._get(url=url, params=params)
         try:
             result = ResultsResponse.from_dict(response_json)
@@ -159,8 +157,6 @@ def _get_execution_results_csv_by_url(
         use this method for large results where you want lower CPU and memory overhead
         if you need metadata information use get_results() or get_status()
         """
-        assert url.startswith(self.base_url)
-
         response = self._get(url=url, params=params, raw=True)
         response.raise_for_status()
         next_uri = response.headers.get(DUNE_CSV_NEXT_URI_HEADER)

pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
     "aiohttp~=3.12.15",
     "dataclasses-json~=0.6.4",
     "python-dateutil~=2.9.0",
-    "requests~=2.32.5",
+    "httpx~=0.28.1",
     "ndjson~=0.3.1",
     "Deprecated~=1.2.18",
 ]
@@ -43,7 +43,6 @@ dev = [
     "tox-uv>=1.28.0",
     # Type stubs
     "types-python-dateutil>=2.8.19.14",
-    "types-requests>=2.28.0",
     "types-Deprecated>=1.2.9.3",
     # Optional features
     "pandas>=1.0.0",

tests/e2e/test_client.py

@@ -4,9 +4,9 @@
 import warnings
 from pathlib import Path
 
+import httpx
 import pandas as pd
 import pytest
-from requests.exceptions import HTTPError
 
 from dune_client.client import DuneClient
 from dune_client.models import (
@@ -162,13 +162,13 @@ def test_cancel_execution(self):
 
     def test_invalid_api_key_error(self):
         dune = DuneClient(api_key="Invalid Key")
-        with pytest.raises(HTTPError) as err:
+        with pytest.raises(httpx.HTTPStatusError) as err:
             dune.execute_query(self.query)
         assert err.value.response.status_code == 401
-        with pytest.raises(HTTPError) as err:
+        with pytest.raises(httpx.HTTPStatusError) as err:
             dune.get_execution_status("wonky job_id")
         assert err.value.response.status_code == 401
-        with pytest.raises(HTTPError) as err:
+        with pytest.raises(httpx.HTTPStatusError) as err:
             dune.get_execution_results("wonky job_id")
         assert err.value.response.status_code == 401
 
@@ -177,7 +177,7 @@ def test_query_not_found_error(self):
         query = copy.copy(self.query)
         query.query_id = 99999999  # Invalid Query Id.
 
-        with pytest.raises(HTTPError) as err:
+        with pytest.raises(httpx.HTTPStatusError) as err:
             dune.execute_query(query)
         assert err.value.response.status_code == 404
 
@@ -187,13 +187,13 @@ def test_internal_error(self):
         # This query ID is too large!
         query.query_id = 9999999999999
 
-        with pytest.raises(HTTPError) as err:
+        with pytest.raises(httpx.HTTPStatusError) as err:
             dune.execute_query(query)
         assert err.value.response.status_code == 500
 
     def test_invalid_job_id_error(self):
         dune = DuneClient()
-        with pytest.raises(HTTPError) as err:
+        with pytest.raises(httpx.HTTPStatusError) as err:
             dune.get_execution_status("Wonky Job ID")
         assert err.value.response.status_code == 400
 
@@ -246,7 +246,7 @@ def test_create_table_error(self):
 
         namespace = "test"
         table_name = "table"
-        with pytest.raises(HTTPError) as err:
+        with pytest.raises(httpx.HTTPStatusError) as err:
             client.create_table(
                 namespace=namespace,
                 table_name=table_name,

tests/unit/test_utils.py

@@ -6,9 +6,9 @@
 
 class TestUtils(unittest.TestCase):
     def test_package_version_some(self):
-        version_string = get_package_version("requests")
+        version_string = get_package_version("httpx")
         parsed_version = list(map(int, version_string.split(".")))
-        assert parsed_version >= [2, 31, 0]
+        assert parsed_version >= [0, 28, 0]
 
     def test_package_version_none(self):
         # Can't self refer (this should only work when user has dune-client installed).