feat(visualqa): fix defects

Author: Dinesh Sajwan

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

@@ -41,3 +41,4 @@ def handler(event,  context: LambdaContext) -> dict:
 
     print(f"llm_response is {llm_response}")
     return llm_response
+

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

@@ -54,7 +54,7 @@ def run_question_answering(arguments):
           # user didn't provide a image url as input, we use the RAG source against the entire knowledge base
          if response_generation_method == 'LONG_CONTEXT':
                 if not filename: 
-                    warning = 'Error: Image presigned url is required for LONG_CONTEXT approach, defaulting to RAG.'
+                    warning = 'Error: Filename url is required for LONG_CONTEXT approach, defaulting to RAG.'
                     logger.warning(warning)
                     llm_response = run_qa_agent_rag_on_image_no_memory(arguments)
                     return llm_response

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

@@ -37,6 +37,7 @@
 
 bucket_name = os.environ['INPUT_BUCKET']
 
+
 def run_qa_agent_on_image_no_memory(input_params):
     logger.info("starting qa agent without memory on uploaded image")
 
@@ -99,7 +100,7 @@ def run_qa_agent_rag_on_image_no_memory(input_params):
     qa_model=input_params['qa_model']
     embeddings_model = input_params['embeddings_model']
 
-    if 'modelId' in qa_model and 'embedding_model_id' in embeddings_model:
+    if 'modelId' in qa_model and 'modelId' in embeddings_model:
          qa_model_id= qa_model['modelId']
          embedding_model_id = input_params['embeddings_model']['modelId']
     else:

lambda/aws-rag-appsync-stepfn-opensearch/s3_file_transformer/src/requirements.txt

@@ -1,7 +1,7 @@
 aws-lambda-powertools
-aws-xray-sdk==3.5.4
+aws-xray-sdk==2.12.1
 fastjsonschema==2.19.1
-typing-extensions====4.7.0
+typing-extensions==4.7.0
 boto3>=1.34.29
 requests==2.31.0
 langchain==0.1.4

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

@@ -11,7 +11,7 @@
  *  and limitations under the License.
  */
 import * as path from 'path';
-import { Duration, Aws, Annotations } from 'aws-cdk-lib';
+import { Duration, Aws } from 'aws-cdk-lib';
 import * as appsync from 'aws-cdk-lib/aws-appsync';
 import * as cognito from 'aws-cdk-lib/aws-cognito';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
@@ -158,7 +158,7 @@ export interface QaAppsyncOpensearchProps {
    * Optional. Allows to provide custom lambda code
    * and settings instead of the existing
    */
-  readonly sagemakerEndpointName?: string
+  readonly sagemakerEndpointName?: string;
 }
 
 /**
@@ -465,13 +465,13 @@ export class QaAppsyncOpensearch extends BaseClass {
         resources: ['*'],
       }),
     );
-        
-    if(props.sagemakerEndpointName){
+
+    if (props.sagemakerEndpointName) {
       question_answering_function_role.addToPolicy(
         new iam.PolicyStatement({
           effect: iam.Effect.ALLOW,
           actions: ['sagemaker:InvokeEndpoint'],
-          resources: ['arn:'+ Aws.PARTITION +':sagemaker:' + Aws.ACCOUNT_ID + ':endpoint/*' ],
+          resources: ['arn:'+ Aws.PARTITION +':sagemaker:' + Aws.ACCOUNT_ID + ':endpoint/*'],
         }),
       );
     }
@@ -554,7 +554,7 @@ export class QaAppsyncOpensearch extends BaseClass {
       true,
     );
 
-    const sagemakerEndpointNamestr = props.sagemakerEndpointName || ""
+    const sagemakerEndpointNamestr = props.sagemakerEndpointName || '';
     const construct_docker_lambda_props = {
       code: lambda.DockerImageCode.fromImageAsset(
         path.join(
@@ -578,7 +578,7 @@ export class QaAppsyncOpensearch extends BaseClass {
         OPENSEARCH_DOMAIN_ENDPOINT: opensearch_helper.getOpenSearchEndpoint(props),
         OPENSEARCH_INDEX: props.openSearchIndexName,
         OPENSEARCH_SECRET_ID: SecretId,
-        SAGEMAKER_ENDPOINT:sagemakerEndpointNamestr
+        SAGEMAKER_ENDPOINT: sagemakerEndpointNamestr,
       },
       ...(props.lambdaProvisionedConcurrency && {
         currentVersionOptions: {

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

@@ -11,7 +11,7 @@
  *  and limitations under the License.
  */
 import * as path from 'path';
-import { Duration, Aws, Stack, Annotations } from 'aws-cdk-lib';
+import { Duration, Aws, Stack } from 'aws-cdk-lib';
 import * as appsync from 'aws-cdk-lib/aws-appsync';
 import * as cognito from 'aws-cdk-lib/aws-cognito';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
@@ -536,7 +536,7 @@ export class RagAppsyncStepfnOpensearch extends BaseClass {
       actions: [
         'rekognition:DetectModerationLabels',
       ],
-      resources: ['arn:'+ Aws.PARTITION +':rekognition:' + Aws.ACCOUNT_ID + ':project/*' ],
+      resources: ['arn:'+ Aws.PARTITION +':rekognition:' + Aws.REGION +':'+ Aws.ACCOUNT_ID + ':project/*'],
     }));
 
     s3_transformer_job_function_role.addToPolicy(new iam.PolicyStatement({

test/patterns/gen-ai/aws-qa-appsync-opensearch/aws-qa-appsync-opensearch-serverless.test.ts

@@ -55,6 +55,7 @@ describe('QA Appsync Open search construct', () => {
       openSearchIndexName: 'demoindex',
       openSearchSecret: osSecret,
       cognitoUserPool: userPoolLoaded,
+      sagemakerEndpointName: 'sageMakerEndpoint',
     };
 
     qaTestConstruct = new QaAppsyncOpensearch(qaTestStack, 'test', qaTestProps);
@@ -89,6 +90,7 @@ describe('QA Appsync Open search construct', () => {
           },
           OPENSEARCH_INDEX: 'demoindex',
           OPENSEARCH_SECRET_ID: 'OSSecretId',
+          SAGEMAKER_ENDPOINT: 'sageMakerEndpoint',
         },
       },
     });

test/patterns/gen-ai/aws-qa-appsync-opensearch/aws-qa-appsync-opensearch.test.ts

@@ -58,6 +58,7 @@ describe('QA Appsync Open search construct', () => {
       openSearchIndexName: 'demoindex',
       openSearchSecret: osSecret,
       cognitoUserPool: userPoolLoaded,
+      sagemakerEndpointName: 'sageMakerEndpoint',
     };
 
     qaTestConstruct = new QaAppsyncOpensearch(qaTestStack, 'test', qaTestProps);
@@ -87,6 +88,7 @@ describe('QA Appsync Open search construct', () => {
           OPENSEARCH_DOMAIN_ENDPOINT: 'osendppint.amazon.aws.com',
           OPENSEARCH_INDEX: 'demoindex',
           OPENSEARCH_SECRET_ID: 'OSSecretId',
+          SAGEMAKER_ENDPOINT: 'sageMakerEndpoint',
         },
       },
     });
@@ -223,6 +225,7 @@ describe('QA Appsync Open search construct custom lambda', () => {
       openSearchSecret: osSecret,
       cognitoUserPool: userPoolLoaded,
       customDockerLambdaProps: customDockerLambdaProps,
+      sagemakerEndpointName: 'sageMakerEndpoint',
     };
 
     qaTestConstruct = new QaAppsyncOpensearch(qaTestStack, 'test', qaTestProps);
@@ -252,6 +255,7 @@ describe('QA Appsync Open search construct custom lambda', () => {
           OPENSEARCH_DOMAIN_ENDPOINT: 'osendppint.amazon.aws.com',
           OPENSEARCH_INDEX: 'demoindex',
           OPENSEARCH_SECRET_ID: 'OSSecretId',
+          SAGEMAKER_ENDPOINT: 'sageMakerEndpoint',
           TEST_VAR: 'hello',
         },
       },