Address feedback

Author: jonathan343

packages/smithy-aws-core/src/smithy_aws_core/aio/protocols.py

@@ -2,9 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from collections.abc import AsyncIterable, Callable
 from inspect import iscoroutinefunction
-from string import Formatter
 from typing import TYPE_CHECKING, Any, Final
-from urllib.parse import quote as urlquote
 
 from smithy_core import URI as _URI
 from smithy_core.aio.interfaces import AsyncByteStream, AsyncWriter
@@ -35,7 +33,7 @@
 from smithy_core.schemas import APIOperation, Schema
 from smithy_core.serializers import SerializeableShape
 from smithy_core.shapes import ShapeID, ShapeType
-from smithy_core.traits import EndpointTrait, HTTPTrait
+from smithy_core.traits import HTTPTrait
 from smithy_core.types import TimestampFormat
 from smithy_http import tuples_to_fields
 from smithy_http.aio import HTTPRequest as _HTTPRequest
@@ -296,10 +294,9 @@ def serialize_request[
             body = AsyncBytesReader(payload)
 
         fields = tuples_to_fields(field_tuples)
-        host = self._resolve_host_prefix(operation=operation, payload=payload)
         return _HTTPRequest(
             destination=_URI(
-                host=host,
+                host="",
                 path=self._http_trait.path.pattern,
                 query=self._http_trait.query,
             ),
@@ -368,47 +365,6 @@ def _is_success(
     ) -> bool:
         return 200 <= response.status < 300
 
-    def _resolve_host_prefix(
-        self,
-        *,
-        operation: APIOperation[Any, Any],
-        payload: bytes,
-    ) -> str:
-        endpoint_trait = operation.schema.get_trait(EndpointTrait)
-        if endpoint_trait is None:
-            return ""
-
-        host_prefix = endpoint_trait.host_prefix
-        labels = self._host_prefix_labels(host_prefix)
-        if not labels:
-            return host_prefix
-
-        deserializer = self.payload_codec.create_deserializer(source=payload)
-        document = deserializer.read_document(schema=DOCUMENT)
-        if document.shape_type is not ShapeType.MAP:
-            raise ExpectationNotMetError(
-                f"Expected input document to be a map for host labels, got {document.shape_type}"
-            )
-
-        values: dict[str, str] = {}
-        map_document = document.as_map()
-        for label in labels:
-            value = map_document.get(label)
-            if value is None or value.shape_type is not ShapeType.STRING:
-                raise ExpectationNotMetError(
-                    f"Expected host label member '{label}' to be a string in input payload"
-                )
-            values[label] = urlquote(value.as_string(), safe=".")
-
-        return host_prefix.format(**values)
-
-    def _host_prefix_labels(self, host_prefix: str) -> set[str]:
-        labels: set[str] = set()
-        for _, field_name, _, _ in Formatter().parse(host_prefix):
-            if field_name:
-                labels.add(field_name)
-        return labels
-
     def _coerce_json_source(
         self,
         *,
@@ -453,6 +409,10 @@ async def _create_error(
         error_registry: TypeRegistry,
         context: TypedProperties,
     ) -> CallError:
+        # Keeps HttpBindingClientProtocol._create_error's error ID resolution,
+        # but awsJson operations do not use per-operation HTTP bindings. Once
+        # the error shape is resolved, deserialize it directly from JSON and
+        # normalize empty bodies to {} for structured errors.
         error_id = self.error_identifier.identify(
             operation=operation, response=response
         )

packages/smithy-aws-core/tests/unit/aio/test_protocols.py

@@ -16,18 +16,12 @@
 from smithy_core.aio.interfaces import AsyncWriter
 from smithy_core.documents import TypeRegistry
 from smithy_core.exceptions import DiscriminatorError, ModeledError
-from smithy_core.prelude import STRING
 from smithy_core.schemas import APIOperation, Schema
 from smithy_core.serializers import ShapeSerializer
 from smithy_core.shapes import ShapeID, ShapeType
 from smithy_core.traits import (
-    DynamicTrait,
-    EndpointTrait,
-    HostLabelTrait,
-    HTTPHeaderTrait,
     HTTPTrait,
     StreamingTrait,
-    Trait,
 )
 from smithy_core.types import TypedProperties
 from smithy_http import Fields, tuples_to_fields
@@ -125,13 +119,6 @@ def test_aws_json_document_discriminator(
 _EMPTY_INPUT_SCHEMA = Schema.collection(
     id=ShapeID("com.test#EmptyInput"),
 )
-_HEADER_AND_LABEL_INPUT_SCHEMA = Schema.collection(
-    id=ShapeID("com.test#HeaderAndLabelInput"),
-    members={
-        "headerMember": {"target": STRING, "traits": [HTTPHeaderTrait("x-test")]},
-        "label": {"target": STRING, "traits": [HostLabelTrait()]},
-    },
-)
 _EVENT_STREAM_MEMBER_SCHEMA = Schema(
     id=ShapeID("com.test#InputEvents"),
     shape_type=ShapeType.UNION,
@@ -148,35 +135,10 @@ def serialize_members(self, serializer: ShapeSerializer) -> None:
         pass
 
 
-@dataclass
-class _HeaderAndLabelInput:
-    header_member: str | None = None
-    label: str | None = None
-
-    def serialize(self, serializer: ShapeSerializer) -> None:
-        serializer.write_struct(_HEADER_AND_LABEL_INPUT_SCHEMA, self)
-
-    def serialize_members(self, serializer: ShapeSerializer) -> None:
-        if self.header_member is not None:
-            serializer.write_string(
-                _HEADER_AND_LABEL_INPUT_SCHEMA.members["headerMember"],
-                self.header_member,
-            )
-        if self.label is not None:
-            serializer.write_string(
-                _HEADER_AND_LABEL_INPUT_SCHEMA.members["label"],
-                self.label,
-            )
-
-
-def _operation_schema(name: str, *, endpoint: str | None = None) -> Schema:
-    traits: list[Trait | DynamicTrait] = []
-    if endpoint is not None:
-        traits.append(EndpointTrait({"hostPrefix": endpoint}))
+def _operation_schema(name: str) -> Schema:
     return Schema(
         id=ShapeID(f"com.test#{name}"),
         shape_type=ShapeType.OPERATION,
-        traits=traits,
     )
 
 
@@ -239,28 +201,6 @@ async def test_aws_json11_serializes_input_event_stream_request_with_writable_bo
     assert isinstance(request.body, AsyncWriter)
 
 
-@pytest.mark.asyncio
-async def test_aws_json_ignores_http_bindings_but_applies_host_labels() -> None:
-    protocol = AwsJson11ClientProtocol(
-        Schema(id=ShapeID("com.test#JsonService"), shape_type=ShapeType.SERVICE)
-    )
-    request = protocol.serialize_request(
-        operation=_mock_operation(
-            _operation_schema("EndpointOperation", endpoint="foo.{label}.")
-        ),
-        input=_HeaderAndLabelInput(header_member="payload", label="bar"),
-        endpoint=URI(host="example.com"),
-        context=TypedProperties(),
-    )
-
-    assert request.destination.host == "foo.bar."
-    assert "x-test" not in request.fields
-    assert (
-        await request.consume_body_async()
-        == b'{"headerMember":"payload","label":"bar"}'
-    )
-
-
 def test_aws_json_matches_content_type_with_parameters() -> None:
     protocol = AwsJson11ClientProtocol(
         Schema(id=ShapeID("com.test#JsonService"), shape_type=ShapeType.SERVICE)

packages/smithy-json/src/smithy_json/_private/deserializers.py

@@ -139,9 +139,7 @@ def read_big_decimal(self, schema: Schema) -> Decimal:
         match event.value:
             case Decimal():
                 return event.value
-            case int() | float():
-                return Decimal.from_float(event.value)
-            case "Infinity" | "-Infinity" | "NaN":
+            case int() | float() | "Infinity" | "-Infinity" | "NaN":
                 return Decimal(event.value)
             case _:
                 raise JSONTokenError("number", event)