Release 2026-05-21: merge develop into main

aws-sdk-python-automation · aws-sdk-python-automation · commit d0e320684148 · 2026-05-21T16:54:02.000Z
diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml
@@ -18,6 +18,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: apache/skywalking-eyes/header@e0cc16d0e47f446fbc456d0e670dc50dec09719e
+      - uses: apache/skywalking-eyes/header@e910f72bae86171d727742c25f8a4555b7b83893
         with:
           mode: check 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.12", "3.13", "3.14", "3.15"]
+        python-version: ["3.12", "3.13", "3.14", "3.14t", "3.15"]
 
     steps:
       - name: Checkout Repository
diff --git a/codegen/gradle/libs.versions.toml b/codegen/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
 junit5 = "6.0.3"
-smithy = "1.69.0"
+smithy = "1.70.0"
 mockito = "5.23.0"
 test-logger-plugin = "4.0.0"
 spotbugs = "6.0.22"
 spotless = "8.4.0"
 smithy-gradle-plugins = "1.4.0"
-dep-analysis = "3.9.0"
+dep-analysis = "3.11.0"
 jsoup = "1.22.1"
 commonmark = "0.17.0"
 
diff --git a/codegen/gradle/wrapper/gradle-wrapper.jar b/codegen/gradle/wrapper/gradle-wrapper.jar
diff --git a/codegen/gradle/wrapper/gradle-wrapper.properties b/codegen/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/codegen/gradlew b/codegen/gradlew
diff --git a/codegen/gradlew.bat b/codegen/gradlew.bat
diff --git a/packages/aws-sdk-signers/pyproject.toml b/packages/aws-sdk-signers/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"
 ]
 
diff --git a/packages/smithy-aws-core/pyproject.toml b/packages/smithy-aws-core/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 = [
diff --git a/packages/smithy-aws-event-stream/pyproject.toml b/packages/smithy-aws-event-stream/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 = [
diff --git a/packages/smithy-core/pyproject.toml b/packages/smithy-core/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 = []
diff --git a/packages/smithy-http/.changes/0.4.1.json b/packages/smithy-http/.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`."
+    }
+  ]
+}
diff --git a/packages/smithy-http/CHANGELOG.md b/packages/smithy-http/CHANGELOG.md
@@ -1,5 +1,10 @@
 # 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
diff --git a/packages/smithy-http/pyproject.toml b/packages/smithy-http/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 = [
diff --git a/packages/smithy-http/src/smithy_http/__init__.py b/packages/smithy-http/src/smithy_http/__init__.py
@@ -7,7 +7,7 @@
 from . import interfaces
 from .interfaces import FieldPosition
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 _VALID_FIELD_POSITIONS = frozenset(get_args(FieldPosition))
 
diff --git a/packages/smithy-http/src/smithy_http/aio/crt.py b/packages/smithy-http/src/smithy_http/aio/crt.py
@@ -6,6 +6,7 @@
 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,6 +37,7 @@
 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
@@ -175,13 +177,18 @@ async def send(
             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:
@@ -308,6 +315,15 @@ def _marshal_request(
         )
         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]:
diff --git a/packages/smithy-http/tests/unit/aio/test_crt.py b/packages/smithy-http/tests/unit/aio/test_crt.py
@@ -66,6 +66,69 @@ async def test_port_included_in_host_header(host: str, expected: str) -> None:
     assert crt_request.headers.get("host") == expected  # type: ignore
 
 
+async def test_send_http1_uses_body_stream() -> None:
+    """Test HTTP/1.1 requests use the CRT body stream."""
+    client = AWSCRTHTTPClient()
+    request = HTTPRequest(
+        method="POST",
+        destination=URI(scheme="https", host="example.com", path="/"),
+        body=AsyncBytesReader(b"Action=Test&Version=2020-01-08"),
+        fields=Fields(),
+    )
+    mock_stream = Mock()
+    mock_response = Mock()
+    mock_connection = Mock()
+    mock_connection.version = crt_http.HttpVersion.Http1_1
+    mock_connection.request = Mock(return_value=mock_stream)
+
+    with (
+        patch.object(
+            client, "_get_connection", AsyncMock(return_value=mock_connection)
+        ),
+        patch.object(client, "_await_response", AsyncMock(return_value=mock_response)),
+    ):
+        actual = await client.send(request)
+
+    assert actual is mock_response
+    mock_connection.request.assert_called_once()
+    assert "request_body_generator" not in mock_connection.request.call_args.kwargs
+    crt_request = mock_connection.request.call_args.args[0]
+    assert crt_request.body_stream is not None
+
+
+async def test_send_http2_uses_body_generator() -> None:
+    """Test HTTP/2 requests use the CRT body generator."""
+    client = AWSCRTHTTPClient()
+    request = HTTPRequest(
+        method="POST",
+        destination=URI(scheme="https", host="example.com", path="/"),
+        body=AsyncBytesReader(b"Action=Test&Version=2020-01-08"),
+        fields=Fields(),
+    )
+    mock_stream = Mock()
+    mock_response = Mock()
+    mock_connection = Mock()
+    mock_connection.version = crt_http.HttpVersion.Http2
+    mock_connection.request = Mock(return_value=mock_stream)
+
+    with (
+        patch.object(
+            client, "_get_connection", AsyncMock(return_value=mock_connection)
+        ),
+        patch.object(client, "_await_response", AsyncMock(return_value=mock_response)),
+    ):
+        actual = await client.send(request)
+
+    assert actual is mock_response
+    mock_connection.request.assert_called_once()
+    crt_request = mock_connection.request.call_args.args[0]
+    body_generator = mock_connection.request.call_args.kwargs["request_body_generator"]
+    assert crt_request.body_stream is None
+    assert [chunk async for chunk in body_generator] == [
+        b"Action=Test&Version=2020-01-08"
+    ]
+
+
 async def test_body_generator_bytes() -> None:
     """Test body generator with bytes input."""
     client = AWSCRTHTTPClient()
@@ -191,6 +254,53 @@ async def test_body_generator_empty_bytes() -> None:
     assert chunks == [b""]
 
 
+async def test_body_stream_bytes() -> None:
+    """Test body stream with bytes input."""
+    client = AWSCRTHTTPClient()
+
+    body_stream = await client._create_body_stream(b"Hello, World!")
+
+    assert body_stream is not None
+    assert body_stream.read() == b"Hello, World!"
+
+
+async def test_body_stream_bytesio() -> None:
+    """Test body stream with BytesIO."""
+    client = AWSCRTHTTPClient()
+    body = BytesIO(b"data from BytesIO")
+
+    body_stream = await client._create_body_stream(body)
+
+    assert body_stream is not None
+    assert body_stream is body
+    assert body_stream.read() == b"data from BytesIO"
+
+
+async def test_body_stream_async_iterable() -> None:
+    """Test body stream with custom AsyncIterable."""
+
+    async def custom_generator() -> AsyncIterator[bytes]:
+        yield b"chunk1"
+        yield b"chunk2"
+        yield b"chunk3"
+
+    client = AWSCRTHTTPClient()
+
+    body_stream = await client._create_body_stream(custom_generator())
+
+    assert body_stream is not None
+    assert body_stream.read() == b"chunk1chunk2chunk3"
+
+
+async def test_body_stream_empty_bytes() -> None:
+    """Test body stream with empty bytes."""
+    client = AWSCRTHTTPClient()
+
+    body_stream = await client._create_body_stream(b"")
+
+    assert body_stream is None
+
+
 async def test_build_connection_http() -> None:
     """Test building HTTP connection."""
     client = AWSCRTHTTPClient()
diff --git a/packages/smithy-json/pyproject.toml b/packages/smithy-json/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 = [
diff --git a/packages/smithy-xml/pyproject.toml b/packages/smithy-xml/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 = [
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ classifiers = [`
`23`	`23`	`"Programming Language :: Python :: 3.13",`
`24`	`24`	`"Programming Language :: Python :: 3.14",`
`25`	`25`	`"Programming Language :: Python :: Implementation :: CPython",`
	`26`	`+ "Programming Language :: Python :: Free Threading :: 2 - Beta",`
`26`	`27`	`"Topic :: Software Development :: Libraries"`
`27`	`28`	`]`
`28`	`29`