chore(aurora): remove circular dependency preventing python use (#367)

Author: krokoko

apidocs/classes/amazonaurora.AmazonAuroraDefaultVectorStore.md

@@ -40,7 +40,7 @@ https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraPostgreSQL.Ve
 - [clusterIdentifier](amazonaurora.AmazonAuroraDefaultVectorStore.md#clusteridentifier)
 - [credentialsSecretArn](amazonaurora.AmazonAuroraDefaultVectorStore.md#credentialssecretarn)
 - [databaseName](amazonaurora.AmazonAuroraDefaultVectorStore.md#databasename)
-- [embeddingsModel](amazonaurora.AmazonAuroraDefaultVectorStore.md#embeddingsmodel)
+- [embeddingsModelVectorDimension](amazonaurora.AmazonAuroraDefaultVectorStore.md#embeddingsmodelvectordimension)
 - [env](amazonaurora.AmazonAuroraDefaultVectorStore.md#env)
 - [node](amazonaurora.AmazonAuroraDefaultVectorStore.md#node)
 - [physicalName](amazonaurora.AmazonAuroraDefaultVectorStore.md#physicalname)
@@ -117,9 +117,9 @@ The name of your Database.
 
 ___
 
-### embeddingsModel
+### embeddingsModelVectorDimension
 
-• `Readonly` **embeddingsModel**: [`BedrockFoundationModel`](bedrock.BedrockFoundationModel.md)
+• `Readonly` **embeddingsModelVectorDimension**: `number`
 
 Model used for embeddings.
 

apidocs/interfaces/amazonaurora.AmazonAuroraDefaultVectorStoreProps.md

@@ -8,13 +8,13 @@
 
 ### Properties
 
-- [embeddingsModel](amazonaurora.AmazonAuroraDefaultVectorStoreProps.md#embeddingsmodel)
+- [embeddingsModelVectorDimension](amazonaurora.AmazonAuroraDefaultVectorStoreProps.md#embeddingsmodelvectordimension)
 
 ## Properties
 
-### embeddingsModel
+### embeddingsModelVectorDimension
 
-• `Readonly` **embeddingsModel**: [`BedrockFoundationModel`](../classes/bedrock.BedrockFoundationModel.md)
+• `Readonly` **embeddingsModelVectorDimension**: `number`
 
 The embeddings model for the knowledge base.
 Must be identical as in the KnowledgeBaseV2 construct.

src/cdk-lib/amazonaurora/README.md

@@ -53,6 +53,6 @@ new amazonaurora.AmazonAuroraVectoStore(
 import { amazonaurora } from '@cdklabs/generative-ai-cdk-constructs';
 
 new amazonaurora.AmazonAuroraDefaultVectorStore(stack, 'AuroraDefaultVectorStore', {
-  embeddingsModel: BedrockFoundationModel.COHERE_EMBED_ENGLISH_V3,
+  embeddingsModel: BedrockFoundationModel.COHERE_EMBED_ENGLISH_V3.vectorDimensions!,
 });
 ```

src/cdk-lib/amazonaurora/aurora-default-vector-store.ts

@@ -21,7 +21,6 @@ import { Construct } from 'constructs';
 import { buildCustomResourceProvider } from '../../common/helpers/custom-resource-provider-helper';
 import { generatePhysicalNameV2 } from '../../common/helpers/utils';
 import { buildVpc, DefaultVpcProps } from '../../common/helpers/vpc-helper';
-import { BedrockFoundationModel } from '../bedrock/models';
 
 
 export interface AmazonAuroraDefaultVectorStoreProps {
@@ -33,7 +32,7 @@ export interface AmazonAuroraDefaultVectorStoreProps {
    * needs to know the vector dimensions to create the vector
    * index of appropriate dimensions in the Aurora database.
    */
-  readonly embeddingsModel: BedrockFoundationModel;
+  readonly embeddingsModelVectorDimension: number;
 }
 
 /**
@@ -86,7 +85,7 @@ export class AmazonAuroraDefaultVectorStore extends cdk.Resource {
   /**
    * Model used for embeddings.
    */
-  public readonly embeddingsModel: BedrockFoundationModel;
+  public readonly embeddingsModelVectorDimension: number;
 
   /**
    * An IAM policy that allows Data API access to Aurora.
@@ -105,7 +104,7 @@ export class AmazonAuroraDefaultVectorStore extends cdk.Resource {
     this.tableName = 'bedrock_integration.bedrock_kb';
     this.primaryKeyField = 'id';
     this.clusterIdentifier = 'aurora-serverless-vector-cluster';
-    this.embeddingsModel = props.embeddingsModel;
+    this.embeddingsModelVectorDimension = props.embeddingsModelVectorDimension;
 
     const vpc = buildVpc(this, {
       defaultVpcProps: DefaultVpcProps(),
@@ -249,7 +248,7 @@ export class AmazonAuroraDefaultVectorStore extends cdk.Resource {
       properties: {
         DatabaseName: this.databaseName,
         SecretName: auroraCluster.secret?.secretName || '',
-        VectorDimensions: props.embeddingsModel.vectorDimensions!,
+        VectorDimensions: props.embeddingsModelVectorDimension!,
       },
     });
 

src/cdk-lib/bedrock/README.md

@@ -104,7 +104,7 @@ import * as s3 from 'aws-cdk-lib/aws-s3';
 import { amazonaurora, bedrock } from '@cdklabs/generative-ai-cdk-constructs';
 
 const auroraDb = new amazonaurora.AmazonAuroraDefaultVectorStore(stack, 'AuroraDefaultVectorStore', {
-  embeddingsModel: BedrockFoundationModel.COHERE_EMBED_ENGLISH_V3,
+  embeddingsModel: BedrockFoundationModel.COHERE_EMBED_ENGLISH_V3.vectorDimensions!,
 });
 
 const kb = new bedrock.KnowledgeBase(this, 'KnowledgeBase', {

src/cdk-lib/bedrock/knowledge-base.ts

@@ -229,9 +229,6 @@ export class KnowledgeBase extends Construct implements cdk.ITaggableV2 {
     if (props.vectorIndex) {
       validateIndexParameters(props.vectorIndex, indexName, vectorField);
     }
-    if (props.vectorStore instanceof AmazonAuroraDefaultVectorStore) {
-      validateModelComparability(embeddingsModel, props.vectorStore.embeddingsModel);
-    }
 
     this.name = generatePhysicalNameV2(
       this,
@@ -676,22 +673,6 @@ function validateIndexParameters(
   }
 }
 
-/**
- * Validate that the embedding model provided for `AmazonAuroraDefaultVectorStore`
- * construct is identical to provided for `KnowledgeBase` construct.
- *
- * @internal This is an internal core function and should not be called directly.
- */
-function validateModelComparability(
-  foundationModel: BedrockFoundationModel,
-  foundationModel2: BedrockFoundationModel,
-) {
-  if (foundationModel.modelId !== foundationModel2.modelId) {
-    throw new Error('The embeddings model ' + foundationModel + ' provided in AmazonAuroraDefaultVectorStore' +
-    ' construct has to be identical to provided in KnowledgeBase construct.');
-  }
-}
-
 /**
  * Determine storage configuration based on vector store type.
  *

test/cdk-lib/amazonaurora/aurora-default-vector-store.test.ts

@@ -39,7 +39,7 @@ describe('Amazon Aurora Default Vector Store', () => {
 
     beforeAll(() => {
       auroraDefaultVectorStore = new AmazonAuroraDefaultVectorStore(stack, 'AuroraVectorStore', {
-        embeddingsModel: model,
+        embeddingsModelVectorDimension: model.vectorDimensions!,
       });
 
       NagSuppressions.addResourceSuppressionsByPath(
@@ -72,7 +72,7 @@ describe('Amazon Aurora Default Vector Store', () => {
       expect(auroraDefaultVectorStore.tableName).toEqual('bedrock_integration.bedrock_kb');
       expect(auroraDefaultVectorStore.primaryKeyField).toEqual('id');
       expect(auroraDefaultVectorStore.clusterIdentifier).toEqual('aurora-serverless-vector-cluster');
-      expect(auroraDefaultVectorStore.embeddingsModel).toEqual(model);
+      expect(auroraDefaultVectorStore.embeddingsModelVectorDimension).toEqual(model.vectorDimensions);
     });
 
     test('No unsuppressed Errors', () => {

test/cdk-lib/bedrock/knowledge-base.test.ts

@@ -99,7 +99,7 @@ describe('KnowledgeBase', () => {
 
   test('Should correctly initialize with custom props', () => {
     const vectorStore = new AmazonAuroraDefaultVectorStore(stack, 'AuroraDefaultVectorStore6', {
-      embeddingsModel: BedrockFoundationModel.TITAN_EMBED_TEXT_V1,
+      embeddingsModelVectorDimension: BedrockFoundationModel.TITAN_EMBED_TEXT_V1.vectorDimensions!,
     });
     const model = BedrockFoundationModel.TITAN_EMBED_TEXT_V1;
     const knowledgeBase = new KnowledgeBase(stack, 'AuroraDefaultKnowledgeBase', {
@@ -132,7 +132,7 @@ describe('KnowledgeBase', () => {
 
   test('Should throw error when vectorStore is not VectorCollection and indexName is provided', () => {
     const vectorStore = new AmazonAuroraDefaultVectorStore(stack, 'AmazonAuroraDefaultVectorStore6', {
-      embeddingsModel: BedrockFoundationModel.TITAN_EMBED_TEXT_V1,
+      embeddingsModelVectorDimension: BedrockFoundationModel.TITAN_EMBED_TEXT_V1.vectorDimensions!,
     });
     const model = BedrockFoundationModel.TITAN_EMBED_TEXT_V1;
 
@@ -147,7 +147,7 @@ describe('KnowledgeBase', () => {
 
   test('Should throw error when vectorStore is not VectorCollection and vectorField is provided', () => {
     const vectorStore = new AmazonAuroraDefaultVectorStore(stack, 'AmazonAuroraDefaultVectorStore5', {
-      embeddingsModel: BedrockFoundationModel.TITAN_EMBED_TEXT_V1,
+      embeddingsModelVectorDimension: BedrockFoundationModel.TITAN_EMBED_TEXT_V1.vectorDimensions!,
     });
     const model = BedrockFoundationModel.TITAN_EMBED_TEXT_V1;
 
@@ -164,7 +164,7 @@ describe('KnowledgeBase', () => {
     const vectorStores = [
       new VectorCollection(stack, 'VectorCollection3'),
       new AmazonAuroraDefaultVectorStore(stack, 'AmazonAuroraDefaultVectorStore', {
-        embeddingsModel: BedrockFoundationModel.TITAN_EMBED_TEXT_V1,
+        embeddingsModelVectorDimension: BedrockFoundationModel.TITAN_EMBED_TEXT_V1.vectorDimensions!,
       }),
       new PineconeVectorStore({
         connectionString: 'test-connection-string',
@@ -193,7 +193,7 @@ describe('KnowledgeBase', () => {
 
   test('Should correctly initialize with AmazonAuroraDefaultVectorStore and custom embeddingsModel', () => {
     const vectorStore = new AmazonAuroraDefaultVectorStore(stack, 'AuroraDefaultVectorStore2', {
-      embeddingsModel: BedrockFoundationModel.COHERE_EMBED_ENGLISH_V3,
+      embeddingsModelVectorDimension: BedrockFoundationModel.COHERE_EMBED_ENGLISH_V3.vectorDimensions!,
     });
     const model = BedrockFoundationModel.COHERE_EMBED_ENGLISH_V3;