Use L1 constructs from aws-bedrock instead of L2 from generative-ai-cdk-constructs

Author: kris-szlapa

packages/cdk/resources/VectorKnowledgeBaseResources.ts

@@ -1,88 +1,85 @@
 import {Construct} from "constructs"
-import {bedrock} from "@cdklabs/generative-ai-cdk-constructs"
 import {Role} from "aws-cdk-lib/aws-iam"
 import {Bucket} from "aws-cdk-lib/aws-s3"
-import {
-  ContentFilterType,
-  ContentFilterStrength,
-  ManagedWordFilterType,
-  PIIType,
-  GuardrailAction
-} from "@cdklabs/generative-ai-cdk-constructs/lib/cdk-lib/bedrock/guardrails/guardrail-filters"
+import * as bedrock from "aws-cdk-lib/aws-bedrock"
 
 export interface VectorKnowledgeBaseProps {
   kbName: string
-  embeddingsModel: bedrock.BedrockFoundationModel
+  embeddingsModel: string
   docsBucket: Bucket
   bedrockExecutionRole: Role
+  collectionArn: string
+  vectorIndexName: string
 }
 
 export class VectorKnowledgeBaseResources extends Construct {
-  public readonly knowledgeBase: bedrock.VectorKnowledgeBase
-  public readonly guardrail: bedrock.Guardrail
+  public readonly knowledgeBase: bedrock.CfnKnowledgeBase
+  public readonly guardrail: bedrock.CfnGuardrail
 
   constructor(scope: Construct, id: string, props: VectorKnowledgeBaseProps) {
     super(scope, id)
 
-    this.guardrail = new bedrock.Guardrail(this, "Guardrail", {
+    this.guardrail = new bedrock.CfnGuardrail(this, "Guardrail", {
       name: "eps-assist-guardrail",
       description: "Guardrail for EPS Assist Me Slackbot",
       blockedInputMessaging: "Your input was blocked.",
       blockedOutputsMessaging: "Your output was blocked.",
-      contentFilters: [
-        {
-          type: ContentFilterType.SEXUAL,
-          inputStrength: ContentFilterStrength.HIGH,
-          outputStrength: ContentFilterStrength.HIGH
-        },
-        {
-          type: ContentFilterType.VIOLENCE,
-          inputStrength: ContentFilterStrength.HIGH,
-          outputStrength: ContentFilterStrength.HIGH
-        },
-        {
-          type: ContentFilterType.HATE,
-          inputStrength: ContentFilterStrength.HIGH,
-          outputStrength: ContentFilterStrength.HIGH
-        },
-        {
-          type: ContentFilterType.INSULTS,
-          inputStrength: ContentFilterStrength.HIGH,
-          outputStrength: ContentFilterStrength.HIGH
-        },
-        {
-          type: ContentFilterType.MISCONDUCT,
-          inputStrength: ContentFilterStrength.HIGH,
-          outputStrength: ContentFilterStrength.HIGH
-        },
-        {
-          type: ContentFilterType.PROMPT_ATTACK,
-          inputStrength: ContentFilterStrength.HIGH,
-          outputStrength: ContentFilterStrength.NONE
-        }
-      ],
-      piiFilters: [
-        {type: PIIType.General.EMAIL, action: GuardrailAction.ANONYMIZE},
-        {type: PIIType.General.PHONE, action: GuardrailAction.ANONYMIZE},
-        {type: PIIType.General.NAME, action: GuardrailAction.ANONYMIZE},
-        {type: PIIType.Finance.CREDIT_DEBIT_CARD_NUMBER, action: GuardrailAction.BLOCK}
-      ],
-      managedWordListFilters: [
-        {type: ManagedWordFilterType.PROFANITY}
-      ]
+      contentPolicyConfig: {
+        filtersConfig: [
+          {type: "SEXUAL", inputStrength: "HIGH", outputStrength: "HIGH"},
+          {type: "VIOLENCE", inputStrength: "HIGH", outputStrength: "HIGH"},
+          {type: "HATE", inputStrength: "HIGH", outputStrength: "HIGH"},
+          {type: "INSULTS", inputStrength: "HIGH", outputStrength: "HIGH"},
+          {type: "MISCONDUCT", inputStrength: "HIGH", outputStrength: "HIGH"},
+          {type: "PROMPT_ATTACK", inputStrength: "HIGH", outputStrength: "NONE"}
+        ]
+      },
+      sensitiveInformationPolicyConfig: {
+        piiEntitiesConfig: [
+          {type: "EMAIL", action: "ANONYMIZE"},
+          {type: "PHONE", action: "ANONYMIZE"},
+          {type: "NAME", action: "ANONYMIZE"},
+          {type: "CREDIT_DEBIT_CARD_NUMBER", action: "BLOCK"}
+        ]
+      },
+      wordPolicyConfig: {
+        managedWordListsConfig: [{type: "PROFANITY"}]
+      }
     })
 
-    // Main construct - let it create its own default OpenSearch collection
-    this.knowledgeBase = new bedrock.VectorKnowledgeBase(this, "VectorKB", {
+    this.knowledgeBase = new bedrock.CfnKnowledgeBase(this, "VectorKB", {
       name: props.kbName,
       description: "Knowledge base for EPS Assist Me Slackbot",
-      embeddingsModel: props.embeddingsModel,
-      existingRole: props.bedrockExecutionRole
+      roleArn: props.bedrockExecutionRole.roleArn,
+      knowledgeBaseConfiguration: {
+        type: "VECTOR",
+        vectorKnowledgeBaseConfiguration: {
+          embeddingModelArn: `arn:aws:bedrock:eu-west-2::foundation-model/${props.embeddingsModel}`
+        }
+      },
+      storageConfiguration: {
+        type: "OPENSEARCH_SERVERLESS",
+        opensearchServerlessConfiguration: {
+          collectionArn: props.collectionArn,
+          vectorIndexName: props.vectorIndexName,
+          fieldMapping: {
+            vectorField: "bedrock-knowledge-base-default-vector",
+            textField: "AMAZON_BEDROCK_TEXT_CHUNK",
+            metadataField: "AMAZON_BEDROCK_METADATA"
+          }
+        }
+      }
     })
 
-    // Add S3 data source to knowledge base
-    this.knowledgeBase.addS3DataSource({
-      bucket: props.docsBucket
+    new bedrock.CfnDataSource(this, "S3DataSource", {
+      knowledgeBaseId: this.knowledgeBase.attrKnowledgeBaseId,
+      name: "eps-assist-s3-datasource",
+      dataSourceConfiguration: {
+        type: "S3",
+        s3Configuration: {
+          bucketArn: props.docsBucket.bucketArn
+        }
+      }
     })
   }
 }

packages/cdk/stacks/EpsAssistMeStack.ts

@@ -9,7 +9,7 @@ import * as cdk from "aws-cdk-lib"
 import * as iam from "aws-cdk-lib/aws-iam"
 import * as ops from "aws-cdk-lib/aws-opensearchserverless"
 import * as cr from "aws-cdk-lib/custom-resources"
-import {bedrock} from "@cdklabs/generative-ai-cdk-constructs"
+
 import {nagSuppressions} from "../nagSuppressions"
 import {Apis} from "../resources/Apis"
 import {Functions} from "../resources/Functions"
@@ -144,9 +144,11 @@ export class EpsAssistMeStack extends Stack {
     // Create VectorKnowledgeBase construct
     const vectorKB = new VectorKnowledgeBaseResources(this, "VectorKB", {
       kbName: "eps-assist-kb",
-      embeddingsModel: bedrock.BedrockFoundationModel.TITAN_EMBED_TEXT_V2_1024,
+      embeddingsModel: EMBEDDING_MODEL,
       docsBucket: storage.kbDocsBucket.bucket,
-      bedrockExecutionRole
+      bedrockExecutionRole,
+      collectionArn: `arn:aws:aoss:${region}:${account}:collection/${openSearchResources.collection.collection.attrId}`,
+      vectorIndexName: VECTOR_INDEX_NAME
     })
 
     // Create Functions construct
@@ -159,10 +161,10 @@ export class EpsAssistMeStack extends Stack {
       createIndexFunctionRole,
       slackBotTokenParameter: secrets.slackBotTokenParameter,
       slackSigningSecretParameter: secrets.slackSigningSecretParameter,
-      guardrailId: vectorKB.guardrail.guardrailId,
-      guardrailVersion: vectorKB.guardrail.guardrailVersion,
+      guardrailId: vectorKB.guardrail.attrGuardrailId,
+      guardrailVersion: vectorKB.guardrail.attrVersion,
       collectionId: openSearchResources.collection.collection.attrId,
-      knowledgeBaseId: vectorKB.knowledgeBase.knowledgeBaseId,
+      knowledgeBaseId: vectorKB.knowledgeBase.attrKnowledgeBaseId,
       region,
       account,
       slackBotTokenSecret: secrets.slackBotTokenSecret,