From be3ac6363e4276ff49f1125b10487dfbfda0f9b1 Mon Sep 17 00:00:00 2001
From: Arron Bailiss <arron@amazon.com>
Date: Sun, 18 May 2025 17:30:15 -0400
Subject: [PATCH] fix(bedrock): use the AWS_REGION environment variable for the
 Bedrock model provider region if set and boto_session is not passed

---
 src/strands/models/bedrock.py        |  6 ++++--
 tests/strands/models/test_bedrock.py | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/strands/models/bedrock.py b/src/strands/models/bedrock.py
index b1b18b3ef..4c02156df 100644
--- a/src/strands/models/bedrock.py
+++ b/src/strands/models/bedrock.py
@@ -4,6 +4,7 @@
 """
 
 import logging
+import os
 from typing import Any, Iterable, Literal, Optional, cast
 
 import boto3
@@ -96,7 +97,8 @@ def __init__(
         Args:
             boto_session: Boto Session to use when calling the Bedrock Model.
             boto_client_config: Configuration to use when creating the Bedrock-Runtime Boto Client.
-            region_name: AWS region to use for the Bedrock service. Defaults to "us-west-2".
+            region_name: AWS region to use for the Bedrock service.
+                Defaults to the AWS_REGION environment variable if set, or "us-west-2" if not set.
             **model_config: Configuration options for the Bedrock model.
         """
         if region_name and boto_session:
@@ -108,7 +110,7 @@ def __init__(
         logger.debug("config=<%s> | initializing", self.config)
 
         session = boto_session or boto3.Session(
-            region_name=region_name or "us-west-2",
+            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")
         self.client = session.client(
diff --git a/tests/strands/models/test_bedrock.py b/tests/strands/models/test_bedrock.py
index 566671ce4..0844c8cd1 100644
--- a/tests/strands/models/test_bedrock.py
+++ b/tests/strands/models/test_bedrock.py
@@ -1,3 +1,4 @@
+import os
 import unittest.mock
 
 import boto3
@@ -99,6 +100,16 @@ def test__init__with_custom_region(bedrock_client):
         mock_session_cls.assert_called_once_with(region_name=custom_region)
 
 
+def test__init__with_environment_variable_region(bedrock_client):
+    """Test that BedrockModel uses the provided region."""
+    _ = bedrock_client
+    os.environ["AWS_REGION"] = "eu-west-1"
+
+    with unittest.mock.patch("strands.models.bedrock.boto3.Session") as mock_session_cls:
+        _ = BedrockModel()
+        mock_session_cls.assert_called_once_with(region_name="eu-west-1")
+
+
 def test__init__with_region_and_session_raises_value_error():
     """Test that BedrockModel raises ValueError when both region and session are provided."""
     with pytest.raises(ValueError):