smithy-http 0.7.0__tar.gz → 0.8.0__tar.gz

smithy_http-0.8.0/.changes/0.8.0.json

@@ -0,0 +1,92 @@
+{
+  "changes": [
+    {
+      "type": "breaking",
+      "description": "Removed the eventloop parameter from AWSCRTHTTPClient."
+    },
+    {
+      "type": "breaking",
+      "description": "Removed `HostPrefixSerializer` and `Binding.HOST`. `@hostLabel` no longer changes where a member is serialized and smithy-core now applies host prefixes."
+    },
+    {
+      "type": "feature",
+      "description": "Added support for the `aws.protocols#awsQueryCompatible` trait to `RpcV2CborClientProtocol` and `RpcV2JsonClientProtocol`."
+    },
+    {
+      "type": "feature",
+      "description": "Added `RpcV2JsonClientProtocol` and `AsyncRpcV2JsonClientProtocol`, implementations of the `smithy.protocols#rpcv2Json` protocol, and a `json` extra that installs `smithy-json`."
+    },
+    {
+      "type": "enhancement",
+      "description": "Documented HTTPQueryMapValueSerializer."
+    },
+    {
+      "type": "enhancement",
+      "description": "Completed type annotations and __all__ declarations for the public API."
+    },
+    {
+      "type": "enhancement",
+      "description": "Allow MockHTTPClient and AsyncMockHTTPClient responses to have stream bodies."
+    },
+    {
+      "type": "enhancement",
+      "description": "Imported symbols from their defining modules."
+    },
+    {
+      "type": "bugfix",
+      "description": "Iterating a `Urllib3HTTPClient` response body now yields 64 KiB chunks instead of 1 KiB ones."
+    },
+    {
+      "type": "bugfix",
+      "description": "RPC v2 protocols (including `RpcV2CborClientProtocol` and `AsyncRpcV2CborClientProtocol`) now treat a response whose `Smithy-Protocol` header does not match the request as malformed, raising a `CallError` based solely on the HTTP status code without interpreting the body."
+    },
+    {
+      "type": "bugfix",
+      "description": "Declared smithy-aws-event-stream as the eventstream extra, bounded yarl, and raised MissingDependencyError when the aiohttp extra is not installed."
+    },
+    {
+      "type": "bugfix",
+      "description": "`Urllib3HTTPClient` now streams request bodies that are readers with a known length or chunked transfer encoding, such as an open file, instead of reading the whole body into memory first. Uploads are sent in 128 KiB blocks."
+    },
+    {
+      "type": "bugfix",
+      "description": "Derived the CRT timeout error from SmithyHTTPError."
+    },
+    {
+      "type": "bugfix",
+      "description": "`Field.as_string()` now joins values with its `delimiter` argument, a bare comma by default, instead of always using a comma and a space. The `Field` interface now declares the `delimiter` parameter. `AIOHTTPClient` and `Urllib3HTTPClient` no longer send trailer fields as headers, matching `AWSCRTHTTPClient`."
+    },
+    {
+      "type": "bugfix",
+      "description": "`AIOHTTPClient` now reads request bodies that are readers, such as open files, in 128 KiB chunks instead of 1 KiB ones, which made uploads about 25 times faster on fast connections. An async iterable body is now passed to aiohttp unchanged, so each item is sent as soon as it's produced."
+    },
+    {
+      "type": "bugfix",
+      "description": "`AIOHTTPClient` now sends requests that set `Transfer-Encoding: chunked` using aiohttp's chunked uploads. Previously aiohttp rejected the header with a `ValueError`."
+    },
+    {
+      "type": "bugfix",
+      "description": "RPC v2 protocols now raise a `CallError` instead of an unrelated exception for error responses whose body cannot be decoded or whose `__type` is not an absolute shape ID, and resolve `__type` values with a `:`-delimited suffix to the modeled error."
+    },
+    {
+      "type": "bugfix",
+      "description": "The urllib3 HTTP client now streams response bodies instead of reading each one into memory. A streaming output, such as an S3 `GetObject` body, holds its connection until it is read to the end or closed, so use it in a `with` block to release the connection early."
+    },
+    {
+      "type": "dependency",
+      "description": "Bump `smithy-core` from `~=0.10.0` to `~=0.11.0`."
+    },
+    {
+      "type": "dependency",
+      "description": "Bump `smithy-cbor` from `~=0.2.0` to `~=0.3.0`."
+    },
+    {
+      "type": "dependency",
+      "description": "Bump `smithy-json` from `~=0.4.0` to `~=0.5.0`."
+    },
+    {
+      "type": "dependency",
+      "description": "Bump `smithy-aws-event-stream` from `~=0.4.0` to `~=0.5.0`."
+    }
+  ]
+}

{smithy_http-0.7.0 → smithy_http-0.8.0}/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## v0.8.0
+
+### Breaking Changes
+* Removed the eventloop parameter from AWSCRTHTTPClient.
+* Removed `HostPrefixSerializer` and `Binding.HOST`. `@hostLabel` no longer changes where a member is serialized and smithy-core now applies host prefixes.
+
+### Features
+* Added support for the `aws.protocols#awsQueryCompatible` trait to `RpcV2CborClientProtocol` and `RpcV2JsonClientProtocol`.
+* Added `RpcV2JsonClientProtocol` and `AsyncRpcV2JsonClientProtocol`, implementations of the `smithy.protocols#rpcv2Json` protocol, and a `json` extra that installs `smithy-json`.
+
+### Enhancements
+* Documented HTTPQueryMapValueSerializer.
+* Completed type annotations and __all__ declarations for the public API.
+* Allow MockHTTPClient and AsyncMockHTTPClient responses to have stream bodies.
+* Imported symbols from their defining modules.
+
+### Bug fixes
+* Iterating a `Urllib3HTTPClient` response body now yields 64 KiB chunks instead of 1 KiB ones.
+* RPC v2 protocols (including `RpcV2CborClientProtocol` and `AsyncRpcV2CborClientProtocol`) now treat a response whose `Smithy-Protocol` header does not match the request as malformed, raising a `CallError` based solely on the HTTP status code without interpreting the body.
+* Declared smithy-aws-event-stream as the eventstream extra, bounded yarl, and raised MissingDependencyError when the aiohttp extra is not installed.
+* `Urllib3HTTPClient` now streams request bodies that are readers with a known length or chunked transfer encoding, such as an open file, instead of reading the whole body into memory first. Uploads are sent in 128 KiB blocks.
+* Derived the CRT timeout error from SmithyHTTPError.
+* `Field.as_string()` now joins values with its `delimiter` argument, a bare comma by default, instead of always using a comma and a space. The `Field` interface now declares the `delimiter` parameter. `AIOHTTPClient` and `Urllib3HTTPClient` no longer send trailer fields as headers, matching `AWSCRTHTTPClient`.
+* `AIOHTTPClient` now reads request bodies that are readers, such as open files, in 128 KiB chunks instead of 1 KiB ones, which made uploads about 25 times faster on fast connections. An async iterable body is now passed to aiohttp unchanged, so each item is sent as soon as it's produced.
+* `AIOHTTPClient` now sends requests that set `Transfer-Encoding: chunked` using aiohttp's chunked uploads. Previously aiohttp rejected the header with a `ValueError`.
+* RPC v2 protocols now raise a `CallError` instead of an unrelated exception for error responses whose body cannot be decoded or whose `__type` is not an absolute shape ID, and resolve `__type` values with a `:`-delimited suffix to the modeled error.
+* The urllib3 HTTP client now streams response bodies instead of reading each one into memory. A streaming output, such as an S3 `GetObject` body, holds its connection until it is read to the end or closed, so use it in a `with` block to release the connection early.
+
+### Dependencies
+* Bump `smithy-core` from `~=0.10.0` to `~=0.11.0`.
+* Bump `smithy-cbor` from `~=0.2.0` to `~=0.3.0`.
+* Bump `smithy-json` from `~=0.4.0` to `~=0.5.0`.
+* Bump `smithy-aws-event-stream` from `~=0.4.0` to `~=0.5.0`.
+
 ## v0.7.0
 
 ### Breaking Changes

{smithy_http-0.7.0 → smithy_http-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: smithy-http
-Version: 0.7.0
+Version: 0.8.0
 Summary: HTTP components for Smithy tooling.
 Project-URL: Changelog, https://github.com/smithy-lang/smithy-python/blob/develop/packages/smithy-http/CHANGELOG.md
 Project-URL: Code, https://github.com/smithy-lang/smithy-python/blob/develop/packages/smithy-http/
@@ -26,14 +26,18 @@ Classifier: Programming Language :: Python :: Free Threading :: 2 - Beta
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.12
-Requires-Dist: smithy-core
+Requires-Dist: smithy-core~=0.11.0
 Provides-Extra: aiohttp
 Requires-Dist: aiohttp<4.0,>=3.11.12; extra == 'aiohttp'
-Requires-Dist: yarl; extra == 'aiohttp'
+Requires-Dist: yarl>=1.17.0; extra == 'aiohttp'
 Provides-Extra: awscrt
 Requires-Dist: awscrt~=0.32.0; extra == 'awscrt'
 Provides-Extra: cbor
-Requires-Dist: smithy-cbor~=0.2.0; extra == 'cbor'
+Requires-Dist: smithy-cbor~=0.3.0; extra == 'cbor'
+Provides-Extra: eventstream
+Requires-Dist: smithy-aws-event-stream~=0.5.0; extra == 'eventstream'
+Provides-Extra: json
+Requires-Dist: smithy-json~=0.5.0; extra == 'json'
 Provides-Extra: urllib3
 Requires-Dist: urllib3<3.0,>=2.0; extra == 'urllib3'
 Description-Content-Type: text/markdown

{smithy_http-0.7.0 → smithy_http-0.8.0}/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
   "Topic :: Software Development :: Libraries"
 ]
 dependencies = [
-    "smithy-core",
+    "smithy-core~=0.11.0",
 ]
 
 [project.urls]
@@ -41,11 +41,17 @@ awscrt = [
     "awscrt~=0.32.0",
 ]
 cbor = [
-    "smithy-cbor~=0.2.0",
+    "smithy-cbor~=0.3.0",
+]
+json = [
+    "smithy-json~=0.5.0",
+]
+eventstream = [
+    "smithy-aws-event-stream~=0.5.0",
 ]
 aiohttp = [
     "aiohttp>=3.11.12, <4.0",
-    "yarl"
+    "yarl>=1.17.0",
 ]
 urllib3 = [
     "urllib3>=2.0, <3.0",

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/__init__.py

@@ -22,7 +22,7 @@ __all__ = [
     "tuples_to_fields",
 ]
 
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 
 _VALID_FIELD_POSITIONS = frozenset(get_args(FieldPosition))
 
@@ -48,7 +48,7 @@ class Field(interfaces.Field):
         self.values: list[str] = list(values) if values is not None else []
         if kind not in _VALID_FIELD_POSITIONS:
             raise ValueError(f"Unknown field kind: {kind!r}")
-        self.kind = kind
+        self.kind: FieldPosition = kind
 
     def __eq__(self, other: object) -> bool:
         """Name, values, and kind must match.
@@ -88,8 +88,8 @@ class Field(interfaces.Field):
         If the ``Field`` has zero values, the empty string is returned. If the ``Field``
         has exactly one value, the value is returned unmodified.
 
-        For ``Field``s with more than one value, the values are joined by a comma and a
-        space. For such multi-valued ``Field``s, any values that already contain
+        For ``Field``s with more than one value, the values are joined by
+        ``delimiter``. For such multi-valued ``Field``s, any values that already contain
         commas or double quotes will be surrounded by double quotes. Within any values
         that get quoted, pre-existing double quotes and backslashes are escaped with a
         backslash.
@@ -99,7 +99,7 @@ class Field(interfaces.Field):
             return ""
         if value_count == 1:
             return self.values[0]
-        return ", ".join(quote_and_escape_field_value(val) for val in self.values)
+        return delimiter.join(quote_and_escape_field_value(val) for val in self.values)
 
     def as_tuples(self) -> list[tuple[str, str]]:
         """Get list of ``name``, ``value`` tuples where each tuple represents one
@@ -108,6 +108,8 @@ class Field(interfaces.Field):
 
 
 class Fields(interfaces.Fields):
+    """Collection of header and trailer entries mapped by name."""
+
     def __init__(
         self,
         initial: Iterable[interfaces.Field] | None = None,
@@ -134,7 +136,7 @@ class Fields(interfaces.Fields):
                 "following normalized field names appear more than once: "
                 f"{', '.join(non_unique_names)}."
             )
-        init_tuples = zip(init_field_names, init_fields)
+        init_tuples = zip(init_field_names, init_fields, strict=True)
         self.entries: dict[str, interfaces.Field] = OrderedDict(init_tuples)
         self.encoding: str = encoding
 
@@ -187,6 +189,7 @@ class Fields(interfaces.Fields):
     def get(
         self, key: str, default: interfaces.Field | None = None
     ) -> interfaces.Field | None:
+        """Return the field named ``key``, or ``default`` if absent."""
         return self[key] if key in self else default
 
     def get_by_type(self, kind: FieldPosition) -> list[interfaces.Field]:

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/aio/aiohttp.py

@@ -3,18 +3,18 @@
 from collections.abc import AsyncIterable, AsyncIterator
 from copy import copy, deepcopy
 from itertools import chain
-from typing import TYPE_CHECKING, Any, Self
-
-import yarl
+from typing import TYPE_CHECKING, Any, Self, cast
 
 if TYPE_CHECKING:
     # pyright doesn't like optional imports. This is reasonable because if we use these
     # in type hints then they'd result in runtime errors.
     # TODO: add integ tests that import these without the dependendency installed
     import aiohttp
+    import yarl
 
 try:
     import aiohttp
+    import yarl
 
     HAS_AIOHTTP = True
 except ImportError:
@@ -37,10 +37,14 @@ from ..interfaces import (
 )
 from .interfaces import AsyncHTTPClient
 
-__all__ = ["AIOHTTPClient", "AIOHTTPClientConfig"]
+__all__ = ["HAS_AIOHTTP", "AIOHTTPClient", "AIOHTTPClientConfig"]
+
+_UPLOAD_CHUNK_SIZE = 128 * 1024
 
 
 class AIOHTTPClientConfig(HTTPClientConfiguration):
+    """Configuration for the aiohttp HTTP client."""
+
     def __post_init__(self) -> None:
         _assert_aiohttp()
 
@@ -48,7 +52,7 @@ class AIOHTTPClientConfig(HTTPClientConfiguration):
 class AIOHTTPClient(AsyncHTTPClient):
     """Implementation of :py:class:`.interfaces.AsyncHTTPClient` using aiohttp."""
 
-    TIMEOUT_EXCEPTIONS = (TimeoutError,)
+    TIMEOUT_EXCEPTIONS: tuple[type[Exception], ...] = (TimeoutError,)
 
     # aiohttp has no HTTP/2 support, so it can never interleave request and
     # response data.
@@ -107,8 +111,19 @@ class AIOHTTPClient(AsyncHTTPClient):
 
         request_config = request_config or HTTPRequestConfiguration()
 
+        # aiohttp chunks a body itself when asked with chunked=True, and rejects a
+        # Transfer-Encoding: chunked header, so the header becomes that flag.
+        chunked = "transfer-encoding" in request.fields and [
+            value.strip().lower()
+            for value in request.fields["transfer-encoding"].values
+        ] == ["chunked"]
+        # aiohttp can't send request trailers, and a trailer is never a header.
         headers_list = list(
-            chain.from_iterable(fld.as_tuples() for fld in request.fields)
+            chain.from_iterable(
+                fld.as_tuples()
+                for fld in request.fields.get_by_type("header")
+                if not (chunked and fld.name.lower() == "transfer-encoding")
+            )
         )
 
         body: StreamingBlob | None = request.body
@@ -124,7 +139,8 @@ class AIOHTTPClient(AsyncHTTPClient):
             method=request.method,
             url=self._serialize_uri(request.destination),
             headers=headers_list,
-            data=body,
+            data=_upload_data(request.body, body),
+            chunked=True if chunked else None,
             allow_redirects=False,
             skip_auto_headers={"Content-Type"},
         )
@@ -154,7 +170,7 @@ class AIOHTTPClient(AsyncHTTPClient):
         await body.seek(position)
         return None if position == end else body
 
-    def _serialize_uri(self, uri: URI) -> yarl.URL:
+    def _serialize_uri(self, uri: URI) -> "yarl.URL":
         """Serialize the URI, preserving the already-encoded query string as-is."""
         return yarl.URL.build(
             scheme=uri.scheme or "",
@@ -179,6 +195,21 @@ class AIOHTTPClient(AsyncHTTPClient):
         )
 
 
+def _upload_data(source: Any, body: AsyncBytesReader | None) -> Any:
+    """What aiohttp uploads for a request body, which it iterates.
+
+    A reader is read in 128 KiB chunks, which uploads faster than the 64 KiB that
+    AsyncBytesReader iterates in by default. An async iterable that isn't a reader
+    is passed through, so each item is sent as soon as it's produced rather than
+    held until a chunk fills.
+    """
+    if body is None:
+        return None
+    if not hasattr(source, "read") and isinstance(source, AsyncIterable):
+        return cast(AsyncIterable[bytes], source)
+    return body.iter_chunks(_UPLOAD_CHUNK_SIZE)
+
+
 def _assert_aiohttp() -> None:
     if not HAS_AIOHTTP:
         raise MissingDependencyError(

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/aio/crt.py

@@ -47,6 +47,7 @@ from . import interfaces as http_aio_interfaces
 
 __all__ = [
     "DEFAULT_READ_BUFFER_SIZE",
+    "HAS_CRT",
     "AWSCRTHTTPClient",
     "AWSCRTHTTPClientConfig",
     "AsyncAWSCRTHTTPResponse",
@@ -56,13 +57,7 @@ __all__ = [
 
 # Default buffer size for reading from streams (8 KB)
 DEFAULT_READ_BUFFER_SIZE = 8192
-
-
-def _assert_crt() -> None:
-    if not HAS_CRT:
-        raise MissingDependencyError(
-            "Attempted to use awscrt component, but awscrt is not installed."
-        )
+"""Default number of bytes read from a request body at a time."""
 
 
 class _AWSCRTEventLoop:
@@ -70,10 +65,12 @@ class _AWSCRTEventLoop:
         _assert_crt()
         event_loop_group = crt_io.EventLoopGroup(1)
         host_resolver = crt_io.DefaultHostResolver(event_loop_group)
-        self.bootstrap = crt_io.ClientBootstrap(event_loop_group, host_resolver)
+        self._bootstrap = crt_io.ClientBootstrap(event_loop_group, host_resolver)
 
 
 class AsyncAWSCRTHTTPResponse(http_aio_interfaces.HTTPResponse):
+    """HTTP response from the AWS CRT HTTP client."""
+
     def __init__(
         self,
         *,
@@ -113,6 +110,7 @@ class AsyncAWSCRTHTTPResponse(http_aio_interfaces.HTTPResponse):
         return None
 
     async def chunks(self) -> AsyncGenerator[bytes, None]:
+        """Yield the response body chunks as they arrive."""
         while True:
             chunk = await self._stream.get_next_response_chunk()
             if chunk:
@@ -143,45 +141,30 @@ class AWSCRTHTTPClientConfig(http_interfaces.HTTPClientConfiguration):
         _assert_crt()
 
 
-class _CRTTimeoutError(Exception):
+class _CRTTimeoutError(SmithyHTTPError):
     """Internal wrapper for CRT timeout errors."""
 
 
 class AWSCRTHTTPClient(http_aio_interfaces.AsyncHTTPClient):
+    """Asynchronous HTTP client backed by the AWS CRT."""
+
     _HTTP_PORT = 80
     _HTTPS_PORT = 443
     _TIMEOUT_ERROR_NAMES = frozenset(["AWS_IO_SOCKET_TIMEOUT", "AWS_IO_SOCKET_CLOSED"])
 
-    TIMEOUT_EXCEPTIONS = (_CRTTimeoutError,)
+    TIMEOUT_EXCEPTIONS: tuple[type[Exception], ...] = (_CRTTimeoutError,)
 
     # CRT can stream request and response data concurrently when the connection
     # negotiates HTTP/2.
     SUPPORTS_DUPLEX_STREAMING = True
 
-    def __init__(
-        self,
-        eventloop: _AWSCRTEventLoop | None = None,
-        client_config: AWSCRTHTTPClientConfig | None = None,
-    ) -> None:
+    def __init__(self, client_config: AWSCRTHTTPClientConfig | None = None) -> None:
         """
         :param client_config: Configuration that applies to all requests made with this
         client.
         """
         _assert_crt()
-        self._config = client_config or AWSCRTHTTPClientConfig()
-        if eventloop is None:
-            eventloop = _AWSCRTEventLoop()
-        self._eventloop = eventloop
-        self._client_bootstrap = self._eventloop.bootstrap
-        tls_ctx_options = crt_io.TlsContextOptions()
-        if self._config.trust_store_path is not None:
-            tls_ctx_options.override_default_trust_store_from_path(
-                None, self._config.trust_store_path
-            )
-        self._tls_ctx = crt_io.ClientTlsContext(tls_ctx_options)
-        self._socket_options = crt_io.SocketOptions()
-        self._connections: ConnectionPoolDict = {}
-        self._closed = False
+        self._init(_AWSCRTEventLoop(), client_config)
 
     async def __aenter__(self) -> Self:
         if self._closed:
@@ -192,10 +175,10 @@ class AWSCRTHTTPClient(http_aio_interfaces.AsyncHTTPClient):
         await self.close()
 
     def __deepcopy__(self, memo: Any) -> "AWSCRTHTTPClient":
-        return AWSCRTHTTPClient(
-            eventloop=self._eventloop,
-            client_config=deepcopy(self._config),
-        )
+        # Config is copied per operation, so copies share the event loop's thread.
+        copied = AWSCRTHTTPClient.__new__(AWSCRTHTTPClient)
+        copied._init(self._eventloop, deepcopy(self._config))
+        return copied
 
     async def send(
         self,
@@ -253,6 +236,24 @@ class AWSCRTHTTPClient(http_aio_interfaces.AsyncHTTPClient):
             return_exceptions=True,
         )
 
+    def _init(
+        self,
+        eventloop: _AWSCRTEventLoop,
+        client_config: AWSCRTHTTPClientConfig | None,
+    ) -> None:
+        self._config = client_config or AWSCRTHTTPClientConfig()
+        self._eventloop = eventloop
+        self._client_bootstrap = eventloop._bootstrap  # pyright: ignore[reportPrivateUsage]
+        tls_ctx_options = crt_io.TlsContextOptions()
+        if self._config.trust_store_path is not None:
+            tls_ctx_options.override_default_trust_store_from_path(
+                None, self._config.trust_store_path
+            )
+        self._tls_ctx = crt_io.ClientTlsContext(tls_ctx_options)
+        self._socket_options = crt_io.SocketOptions()
+        self._connections: ConnectionPoolDict = {}
+        self._closed = False
+
     async def _await_response(
         self, stream: "AIOHttpClientStreamUnified"
     ) -> AsyncAWSCRTHTTPResponse:
@@ -355,8 +356,7 @@ class AWSCRTHTTPClient(http_aio_interfaces.AsyncHTTPClient):
         for fld in request.fields.entries.values():
             if fld.kind != "header":
                 continue
-            for val in fld.values:
-                headers_list.append((fld.name, val))
+            headers_list.extend((fld.name, val) for val in fld.values)
 
         path = self._render_path(request.destination)
         headers = crt_http.HttpHeaders(headers_list)
@@ -416,3 +416,10 @@ class AWSCRTHTTPClient(http_aio_interfaces.AsyncHTTPClient):
                     yield bytes(chunk)
                 else:
                     yield chunk
+
+
+def _assert_crt() -> None:
+    if not HAS_CRT:
+        raise MissingDependencyError(
+            "Attempted to use awscrt component, but awscrt is not installed."
+        )

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/aio/identity/apikey.py

@@ -2,11 +2,8 @@
 #  SPDX-License-Identifier: Apache-2.0
 from smithy_core.aio.interfaces.identity import AsyncIdentityResolver
 
-from ...identity.apikey import (
-    APIKeyIdentity,
-    APIKeyIdentityProperties,
-    APIKeyIdentityResolver,
-)
+from ...identity import APIKeyIdentity, APIKeyIdentityProperties
+from ...identity.apikey import APIKeyIdentityResolver
 
 __all__ = [
     "APIKeyIdentity",

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/aio/protocols.py

@@ -36,12 +36,14 @@ from ..protocols import (
     HttpClientProtocol,
     RpcClientProtocol,
     RpcV2CborClientProtocol,
+    RpcV2JsonClientProtocol,
 )
 
 __all__ = [
     "AsyncHttpEventStreamMixin",
     "AsyncRpcEventStreamMixin",
     "AsyncRpcV2CborClientProtocol",
+    "AsyncRpcV2JsonClientProtocol",
 ]
 
 try:
@@ -138,7 +140,7 @@ class AsyncHttpEventStreamMixin(
         auth_scheme: AsyncAuthScheme[Any, Any, Any, Any] | None = None,
     ) -> AsyncEventPublisher[Event]:
         _assert_event_stream()
-        signing_config: SigningConfig[Any] | None = None
+        signing_config: SigningConfig[Any, Any, Any, Any] | None = None
         if auth_scheme is not None:
             event_signer = auth_scheme.event_signer(request=request)
             if event_signer is not None:
@@ -292,6 +294,10 @@ class AsyncRpcV2CborClientProtocol(AsyncRpcEventStreamMixin, RpcV2CborClientProt
     """An implementation of the smithy.protocols#rpcv2Cbor protocol."""
 
 
+class AsyncRpcV2JsonClientProtocol(AsyncRpcEventStreamMixin, RpcV2JsonClientProtocol):
+    """An implementation of the smithy.protocols#rpcv2Json protocol."""
+
+
 def _assert_event_stream() -> None:
     if not _HAS_EVENT_STREAM:
         raise MissingDependencyError(

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/aio/testing.py

@@ -38,4 +38,6 @@ class AsyncMockHTTPClient(MockHTTPClientBase, AsyncHTTPClient):
         :raises MockHTTPClientError: If no responses are queued.
         """
         status, fields, body = self._pop_response(request)
-        return HTTPResponse(status=status, fields=fields, body=list_async([body]))
+        if isinstance(body, bytes | bytearray):
+            body = list_async([bytes(body)])
+        return HTTPResponse(status=status, fields=fields, body=body)

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/auth/apikey.py

@@ -7,6 +7,7 @@ from smithy_core.exceptions import SmithyIdentityError
 from smithy_core.interfaces import TypedProperties as _TypedProperties
 from smithy_core.interfaces.auth import AuthScheme, Signer
 from smithy_core.interfaces.identity import IdentityResolver
+from smithy_core.shapes import ShapeID
 from smithy_core.traits import APIKeyLocation, HTTPAPIKeyAuthTrait
 
 from smithy_http.interfaces import HTTPRequest
@@ -77,7 +78,7 @@ class APIKeySigner(Signer[HTTPRequest, APIKeyIdentity, Any]):
 class _APIKeyAuthSchemeBase:
     """API key auth scheme logic shared by the sync and async schemes."""
 
-    scheme_id = HTTPAPIKeyAuthTrait.id
+    scheme_id: ShapeID = HTTPAPIKeyAuthTrait.id
 
     def __init__(
         self, *, name: str, location: APIKeyLocation, scheme: str | None = None

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/bindings.py

@@ -8,7 +8,6 @@ from smithy_core.shapes import ShapeType
 from smithy_core.traits import (
     ErrorFault,
     ErrorTrait,
-    HostLabelTrait,
     HTTPErrorTrait,
     HTTPHeaderTrait,
     HTTPLabelTrait,
@@ -50,9 +49,6 @@ class Binding(Enum):
     QUERY_PARAMS = 7
     """Indicates the member is bound to the query string as multiple key-value pairs."""
 
-    HOST = 8
-    """Indicates the member is bound to a prefix to the host AND to the body."""
-
 
 @dataclass(init=False)
 class _BindingMatcher:
@@ -86,9 +82,7 @@ class _BindingMatcher:
         for member in members:
             binding = self._do_match(member)
             self.bindings[member.expect_member_index()] = binding
-            found_body = (
-                found_body or binding is Binding.BODY or binding is Binding.HOST
-            )
+            found_body = found_body or binding is Binding.BODY
             if binding is Binding.PAYLOAD:
                 found_payload = True
                 self.payload_member = member
@@ -140,8 +134,6 @@ class RequestBindingMatcher(_BindingMatcher):
             return Binding.PREFIX_HEADERS
         if HTTPPayloadTrait.id in member.traits:
             return Binding.PAYLOAD
-        if HostLabelTrait.id in member.traits:
-            return Binding.HOST
         return Binding.BODY
 
 

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/deserializers.py

@@ -35,7 +35,14 @@ if TYPE_CHECKING:
     from smithy_core.interfaces import StreamingBlob as SyncStreamingBlob
 
 
-__all__ = ["HTTPResponseDeserializer"]
+__all__ = [
+    "HTTPHeaderDeserializer",
+    "HTTPHeaderListDeserializer",
+    "HTTPHeaderMapDeserializer",
+    "HTTPResponseCodeDeserializer",
+    "HTTPResponseDeserializer",
+    "RawPayloadDeserializer",
+]
 
 _PREFIX_HEADER_OMISSIONS = frozenset(
     {

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/endpoints.py

@@ -27,6 +27,8 @@ class HTTPEndpoint(Endpoint):
         headers: interfaces.Fields | None = None,
     ) -> None:
         self.uri = uri
-        self.properties = properties if properties is not None else TypedProperties()
+        self.properties: _TypedProperties = (
+            properties if properties is not None else TypedProperties()
+        )
         headers = headers if headers is not None else Fields()
         self.properties[HEADERS] = headers

{smithy_http-0.7.0 → smithy_http-0.8.0}/src/smithy_http/identity/__init__.py

@@ -18,4 +18,6 @@ class APIKeyIdentity(Identity):
 
 
 class APIKeyIdentityProperties(TypedDict, total=False):
+    """Identity properties that may carry an explicit API key."""
+
     api_key: str