Merge branch 'strands-agents:main' into main

Author: dgallitelli

.github/workflows/test-lint-pr.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}  # Explicitly define which commit to checkout
+          ref: ${{ github.event.pull_request.head.sha }}  # Explicitly define which commit to check out
           persist-credentials: false  # Don't persist credentials for subsequent actions
       - name: Set up Python
         uses: actions/setup-python@v5

CONTRIBUTING.md

@@ -33,14 +33,14 @@ This project uses [hatchling](https://hatch.pypa.io/latest/build/#hatchling) as
 
 1. Install development dependencies:
    ```bash
-   pip install -e ".[dev]" && pip install -e ".[litellm]
+   pip install -e ".[dev]" && pip install -e ".[litellm]"
    ```
 
 2. Set up pre-commit hooks:
    ```bash
    pre-commit install -t pre-commit -t commit-msg
    ```
-   This will automatically run formatters and convention commit checks on your code before each commit.
+   This will automatically run formatters and conventional commit checks on your code before each commit.
 
 3. Run code formatters manually:
    ```bash

STYLE_GUIDE.md

@@ -26,7 +26,7 @@ logger.debug("field1=<%s>, field2=<%s>, ... | human readable message", field1, f
      - This is an optimization to skip string interpolation when the log level is not enabled
 
 1. **Messages**:
-   - Add human readable messages at the end of the log
+   - Add human-readable messages at the end of the log
    - Use lowercase for consistency
    - Avoid punctuation (periods, exclamation points, etc.) to reduce clutter
    - Keep messages concise and focused on a single statement

pyproject.toml

@@ -54,7 +54,7 @@ dev = [
     "commitizen>=4.4.0,<5.0.0",
     "hatch>=1.0.0,<2.0.0",
     "moto>=5.1.0,<6.0.0",
-    "mypy>=0.981,<1.0.0",
+    "mypy>=1.15.0,<2.0.0",
     "pre-commit>=3.2.0,<4.2.0",
     "pytest>=8.0.0,<9.0.0",
     "pytest-asyncio>=0.26.0,<0.27.0",
@@ -69,15 +69,18 @@ docs = [
 litellm = [
     "litellm>=1.69.0,<2.0.0",
 ]
+llamaapi = [
+    "llama-api-client>=0.1.0,<1.0.0",
+]
 ollama = [
     "ollama>=0.4.8,<1.0.0",
 ]
-llamaapi = [
-    "llama-api-client>=0.1.0,<1.0.0",
+openai = [
+    "openai>=1.68.0,<2.0.0",
 ]
 
 [tool.hatch.envs.hatch-static-analysis]
-features = ["anthropic", "litellm", "llamaapi", "ollama"]
+features = ["anthropic", "litellm", "llamaapi", "ollama", "openai"]
 dependencies = [
   "mypy>=1.15.0,<2.0.0",
   "ruff>=0.11.6,<0.12.0",
@@ -100,7 +103,7 @@ lint-fix = [
 ]
 
 [tool.hatch.envs.hatch-test]
-features = ["anthropic", "litellm", "llamaapi", "ollama"]
+features = ["anthropic", "litellm", "llamaapi", "ollama", "openai"]
 extra-dependencies = [
     "moto>=5.1.0,<6.0.0",
     "pytest>=8.0.0,<9.0.0",

src/strands/models/bedrock.py

@@ -112,7 +112,21 @@ def __init__(
         session = boto_session or boto3.Session(
             region_name=region_name or os.getenv("AWS_REGION") or "us-west-2",
         )
-        client_config = boto_client_config or BotocoreConfig(user_agent_extra="strands-agents")
+
+        # Add strands-agents to the request user agent
+        if boto_client_config:
+            existing_user_agent = getattr(boto_client_config, "user_agent_extra", None)
+
+            # Append 'strands-agents' to existing user_agent_extra or set it if not present
+            if existing_user_agent:
+                new_user_agent = f"{existing_user_agent} strands-agents"
+            else:
+                new_user_agent = "strands-agents"
+
+            client_config = boto_client_config.merge(BotocoreConfig(user_agent_extra=new_user_agent))
+        else:
+            client_config = BotocoreConfig(user_agent_extra="strands-agents")
+
         self.client = session.client(
             service_name="bedrock-runtime",
             config=client_config,