From 4cede98be0e147e5c1fcdbd8ad202cc71e153243 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 07:03:50 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump cdklabs-generative-ai-cdk-constructs Bumps [cdklabs-generative-ai-cdk-constructs](https://github.com/awslabs/generative-ai-cdk-constructs) from 0.1.164 to 0.1.169. - [Release notes](https://github.com/awslabs/generative-ai-cdk-constructs/releases) - [Changelog](https://github.com/awslabs/generative-ai-cdk-constructs/blob/main/CHANGELOG.md) - [Commits](https://github.com/awslabs/generative-ai-cdk-constructs/compare/v0.1.164...v0.1.169) --- updated-dependencies: - dependency-name: cdklabs-generative-ai-cdk-constructs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 18 +++++++++--------- pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index 1df5c991909..9c699ec5aaf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -429,13 +429,13 @@ ujson = ["ujson (>=5.7.0)"] [[package]] name = "cdk-nag" -version = "2.28.127" +version = "2.28.132" description = "Check CDK v2 applications for best practices using a combination on available rule packs." optional = false python-versions = "~=3.8" files = [ - {file = "cdk-nag-2.28.127.tar.gz", hash = "sha256:4619c26db127f8a4cd273f84044e564edce3d9709ba72d9822467d9c480c8dee"}, - {file = "cdk_nag-2.28.127-py3-none-any.whl", hash = "sha256:a3608d4b6c5da9f443bb68fa0d533a7e69e68f947e0a7c06c81de743d53abdf0"}, + {file = "cdk-nag-2.28.132.tar.gz", hash = "sha256:ecfeb699c85eaab691b0594b711eae4fba92669a927a2ac508b2e5b061c7b154"}, + {file = "cdk_nag-2.28.132-py3-none-any.whl", hash = "sha256:171d5322ba08b9e82d9f9b2a1d3437d86995d5d0100f11b60b3940546fc8a249"}, ] [package.dependencies] @@ -447,18 +447,18 @@ typeguard = ">=2.13.3,<2.14.0" [[package]] name = "cdklabs-generative-ai-cdk-constructs" -version = "0.1.164" +version = "0.1.169" description = "AWS Generative AI CDK Constructs is a library for well-architected generative AI patterns." optional = false python-versions = "~=3.8" files = [ - {file = "cdklabs.generative-ai-cdk-constructs-0.1.164.tar.gz", hash = "sha256:a22d28d16a9907aa26d9a47b24ae02ec6b47091632965457618568c7024e2229"}, - {file = "cdklabs.generative_ai_cdk_constructs-0.1.164-py3-none-any.whl", hash = "sha256:c2f2bf47947f53a8b8793e0defa4231826ba906177b0e27df2f407e43a04aa2c"}, + {file = "cdklabs.generative-ai-cdk-constructs-0.1.169.tar.gz", hash = "sha256:80d95091423460d105e32d4de61548a01e7b98abb53bbead2189d0600d84cea3"}, + {file = "cdklabs.generative_ai_cdk_constructs-0.1.169-py3-none-any.whl", hash = "sha256:5d8a284ff6165f8fc48af6ed5c0d3c44571d9409eed63c06b768541608732876"}, ] [package.dependencies] -aws-cdk-lib = ">=2.141.0,<3.0.0" -cdk-nag = ">=2.28.127,<3.0.0" +aws-cdk-lib = ">=2.143.0,<3.0.0" +cdk-nag = ">=2.28.131,<3.0.0" constructs = ">=10.3.0,<11.0.0" jsii = ">=1.98.0,<2.0.0" publication = ">=0.0.3" @@ -3664,4 +3664,4 @@ validation = ["fastjsonschema"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<4.0.0" -content-hash = "518cc7c0d3621dd286168286ba238dd3fa66cc273d8b2a4a224f999fa5189eed" +content-hash = "69796793b550a5aaad7947afbc9d9a6ea9c0075a83093c403a8f4e500a516cc8" diff --git a/pyproject.toml b/pyproject.toml index d1861ae834d..832d669db07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,7 +75,7 @@ aws-cdk-lib = "^2.144.0" "aws-cdk.aws-apigatewayv2-integrations-alpha" = "^2.38.1-alpha.0" "aws-cdk.aws-apigatewayv2-authorizers-alpha" = "^2.38.1-alpha.0" "aws-cdk.aws-lambda-python-alpha" = "^2.143.1a0" -"cdklabs.generative-ai-cdk-constructs" = "^0.1.164" +"cdklabs.generative-ai-cdk-constructs" = "^0.1.169" pytest-benchmark = "^4.0.0" mypy-boto3-appconfig = "^1.34.58" mypy-boto3-cloudformation = "^1.34.111" From cc3d1b651bd0c9f8520727c2e5009e2d0ab10779 Mon Sep 17 00:00:00 2001 From: Leandro Damascena Date: Tue, 4 Jun 2024 08:33:44 +0100 Subject: [PATCH 2/2] breaking change --- .../cdk/bedrock_agent_stack.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/event_handler_bedrock_agents/cdk/bedrock_agent_stack.py b/examples/event_handler_bedrock_agents/cdk/bedrock_agent_stack.py index 9f7efd07c85..125951dd164 100644 --- a/examples/event_handler_bedrock_agents/cdk/bedrock_agent_stack.py +++ b/examples/event_handler_bedrock_agents/cdk/bedrock_agent_stack.py @@ -3,7 +3,13 @@ ) from aws_cdk.aws_lambda import Runtime from aws_cdk.aws_lambda_python_alpha import PythonFunction -from cdklabs.generative_ai_cdk_constructs.bedrock import Agent, AgentActionGroup, ApiSchema, BedrockFoundationModel +from cdklabs.generative_ai_cdk_constructs.bedrock import ( + ActionGroupExecutor, + Agent, + AgentActionGroup, + ApiSchema, + BedrockFoundationModel, +) from constructs import Construct @@ -28,12 +34,14 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None: instruction="You are a helpful and friendly agent that answers questions about insurance claims.", ) + executor_group = ActionGroupExecutor(lambda_=action_group_function) + action_group = AgentActionGroup( self, "ActionGroup", action_group_name="InsureClaimsSupport", description="Use these functions for insurance claims support", - action_group_executor=action_group_function, + action_group_executor=executor_group, action_group_state="ENABLED", api_schema=ApiSchema.from_asset("./lambda/openapi.json"), # (2)! )