bedrock-agentcore-starter-toolkit 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

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/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.dist-info → bedrock_agentcore_starter_toolkit-0.1.9.dist-info}/METADATA

@@ -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.dist-info → bedrock_agentcore_starter_toolkit-0.1.9.dist-info}/RECORD

@@ -19,7 +19,7 @@ bedrock_agentcore_starter_toolkit/operations/gateway/__init__.py,sha256=5Qo1GeN-
 bedrock_agentcore_starter_toolkit/operations/gateway/client.py,sha256=8WP2E_u6h1-mPfz4TgNMloD6bcXfoXQDL3UCrbyhT7g,20068
 bedrock_agentcore_starter_toolkit/operations/gateway/constants.py,sha256=0_4J6BN4VAE4-XTQhPTEACkhilRrFqu_iKiuHSm2pYk,4610
 bedrock_agentcore_starter_toolkit/operations/gateway/create_lambda.py,sha256=MQsBJfUj26zBh7LqYWLoekHuvbAHIJE8qcXwrmJOhM0,2875
-bedrock_agentcore_starter_toolkit/operations/gateway/create_role.py,sha256=a38JE28PbdRabskTgLXsiqHqWS1vt06jxEEGneYPO_g,3145
+bedrock_agentcore_starter_toolkit/operations/gateway/create_role.py,sha256=Z02OtPyuilulX0DnA5vMfGVyn6KUB9wL1mmKeNOCblw,4511
 bedrock_agentcore_starter_toolkit/operations/gateway/exceptions.py,sha256=WjsrE7lT2708CJniM_ISMzkfNX4IUteGgvOxleD9JZY,272
 bedrock_agentcore_starter_toolkit/operations/runtime/__init__.py,sha256=7ucAtIbabrDmEaHOfGqHtEr2CkQlEsb5O2tkHirXCqU,673
 bedrock_agentcore_starter_toolkit/operations/runtime/configure.py,sha256=7xjNN6fn1U2cv20W2tmHdlbSjc-RU953tnbOaH5iXPQ,9056
@@ -39,7 +39,7 @@ bedrock_agentcore_starter_toolkit/services/import_agent/assets/requirements_lang
 bedrock_agentcore_starter_toolkit/services/import_agent/assets/requirements_strands.j2,sha256=ZAWzCFwdj8Mbq8aBGO3Jnxz0G8XJZPNpIsPf_2Jetfk,100
 bedrock_agentcore_starter_toolkit/services/import_agent/assets/template_fixtures_merged.json,sha256=Xem7jS8n96QEyHBmnPAvWHM4AyTLyma7Nq9sCVHuXJA,175239
 bedrock_agentcore_starter_toolkit/services/import_agent/scripts/__init__.py,sha256=UmhcnsfIo2P1Z9VAJ6Ua2mSkxs4BOeTxgFMcgQXQWCQ,79
-bedrock_agentcore_starter_toolkit/services/import_agent/scripts/base_bedrock_translate.py,sha256=xAqf0Rrhb4QWE_6WBk98NkQdHbCyy2uFzKbiw_9cWA4,72520
+bedrock_agentcore_starter_toolkit/services/import_agent/scripts/base_bedrock_translate.py,sha256=zmI1e-1pYhP4SroQ4r_k8KmdncaXmJPsYvsDKPCcvtU,72713
 bedrock_agentcore_starter_toolkit/services/import_agent/scripts/bedrock_to_langchain.py,sha256=xwoZcmZ27CfYohwSfLIgbFxa2ubiBFhvufgQEWZkmLk,14950
 bedrock_agentcore_starter_toolkit/services/import_agent/scripts/bedrock_to_strands.py,sha256=eC3v2Ts7B_RUGl4bkUim2uFYYuZZYP9syYBlylJ2gXs,14642
 bedrock_agentcore_starter_toolkit/utils/endpoints.py,sha256=1gIDRd1oO1fymYpiedVit7m6zl5k6N8Ns9N-2ix7ZaE,1153
@@ -54,9 +54,9 @@ bedrock_agentcore_starter_toolkit/utils/runtime/templates/Dockerfile.j2,sha256=0
 bedrock_agentcore_starter_toolkit/utils/runtime/templates/dockerignore.template,sha256=b_70sBi0MwkTuA9TqxPqFcWK7TcmpaXBJ6M2Ipox65Q,691
 bedrock_agentcore_starter_toolkit/utils/runtime/templates/execution_role_policy.json.j2,sha256=-0AXT46IYVQr4fwueXTQ0FVXcCshZFNx7-2mViR34Co,4941
 bedrock_agentcore_starter_toolkit/utils/runtime/templates/execution_role_trust_policy.json.j2,sha256=PPJF6Ofq70W5DUE0NlbmnZjw5RkgepPgkskxEgEG28o,473
-bedrock_agentcore_starter_toolkit-0.1.8.dist-info/METADATA,sha256=T-Y9VXQUjDahbwI5rWcjOYWCgrGU7avljQfd6DBtgLw,9706
-bedrock_agentcore_starter_toolkit-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bedrock_agentcore_starter_toolkit-0.1.8.dist-info/entry_points.txt,sha256=Tf94DkUf2Tp8P7p8MEXLxre7A7Pp_XNukteiz0wHnk8,77
-bedrock_agentcore_starter_toolkit-0.1.8.dist-info/licenses/LICENSE.txt,sha256=nNPOMinitYdtfbhdQgsPgz1UowBznU6QVN3Xs0pSTKU,10768
-bedrock_agentcore_starter_toolkit-0.1.8.dist-info/licenses/NOTICE.txt,sha256=rkBsg8DbKqfIoQbveqX9foR4uJPUVAokbkr02pRPilE,8674
-bedrock_agentcore_starter_toolkit-0.1.8.dist-info/RECORD,,
+bedrock_agentcore_starter_toolkit-0.1.9.dist-info/METADATA,sha256=TLmOIQhVBcBCBt2IUzBt4eU4PXKLFxLGvVBxVOh3POo,9706
+bedrock_agentcore_starter_toolkit-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bedrock_agentcore_starter_toolkit-0.1.9.dist-info/entry_points.txt,sha256=Tf94DkUf2Tp8P7p8MEXLxre7A7Pp_XNukteiz0wHnk8,77
+bedrock_agentcore_starter_toolkit-0.1.9.dist-info/licenses/LICENSE.txt,sha256=nNPOMinitYdtfbhdQgsPgz1UowBznU6QVN3Xs0pSTKU,10768
+bedrock_agentcore_starter_toolkit-0.1.9.dist-info/licenses/NOTICE.txt,sha256=rkBsg8DbKqfIoQbveqX9foR4uJPUVAokbkr02pRPilE,8674
+bedrock_agentcore_starter_toolkit-0.1.9.dist-info/RECORD,,