smithy-http 0.3.1__tar.gz → 0.4.1__tar.gz

smithy_http-0.4.1/.changes/0.4.0.json

@@ -0,0 +1,12 @@
+{
+  "changes": [
+    {
+      "type": "breaking",
+      "description": "Replace `FieldPosition` enum values with string literals for `Field.kind`. Use \"header\" and \"trailer\" instead of `FieldPosition.HEADER` and `FieldPosition.TRAILER`."
+    },
+    {
+      "type": "dependency",
+      "description": "Upgrade CRT to 0.32.0 to fix bug where HTTP2 exceptions could hang indefinitely"
+    }
+  ]
+}

smithy_http-0.4.1/.changes/0.4.1.json

@@ -0,0 +1,8 @@
+{
+  "changes": [
+    {
+      "type": "bugfix",
+      "description": "Fixed `AWSCRTHTTPClient` to send HTTP/1.1 request bodies via `body_stream` instead of the HTTP/2-only `request_body_generator`."
+    }
+  ]
+}

{smithy_http-0.3.1 → smithy_http-0.4.1}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v0.4.1
+
+### Bug fixes
+* Fixed `AWSCRTHTTPClient` to send HTTP/1.1 request bodies via `body_stream` instead of the HTTP/2-only `request_body_generator`.
+
+## v0.4.0
+
+### Breaking Changes
+* Replace `FieldPosition` enum values with string literals for `Field.kind`. Use "header" and "trailer" instead of `FieldPosition.HEADER` and `FieldPosition.TRAILER`.
+
+### Dependencies
+* Upgrade CRT to 0.32.0 to fix bug where HTTP2 exceptions could hang indefinitely
+
 ## v0.3.1
 
 ### Bug fixes

{smithy_http-0.3.1 → smithy_http-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smithy-http
-Version: 0.3.1
+Version: 0.4.1
 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/
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Free Threading :: 2 - Beta
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.12
@@ -29,7 +30,7 @@ Provides-Extra: aiohttp
 Requires-Dist: aiohttp<4.0,>=3.11.12; extra == 'aiohttp'
 Requires-Dist: yarl; extra == 'aiohttp'
 Provides-Extra: awscrt
-Requires-Dist: awscrt~=0.28.2; extra == 'awscrt'
+Requires-Dist: awscrt~=0.32.0; extra == 'awscrt'
 Description-Content-Type: text/markdown
 
 # smithy-http

{smithy_http-0.3.1 → smithy_http-0.4.1}/pyproject.toml

@@ -23,6 +23,7 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Free Threading :: 2 - Beta",
   "Topic :: Software Development :: Libraries"
 ]
 dependencies = [
@@ -36,7 +37,7 @@ dependencies = [
 
 [project.optional-dependencies]
 awscrt = [
-    "awscrt~=0.28.2",
+    "awscrt~=0.32.0",
 ]
 aiohttp = [
     "aiohttp>=3.11.12, <4.0",

{smithy_http-0.3.1 → smithy_http-0.4.1}/src/smithy_http/__init__.py

@@ -2,11 +2,14 @@
 # SPDX-License-Identifier: Apache-2.0
 from collections import Counter, OrderedDict
 from collections.abc import Iterable, Iterator
+from typing import get_args
 
 from . import interfaces
 from .interfaces import FieldPosition
 
-__version__ = "0.3.1"
+__version__ = "0.4.1"
+
+_VALID_FIELD_POSITIONS = frozenset(get_args(FieldPosition))
 
 
 class Field(interfaces.Field):
@@ -24,10 +27,12 @@ class Field(interfaces.Field):
         *,
         name: str,
         values: Iterable[str] | None = None,
-        kind: FieldPosition = FieldPosition.HEADER,
+        kind: FieldPosition = "header",
     ):
         self.name = name
         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
 
     def add(self, value: str) -> None:
@@ -79,7 +84,7 @@ class Field(interfaces.Field):
             return False
         return (
             self.name == other.name
-            and self.kind is other.kind
+            and self.kind == other.kind
             and self.values == other.values
         )
 
@@ -153,7 +158,7 @@ class Fields(interfaces.Fields):
 
         Used to grab all headers or all trailers.
         """
-        return [entry for entry in self.entries.values() if entry.kind is kind]
+        return [entry for entry in self.entries.values() if entry.kind == kind]
 
     def extend(self, other: interfaces.Fields) -> None:
         """Merges ``entries`` of ``other`` into the current ``entries``.
@@ -225,8 +230,6 @@ def tuples_to_fields(
         try:
             fields[name].add(value)
         except KeyError:
-            fields[name] = Field(
-                name=name, values=[value], kind=kind or FieldPosition.HEADER
-            )
+            fields[name] = Field(name=name, values=[value], kind=kind or "header")
 
     return fields

{smithy_http-0.3.1 → smithy_http-0.4.1}/src/smithy_http/aio/aiohttp.py

@@ -28,7 +28,6 @@ from smithy_core.interfaces import URI
 
 from .. import Field, Fields
 from ..interfaces import (
-    FieldPosition,
     HTTPClientConfiguration,
     HTTPRequestConfiguration,
 )
@@ -125,7 +124,7 @@ class AIOHTTPClient(HTTPClient):
                 headers[header_name] = Field(
                     name=header_name,
                     values=[header_val],
-                    kind=FieldPosition.HEADER,
+                    kind="header",
                 )
 
         return HTTPResponse(

{smithy_http-0.3.1 → smithy_http-0.4.1}/src/smithy_http/aio/crt.py

@@ -6,6 +6,7 @@ from collections.abc import AsyncGenerator, AsyncIterable
 from copy import deepcopy
 from dataclasses import dataclass
 from inspect import iscoroutinefunction
+from io import BytesIO
 from typing import TYPE_CHECKING, Any
 
 from awscrt.exceptions import AwsCrtError
@@ -36,12 +37,12 @@ except ImportError:
 from smithy_core import interfaces as core_interfaces
 from smithy_core.aio import interfaces as core_aio_interfaces
 from smithy_core.aio.types import AsyncBytesReader
+from smithy_core.aio.utils import read_streaming_blob_async
 from smithy_core.exceptions import MissingDependencyError
 
 from .. import Field, Fields
 from .. import interfaces as http_interfaces
 from ..exceptions import SmithyHTTPError
-from ..interfaces import FieldPosition
 from . import interfaces as http_aio_interfaces
 
 # Default buffer size for reading from streams (8 KB)
@@ -176,13 +177,18 @@ class AWSCRTHTTPClient(http_aio_interfaces.HTTPClient):
             crt_request = self._marshal_request(request)
             connection = await self._get_connection(request.destination)
 
-            # Convert body to async iterator for request_body_generator
-            body_generator = self._create_body_generator(request.body)
-
-            crt_stream = connection.request(
-                crt_request,
-                request_body_generator=body_generator,
-            )
+            # request_body_generator is HTTP/2-only in CRT; HTTP/1.1 must use body_stream
+            if connection.version is crt_http.HttpVersion.Http2:
+                crt_stream = connection.request(
+                    crt_request,
+                    request_body_generator=self._create_body_generator(request.body),
+                )
+            else:
+                if (
+                    body_stream := await self._create_body_stream(request.body)
+                ) is not None:
+                    crt_request.body_stream = body_stream
+                crt_stream = connection.request(crt_request)
 
             return await self._await_response(crt_stream)
         except AwsCrtError as e:
@@ -203,7 +209,7 @@ class AWSCRTHTTPClient(http_aio_interfaces.HTTPClient):
                 fields[header_name] = Field(
                     name=header_name,
                     values=[header_val],
-                    kind=FieldPosition.HEADER,
+                    kind="header",
                 )
         return AWSCRTHTTPResponse(
             status=status_code,
@@ -294,8 +300,7 @@ class AWSCRTHTTPClient(http_aio_interfaces.HTTPClient):
             request.fields.set_field(Field(name="accept", values=["*/*"]))
 
         for fld in request.fields.entries.values():
-            # TODO: Use literal values for "header"/"trailer".
-            if fld.kind.value != FieldPosition.HEADER.value:
+            if fld.kind != "header":
                 continue
             for val in fld.values:
                 headers_list.append((fld.name, val))
@@ -310,6 +315,15 @@ class AWSCRTHTTPClient(http_aio_interfaces.HTTPClient):
         )
         return crt_request
 
+    async def _create_body_stream(
+        self, body: core_aio_interfaces.StreamingBlob
+    ) -> core_interfaces.BytesReader | None:
+        """Convert various body types to a bytes reader for CRT HTTP/1.1."""
+        if core_interfaces.is_bytes_reader(body):
+            return body
+        buffered = await read_streaming_blob_async(body)
+        return BytesIO(buffered) if buffered else None
+
     async def _create_body_generator(
         self, body: core_aio_interfaces.StreamingBlob
     ) -> AsyncGenerator[bytes, None]:

{smithy_http-0.3.1 → smithy_http-0.4.1}/src/smithy_http/interfaces/__init__.py

@@ -2,29 +2,18 @@
 #  SPDX-License-Identifier: Apache-2.0
 from collections.abc import Iterator
 from dataclasses import dataclass
-from enum import Enum
-from typing import Protocol
+from typing import Literal, Protocol
 
+FieldPosition = Literal["header", "trailer"]
+"""The type of a field.
 
-class FieldPosition(Enum):
-    """The type of a field.
+Defines its placement in a request or response.
 
-    Defines its placement in a request or response.
-    """
-
-    HEADER = 0
-    """Header field.
-
-    In HTTP this is a header as defined in RFC 9110 Section 6.3. Implementations of
-    other protocols may use this FieldPosition for similar types of metadata.
-    """
-
-    TRAILER = 1
-    """Trailer field.
+header: Header field. In HTTP this is a header as defined in RFC 9110 Section 6.3.
+trailer: Trailer field. In HTTP this is a trailer as defined in RFC 9110 Section 6.5.
 
-    In HTTP this is a trailer as defined in RFC 9110 Section 6.5. Implementations of
-    other protocols may use this FieldPosition for similar types of metadata.
-    """
+Implementations of other protocols may use this FieldPosition for similar types of metadata.
+"""
 
 
 class Field(Protocol):
@@ -40,7 +29,7 @@ class Field(Protocol):
 
     name: str
     values: list[str]
-    kind: FieldPosition = FieldPosition.HEADER
+    kind: FieldPosition = "header"
 
     def add(self, value: str) -> None:
         """Append a value to a field."""