refactor: L1 to L2 OpenSearch VectorIndex changes

Author: bencegadanyi1-nhs

cdk.json

@@ -21,11 +21,6 @@
   },
   "context": {
     "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
-    "@aws-cdk/aws-lambda:recognizeVersionProps": true,
-    "aws-cdk:enableDiffNoFail": true,
-    "bundling": {
-      "dockerless": true
-    },
     "@aws-cdk/core:checkSecretUsage": true,
     "@aws-cdk/core:target-partitions": [
       "aws",

packages/cdk/resources/OpenSearchResources.ts

@@ -5,10 +5,6 @@ import {
   VectorCollection,
   VectorCollectionStandbyReplicas
 } from "@cdklabs/generative-ai-cdk-constructs/lib/cdk-lib/opensearchserverless"
-import {
-  VectorIndex,
-  MetadataManagementFieldProps
-} from "@cdklabs/generative-ai-cdk-constructs/lib/cdk-lib/opensearch-vectorindex"
 
 export interface OpenSearchResourcesProps {
   readonly stackName: string
@@ -18,7 +14,6 @@ export interface OpenSearchResourcesProps {
 
 export class OpenSearchResources extends Construct {
   public readonly collection: VectorCollection
-  public readonly vectorIndex: VectorIndex
 
   constructor(scope: Construct, id: string, props: OpenSearchResourcesProps) {
     super(scope, id)
@@ -33,46 +28,6 @@ export class OpenSearchResources extends Construct {
     // Grant access to the Bedrock execution role
     this.collection.grantDataAccess(props.bedrockExecutionRole)
 
-    // Define the metadata mappings for Bedrock Knowledge Base compatibility
-    const mappings: Array<MetadataManagementFieldProps> = [
-      {
-        mappingField: "AMAZON_BEDROCK_METADATA",
-        dataType: "text",
-        filterable: false
-      },
-      {
-        mappingField: "AMAZON_BEDROCK_TEXT_CHUNK",
-        dataType: "text",
-        filterable: true
-      },
-      {
-        mappingField: "id",
-        dataType: "text",
-        filterable: true
-      },
-      {
-        mappingField: "x-amz-bedrock-kb-data-source-id",
-        dataType: "text",
-        filterable: true
-      },
-      {
-        mappingField: "x-amz-bedrock-kb-source-uri",
-        dataType: "text",
-        filterable: true
-      }
-    ]
-
-    // Create the vector index with Bedrock-compatible field mappings
-    this.vectorIndex = new VectorIndex(this, "VectorIndex", {
-      collection: this.collection,
-      indexName: "eps-assist-os-index",
-      vectorField: "bedrock-knowledge-base-default-vector",
-      vectorDimensions: 1024,
-      precision: "float",
-      distanceType: "cosine",
-      mappings: mappings
-    })
-
     // Set static values for commit and version tags to prevent recreation
     Tags.of(this.collection).add("commit", "static_value")
     Tags.of(this.collection).add("version", "static_value")

packages/cdk/resources/VectorIndex.ts

@@ -0,0 +1,68 @@
+import {Construct} from "constructs"
+import {CfnIndex} from "aws-cdk-lib/aws-opensearchserverless"
+import {VectorCollection} from "@cdklabs/generative-ai-cdk-constructs/lib/cdk-lib/opensearchserverless"
+
+export interface VectorIndexProps {
+  readonly indexName: string
+  readonly collection: VectorCollection
+}
+
+export class VectorIndex extends Construct {
+  public readonly cfnIndex: CfnIndex
+  public readonly indexName: string
+
+  constructor(scope: Construct, id: string, props: VectorIndexProps) {
+    super(scope, id)
+
+    this.indexName = props.indexName
+
+    const indexMapping: CfnIndex.MappingsProperty = {
+      properties: {
+        "bedrock-knowledge-base-default-vector": {
+          type: "knn_vector",
+          dimension: 1024,
+          method: {
+            name: "hnsw",
+            engine: "faiss",
+            parameters: {},
+            spaceType: "l2"
+          }
+        },
+        "AMAZON_BEDROCK_METADATA": {
+          type: "text",
+          index: false
+        },
+        "AMAZON_BEDROCK_TEXT_CHUNK": {
+          type: "text",
+          index: true
+        },
+        "id": {
+          type: "text",
+          index: true
+        },
+        "x-amz-bedrock-kb-data-source-id": {
+          type: "text",
+          index: true
+        },
+        "x-amz-bedrock-kb-source-uri": {
+          type: "text",
+          index: true
+        }
+      }
+    }
+
+    const cfnIndex = new CfnIndex(this, "MyCfnIndex", {
+      collectionEndpoint: props.collection.collectionEndpoint, // Use L2 property
+      indexName: props.indexName,
+      mappings: indexMapping,
+      settings: {
+        index: {
+          knn: true,
+          knnAlgoParamEfSearch: 512
+        }
+      }
+    })
+
+    this.cfnIndex = cfnIndex
+  }
+}

packages/cdk/stacks/EpsAssistMeStack.ts

@@ -17,6 +17,7 @@ import {RuntimePolicies} from "../resources/RuntimePolicies"
 import {DatabaseTables} from "../resources/DatabaseTables"
 import {BedrockPromptResources} from "../resources/BedrockPromptResources"
 import {S3LambdaNotification} from "../constructs/S3LambdaNotification"
+import {VectorIndex} from "../resources/VectorIndex"
 
 export interface EpsAssistMeStackProps extends StackProps {
   readonly stackName: string
@@ -82,17 +83,24 @@ export class EpsAssistMeStack extends Stack {
       region
     })
 
+    const vectorIndex = new VectorIndex(this, "VectorIndex", {
+      indexName: "eps-assist-os-index",
+      collection: openSearchResources.collection
+    })
+
     // Create VectorKnowledgeBase construct with Bedrock execution role
     const vectorKB = new VectorKnowledgeBaseResources(this, "VectorKB", {
       stackName: props.stackName,
       docsBucket: storage.kbDocsBucket.bucket,
       bedrockExecutionRole: bedrockExecutionRole.role,
       collectionArn: openSearchResources.collection.collectionArn,
-      vectorIndexName: openSearchResources.vectorIndex.indexName,
+      vectorIndexName: vectorIndex.indexName,
       region,
       account
     })
 
+    vectorKB.knowledgeBase.node.addDependency(vectorIndex.cfnIndex)
+
     // Create runtime policies with resource dependencies
     const runtimePolicies = new RuntimePolicies(this, "RuntimePolicies", {
       region,