Merge pull request #222 from awslabs/fix/update-aoss-resources

Author: hvital

lambda/aws-qa-appsync-opensearch/question_answering/src/qa_agent/helper.py

@@ -109,9 +109,10 @@ def load_vector_db_opensearch(region: str,
         )
     embedding_function = get_embeddings_llm()
 
+    opensearch_url = opensearch_domain_endpoint if opensearch_domain_endpoint.startswith("https://") else f"https://{opensearch_domain_endpoint}"
     vector_db = OpenSearchVectorSearch(index_name=opensearch_index,
                                        embedding_function=embedding_function,
-                                       opensearch_url=f"https://{opensearch_domain_endpoint}",
+                                       opensearch_url=opensearch_url,
                                        http_auth=http_auth,
                                        use_ssl = True,
                                        verify_certs = True,

lambda/aws-rag-appsync-stepfn-opensearch/embeddings_job/src/lambda.py

@@ -150,15 +150,20 @@ def process_documents_in_aoss(index_exists, shards, http_auth):
             },
             "mappings": {
                 "properties": {
-                "osha_vector": {
-                    "type": "knn_vector",
-                    "dimension": 1536,
-                    "method": {
-                    "engine": "faiss",
-                    "name": "hnsw",
-                    "space_type": "l2"
-                    }
-                }
+                    "vector_field": {
+                        "type": "knn_vector",
+                        "dimension": 1536,
+                        "method": {
+                            "engine": "nmslib",
+                            "space_type": "cosinesimil",
+                            "name": "hnsw",
+                            "parameters": {},
+                        }
+                    },
+                    "id": {
+                        "type": "text",
+                        "fields": {"keyword": {"type": "keyword", "ignore_above": 256}},
+                    },
                 }
             }
         }

src/patterns/gen-ai/aws-qa-appsync-opensearch/index.ts

@@ -486,7 +486,7 @@ export class QaAppsyncOpensearch extends Construct {
         effect: iam.Effect.ALLOW,
         actions: ['aoss:APIAccessAll'],
         resources: [
-          'arn:' + Aws.PARTITION + ':aoss:' + Aws.REGION+':' + Aws.ACCOUNT_ID + ':collection/'+props.openSearchIndexName,
+          'arn:' + Aws.PARTITION + ':aoss:' + Aws.REGION+':' + Aws.ACCOUNT_ID + ':collection/'+props.existingOpensearchServerlessCollection.attrId,
         ],
       }));
     }

src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/index.ts

@@ -661,7 +661,7 @@ export class RagAppsyncStepfnOpensearch extends Construct {
         effect: iam.Effect.ALLOW,
         actions: ['aoss:APIAccessAll'],
         resources: [
-          'arn:' + Aws.PARTITION + ':aoss:' + Aws.REGION + ':' + Aws.ACCOUNT_ID + ':collection/' + props.openSearchIndexName,
+          'arn:' + Aws.PARTITION + ':aoss:' + Aws.REGION + ':' + Aws.ACCOUNT_ID + ':collection/' + props.existingOpensearchServerlessCollection.attrId,
         ],
       }));
     }