Merge branch 'sample/rfp-answers-with-genai' of https://github.com/lhgmnn/generative-ai-cdk-constructs-samples into sample/rfp-answers-with-genai

Author: krokoko

samples/bedrock-agent/lib/bedrock-agent-stack.ts

@@ -65,10 +65,10 @@ export class BedrockAgentStack extends cdk.Stack {
     });
 
     const agent = new bedrock.Agent(this, 'Agent', {
-      foundationModel: bedrock.BedrockFoundationModel.ANTHROPIC_CLAUDE_INSTANT_V1_2,
+      foundationModel: bedrock.BedrockFoundationModel.ANTHROPIC_CLAUDE_3_5_SONNET_V1_0,
       instruction: 'You are a helpful and friendly agent that answers questions about literature.',
       knowledgeBases: [kb],
-      enableUserInput: true,
+      userInputEnabled: true,
       shouldPrepareAgent:true
     });
 
@@ -79,23 +79,35 @@ export class BedrockAgentStack extends cdk.Stack {
       timeout:cdk.Duration.minutes(2)
     });
 
-    const actionGroup = new AgentActionGroup(this,'MyActionGroup',{
-      actionGroupName: 'query-library',
+    const actionGroup = new AgentActionGroup({
+      name: 'query-library',
       description: 'Use these functions to get information about the books in the library.',
-      actionGroupExecutor: {
-        lambda: actionGroupFunction
-      },
-      actionGroupState: "ENABLED",
-      apiSchema: bedrock.ApiSchema.fromAsset(path.join(__dirname, 'action-group.yaml')),
+      executor: bedrock.ActionGroupExecutor.fromlambdaFunction(actionGroupFunction),
+      enabled: true,
+      apiSchema: bedrock.ApiSchema.fromLocalAsset(path.join(__dirname, 'action-group.yaml')),
     });
 
-    agent.addActionGroups([actionGroup])
+    agent.addActionGroup(actionGroup);
 
-    agent.addAlias({
+    const agentAlias2 = new bedrock.AgentAlias(this, 'myalias2', {
       aliasName: 'my-agent-alias',
-      description:'alias for my agent'
-      
-    })
+      agent: agent,
+      description: 'alias for my agent'
+    });
+
+    // Add NAG suppression for the Agent's role policy
+    NagSuppressions.addResourceSuppressionsByPath(
+      this,
+      `/${this.node.path}/Agent/Role/DefaultPolicy/Resource`,
+      [
+        {
+          id: 'AwsSolutions-IAM5',
+          reason: 'The Agent requires permissions to invoke the action group Lambda function',
+          appliesTo: ['Resource::<ActionGroupFunctionFE14D1CB.Arn>:*'],
+        },
+      ],
+      true
+    );
 
     new cdk.CfnOutput(this, 'AgentId', {value: agent.agentId});
     new cdk.CfnOutput(this, 'KnowledgeBaseId', {value: kb.knowledgeBaseId});
@@ -108,10 +120,29 @@ export class BedrockAgentStack extends cdk.Stack {
         {
           id: 'AwsSolutions-IAM4',
           reason: 'ActionGroup Lambda uses the AWSLambdaBasicExecutionRole AWS Managed Policy.',
+        },
+        {
+          id: 'AwsSolutions-L1',
+          reason: 'Using Python 3.12 as the latest runtime version for Lambda.',
         }
       ],
       true,
     );
+    NagSuppressions.addResourceSuppressionsByPath(
+      this,
+      `/${this.node.path}/Agent/Role/DefaultPolicy`,
+      [
+        {
+          id: 'AwsSolutions-IAM5',
+          reason: 'The Lambda function requires broad permissions for logging and invocation.',
+          appliesTo: [
+            'Action::lambda:InvokeFunction',
+            'Action::logs:*'
+          ],
+        },
+      ],
+      true,
+    );
     NagSuppressions.addResourceSuppressionsByPath(
       this,
       `/${this.node.path}/LogRetentionaae0aa3c5b4d4f87b02d85b201efdd8a/ServiceRole`,

samples/bedrock-agent/package-lock.json

@@ -14,16 +14,16 @@
     "@types/jest": "^27.5.2",
     "@types/node": "10.17.27",
     "@types/prettier": "2.6.0",
-    "aws-cdk": "2.162.1",
+    "aws-cdk": "2.176.0",
     "jest": "^27.5.1",
     "ts-jest": "^27.1.4",
     "ts-node": "^10.9.1",
     "typescript": "~3.9.7"
   },
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "^2.162.1-alpha.0",
-    "@cdklabs/generative-ai-cdk-constructs": "^0.1.275",
-    "aws-cdk-lib": "^2.162.1",
+    "@aws-cdk/aws-lambda-python-alpha": "^2.176.0-alpha.0",
+    "@cdklabs/generative-ai-cdk-constructs": "^0.1.290",
+    "aws-cdk-lib": "^2.176.0",
     "cdk-nag": "^2.28.13",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"

samples/bedrock-agent/package.json

@@ -46,6 +46,6 @@
     "prettier-plugin-tailwindcss": "^0.5.5",
     "tailwindcss": "^3.3.3",
     "typescript": "^5.0.2",
-    "vite": "^4.5.5"
+    "vite": "^4.5.9"
   }
 }

samples/contract-compliance-analysis/front-end/package-lock.json

@@ -13,6 +13,7 @@
 env = cdk.Environment(account=os.getenv('CDK_DEFAULT_ACCOUNT'), 
                         region=os.getenv('CDK_DEFAULT_REGION'))
 
+
 #---------------------------------------------------------------------------
 # Bedrock knowledge base with OpenSearch
 #---------------------------------------------------------------------------
@@ -23,6 +24,7 @@
 
 #---------------------------------------------------------------------------
 # Bedrock knowledge base with Amazon RDS Aurora PostgreSQL
+# uncomment this if you want to deploy Amazon RDS Aurora PostgreSQL 
 #---------------------------------------------------------------------------
 
 
@@ -31,6 +33,16 @@
 #     )
 
 
+#---------------------------------------------------------------------------
+# Bedrock knowledge base with Pinecone
+# uncomment this if you want to deploy Pinecone
+#---------------------------------------------------------------------------
+    
+
+# BedrockPineconeStack(app, "BedrockPineconeStack",
+#     env=env
+#     )
+
 
 app.synth()