smithy-http 0.4.2__tar.gz → 0.4.4__tar.gz

smithy_http-0.4.4/.changes/0.4.3.json

@@ -0,0 +1,12 @@
+{
+  "changes": [
+    {
+      "type": "enhancement",
+      "description": "Enabled HTTP binding protocols to resolve modeled response errors when wire identifiers do not exactly match registered shape IDs. ([#742](https://github.com/smithy-lang/smithy-python/pull/742))"
+    },
+    {
+      "type": "bugfix",
+      "description": "Fixed `AIOHTTPClient` sending omitted request payloads with chunked transfer encoding."
+    }
+  ]
+}

smithy_http-0.4.4/.changes/0.4.4.json

@@ -0,0 +1,16 @@
+{
+  "changes": [
+    {
+      "type": "enhancement",
+      "description": "Added a protocol hook for extracting server-provided retry delays from error responses."
+    },
+    {
+      "type": "enhancement",
+      "description": "Declared `AWSCRTHTTPClient` as duplex (bidirectional) streaming capable via `SUPPORTS_DUPLEX_STREAMING`. `AIOHTTPClient` explicitly does not support duplex streaming."
+    },
+    {
+      "type": "enhancement",
+      "description": "Disabled automatic redirects in `AIOHTTPClient` so that redirect responses are returned to the caller instead of being followed transparently."
+    }
+  ]
+}

{smithy_http-0.4.2 → smithy_http-0.4.4}/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## v0.4.4
+
+### Enhancements
+* Added a protocol hook for extracting server-provided retry delays from error responses.
+* Declared `AWSCRTHTTPClient` as duplex (bidirectional) streaming capable via `SUPPORTS_DUPLEX_STREAMING`. `AIOHTTPClient` explicitly does not support duplex streaming.
+* Disabled automatic redirects in `AIOHTTPClient` so that redirect responses are returned to the caller instead of being followed transparently.
+
+## v0.4.3
+
+### Enhancements
+* Enabled HTTP binding protocols to resolve modeled response errors when wire identifiers do not exactly match registered shape IDs. ([#742](https://github.com/smithy-lang/smithy-python/pull/742))
+
+### Bug fixes
+* Fixed `AIOHTTPClient` sending omitted request payloads with chunked transfer encoding.
+
 ## v0.4.2
 
 ### Bug fixes

{smithy_http-0.4.2 → smithy_http-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: smithy-http
-Version: 0.4.2
+Version: 0.4.4
 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/

{smithy_http-0.4.2 → smithy_http-0.4.4}/src/smithy_http/__init__.py

@@ -7,7 +7,7 @@ from typing import get_args
 from . import interfaces
 from .interfaces import FieldPosition
 
-__version__ = "0.4.2"
+__version__ = "0.4.4"
 
 _VALID_FIELD_POSITIONS = frozenset(get_args(FieldPosition))
 

{smithy_http-0.4.2 → smithy_http-0.4.4}/src/smithy_http/aio/aiohttp.py

@@ -53,6 +53,10 @@ class AIOHTTPClient(HTTPClient):
 
     TIMEOUT_EXCEPTIONS = (TimeoutError,)
 
+    # aiohttp has no HTTP/2 support and this client fully buffers the response
+    # before returning, so it can never interleave request and response data.
+    SUPPORTS_DUPLEX_STREAMING = False
+
     def __init__(
         self,
         *,
@@ -90,8 +94,13 @@ class AIOHTTPClient(HTTPClient):
             chain.from_iterable(fld.as_tuples() for fld in request.fields)
         )
 
-        body: StreamingBlob = request.body
-        if not isinstance(body, AsyncBytesReader):
+        body: StreamingBlob | None = request.body
+        if (
+            "content-length" not in request.fields
+            and "transfer-encoding" not in request.fields
+        ):
+            body = await self._prepare_body(body)
+        elif not isinstance(body, AsyncBytesReader):
             body = AsyncBytesReader(body)
 
         # The typing on `params` is incorrect, it'll happily accept a mapping whose
@@ -103,9 +112,23 @@ class AIOHTTPClient(HTTPClient):
             params=parse_qs(request.destination.query),  # type: ignore
             headers=headers_list,
             data=body,
+            allow_redirects=False,
         ) as resp:
             return await self._marshal_response(resp)
 
+    async def _prepare_body(self, body: StreamingBlob) -> AsyncBytesReader | None:
+        """Convert a body for aiohttp, omitting seekable bodies with no data."""
+        if not isinstance(body, AsyncBytesReader):
+            body = AsyncBytesReader(body)
+
+        if not body.seekable():
+            return body
+
+        position = await body.seek(0, 1)
+        end = await body.seek(0, 2)
+        await body.seek(position)
+        return None if position == end else body
+
     def _serialize_uri_without_query(self, uri: URI) -> yarl.URL:
         """Serialize all parts of the URI up to and including the path."""
         return yarl.URL.build(

{smithy_http-0.4.2 → smithy_http-0.4.4}/src/smithy_http/aio/crt.py

@@ -1,7 +1,6 @@
 #  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 #  pyright: reportMissingTypeStubs=false,reportUnknownMemberType=false
-#  flake8: noqa: F811
 from collections.abc import AsyncGenerator, AsyncIterable
 from copy import deepcopy
 from dataclasses import dataclass
@@ -143,6 +142,10 @@ class AWSCRTHTTPClient(http_aio_interfaces.HTTPClient):
 
     TIMEOUT_EXCEPTIONS = (_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,

{smithy_http-0.4.2 → smithy_http-0.4.4}/src/smithy_http/aio/protocols.py

@@ -23,6 +23,7 @@ from smithy_core.interfaces import StreamingBlob as SyncStreamingBlob
 from smithy_core.prelude import DOCUMENT
 from smithy_core.schemas import APIOperation
 from smithy_core.serializers import SerializeableShape
+from smithy_core.shapes import ShapeID
 from smithy_core.traits import EndpointTrait, HTTPTrait
 
 from ..deserializers import HTTPResponseDeserializer
@@ -185,15 +186,28 @@ class HttpBindingClientProtocol(HttpClientProtocol):
         error_id = self.error_identifier.identify(
             operation=operation, response=response
         )
+        if error_id is not None and error_id not in error_registry:
+            error_id = self._resolve_error_id(
+                operation=operation,
+                error_id=error_id,
+            )
+
+        retry_after = self._retry_after(response)
 
         if error_id is None and self._matches_content_type(response):
             if isinstance(response_body, bytearray):
                 response_body = bytes(response_body)
             deserializer = self.payload_codec.create_deserializer(source=response_body)
             document = deserializer.read_document(schema=DOCUMENT)
+            document_error_id = document.discriminator
+            if document_error_id not in error_registry:
+                document_error_id = self._resolve_error_id(
+                    operation=operation,
+                    error_id=document_error_id,
+                )
 
-            if document.discriminator in error_registry:
-                error_id = document.discriminator
+            if document_error_id in error_registry:
+                error_id = document_error_id
                 if isinstance(response_body, SeekableBytesReader):
                     response_body.seek(0)
 
@@ -213,7 +227,10 @@ class HttpBindingClientProtocol(HttpClientProtocol):
                 response=response,
                 body=response_body,
             )
-            return error_shape.deserialize(deserializer)
+            modeled_error = error_shape.deserialize(deserializer)
+            if retry_after is not None:
+                modeled_error.retry_after = retry_after
+            return modeled_error
 
         message = (
             f"Unknown error for operation {operation.schema.id} "
@@ -234,8 +251,22 @@ class HttpBindingClientProtocol(HttpClientProtocol):
             is_throttling_error=is_throttle,
             is_timeout_error=is_timeout,
             is_retry_safe=is_throttle or is_timeout or None,
+            retry_after=retry_after,
         )
 
+    def _retry_after(self, response: HTTPResponse) -> float | None:
+        """The retry delay in seconds requested by the server, if the response carries one."""
+        return None
+
+    def _resolve_error_id(
+        self,
+        *,
+        operation: APIOperation[Any, Any],
+        error_id: ShapeID,
+    ) -> ShapeID:
+        """Resolve a response discriminator to its modeled error shape ID."""
+        return error_id
+
     def _matches_content_type(self, response: HTTPResponse) -> bool:
         if "content-type" not in response.fields:
             return False

{smithy_http-0.4.2 → smithy_http-0.4.4}/src/smithy_http/testing/mockhttp.py

@@ -22,6 +22,11 @@ class MockHTTPClient(HTTPClient):
 
     TIMEOUT_EXCEPTIONS = (TimeoutError,)
 
+    # Declared so duplex (bidirectional) stream operations can be unit tested
+    # against this client. Queued responses are returned without consuming the
+    # request body, which is compatible with duplex streaming.
+    SUPPORTS_DUPLEX_STREAMING = True
+
     def __init__(
         self,
         *,