Add support for httpx as backend

.github/workflows/ci-cd.yml

@@ -41,20 +41,21 @@ jobs:
         os:
         - ubuntu-24.04
         - ubuntu-24.04-arm
+        no-httpx: [false]
         include:
-        - experimental: false
-        - upload-coverage: false
-        - upload-coverage: true
-          python-version: 3.11
+        - no-httpx: true
+          python-version: 3.13
           os: ubuntu-24.04
       fail-fast: false
     uses: ./.github/workflows/reusable-test.yml
     with:
       python-version: ${{ matrix.python-version }}
       os: ${{ matrix.os }}
-      continue-on-error: ${{ matrix.experimental }}
+      continue-on-error: false
       enable-cache: ${{ github.ref_type == 'tag' && 'false' || 'auto' }}
-      upload-coverage: ${{ matrix.upload-coverage }}
+      upload-coverage:
+        ${{ matrix.python-version == 3.11 && matrix.os == 'ubuntu-24.04' }}
+      no-httpx: ${{ matrix.no-httpx }}
     secrets:
       # yamllint disable-line rule:line-length
       codecov-token: ${{ matrix.upload-coverage && secrets.CODECOV_TOKEN || '' }}

.github/workflows/reusable-test.yml

@@ -19,6 +19,9 @@ on:
         required: true
       upload-coverage:
         type: boolean
+      no-httpx:
+        type: boolean
+        required: true
     secrets:
       codecov-token:
         required: false
@@ -28,7 +31,9 @@ env:
 
 jobs:
   test:
-    name: Test Python ${{ inputs.python-version }} on ${{ inputs.os }}
+    name: Test Python ${{ inputs.python-version }} on ${{ inputs.os }}${{
+      inputs.no-httpx && ' no-httpx' || '' }}
+
     runs-on: ${{ inputs.os }}
     continue-on-error: ${{ inputs.continue-on-error }}
     env:
@@ -51,10 +56,18 @@ jobs:
       run: |
         uv run make pre-commit
     - name: Run unittests
+      if: ${{ ! matrix.no_httpx }}
       env:
         COLOR: 'yes'
       run: |
         uv run make mototest
+    - name: Run unittests without httpx installed
+      if: ${{ matrix.no_httpx }}
+      env:
+        COLOR: 'yes'
+        HTTP_BACKEND: 'aiohttp'
+      run: |
+        uv run --no-group=httpx make mototest
     - name: Upload coverage to Codecov
       if: ${{ inputs.upload-coverage }}
       # yamllint disable-line rule:line-length

Makefile

@@ -1,6 +1,7 @@
 # Some simple testing tasks (sorry, UNIX only).
 
-# ?= conditional assign, so users can pass options on the CLI instead of manually editing this file
+# ?= is conditional assign, so users can pass options on the CLI instead of manually editing this file
+HTTP_BACKEND?='all'
 FLAGS?=
 
 pre-commit:
@@ -17,7 +18,7 @@ cov cover coverage: pre-commit
 	@echo "open file://`pwd`/htmlcov/index.html"
 
 mototest:
-	python -Wd -X tracemalloc=5 -X faulthandler -m pytest -vv -m "not localonly" -n auto --cov-report term --cov-report html --cov-report xml --cov=aiobotocore --cov=tests --log-cli-level=DEBUG $(FLAGS) aiobotocore tests
+	python -Wd -X tracemalloc=5 -X faulthandler -m pytest -vv -m "not localonly" -n auto --cov-report term --cov-report html --cov-report xml --cov=aiobotocore --cov=tests --log-cli-level=DEBUG  --http-backend=$(HTTP_BACKEND) $(FLAGS) aiobotocore tests
 
 clean:
 	rm -rf `find . -name __pycache__`

aiobotocore/_endpoint_helpers.py

@@ -4,6 +4,11 @@
 import botocore.retryhandler
 import wrapt
 
+try:
+    import httpx
+except ImportError:
+    httpx = None
+
 # Monkey patching: We need to insert the aiohttp exception equivalents
 # The only other way to do this would be to have another config file :(
 _aiohttp_retryable_exceptions = [
@@ -14,10 +19,26 @@
     asyncio.TimeoutError,
 ]
 
+
 botocore.retryhandler.EXCEPTION_MAP['GENERAL_CONNECTION_ERROR'].extend(
     _aiohttp_retryable_exceptions
 )
 
+if httpx is not None:
+    # See https://www.python-httpx.org/exceptions/#the-exception-hierarchy
+    # All child exceptions of TransportError, except ProxyError,
+    # UnsupportedProtocol and CloseError.
+    _httpx_retryable_exceptions = [
+        httpx.TimeoutException,
+        httpx.ProtocolError,
+        httpx.ConnectError,
+        httpx.ReadError,
+        httpx.WriteError,
+    ]
+    botocore.retryhandler.EXCEPTION_MAP['GENERAL_CONNECTION_ERROR'].extend(
+        _httpx_retryable_exceptions
+    )
+
 
 def _text(s, encoding='utf-8', errors='strict'):
     if isinstance(s, bytes):

aiobotocore/awsrequest.py

@@ -1,6 +1,11 @@
 import botocore.utils
 from botocore.awsrequest import AWSResponse
 
+try:
+    import httpx
+except ImportError:
+    httpx = None
+
 
 class AioAWSResponse(AWSResponse):
     # Unlike AWSResponse, these return awaitables
@@ -9,8 +14,12 @@ async def _content_prop(self):
         """Content of the response as bytes."""
 
         if self._content is None:
+            if httpx is not None and isinstance(self.raw, httpx.Response):
+                read_func = self.raw.aread
+            else:
+                read_func = self.raw.read
             # NOTE: this will cache the data in self.raw
-            self._content = await self.raw.read() or b''
+            self._content = await read_func() or b''
 
         return self._content
 

aiobotocore/config.py

@@ -4,6 +4,13 @@
 from botocore.exceptions import ParamValidationError
 
 from aiobotocore.endpoint import DEFAULT_HTTP_SESSION_CLS
+from aiobotocore.httpxsession import HttpxSession
+
+# AWS has a 20 second idle timeout:
+#   https://web.archive.org/web/20150926192339/https://forums.aws.amazon.com/message.jspa?messageID=215367
+# and aiohttp default timeout is 30s so we set it to something
+# reasonable here
+DEFAULT_KEEPALIVE_TIMEOUT = 12
 
 
 class AioConfig(botocore.client.Config):
@@ -15,18 +22,16 @@ def __init__(
     ):
         super().__init__(**kwargs)
 
-        self._validate_connector_args(connector_args)
+        self._validate_connector_args(connector_args, http_session_cls)
         self.connector_args = copy.copy(connector_args)
         self.http_session_cls = http_session_cls
         if not self.connector_args:
             self.connector_args = dict()
 
         if 'keepalive_timeout' not in self.connector_args:
-            # AWS has a 20 second idle timeout:
-            #   https://web.archive.org/web/20150926192339/https://forums.aws.amazon.com/message.jspa?messageID=215367
-            # and aiohttp default timeout is 30s so we set it to something
-            # reasonable here
-            self.connector_args['keepalive_timeout'] = 12
+            self.connector_args['keepalive_timeout'] = (
+                DEFAULT_KEEPALIVE_TIMEOUT
+            )
 
     def merge(self, other_config):
         # Adapted from parent class
@@ -35,13 +40,17 @@ def merge(self, other_config):
         return AioConfig(self.connector_args, **config_options)
 
     @staticmethod
-    def _validate_connector_args(connector_args):
+    def _validate_connector_args(connector_args, http_session_cls):
         if connector_args is None:
             return
 
         for k, v in connector_args.items():
             # verify_ssl is handled by verify parameter to create_client
             if k == 'use_dns_cache':
+                if http_session_cls is HttpxSession:
+                    raise ParamValidationError(
+                        report='Httpx does not support dns caching. https://github.com/encode/httpx/discussions/2211'
+                    )
                 if not isinstance(v, bool):
                     raise ParamValidationError(
                         report=f'{k} value must be a boolean'
@@ -51,12 +60,16 @@ def _validate_connector_args(connector_args):
                     raise ParamValidationError(
                         report=f'{k} value must be an int or None'
                     )
-            elif k == 'keepalive_timeout':
+            elif k in ('keepalive_timeout', 'write_timeout', 'pool_timeout'):
                 if v is not None and not isinstance(v, (float, int)):
                     raise ParamValidationError(
                         report=f'{k} value must be a float/int or None'
                     )
             elif k == 'force_close':
+                if http_session_cls is HttpxSession:
+                    raise ParamValidationError(
+                        report=f'Httpx backend does not currently support {k}.'
+                    )
                 if not isinstance(v, bool):
                     raise ParamValidationError(
                         report=f'{k} value must be a boolean'
@@ -72,6 +85,10 @@ def _validate_connector_args(connector_args):
             elif k == "resolver":
                 from aiohttp.abc import AbstractResolver
 
+                if http_session_cls is HttpxSession:
+                    raise ParamValidationError(
+                        report=f'Httpx backend does not support {k}.'
+                    )
                 if not isinstance(v, AbstractResolver):
                     raise ParamValidationError(
                         report=f'{k} must be an instance of a AbstractResolver'

aiobotocore/endpoint.py

@@ -17,7 +17,12 @@
 from aiobotocore.httpchecksum import handle_checksum_body
 from aiobotocore.httpsession import AIOHTTPSession
 from aiobotocore.parsers import AioResponseParserFactory
-from aiobotocore.response import StreamingBody
+from aiobotocore.response import HttpxStreamingBody, StreamingBody
+
+try:
+    import httpx
+except ImportError:
+    httpx = None
 
 DEFAULT_HTTP_SESSION_CLS = AIOHTTPSession
 
@@ -50,8 +55,11 @@ async def convert_to_response_dict(http_response, operation_model):
     elif operation_model.has_event_stream_output:
         response_dict['body'] = http_response.raw
     elif operation_model.has_streaming_output:
-        length = response_dict['headers'].get('content-length')
-        response_dict['body'] = StreamingBody(http_response.raw, length)
+        if httpx and isinstance(http_response.raw, httpx.Response):
+            response_dict['body'] = HttpxStreamingBody(http_response.raw)
+        else:
+            length = response_dict['headers'].get('content-length')
+            response_dict['body'] = StreamingBody(http_response.raw, length)
     else:
         response_dict['body'] = await http_response.content
     return response_dict

aiobotocore/httpchecksum.py

@@ -12,7 +12,12 @@
 )
 
 from aiobotocore._helpers import resolve_awaitable
-from aiobotocore.response import StreamingBody
+from aiobotocore.response import HttpxStreamingBody, StreamingBody
+
+try:
+    import httpx
+except ImportError:
+    httpx = None
 
 
 class AioAwsChunkedWrapper(AwsChunkedWrapper):
@@ -93,6 +98,31 @@ def _validate_checksum(self):
             raise FlexibleChecksumError(error_msg=error_msg)
 
 
+# TODO: fix inheritance? read & _validate_checksum are the exact same as above
+# only diff is super class and how to call __init__
+class HttpxStreamingChecksumBody(HttpxStreamingBody):
+    def __init__(self, raw_stream, content_length, checksum, expected):
+        # HttpxStreamingbody doesn't use content_length
+        super().__init__(raw_stream)
+        self._checksum = checksum
+        self._expected = expected
+
+    async def read(self, amt=None):
+        chunk = await super().read(amt=amt)
+        self._checksum.update(chunk)
+        if amt is None or (not chunk and amt > 0):
+            self._validate_checksum()
+        return chunk
+
+    def _validate_checksum(self):
+        if self._checksum.digest() != base64.b64decode(self._expected):
+            error_msg = (
+                f"Expected checksum {self._expected} did not match calculated "
+                f"checksum: {self._checksum.b64digest()}"
+            )
+            raise FlexibleChecksumError(error_msg=error_msg)
+
+
 async def handle_checksum_body(
     http_response, response, context, operation_model
 ):
@@ -139,7 +169,11 @@ async def handle_checksum_body(
 def _handle_streaming_response(http_response, response, algorithm):
     checksum_cls = _CHECKSUM_CLS.get(algorithm)
     header_name = f"x-amz-checksum-{algorithm}"
-    return StreamingChecksumBody(
+    if httpx is not None and isinstance(http_response.raw, httpx.Response):
+        streaming_cls = HttpxStreamingChecksumBody
+    else:
+        streaming_cls = StreamingChecksumBody
+    return streaming_cls(
         http_response.raw,
         response["headers"].get("content-length"),
         checksum_cls(),

aiobotocore/httpsession.py

@@ -40,6 +40,7 @@
 from multidict import CIMultiDict
 
 import aiobotocore.awsrequest
+import aiobotocore.config  # avoid circular import
 from aiobotocore._endpoint_helpers import _IOBaseWrapper, _text
 
 
@@ -83,10 +84,9 @@ def __init__(
         self._timeout = timeout
         self._connector_args = connector_args
         if self._connector_args is None:
-            # AWS has a 20 second idle timeout:
-            #   https://web.archive.org/web/20150926192339/https://forums.aws.amazon.com/message.jspa?messageID=215367
-            # aiohttp default timeout is 30s so set something reasonable here
-            self._connector_args = dict(keepalive_timeout=12)
+            self._connector_args = dict(
+                keepalive_timeout=aiobotocore.config.DEFAULT_KEEPALIVE_TIMEOUT
+            )
 
         self._max_pool_connections = max_pool_connections
         self._socket_options = socket_options