fix: address bot's comments

Author: JackYPCOnline

src/strands/models/_openai_bedrock.py

@@ -2,13 +2,12 @@
 
 Converts an ``aws_config`` dict into the ``base_url`` and ``api_key`` that the
 OpenAI Python SDK consumes. Tokens are minted on demand via
-``aws_bedrock_token_generator.provide_token`` so long-running agents keep working
-past the bearer token's maximum lifetime.
+``aws_bedrock_token_generator.provide_token`` so long-running agents survive the
+bearer token's maximum lifetime.
 
-``aws_bedrock_token_generator`` is imported lazily inside
-:func:`resolve_bedrock_client_args` so that users of OpenAI-compatible extras
-(``sagemaker``, ``litellm``, bare ``openai`` without Mantle) don't pay an
-``ImportError`` just for importing the model class.
+``aws_bedrock_token_generator`` is imported lazily so that extras which reuse
+the OpenAI package without pulling the Mantle dependency do not hit an
+``ImportError`` at module load.
 """
 
 from __future__ import annotations
@@ -25,7 +24,7 @@ class AwsConfig(TypedDict, total=False):
     """AWS-side config for reaching Bedrock Mantle via an OpenAI-compatible client.
 
     Attributes:
-        region: AWS region hosting the Bedrock Mantle endpoint (required).
+        region: AWS region hosting the Bedrock Mantle endpoint.
         credentials_provider: Optional botocore ``CredentialProvider`` forwarded to
             ``provide_token``. Defaults to the AWS credential chain.
         expiry: Optional ``timedelta`` for the bearer token's lifetime, forwarded
@@ -61,8 +60,7 @@ def resolve_bedrock_client_args(aws_config: AwsConfig, client_args: dict[str, An
             "Install it with: pip install strands-agents[openai]"
         ) from e
 
-    # Only forward optional kwargs when explicitly set, so provide_token's own
-    # defaults apply. Passing expiry=None in particular crashes the library.
+    # Only forward kwargs the user set; provide_token rejects expiry=None.
     token_kwargs: dict[str, Any] = {"region": region}
     if "credentials_provider" in aws_config:
         token_kwargs["aws_credentials_provider"] = aws_config["credentials_provider"]

src/strands/models/openai.py

@@ -89,27 +89,20 @@ def __init__(
                 Note: The client should not be shared across different asyncio event loops.
             client_args: Arguments for the OpenAI client (legacy approach).
                 For a complete list of supported arguments, see https://pypi.org/project/openai/.
-                May be combined with ``aws_config``; transport-level options like ``http_client``,
-                ``timeout``, or ``default_headers`` are preserved, while ``base_url`` and
-                ``api_key`` are always overridden by ``aws_config`` when both are set.
+                May be combined with ``aws_config``; when both are set, ``aws_config`` overrides
+                ``base_url`` and ``api_key`` only.
             aws_config: Route requests through Amazon Bedrock's Mantle (OpenAI-compatible)
-                endpoint. Provide ``{"region": "us-east-1"}`` at minimum. Accepts optional
-                ``credentials_provider`` (a botocore ``CredentialProvider``) and ``expiry``
-                (a ``datetime.timedelta`` up to 12h). When set, a fresh bearer token is minted
-                on every request via ``aws-bedrock-token-generator`` and the OpenAI client is
-                pointed at ``https://bedrock-mantle.<region>.api.aws/v1``. Cannot be combined
-                with a pre-built ``client``.
+                endpoint. See :class:`AwsConfig` for accepted keys. When set, a fresh bearer
+                token is minted on every request. Cannot be combined with a pre-built ``client``.
             **model_config: Configuration options for the OpenAI model.
 
         Raises:
-            ValueError: If ``client`` is combined with ``client_args`` or ``aws_config``,
-                or if ``aws_config`` is missing a region.
+            ValueError: If ``client`` is combined with ``client_args`` or ``aws_config``.
         """
         validate_config_keys(model_config, self.OpenAIConfig)
         self.config = dict(model_config)
 
-        # Validate that client configuration methods are mutually exclusive where they conflict.
-        # client_args + aws_config is allowed — aws_config will override base_url / api_key only.
+        # client_args + aws_config is allowed; aws_config overrides base_url / api_key only.
         client_args_provided = client_args is not None and len(client_args) > 0
         if client is not None and client_args_provided:
             raise ValueError("Only one of 'client' or 'client_args' should be provided, not both.")
@@ -125,9 +118,7 @@ def __init__(
     def _resolve_client_args(self) -> dict[str, Any]:
         """Return the kwargs to pass to ``openai.AsyncOpenAI`` for the current request.
 
-        When ``aws_config`` is set, a fresh Bedrock Mantle bearer token is minted on every
-        call and ``base_url`` / ``api_key`` are overridden. Any other entries from
-        ``client_args`` (e.g. ``http_client``, ``timeout``) are preserved.
+        Delegates to :func:`resolve_bedrock_client_args` when ``aws_config`` is set.
         """
         if self._aws_config is not None:
             return resolve_bedrock_client_args(self._aws_config, self.client_args)
@@ -619,7 +610,6 @@ async def _get_client(self) -> AsyncIterator[Any]:
             # Use the injected client (caller manages lifecycle)
             yield self._custom_client
         else:
-            # Create a new client from resolved args (static client_args or freshly-minted Bedrock creds).
             # We initialize an OpenAI context on every request so as to avoid connection sharing in the underlying
             # httpx client. The asyncio event loop does not allow connections to be shared. For more details, please
             # refer to https://github.com/encode/httpx/discussions/2959.

src/strands/models/openai_responses.py

@@ -152,19 +152,12 @@ def __init__(
         Args:
             client_args: Arguments for the OpenAI client.
                 For a complete list of supported arguments, see https://pypi.org/project/openai/.
-                May be combined with ``aws_config``; transport-level options like ``http_client``,
-                ``timeout``, or ``default_headers`` are preserved, while ``base_url`` and
-                ``api_key`` are always overridden by ``aws_config`` when both are set.
+                May be combined with ``aws_config``; when both are set, ``aws_config`` overrides
+                ``base_url`` and ``api_key`` only.
             aws_config: Route requests through Amazon Bedrock's Mantle (OpenAI-compatible)
-                endpoint. Provide ``{"region": "us-east-1"}`` at minimum. Accepts optional
-                ``credentials_provider`` (a botocore ``CredentialProvider``) and ``expiry``
-                (a ``datetime.timedelta`` up to 12h). When set, a fresh bearer token is minted
-                on every request via ``aws-bedrock-token-generator`` and the OpenAI client is
-                pointed at ``https://bedrock-mantle.<region>.api.aws/v1``.
+                endpoint. See :class:`AwsConfig` for accepted keys. When set, a fresh bearer
+                token is minted on every request.
             **model_config: Configuration options for the OpenAI Responses API model.
-
-        Raises:
-            ValueError: If ``aws_config`` is missing a region.
         """
         validate_config_keys(model_config, self.OpenAIResponsesConfig)
         self.config = dict(model_config)
@@ -177,9 +170,7 @@ def __init__(
     def _resolve_client_args(self) -> dict[str, Any]:
         """Return the kwargs to pass to ``openai.AsyncOpenAI`` for the current request.
 
-        When ``aws_config`` is set, a fresh Bedrock Mantle bearer token is minted on every
-        call and ``base_url`` / ``api_key`` are overridden. Any other entries from
-        ``client_args`` (e.g. ``http_client``, ``timeout``) are preserved.
+        Delegates to :func:`resolve_bedrock_client_args` when ``aws_config`` is set.
         """
         if self._aws_config is not None:
             return resolve_bedrock_client_args(self._aws_config, self.client_args)

tests/strands/models/test_openai.py

@@ -1718,8 +1718,6 @@ def test_format_request_messages_multiple_tool_calls_with_images():
 
 
 class TestOpenAIModelAwsConfig:
-    """Tests for the Bedrock Mantle pathway via the aws_config kwarg."""
-
     @pytest.fixture
     def mock_provide_token(self):
         with unittest.mock.patch("aws_bedrock_token_generator.provide_token") as mock:
@@ -1731,12 +1729,11 @@ def test_aws_config_sets_base_url_and_api_key(self, openai_client, mock_provide_
         _ = openai_client
         model = OpenAIModel(model_id="openai.gpt-oss-120b", aws_config={"region": "us-east-1"})
 
-        # api_key is resolved per-request (lazy), so check via the resolved client_args at call time
+        # Token is minted lazily per request, so inspect the resolved kwargs.
         resolved = model._resolve_client_args()
         assert resolved["base_url"] == "https://bedrock-mantle.us-east-1.api.aws/v1"
         assert resolved["api_key"] == "bedrock-api-key-deadbeef&Version=1"
-        # Only region is forwarded when the user did not set optional kwargs,
-        # so provide_token's own defaults (e.g. 12h expiry) apply.
+        # Optional kwargs aren't forwarded so provide_token's own defaults apply.
         mock_provide_token.assert_called_once_with(region="us-east-1")
 
     def test_aws_config_forwards_credentials_provider_and_expiry(self, openai_client, mock_provide_token):

tests/strands/models/test_openai_responses.py

@@ -1306,8 +1306,6 @@ async def test_fallback_logs_debug(self, model, openai_client, messages, caplog)
 
 
 class TestOpenAIResponsesModelAwsConfig:
-    """Tests for the Bedrock Mantle pathway via the aws_config kwarg."""
-
     @pytest.fixture
     def mock_provide_token(self):
         with unittest.mock.patch("aws_bedrock_token_generator.provide_token") as mock: