Ability to specify Aurora DB Name for storing embeddings

cli/magic-config.ts

@@ -80,6 +80,7 @@ const embeddingModels = [
       ) {
         options.ragsToEnable.pop("kendra");
       }
+      options.auroraDefaultDBName = config.rag.engines.aurora.defaultDatabaseName
       options.embeddings = config.rag.embeddingsModels.map((m: any) => m.name);
       options.defaultEmbedding = (config.rag.embeddingsModels ?? []).filter(
         (m: any) => m.default
@@ -255,6 +256,20 @@ async function processCreateOptions(options: any): Promise<void> {
       },
       initial: options.ragsToEnable || [],
     },
+    {
+      type:"input",
+      name:"auroraDefaultDBName",
+      message: "Enter a default database name for Aurora",
+      initial: options.auroraDefaultDBName,
+      validate(v: string) {
+        return (v.length === 0 || (this as any).skipped || 
+          RegExp(/^[a-zA-Z][a-zA-Z0-9_]{0,62}$/).test(v)) ? 
+            true : "You need to enter a valid database name";
+      },
+      skip(): boolean {
+        return !(this as any).state.answers.ragsToEnable.includes("aurora");
+      },
+    },
     {
       type: "confirm",
       name: "kendraEnterprise",
@@ -392,6 +407,8 @@ async function processCreateOptions(options: any): Promise<void> {
       engines: {
         aurora: {
           enabled: answers.ragsToEnable.includes("aurora"),
+          defaultDatabaseName: answers.ragsToEnable.includes("aurora") && answers.auroraDefaultDBName.length > 0 ? 
+            answers.auroraDefaultDBName : undefined
         },
         opensearch: {
           enabled: answers.ragsToEnable.includes("opensearch"),

lib/rag-engines/aurora-pgvector/functions/pgvector-setup/index.py

@@ -20,15 +20,18 @@ def lambda_handler(event, context: LambdaContext):
         SecretId=AURORA_DB_SECRET_ID
     )
     database_secrets = json.loads(secret_response["SecretString"])
-    dbhost = database_secrets["host"]
-    dbport = database_secrets["port"]
-    dbuser = database_secrets["username"]
-    dbpass = database_secrets["password"]
 
     if request_type == "Create" or request_type == "Update":
-        dbconn = psycopg2.connect(
-            host=dbhost, user=dbuser, password=dbpass, port=dbport, connect_timeout=10
-        )
+        db_conn_args = {
+            "host": database_secrets["host"],
+            "user": database_secrets["username"],
+            "password": database_secrets["password"],
+            "port": database_secrets["port"],
+            "connect_timeout":10,
+        }
+        if "dbname" in database_secrets:
+            db_conn_args["dbname"] = database_secrets["dbname"]
+        dbconn = psycopg2.connect(**db_conn_args)
 
         dbconn.set_session(autocommit=True)
 

lib/rag-engines/aurora-pgvector/index.ts

@@ -35,6 +35,7 @@ export class AuroraPgVector extends Construct {
       vpc: props.shared.vpc,
       vpcSubnets: { subnetType: ec2.SubnetType.PRIVATE_ISOLATED },
       iamAuthentication: true,
+      defaultDatabaseName: props.config.rag.engines.aurora.defaultDatabaseName,
     });
 
     const databaseSetupFunction = new lambda.Function(

lib/shared/layers/python-sdk/python/genai_core/aurora/connection.py

@@ -21,15 +21,20 @@ def __init__(self, autocommit=True):
         self.dbport = database_secrets["port"]
         self.dbuser = database_secrets["username"]
         self.dbpass = database_secrets["password"]
+        if "dbname" in database_secrets:
+            self.dbname = database_secrets["dbname"]
 
     def __enter__(self):
-        connection = psycopg2.connect(
-            host=self.dbhost,
-            user=self.dbuser,
-            password=self.dbpass,
-            port=self.dbport,
-            connect_timeout=10,
-        )
+        db_conn_args = {
+            "host":self.dbhost,
+            "user":self.dbuser,
+            "password":self.dbpass,
+            "port":self.dbport,
+            "connect_timeout":10,
+        }
+        if hasattr(self, "dbname"):
+            db_conn_args["dbname"] = self.dbname
+        connection = psycopg2.connect(**db_conn_args)
 
         connection.set_session(autocommit=self.autocommit)
         psycopg2.extras.register_uuid()

lib/shared/types.ts

@@ -90,6 +90,7 @@ export interface SystemConfig {
     engines: {
       aurora: {
         enabled: boolean;
+        defaultDatabaseName?: string;
       };
       opensearch: {
         enabled: boolean;