Skip to content

fix(bedrock): detect region from AWS_DEFAULT_REGION and aws_profile arg #1553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JiwaniZakir wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −5
Open

fix(bedrock): detect region from AWS_DEFAULT_REGION and aws_profile arg #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/anthropic/lib/bedrock/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ def _prepare_options(input_options: FinalRequestOptions) -> FinalRequestOptions:
return options


def _infer_region() -> str:
def _infer_region(aws_profile: str | None = None) -> str:
"""
Infer the AWS region from the environment variables or
from the boto3 session if available.
"""
aws_region = os.environ.get("AWS_REGION")
aws_region = os.environ.get("AWS_REGION") or os.environ.get("AWS_DEFAULT_REGION")
if aws_region is None:
try:
import boto3

session = boto3.Session()
session = boto3.Session(profile_name=aws_profile)
if session.region_name:
aws_region = session.region_name
except ImportError:
Expand Down Expand Up @@ -178,7 +178,7 @@ def __init__(

self.aws_access_key = aws_access_key

self.aws_region = _infer_region() if aws_region is None else aws_region
self.aws_region = _infer_region(aws_profile) if aws_region is None else aws_region
self.aws_profile = aws_profile

self.aws_session_token = aws_session_token
Expand Down Expand Up @@ -343,7 +343,7 @@ def __init__(

self.aws_access_key = aws_access_key

self.aws_region = _infer_region() if aws_region is None else aws_region
self.aws_region = _infer_region(aws_profile) if aws_region is None else aws_region
self.aws_profile = aws_profile

self.aws_session_token = aws_session_token
Expand Down
27 changes: 27 additions & 0 deletions tests/lib/test_bedrock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,13 @@ def test_api_key_env_mutual_exclusion(monkeypatch: t.Any) -> None:
)


def test_region_infer_from_aws_default_region_env(monkeypatch: t.Any) -> None:
monkeypatch.setenv("AWS_DEFAULT_REGION", "ap-southeast-1")
monkeypatch.delenv("AWS_REGION", raising=False)
client = AnthropicBedrock()
assert client.aws_region == "ap-southeast-1"


def test_region_infer_from_profile(
mock_aws_config: None, # noqa: ARG001
profiles: t.List[AwsConfigProfile],
Expand Down Expand Up @@ -275,3 +282,23 @@ def test_region_infer_from_specified_profile(
client = AnthropicBedrock()

assert client.aws_region == next(profile for profile in profiles if profile["name"] == aws_profile)["region"]


@pytest.mark.parametrize(
"profiles, aws_profile",
[
pytest.param(
[{"name": "default", "region": "us-east-2"}, {"name": "custom", "region": "us-west-1"}],
"custom",
id="custom profile via aws_profile arg",
),
],
)
def test_region_infer_from_aws_profile_arg(
mock_aws_config: None, # noqa: ARG001
profiles: t.List[AwsConfigProfile],
aws_profile: str,
) -> None:
client = AnthropicBedrock(aws_profile=aws_profile)

assert client.aws_region == next(profile for profile in profiles if profile["name"] == aws_profile)["region"]