bedrock-agentcore-starter-toolkit 0.1.8__tar.gz → 0.1.9__tar.gz

{bedrock_agentcore_starter_toolkit-0.1.8 → bedrock_agentcore_starter_toolkit-0.1.9}/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.1.9] - 2025-09-07
+
+### Changes
+
+- fix: resolve regex escape sequence warnings (#151) (70d7381)
+- feat(gateway): handle existing policies gracefully in _attach_policy (#140) (f372b99)
+- chore: bump version to 0.1.8 (#150) (1421e48)
+
+### Dependencies
+- Updated to bedrock-agentcore SDK v0.1.3
+
 ## [0.1.8] - 2025-09-02
 
 ### Changes

{bedrock_agentcore_starter_toolkit-0.1.8 → bedrock_agentcore_starter_toolkit-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bedrock-agentcore-starter-toolkit
-Version: 0.1.8
+Version: 0.1.9
 Summary: A starter toolkit for using Bedrock AgentCore
 Project-URL: Homepage, https://github.com/aws/bedrock-agentcore-starter-toolkit
 Project-URL: Bug Tracker, https://github.com/aws/bedrock-agentcore-starter-toolkit/issues
@@ -22,7 +22,7 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Requires-Dist: autopep8>=2.3.2
-Requires-Dist: bedrock-agentcore>=0.1.2
+Requires-Dist: bedrock-agentcore>=0.1.3
 Requires-Dist: boto3>=1.39.7
 Requires-Dist: botocore>=1.39.7
 Requires-Dist: docstring-parser<1.0,>=0.15

{bedrock_agentcore_starter_toolkit-0.1.8 → bedrock_agentcore_starter_toolkit-0.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bedrock-agentcore-starter-toolkit"
-version = "0.1.8"
+version = "0.1.9"
 description = "A starter toolkit for using Bedrock AgentCore"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
     "boto3>=1.39.7",
     "botocore>=1.39.7",
-    "bedrock-agentcore>=0.1.2",
+    "bedrock-agentcore>=0.1.3",
     "docstring_parser>=0.15,<1.0",
     "httpx>=0.28.1",
     "jinja2>=3.1.6",

{bedrock_agentcore_starter_toolkit-0.1.8 → bedrock_agentcore_starter_toolkit-0.1.9}/src/bedrock_agentcore_starter_toolkit/operations/gateway/create_role.py

@@ -73,18 +73,59 @@ def _attach_policy(
     :param policy_name: the policy name (if not using a policy_arn).
     :return:
     """
-    if policy_arn and policy_document:
-        raise Exception("Cannot specify both policy arn and policy document.")
+    # Check for invalid combinations of parameters
+    if policy_arn:
+        if policy_document or policy_name:
+            raise Exception("Cannot specify both policy arn and policy document/name")
+    elif not (policy_document and policy_name):
+        raise Exception("Must specify both policy document and policy name, or just a policy arn")
+
     try:
-        if policy_arn:
-            iam_client.attach_role_policy(RoleName=role_name, PolicyArn=policy_arn)
-        elif policy_document and policy_name:
-            policy = iam_client.create_policy(
-                PolicyName=policy_name,
-                PolicyDocument=policy_document,
-            )
-            iam_client.attach_role_policy(RoleName=role_name, PolicyArn=policy["Policy"]["Arn"])
-        else:
-            raise Exception("Must specify both policy document and policy name or just a policy arn")
+        if policy_document and policy_name:
+            policy_arn = _try_create_policy(iam_client, policy_name, policy_document)
+        iam_client.attach_role_policy(RoleName=role_name, PolicyArn=policy_arn)
     except ClientError as e:
         raise RuntimeError(f"Failed to attach AgentCore policy: {e}") from e
+    
+def _try_create_policy(
+    iam_client: BaseClient, 
+    policy_name: str, 
+    policy_document: str
+) -> str:
+    """Try to create a new policy, or return the arn if the policy already exists.
+
+    :param iam_client: the IAM client to use.
+    :param policy_name: the name of the policy to create.
+    :param policy_document: the policy document to create.
+    :return: the arn of the policy.
+    """
+    try:
+        policy = iam_client.create_policy(
+            PolicyName=policy_name,
+            PolicyDocument=policy_document,
+        )
+        return policy["Policy"]["Arn"]
+    except ClientError as e:
+        if e.response["Error"]["Code"] == "EntityAlreadyExists":
+            return _get_existing_policy_arn(iam_client, policy_name)
+        else:
+            raise e
+        
+def _get_existing_policy_arn(
+    iam_client: BaseClient, 
+    policy_name: str
+) -> str:
+    """Get the arn of an existing policy.
+
+    :param iam_client: the IAM client to use.
+    :param policy_name: the name of the policy to get.
+    :return: the arn of the policy.
+    """
+    paginator = iam_client.get_paginator("list_policies")
+    try:
+        for page in paginator.paginate(Scope="Local"):
+            for policy in page["Policies"]:
+                if policy["PolicyName"] == policy_name:
+                    return policy["Arn"]
+    except ClientError as e:
+        raise RuntimeError(f"Failed to get existing policy arn: {e}") from e

{bedrock_agentcore_starter_toolkit-0.1.8 → bedrock_agentcore_starter_toolkit-0.1.9}/src/bedrock_agentcore_starter_toolkit/services/import_agent/scripts/base_bedrock_translate.py

@@ -1031,6 +1031,10 @@ class BaseBedrockTranslator:
 
             return code_1p
 
+    def _get_url_regex_pattern(self) -> str:
+        """Get the URL regex pattern for source extraction."""
+        return r'(?:https?://|www\.)(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(?:/[^/\s]*)*'
+
     def generate_entrypoint_code(self, platform: str) -> str:
         """Generate entrypoint code for the agent."""
         entrypoint_code = ""
@@ -1059,6 +1063,7 @@ class BaseBedrockTranslator:
             else "tools_used.update([msg.name for msg in agent_result if isinstance(msg, ToolMessage)])"
         )
         response_content_code = "str(agent_result)" if platform == "strands" else "agent_result[-1].content"
+        url_pattern = self._get_url_regex_pattern()
 
         entrypoint_code += f"""
     def endpoint(payload, context):
@@ -1079,7 +1084,7 @@ class BaseBedrockTranslator:
 
             # Gathering sources from the response
             sources = []
-            urls = re.findall(r'(?:https?://|www\.)(?:[a-zA-Z0-9\-]+\.)+[a-zA-Z]{{2,}}(?:/[^/\s]*)*', response_content)
+            urls = re.findall({repr(url_pattern)}, response_content)
             source_tags = re.findall(r"<source>(.*?)</source>", response_content)
             sources.extend(urls)
             sources.extend(source_tags)

{bedrock_agentcore_starter_toolkit-0.1.8 → bedrock_agentcore_starter_toolkit-0.1.9}/tests/operations/gateway/test_gateway_create_role.py

@@ -254,7 +254,7 @@ class TestAttachPolicy:
         """Test that providing policy document without name raises exception."""
         policy_document = {"Version": "2012-10-17"}
 
-        with pytest.raises(Exception, match="Must specify both policy document and policy name or just a policy arn"):
+        with pytest.raises(Exception, match="Must specify both policy document and policy name, or just a policy arn"):
             _attach_policy(iam_client=self.mock_iam_client, role_name=self.role_name, policy_document=policy_document)
 
         # Verify no AWS calls were made
@@ -265,7 +265,7 @@ class TestAttachPolicy:
         """Test that providing policy name without document raises exception."""
         policy_name = "TestPolicy"
 
-        with pytest.raises(Exception, match="Must specify both policy document and policy name or just a policy arn"):
+        with pytest.raises(Exception, match="Must specify both policy document and policy name, or just a policy arn"):
             _attach_policy(iam_client=self.mock_iam_client, role_name=self.role_name, policy_name=policy_name)
 
         # Verify no AWS calls were made
@@ -274,7 +274,7 @@ class TestAttachPolicy:
 
     def test_attach_policy_no_parameters_raises_exception(self):
         """Test that providing no policy parameters raises exception."""
-        with pytest.raises(Exception, match="Must specify both policy document and policy name or just a policy arn"):
+        with pytest.raises(Exception, match="Must specify both policy document and policy name, or just a policy arn"):
             _attach_policy(iam_client=self.mock_iam_client, role_name=self.role_name)
 
         # Verify no AWS calls were made
@@ -412,6 +412,42 @@ class TestAttachPolicy:
             RoleName=self.role_name, PolicyArn=created_policy_arn
         )
 
+    def test_attach_policy_with_existing_full_access_policy(self):
+        """Test attaching a preexisting full access policy."""
+        policy_name = "BedrockAgentCoreGatewayStarterFullAccess"
+        existing_policy_arn = "arn:aws:iam::123456789012:policy/BedrockAgentCoreGatewayStarterFullAccess"
+
+        # Mock ClientError on create_policy
+        client_error = ClientError(
+            error_response={"Error": {
+                "Code": "EntityAlreadyExists", 
+                "Message": f"Policy {policy_name} already exists"
+            }},
+            operation_name="CreatePolicy",
+        )
+        self.mock_iam_client.create_policy.side_effect = client_error
+
+        # Mock paginator
+        self.mock_iam_client.get_paginator.return_value.paginate.return_value = [
+            {"Policies": [{"Arn": existing_policy_arn, "PolicyName": policy_name}]}
+        ]
+
+        _attach_policy(
+            iam_client=self.mock_iam_client,
+            role_name=self.role_name,
+            policy_document=AGENTCORE_FULL_ACCESS,
+            policy_name=policy_name,
+        )
+
+        # Verify paginator was called
+        self.mock_iam_client.get_paginator.assert_called_once_with("list_policies")
+        self.mock_iam_client.get_paginator().paginate.assert_called_once_with(Scope="Local")
+    
+        # Verify attach_role_policy was called
+        self.mock_iam_client.attach_role_policy.assert_called_once_with(
+            RoleName=self.role_name, PolicyArn=existing_policy_arn
+        )
+
     def test_attach_policy_with_aws_managed_policies(self):
         """Test attaching AWS managed policies from POLICIES constant."""
         for policy_arn in POLICIES:

{bedrock_agentcore_starter_toolkit-0.1.8 → bedrock_agentcore_starter_toolkit-0.1.9}/uv.lock

@@ -73,7 +73,7 @@ wheels = [
 
 [[package]]
 name = "bedrock-agentcore"
-version = "0.1.2"
+version = "0.1.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "boto3" },
@@ -84,14 +84,14 @@ dependencies = [
     { name = "urllib3" },
     { name = "uvicorn" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/fe/7c/2de54122abd86ad73cf42b5ba3f26410bb043cca685edc3f90d166b8bc38/bedrock_agentcore-0.1.2.tar.gz", hash = "sha256:9063dddef43c0f6c492d8fec852a6a8c1c630f7bcee07aa3f0d218290370988b", size = 204302, upload-time = "2025-08-11T21:27:50.053Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6b/6b/d5051b8fffe83e71c0d8099388f81d510d316d167f6b3b33236d690a1808/bedrock_agentcore-0.1.3.tar.gz", hash = "sha256:5a569e54844aa2d6080ca0ff1c64a42d1bd7b19ef613f760c82187041b404ec5", size = 228637, upload-time = "2025-09-05T22:53:32.22Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/63/e0/d66fbc2f7620214964039ffe9a675dd1e8e23245c61cd7b280f78d606d02/bedrock_agentcore-0.1.2-py3-none-any.whl", hash = "sha256:2e45b5e3d14ac1828881f089456fb35c48233ab7aad8c4d83c525cf4b2ab92c2", size = 48747, upload-time = "2025-08-11T21:27:48.804Z" },
+    { url = "https://files.pythonhosted.org/packages/58/89/4ed9b136bfab46c4afc4ff1e8fec12618eafc395fcd006234e10103111d6/bedrock_agentcore-0.1.3-py3-none-any.whl", hash = "sha256:570356f11d859dafe91aa524ba8e9cac46837d7202847c615b832e318c77f632", size = 61621, upload-time = "2025-09-05T22:53:31.199Z" },
 ]
 
 [[package]]
 name = "bedrock-agentcore-starter-toolkit"
-version = "0.1.8"
+version = "0.1.9"
 source = { editable = "." }
 dependencies = [
     { name = "autopep8" },
@@ -139,7 +139,7 @@ dev = [
 [package.metadata]
 requires-dist = [
     { name = "autopep8", specifier = ">=2.3.2" },
-    { name = "bedrock-agentcore", specifier = ">=0.1.2" },
+    { name = "bedrock-agentcore", specifier = ">=0.1.3" },
     { name = "boto3", specifier = ">=1.39.7" },
     { name = "botocore", specifier = ">=1.39.7" },
     { name = "docstring-parser", specifier = ">=0.15,<1.0" },