Independent Auditing of AI Agents. Run by human or the agent itself, to answer the most crucial question in the AI Agent Economy. Is the agent doing what is supposed to do? With iFixAi you can have this answer in less than 120 seconds.
Python agent-evaluationaiai-alignmentai-evaluationai-governanceai-safetyclidiagnostic-tooleu-ai-acthallucination-detectioniso-42001llm-evaluationllm-securitynist-ai-rmfowasp-llmprompt-injectionpythonresponsible-airisk-assessmentrisk-management
fix(bedrock): honor the AWS region chain instead of pinning us-east-1 (#337)
Rudy Mizrahi Celeklic92ddd802f8d
diff --git a/ifixai/providers/bedrock.py b/ifixai/providers/bedrock.pyindex 6db5de6..ccd8db4 100644--- a/ifixai/providers/bedrock.py+++ b/ifixai/providers/bedrock.py@@ -22,13 +22,14 @@ from ifixai.providers.schemas import ConversePayloadINITIAL_BACKOFF_SECONDS = 1.0BACKOFF_MULTIPLIER = 2.0+_DEFAULT_REGION = "us-east-1"class BedrockProvider(ChatProvider):def __init__(self,- region_name: str = "us-east-1",+ region_name: str | None = None,profile_name: str | None = None,) -> None:self.region_name = region_name@@ -42,7 +43,7 @@ class BedrockProvider(ChatProvider):if not config.model:raise ProviderResponseError(provider="bedrock",- endpoint=f"bedrock-runtime.{self.region_name}.amazonaws.com",+ endpoint=f"bedrock-runtime.{self.region_name or _DEFAULT_REGION}.amazonaws.com",details=("Bedrock model ID is required. ""Set config.model to a Bedrock model ID "@@ -50,15 +51,17 @@ class BedrockProvider(ChatProvider):),)- endpoint = (- config.endpoint or f"bedrock-runtime.{self.region_name}.amazonaws.com"- )-- session_kwargs: dict = {"region_name": self.region_name}+ # Without an explicit region, honor the standard AWS chain+ # (AWS_REGION / AWS_DEFAULT_REGION / profile) before the default.+ session_kwargs: dict = {}+ if self.region_name:+ session_kwargs["region_name"] = self.region_nameif self.profile_name:session_kwargs["profile_name"] = self.profile_namesession = boto3.Session(**session_kwargs)+ region = getattr(session, "region_name", None) or _DEFAULT_REGION+ endpoint = config.endpoint or f"bedrock-runtime.{region}.amazonaws.com"# The adapter owns this client and its retry loop. Configure the native# socket limits too: cancelling to_thread cannot stop a blocking read.@@ -73,6 +76,7 @@ class BedrockProvider(ChatProvider):)client_kwargs: dict = {"service_name": "bedrock-runtime",+ "region_name": region,"config": Config(retries={"total_max_attempts": 1},**socket_limits,diff --git a/ifixai/tests/test_bedrock_region_resolution.py b/ifixai/tests/test_bedrock_region_resolution.pynew file mode 100644index 0000000..f01c975--- /dev/null+++ b/ifixai/tests/test_bedrock_region_resolution.py@@ -0,0 +1,84 @@+"""Bedrock follows the standard AWS region chain unless a region is passed."""++import asyncio+import json++import pytest++boto3 = pytest.importorskip("boto3")+from botocore.awsrequest import AWSResponse # noqa: E402++from ifixai.core.types import ChatMessage, ProviderConfig # noqa: E402+from ifixai.providers import bedrock # noqa: E402+++class _Body:+ def __init__(self, data):+ self._data = data++ def stream(self, **_kwargs):+ yield self._data++ def read(self):+ return self._data+++def _send(monkeypatch, provider):+ seen = []++ def reply(request, **_kwargs):+ seen.append((request.url, request.headers["Authorization"].decode()+ if isinstance(request.headers["Authorization"], bytes)+ else request.headers["Authorization"]))+ body = json.dumps({+ "output": {"message": {"role": "assistant", "content": [{"text": "ok"}]}},+ "stopReason": "end_turn",+ "usage": {"inputTokens": 1, "outputTokens": 1, "totalTokens": 2},+ }).encode()+ return AWSResponse(request.url, 200, {"Content-Type": "application/json"}, _Body(body))++ real_session = boto3.Session++ class HookedSession(real_session):+ def client(self, *args, **kwargs):+ client = super().client(*args, **kwargs)+ client.meta.events.register("before-send.bedrock-runtime.Converse", reply)+ return client++ monkeypatch.setattr(bedrock.boto3, "Session", HookedSession)+ config = ProviderConfig(provider="bedrock", model="anthropic.claude-3-haiku-20240307-v1:0", timeout=5, max_retries=0)+ assert asyncio.run(provider.send_message([ChatMessage(role="user", content="hi")], config)) == "ok"+ assert len(seen) == 1+ return seen[0]+++def aws_env(monkeypatch, tmp_path):+ monkeypatch.setenv("AWS_ACCESS_KEY_ID", "AKIAEXAMPLEEXAMPLE00")+ monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "x" * 40)+ monkeypatch.setenv("AWS_EC2_METADATA_DISABLED", "true")+ monkeypatch.setenv("AWS_CONFIG_FILE", str(tmp_path / "config"))+ monkeypatch.setenv("AWS_SHARED_CREDENTIALS_FILE", str(tmp_path / "credentials"))+ monkeypatch.delenv("AWS_REGION", raising=False)+ monkeypatch.delenv("AWS_DEFAULT_REGION", raising=False)+ monkeypatch.delenv("AWS_PROFILE", raising=False)+++def test_environment_region_is_honored(monkeypatch, aws_env):+ monkeypatch.setenv("AWS_DEFAULT_REGION", "eu-west-1")+ url, auth = _send(monkeypatch, bedrock.BedrockProvider())+ assert "bedrock-runtime.eu-west-1.amazonaws.com" in url+ assert "/eu-west-1/bedrock/" in auth+++def test_explicit_region_overrides_environment(monkeypatch, aws_env):+ monkeypatch.setenv("AWS_DEFAULT_REGION", "eu-west-1")+ url, auth = _send(monkeypatch, bedrock.BedrockProvider(region_name="ap-south-1"))+ assert "bedrock-runtime.ap-south-1.amazonaws.com" in url+ assert "/ap-south-1/bedrock/" in auth+++def test_us_east_1_remains_the_default_without_a_configured_region(monkeypatch, aws_env):+ url, auth = _send(monkeypatch, bedrock.BedrockProvider())+ assert "bedrock-runtime.us-east-1.amazonaws.com" in url+ assert "/us-east-1/bedrock/" in auth