kiba-core 0.5.3.dev55__tar.gz → 0.5.3.dev57__tar.gz

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/CHANGELOG.md

@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ## [Unreleased]
 
 ### Added
+- [MAJOR] Replace `httpx` with `httpx2` for HTTP requests
+- [MINOR] Use `json_util`/`orjson` for API and database JSON serialization
+- [MINOR] Use Pydantic `JsonValue` for JSON type aliases
 - [MAJOR] Update web3 to 7.8.0
 - [MINOR] Added `call_function_by_name`, `send_transaction_by_name` and `wait_for_transaction_receipt` to `RestEthClient`
 - [MINOR] Updated `RestEthClient` to use `maxPriorityFeePerGas` and `maxFeePerGas` instead of `gasPrice`

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/PKG-INFO

@@ -1,41 +1,41 @@
 Metadata-Version: 2.4
 Name: kiba-core
-Version: 0.5.3.dev55
+Version: 0.5.3.dev57
 Summary: Kiba Labs' python utilities
 Project-URL: repository, https://github.com/kibalabs/core-py
 Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: aiofiles>=25.1.0
-Requires-Dist: pydantic>=2.13.4
-Requires-Dist: orjson>=3.11.9
+Requires-Dist: pydantic>=2.13.5
+Requires-Dist: orjson>=3.12.0
 Provides-Extra: api
 Requires-Dist: fastapi>=0.141.1; extra == "api"
-Requires-Dist: uvicorn[standard]>=0.51.0; extra == "api"
+Requires-Dist: uvicorn[standard]>=0.53.0; extra == "api"
 Provides-Extra: core-api
 Requires-Dist: starlette>=1.6.0; extra == "core-api"
-Requires-Dist: uvicorn[standard]>=0.51.0; extra == "core-api"
+Requires-Dist: uvicorn[standard]>=0.53.0; extra == "core-api"
 Provides-Extra: storage
-Requires-Dist: aiobotocore>=3.9.0; extra == "storage"
+Requires-Dist: aiobotocore>=3.9.1; extra == "storage"
 Provides-Extra: queues
-Requires-Dist: aiobotocore>=3.9.0; extra == "queues"
+Requires-Dist: aiobotocore>=3.9.1; extra == "queues"
 Provides-Extra: queue-sqs
-Requires-Dist: aiobotocore>=3.9.0; extra == "queue-sqs"
+Requires-Dist: aiobotocore>=3.9.1; extra == "queue-sqs"
 Provides-Extra: queue-aqs
 Requires-Dist: azure-storage-queue[aio]>=12.17.0; extra == "queue-aqs"
 Provides-Extra: queue-cosmos
-Requires-Dist: azure-cosmos>=4.16.3; extra == "queue-cosmos"
+Requires-Dist: azure-cosmos>=4.17.0; extra == "queue-cosmos"
 Provides-Extra: database-psql
-Requires-Dist: sqlalchemy[asyncio]>=2.0.52; extra == "database-psql"
+Requires-Dist: sqlalchemy[asyncio]>=2.0.54; extra == "database-psql"
 Requires-Dist: asyncpg>=0.31.0; extra == "database-psql"
 Provides-Extra: database-sqlite
-Requires-Dist: sqlalchemy[asyncio]>=2.0.52; extra == "database-sqlite"
+Requires-Dist: sqlalchemy[asyncio]>=2.0.54; extra == "database-sqlite"
 Requires-Dist: aiosqlite>=0.22.1; extra == "database-sqlite"
 Provides-Extra: requester
-Requires-Dist: httpx>=0.28.1; extra == "requester"
+Requires-Dist: httpx2>=2.13.0; extra == "requester"
 Provides-Extra: web3
-Requires-Dist: web3>=7.16.0; extra == "web3"
+Requires-Dist: web3>=8.0.0; extra == "web3"
 Provides-Extra: types
-Requires-Dist: types-aiobotocore[essential]>=3.9.0; extra == "types"
+Requires-Dist: types-aiobotocore[essential]>=3.9.1; extra == "types"
 Requires-Dist: types-aiofiles>=25.1.0.20260518; extra == "types"
 
 # Core-Py

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/core/api/default_routes.py

@@ -1,13 +1,14 @@
 from starlette.requests import Request
-from starlette.responses import JSONResponse
 from starlette.responses import Response
 from starlette.routing import BaseRoute
 from starlette.routing import Route
 
+from core.api.api_response import KibaJSONResponse
+
 
 def create_default_routes(name: str, version: str, environment: str) -> list[BaseRoute]:
     async def root(request: Request) -> Response:  # noqa: ARG001
-        return JSONResponse(content={'server': name, 'version': version, 'environment': environment})
+        return KibaJSONResponse(content={'server': name, 'version': version, 'environment': environment})
 
     return [
         Route('/', methods=['GET'], endpoint=root),

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/core/api/middleware/exception_handling_middleware.py

@@ -1,11 +1,11 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.middleware.base import RequestResponseEndpoint
 from starlette.requests import Request
-from starlette.responses import JSONResponse
 from starlette.responses import Response
 from starlette.types import ASGIApp
 
 from core import logging
+from core.api.api_response import KibaJSONResponse
 from core.exceptions import ClientException
 from core.exceptions import KibaException
 from core.exceptions import RedirectException
@@ -19,7 +19,7 @@ class ExceptionHandlingMiddleware(BaseHTTPMiddleware):
 
     @staticmethod
     def _convert_exception(exception: KibaException) -> Response:
-        response = JSONResponse(status_code=exception.statusCode, content=exception.to_dict())
+        response = KibaJSONResponse(status_code=exception.statusCode, content=exception.to_dict())
         response.headers.update(exception.outgoing_headers())
         return response
 

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/core/requester/requester.py

@@ -9,7 +9,7 @@ from typing import IO
 from typing import Any
 from typing import Union
 
-import httpx
+import httpx2 as httpx
 
 from core import logging
 from core.exceptions import HTTP_EXCEPTIONS_MAP

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/core/s3_manager.py

@@ -11,7 +11,7 @@ from typing import Any
 
 from aiobotocore.session import get_session as get_botocore_session
 from botocore.exceptions import ClientError
-from httpx import Headers
+from httpx2 import Headers
 
 from core import logging
 from core.exceptions import InternalServerErrorException

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/core/store/database.py

@@ -14,6 +14,7 @@ from sqlalchemy.sql.selectable import TypedReturnsRows
 
 from core import logging
 from core.exceptions import InternalServerErrorException
+from core.util import json_util
 
 DatabaseConnection = AsyncConnection
 ResultType = TypeVar('ResultType', bound=tuple)  # type: ignore[type-arg]
@@ -43,6 +44,8 @@ class Database:
                 self.connectionString,
                 # echo_pool=True,
                 # hide_parameters=False,
+                json_serializer=json_util.dumps,
+                json_deserializer=json_util.loads,
                 pool_size=poolSize,
                 pool_recycle=3600,
                 pool_pre_ping=True,

kiba_core-0.5.3.dev57/core/util/typing_util.py

@@ -0,0 +1,5 @@
+from pydantic import JsonValue
+
+type Json = JsonValue
+type JsonObject = dict[str, JsonValue]
+type JsonList = list[JsonValue]

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/core/web3/eth_client.py

@@ -264,7 +264,8 @@ class Web3EthClient(EthClientInterface):
         return self.w3.eth.get_block(blockNumber, shouldHydrateTransactions)
 
     async def get_block_uncle_count(self, blockNumber: int) -> int:
-        return typing.cast(int, self.w3.eth.get_uncle_count(blockNumber))
+        result = typing.cast(Any, self.w3.manager).request_blocking(method='eth_getUncleCountByBlockNumber', params=[hex(blockNumber)])
+        return int(result, 16)
 
     async def get_transaction_count(self, address: str) -> int:
         return self.w3.eth.get_transaction_count(chain_util.normalize_address_checksum(value=address))
@@ -374,7 +375,7 @@ class RestEthClient(EthClientInterface):
         response = await self._make_request(method='eth_getUncleCountByBlockNumber', params=[hex(blockNumber)])
         if response['result'] is None:
             raise NotFoundException
-        return typing.cast(int, method_formatters.PYTHONIC_RESULT_FORMATTERS[RPC.eth_getUncleCountByBlockNumber](response['result']))
+        return int(response['result'], 16)
 
     async def get_transaction_count(self, address: str) -> int:
         response = await self._make_request(method='eth_getTransactionCount', params=[address, 'latest'])

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/kiba_core.egg-info/PKG-INFO

@@ -1,41 +1,41 @@
 Metadata-Version: 2.4
 Name: kiba-core
-Version: 0.5.3.dev55
+Version: 0.5.3.dev57
 Summary: Kiba Labs' python utilities
 Project-URL: repository, https://github.com/kibalabs/core-py
 Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: aiofiles>=25.1.0
-Requires-Dist: pydantic>=2.13.4
-Requires-Dist: orjson>=3.11.9
+Requires-Dist: pydantic>=2.13.5
+Requires-Dist: orjson>=3.12.0
 Provides-Extra: api
 Requires-Dist: fastapi>=0.141.1; extra == "api"
-Requires-Dist: uvicorn[standard]>=0.51.0; extra == "api"
+Requires-Dist: uvicorn[standard]>=0.53.0; extra == "api"
 Provides-Extra: core-api
 Requires-Dist: starlette>=1.6.0; extra == "core-api"
-Requires-Dist: uvicorn[standard]>=0.51.0; extra == "core-api"
+Requires-Dist: uvicorn[standard]>=0.53.0; extra == "core-api"
 Provides-Extra: storage
-Requires-Dist: aiobotocore>=3.9.0; extra == "storage"
+Requires-Dist: aiobotocore>=3.9.1; extra == "storage"
 Provides-Extra: queues
-Requires-Dist: aiobotocore>=3.9.0; extra == "queues"
+Requires-Dist: aiobotocore>=3.9.1; extra == "queues"
 Provides-Extra: queue-sqs
-Requires-Dist: aiobotocore>=3.9.0; extra == "queue-sqs"
+Requires-Dist: aiobotocore>=3.9.1; extra == "queue-sqs"
 Provides-Extra: queue-aqs
 Requires-Dist: azure-storage-queue[aio]>=12.17.0; extra == "queue-aqs"
 Provides-Extra: queue-cosmos
-Requires-Dist: azure-cosmos>=4.16.3; extra == "queue-cosmos"
+Requires-Dist: azure-cosmos>=4.17.0; extra == "queue-cosmos"
 Provides-Extra: database-psql
-Requires-Dist: sqlalchemy[asyncio]>=2.0.52; extra == "database-psql"
+Requires-Dist: sqlalchemy[asyncio]>=2.0.54; extra == "database-psql"
 Requires-Dist: asyncpg>=0.31.0; extra == "database-psql"
 Provides-Extra: database-sqlite
-Requires-Dist: sqlalchemy[asyncio]>=2.0.52; extra == "database-sqlite"
+Requires-Dist: sqlalchemy[asyncio]>=2.0.54; extra == "database-sqlite"
 Requires-Dist: aiosqlite>=0.22.1; extra == "database-sqlite"
 Provides-Extra: requester
-Requires-Dist: httpx>=0.28.1; extra == "requester"
+Requires-Dist: httpx2>=2.13.0; extra == "requester"
 Provides-Extra: web3
-Requires-Dist: web3>=7.16.0; extra == "web3"
+Requires-Dist: web3>=8.0.0; extra == "web3"
 Provides-Extra: types
-Requires-Dist: types-aiobotocore[essential]>=3.9.0; extra == "types"
+Requires-Dist: types-aiobotocore[essential]>=3.9.1; extra == "types"
 Requires-Dist: types-aiofiles>=25.1.0.20260518; extra == "types"
 
 # Core-Py

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/kiba_core.egg-info/SOURCES.txt

@@ -78,11 +78,17 @@ kiba_core.egg-info/dependency_links.txt
 kiba_core.egg-info/requires.txt
 kiba_core.egg-info/top_level.txt
 tests/__init__.py
+tests/test_database.py
+tests/test_exceptions.py
+tests/api/test_api_response.py
 tests/api/test_authorizer.py
+tests/api/test_exception_handling_middleware.py
 tests/api/test_json_route.py
 tests/api/test_streaming_json_route.py
 tests/caching/test_dict_cache.py
 tests/caching/test_file_cache.py
+tests/requester/__init__.py
+tests/requester/test_requester.py
 tests/util/__init__.py
 tests/util/test_async_util.py
 tests/util/test_chain_util.py

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/kiba_core.egg-info/requires.txt

@@ -1,44 +1,44 @@
 aiofiles>=25.1.0
-pydantic>=2.13.4
-orjson>=3.11.9
+pydantic>=2.13.5
+orjson>=3.12.0
 
 [api]
 fastapi>=0.141.1
-uvicorn[standard]>=0.51.0
+uvicorn[standard]>=0.53.0
 
 [core-api]
 starlette>=1.6.0
-uvicorn[standard]>=0.51.0
+uvicorn[standard]>=0.53.0
 
 [database-psql]
-sqlalchemy[asyncio]>=2.0.52
+sqlalchemy[asyncio]>=2.0.54
 asyncpg>=0.31.0
 
 [database-sqlite]
-sqlalchemy[asyncio]>=2.0.52
+sqlalchemy[asyncio]>=2.0.54
 aiosqlite>=0.22.1
 
 [queue-aqs]
 azure-storage-queue[aio]>=12.17.0
 
 [queue-cosmos]
-azure-cosmos>=4.16.3
+azure-cosmos>=4.17.0
 
 [queue-sqs]
-aiobotocore>=3.9.0
+aiobotocore>=3.9.1
 
 [queues]
-aiobotocore>=3.9.0
+aiobotocore>=3.9.1
 
 [requester]
-httpx>=0.28.1
+httpx2>=2.13.0
 
 [storage]
-aiobotocore>=3.9.0
+aiobotocore>=3.9.1
 
 [types]
-types-aiobotocore[essential]>=3.9.0
+types-aiobotocore[essential]>=3.9.1
 types-aiofiles>=25.1.0.20260518
 
 [web3]
-web3>=7.16.0
+web3>=8.0.0

{kiba_core-0.5.3.dev55 → kiba_core-0.5.3.dev57}/pyproject.toml

@@ -1,56 +1,56 @@
 [project]
 name = "kiba-core"
-version = "0.5.3.dev55"
+version = "0.5.3.dev57"
 description = "Kiba Labs' python utilities"
 readme = "README.md"
 requires-python = ">=3.12, <4"
 dependencies = [
     "aiofiles>=25.1.0",
-    "pydantic>=2.13.4",
-    "orjson>=3.11.9",
+    "pydantic>=2.13.5",
+    "orjson>=3.12.0",
 ]
 
 [project.optional-dependencies]
 api = [
     "fastapi>=0.141.1",
-    "uvicorn[standard]>=0.51.0",
+    "uvicorn[standard]>=0.53.0",
 ]
 core-api = [
     "starlette>=1.6.0",
-    "uvicorn[standard]>=0.51.0",
+    "uvicorn[standard]>=0.53.0",
 ]
 storage = [
-    "aiobotocore>=3.9.0",
+    "aiobotocore>=3.9.1",
 ]
 # TODO(krishan711): remove this in next major update
 queues = [
-    "aiobotocore>=3.9.0",
+    "aiobotocore>=3.9.1",
 ]
 queue-sqs = [
-    "aiobotocore>=3.9.0",
+    "aiobotocore>=3.9.1",
 ]
 queue-aqs = [
     "azure-storage-queue[aio]>=12.17.0",
 ]
 queue-cosmos = [
-    "azure-cosmos>=4.16.3",
+    "azure-cosmos>=4.17.0",
 ]
 database-psql = [
-    "sqlalchemy[asyncio]>=2.0.52",
+    "sqlalchemy[asyncio]>=2.0.54",
     "asyncpg>=0.31.0",
 ]
 database-sqlite = [
-    "sqlalchemy[asyncio]>=2.0.52",
+    "sqlalchemy[asyncio]>=2.0.54",
     "aiosqlite>=0.22.1",
 ]
 requester = [
-    "httpx>=0.28.1",
+    "httpx2>=2.13.0",
 ]
 web3 = [
-    "web3>=7.16.0",
+    "web3>=8.0.0",
 ]
 types = [
-    "types-aiobotocore[essential]>=3.9.0",
+    "types-aiobotocore[essential]>=3.9.1",
     "types-aiofiles>=25.1.0.20260518",
 ]
 

kiba_core-0.5.3.dev57/tests/api/test_api_response.py

@@ -0,0 +1,39 @@
+import datetime
+
+from starlette.applications import Starlette
+from starlette.requests import Request
+from starlette.routing import Route
+from starlette.testclient import TestClient
+
+from core.api.api_response import KibaJSONResponse
+from core.api.default_routes import create_default_routes
+from core.api.middleware.exception_handling_middleware import ExceptionHandlingMiddleware
+from core.exceptions import BadRequestException
+
+
+def test_kiba_json_response_uses_compact_utf8_serialization():
+    response = KibaJSONResponse(content={'message': 'Hello 🌍', 'createdAt': datetime.datetime(2025, 1, 2, 3, 4, 5), 'values': [1, 2]})
+
+    assert response.body == '{"message":"Hello 🌍","createdAt":"2025-01-02T03:04:05","values":[1,2]}'.encode()
+
+
+def test_default_route_uses_kiba_json_response():
+    app = Starlette(routes=create_default_routes(name='core', version='1.0', environment='test'))
+    client = TestClient(app)
+
+    response = client.get('/')
+
+    assert response.content == b'{"server":"core","version":"1.0","environment":"test"}'
+
+
+def test_exception_handling_middleware_uses_kiba_json_response():
+    async def failing_endpoint(_request: Request) -> KibaJSONResponse:
+        raise BadRequestException(message='bad input')
+
+    app = Starlette(routes=[Route('/fail', failing_endpoint)])
+    app.add_middleware(ExceptionHandlingMiddleware)
+    client = TestClient(app, raise_server_exceptions=False)
+
+    response = client.get('/fail')
+
+    assert response.content == b'{"exceptionType":"BadRequestException","message":"bad input","fields":{},"statusCode":400}'

kiba_core-0.5.3.dev57/tests/api/test_exception_handling_middleware.py

@@ -0,0 +1,109 @@
+import pytest
+from pydantic import BaseModel
+from starlette.applications import Starlette
+from starlette.routing import Route
+from starlette.testclient import TestClient
+
+from core.api.api_request import KibaApiRequest
+from core.api.json_route import json_route
+from core.api.middleware.exception_handling_middleware import ExceptionHandlingMiddleware
+from core.exceptions import BadRequestException
+from core.exceptions import FoundRedirectException
+from core.exceptions import MovedPermanentlyRedirectException
+from core.exceptions import TooManyRequestsException
+
+
+class SimpleRequest(BaseModel):
+    value: str
+
+
+class SimpleResponse(BaseModel):
+    result: str
+
+
+@pytest.fixture
+def rate_limited_client():
+    @json_route(requestType=SimpleRequest, responseType=SimpleResponse)
+    async def limited_endpoint(request: KibaApiRequest[SimpleRequest]) -> SimpleResponse:
+        raise TooManyRequestsException(message='slow down', retryAfterSeconds=30)
+
+    app = Starlette(routes=[Route('/limited', limited_endpoint, methods=['POST'])])
+    app.add_middleware(ExceptionHandlingMiddleware)
+    return TestClient(app, raise_server_exceptions=False)
+
+
+@pytest.fixture
+def rate_limited_no_retry_client():
+    @json_route(requestType=SimpleRequest, responseType=SimpleResponse)
+    async def limited_endpoint(request: KibaApiRequest[SimpleRequest]) -> SimpleResponse:
+        raise TooManyRequestsException(message='slow down')
+
+    app = Starlette(routes=[Route('/limited', limited_endpoint, methods=['POST'])])
+    app.add_middleware(ExceptionHandlingMiddleware)
+    return TestClient(app, raise_server_exceptions=False)
+
+
+@pytest.fixture
+def found_redirect_client():
+    @json_route(requestType=SimpleRequest, responseType=SimpleResponse)
+    async def redirect_endpoint(request: KibaApiRequest[SimpleRequest]) -> SimpleResponse:
+        raise FoundRedirectException(location='https://example.com/elsewhere')
+
+    app = Starlette(routes=[Route('/redirect', redirect_endpoint, methods=['POST'])])
+    app.add_middleware(ExceptionHandlingMiddleware)
+    return TestClient(app, raise_server_exceptions=False, follow_redirects=False)
+
+
+@pytest.fixture
+def permanent_redirect_client():
+    @json_route(requestType=SimpleRequest, responseType=SimpleResponse)
+    async def redirect_endpoint(request: KibaApiRequest[SimpleRequest]) -> SimpleResponse:
+        raise MovedPermanentlyRedirectException(location='https://example.com/moved')
+
+    app = Starlette(routes=[Route('/redirect', redirect_endpoint, methods=['POST'])])
+    app.add_middleware(ExceptionHandlingMiddleware)
+    return TestClient(app, raise_server_exceptions=False, follow_redirects=False)
+
+
+@pytest.fixture
+def plain_error_client():
+    @json_route(requestType=SimpleRequest, responseType=SimpleResponse)
+    async def failing_endpoint(request: KibaApiRequest[SimpleRequest]) -> SimpleResponse:
+        raise BadRequestException(message='bad input')
+
+    app = Starlette(routes=[Route('/fail', failing_endpoint, methods=['POST'])])
+    app.add_middleware(ExceptionHandlingMiddleware)
+    return TestClient(app, raise_server_exceptions=False)
+
+
+def test_too_many_requests_returns_429_with_retry_after_header(rate_limited_client):
+    response = rate_limited_client.post('/limited', json={'value': 'hello'})
+    assert response.status_code == 429
+    assert response.headers['retry-after'] == '30'
+
+
+def test_too_many_requests_without_retry_after_omits_header(rate_limited_no_retry_client):
+    response = rate_limited_no_retry_client.post('/limited', json={'value': 'hello'})
+    assert response.status_code == 429
+    assert 'retry-after' not in response.headers
+
+
+def test_found_redirect_sets_location_without_cache_header(found_redirect_client):
+    response = found_redirect_client.post('/redirect', json={'value': 'hello'})
+    assert response.status_code == 302
+    assert response.headers['location'] == 'https://example.com/elsewhere'
+    assert 'cache-control' not in response.headers
+
+
+def test_permanent_redirect_sets_location_and_cache_header(permanent_redirect_client):
+    response = permanent_redirect_client.post('/redirect', json={'value': 'hello'})
+    assert response.status_code == 301
+    assert response.headers['location'] == 'https://example.com/moved'
+    assert response.headers['cache-control'] == f'max-age={60 * 60 * 24 * 365}'
+
+
+def test_plain_exception_has_no_extra_headers(plain_error_client):
+    response = plain_error_client.post('/fail', json={'value': 'hello'})
+    assert response.status_code == 400
+    assert 'retry-after' not in response.headers
+    assert 'location' not in response.headers

kiba_core-0.5.3.dev57/tests/requester/test_requester.py

@@ -0,0 +1,41 @@
+import httpx2 as httpx
+import pytest
+
+from core.exceptions import NotFoundException
+from core.exceptions import TooManyRequestsException
+from core.requester.requester import Requester
+
+
+class TestRequesterExceptionHeaders:
+
+    @pytest.mark.asyncio
+    async def test_429_response_populates_retry_after_from_header(self):
+        def handler(request: httpx.Request) -> httpx.Response:  # noqa: ARG001
+            return httpx.Response(429, headers={'Retry-After': '17'}, text='Too Many Requests')
+
+        requester = Requester()
+        requester.client = httpx.AsyncClient(transport=httpx.MockTransport(handler))
+        with pytest.raises(TooManyRequestsException) as excInfo:
+            await requester.get(url='https://example.com/resource')
+        assert excInfo.value.retryAfterSeconds == 17
+
+    @pytest.mark.asyncio
+    async def test_429_response_without_retry_after_header(self):
+        def handler(request: httpx.Request) -> httpx.Response:  # noqa: ARG001
+            return httpx.Response(429, text='Too Many Requests')
+
+        requester = Requester()
+        requester.client = httpx.AsyncClient(transport=httpx.MockTransport(handler))
+        with pytest.raises(TooManyRequestsException) as excInfo:
+            await requester.get(url='https://example.com/resource')
+        assert excInfo.value.retryAfterSeconds is None
+
+    @pytest.mark.asyncio
+    async def test_404_response_still_maps_to_correct_exception_type(self):
+        def handler(request: httpx.Request) -> httpx.Response:  # noqa: ARG001
+            return httpx.Response(404, text='Not Found')
+
+        requester = Requester()
+        requester.client = httpx.AsyncClient(transport=httpx.MockTransport(handler))
+        with pytest.raises(NotFoundException):
+            await requester.get(url='https://example.com/resource')