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

smithy_http-0.4.3/.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.2 → smithy_http-0.4.3}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 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.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smithy-http
-Version: 0.4.2
+Version: 0.4.3
 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.3}/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.3"
 
 _VALID_FIELD_POSITIONS = frozenset(get_args(FieldPosition))
 

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

@@ -90,8 +90,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
@@ -106,6 +111,19 @@ class AIOHTTPClient(HTTPClient):
         ) 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.3}/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

{smithy_http-0.4.2 → smithy_http-0.4.3}/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,26 @@ 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,
+            )
 
         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)
 
@@ -236,6 +248,15 @@ class HttpBindingClientProtocol(HttpClientProtocol):
             is_retry_safe=is_throttle or is_timeout or 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