Merge pull request #380 from aws-samples/hubin-daily-aics

refactor: update intention api
aws-samples · Sep 5, 2024 · 13f1df3 · 13f1df3
2 parents 82ea194 + abc108d
commit 13f1df3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/source/infrastructure/lib/api/api-stack.ts b/source/infrastructure/lib/api/api-stack.ts
@@ -493,7 +493,19 @@ export class ApiConstruct extends Construct {
       apiResourceCheckChatbot.addMethod("POST", lambdaChatbotIntegration, this.genMethodOption(api, auth, null))
       const apiResourceChatbots = apiResourceChatbotManagement.addResource("chatbots");
       apiResourceChatbots.addMethod("POST", lambdaChatbotIntegration, {
-        ...this.genMethodOption(api, auth, null),
+        ...this.genMethodOption(api, auth, {
+          chatbotId: {type: JsonSchemaType.STRING},
+          groupName: {type: JsonSchemaType.STRING},
+          indexIds: {
+             type: JsonSchemaType.OBJECT,
+             properties: {
+              qq: { type: JsonSchemaType.STRING },
+              qd: { type: JsonSchemaType.STRING },
+              intention: { type: JsonSchemaType.STRING }
+             }
+          },
+          Message: {type: JsonSchemaType.STRING},
+        }),
         requestModels: this.genRequestModel(api, {
           "chatbotId": { "type": JsonSchemaType.STRING },
           "index": {type: JsonSchemaType.OBJECT,
@@ -535,12 +547,13 @@ export class ApiConstruct extends Construct {
             type: JsonSchemaType.STRING,
           }
         }
-      }),
+      })
+      ,
         requestParameters: {
           'method.request.querystring.max_items': false,
           'method.request.querystring.page_size': false
         }
-      });
+      })
 
 
 
@@ -602,7 +615,21 @@ export class ApiConstruct extends Construct {
       apiResourceDownload.addMethod("GET", lambdaIntentionIntegration, this.genMethodOption(api, auth, null));
       const apiResourceExecutionManagement = apiResourceIntentionManagement.addResource("executions");
       apiResourceExecutionManagement.addMethod("POST", lambdaIntentionIntegration, {
-        ...this.genMethodOption(api, auth, null),
+        ...this.genMethodOption(api, auth, {
+          execution_id: { type: JsonSchemaType.STRING },
+          input_payload: {
+            type: JsonSchemaType.OBJECT,
+            properties: {
+              tableItemId: { type: JsonSchemaType.STRING },
+              chatbotId: { type: JsonSchemaType.STRING },
+              groupName: { type: JsonSchemaType.STRING },
+              index: { type: JsonSchemaType.STRING },
+              model: { type: JsonSchemaType.STRING },
+              fieldName: { type: JsonSchemaType.STRING }
+            }
+          },
+          result: { type: JsonSchemaType.STRING }
+        }),
         requestModels: this.genRequestModel(api, {
           "chatbotId": { "type": JsonSchemaType.STRING },
           "index": { "type": JsonSchemaType.STRING },

diff --git a/source/lambda/intention/intention.py b/source/lambda/intention/intention.py
@@ -277,15 +277,9 @@ def __create_execution(event, context, email, group_name):
     __save_2_aos(input_body.get("model"), execution_detail["index"], qaList)
 
     return {
-        "statusCode": 200,
-        "headers": resp_header,
-        "body": json.dumps(
-            {
                 "execution_id": execution_detail["tableItemId"],
-                "input_payload": json.dumps(execution_detail),
+                "input_payload": execution_detail,
                 "result": "success"
-            }
-        ),
     }
 
 def __save_2_aos(modelId: str, index: str, qaList:list):