Fix bad merge issues

stocaaro · stocaaro · commit 8426782267a8 · 2024-11-15T11:33:03.000-06:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ai-constructs/CHANGELOG.md b/packages/ai-constructs/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @aws-amplify/ai-constructs
 
+## 1.0.0
+
+### Major Changes
+
+- bbd6add: GA release of backend AI features
+
+### Patch Changes
+
+- fd8759d: Fix a case when Bedrock throws validation error if tool input is not persisted in history
+
 ## 0.8.2
 
 ### Patch Changes
diff --git a/packages/ai-constructs/package.json b/packages/ai-constructs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ai-constructs",
-  "version": "0.8.2",
+  "version": "1.0.0",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
diff --git a/packages/ai-constructs/src/conversation/runtime/bedrock_converse_adapter.test.ts b/packages/ai-constructs/src/conversation/runtime/bedrock_converse_adapter.test.ts
@@ -901,8 +901,8 @@ void describe('Bedrock converse adapter', () => {
     assert.strictEqual(responseText, 'finalResponse');
 
     assert.strictEqual(toolExecuteMock.mock.calls.length, 2);
-    assert.strictEqual(toolExecuteMock.mock.calls[0].arguments[0], undefined);
-    assert.strictEqual(toolExecuteMock.mock.calls[1].arguments[0], undefined);
+    assert.deepStrictEqual(toolExecuteMock.mock.calls[0].arguments[0], {});
+    assert.deepStrictEqual(toolExecuteMock.mock.calls[1].arguments[0], {});
   });
 
   void it('throws if tool is duplicated', () => {
diff --git a/packages/ai-constructs/src/conversation/runtime/bedrock_converse_adapter.ts b/packages/ai-constructs/src/conversation/runtime/bedrock_converse_adapter.ts
@@ -252,6 +252,10 @@ export class BedrockConverseAdapter {
           if (toolUseBlock) {
             if (toolUseInput) {
               toolUseBlock.toolUse.input = JSON.parse(toolUseInput);
+            } else {
+              // Bedrock API requires tool input to be non-null in message history.
+              // Therefore, falling back to empty object.
+              toolUseBlock.toolUse.input = {};
             }
             accumulatedAssistantMessage.content?.push(toolUseBlock);
             if (
diff --git a/packages/backend-ai/CHANGELOG.md b/packages/backend-ai/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @aws-amplify/backend-ai
 
+## 1.0.0
+
+### Major Changes
+
+- bbd6add: GA release of backend AI features
+
+### Patch Changes
+
+- Updated dependencies [fd8759d]
+- Updated dependencies [bbd6add]
+  - @aws-amplify/ai-constructs@1.0.0
+
 ## 0.3.5
 
 ### Patch Changes
diff --git a/packages/backend-ai/package.json b/packages/backend-ai/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend-ai",
-  "version": "0.3.5",
+  "version": "1.0.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -22,7 +22,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-amplify/ai-constructs": "^0.8.0",
+    "@aws-amplify/ai-constructs": "^1.0.0",
     "@aws-amplify/backend-output-schemas": "^1.4.0",
     "@aws-amplify/backend-output-storage": "^1.1.3",
     "@aws-amplify/data-schema-types": "^1.2.0",
diff --git a/packages/backend-function/API.md b/packages/backend-function/API.md
@@ -117,7 +117,7 @@ type ResourceConfig = {
         GraphQL: {
             endpoint: string;
             region: string;
-            defaultAuthMode: string;
+            defaultAuthMode: 'iam';
             modelIntrospection: any;
         };
     };
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -5,10 +5,10 @@
   "type": "module",
   "devDependencies": {
     "@apollo/client": "^3.10.1",
-    "@aws-amplify/ai-constructs": "^0.8.0",
+    "@aws-amplify/ai-constructs": "^1.0.0",
     "@aws-amplify/auth-construct": "^1.4.0",
     "@aws-amplify/backend": "^1.6.0",
-    "@aws-amplify/backend-ai": "^0.3.5",
+    "@aws-amplify/backend-ai": "^1.0.0",
     "@aws-amplify/backend-secret": "^1.1.4",
     "@aws-amplify/client-config": "^1.5.1",
     "@aws-amplify/data-schema": "^1.0.0",
diff --git a/packages/integration-tests/src/test-project-setup/conversation_handler_project.ts b/packages/integration-tests/src/test-project-setup/conversation_handler_project.ts
@@ -26,6 +26,7 @@ import assert from 'assert';
 import { NormalizedCacheObject } from '@apollo/client';
 import {
   bedrockModelId,
+  expectedRandomNumber,
   expectedTemperatureInDataToolScenario,
   expectedTemperaturesInProgrammaticToolScenario,
 } from '../test-projects/conversation-handler/amplify/constants.js';
@@ -278,6 +279,16 @@ class ConversationHandlerTestProject extends TestProjectBase {
       )
     );
 
+    await this.executeWithRetry(() =>
+      this.assertCustomConversationHandlerCanExecuteTurnWithParameterLessTool(
+        backendId,
+        authenticatedUserCredentials.accessToken,
+        dataUrl,
+        apolloClient,
+        true
+      )
+    );
+
     await this.executeWithRetry(() =>
       this.assertDefaultConversationHandlerCanExecuteTurnWithDataTool(
         backendId,
@@ -853,6 +864,56 @@ class ConversationHandlerTestProject extends TestProjectBase {
     );
   };
 
+  private assertCustomConversationHandlerCanExecuteTurnWithParameterLessTool =
+    async (
+      backendId: BackendIdentifier,
+      accessToken: string,
+      graphqlApiEndpoint: string,
+      apolloClient: ApolloClient<NormalizedCacheObject>,
+      streamResponse: boolean
+    ): Promise<void> => {
+      const customConversationHandlerFunction = (
+        await this.resourceFinder.findByBackendIdentifier(
+          backendId,
+          'AWS::Lambda::Function',
+          (name) => name.includes('custom')
+        )
+      )[0];
+
+      const message: CreateConversationMessageChatInput = {
+        conversationId: randomUUID().toString(),
+        id: randomUUID().toString(),
+        role: 'user',
+        content: [
+          {
+            text: 'Give me a random number',
+          },
+        ],
+      };
+      await this.insertMessage(apolloClient, message);
+
+      // send event
+      const event: ConversationTurnEvent = {
+        conversationId: message.conversationId,
+        currentMessageId: message.id,
+        graphqlApiEndpoint: graphqlApiEndpoint,
+        request: {
+          headers: { authorization: accessToken },
+        },
+        ...this.getCommonEventProperties(streamResponse),
+      };
+      const response = await this.executeConversationTurn(
+        event,
+        customConversationHandlerFunction,
+        apolloClient
+      );
+      // Assert that tool was used. I.e. LLM used value provided by the tool.
+      assert.match(
+        response.content,
+        new RegExp(expectedRandomNumber.toString())
+      );
+    };
+
   private assertDefaultConversationHandlerCanPropagateError = async (
     backendId: BackendIdentifier,
     accessToken: string,
diff --git a/packages/integration-tests/src/test-projects/conversation-handler/amplify/constants.ts b/packages/integration-tests/src/test-projects/conversation-handler/amplify/constants.ts
@@ -14,3 +14,5 @@ export const expectedTemperaturesInProgrammaticToolScenario = {
 };
 
 export const expectedTemperatureInDataToolScenario = 85;
+
+export const expectedRandomNumber = 42;
diff --git a/packages/integration-tests/src/test-projects/conversation-handler/amplify/custom-conversation-handler/custom_handler.ts b/packages/integration-tests/src/test-projects/conversation-handler/amplify/custom-conversation-handler/custom_handler.ts
@@ -3,7 +3,10 @@ import {
   createExecutableTool,
   handleConversationTurnEvent,
 } from '@aws-amplify/backend-ai/conversation/runtime';
-import { expectedTemperaturesInProgrammaticToolScenario } from '../constants.js';
+import {
+  expectedRandomNumber,
+  expectedTemperaturesInProgrammaticToolScenario,
+} from '../constants.js';
 
 const thermometerInputSchema = {
   type: 'object',
@@ -33,11 +36,32 @@ const thermometer = createExecutableTool(
   }
 );
 
+// Parameter-less tool.
+const randomNumberGeneratorInputSchema = {
+  type: 'object',
+  properties: {},
+  required: [],
+} as const;
+
+const randomNumberGenerator = createExecutableTool(
+  'randomNumberGenerator',
+  'Returns a random number',
+  {
+    json: randomNumberGeneratorInputSchema,
+  },
+  () => {
+    return Promise.resolve({
+      // We use this value in test assertion.
+      text: `${expectedRandomNumber}`,
+    });
+  }
+);
+
 /**
  * Handler with simple tool.
  */
 export const handler = async (event: ConversationTurnEvent) => {
   await handleConversationTurnEvent(event, {
-    tools: [thermometer],
+    tools: [randomNumberGenerator, thermometer],
   });
 };
diff --git a/scripts/check_package_versions.ts b/scripts/check_package_versions.ts
@@ -11,8 +11,6 @@ const packagePaths = await glob('./packages/*');
 const getExpectedMajorVersion = (packageName: string) => {
   switch (packageName) {
     case 'ampx':
-    case '@aws-amplify/ai-constructs':
-    case '@aws-amplify/backend-ai':
       return '0.';
     default:
       return '1.';

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@aws-amplify/ai-constructs",`
`3`		`- "version": "0.8.2",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"type": "commonjs",`
`5`	`5`	`"publishConfig": {`
`6`	`6`	`"access": "public"`