Fix case where bedrock content blocks would be populated with 'null' instead of 'undefined. (#2101)

Author: sobolk

.changeset/early-starfishes-impress.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/ai-constructs': patch
+---
+
+Fix case where bedrock content blocks would be populated with 'null' instead of 'undefined.

packages/ai-constructs/API.md

@@ -72,6 +72,12 @@ type ConversationMessageContentBlock = bedrock.ContentBlock | {
             bytes: string;
         };
     };
+    text?: never;
+    document?: never;
+    toolUse?: never;
+    toolResult?: never;
+    guardContent?: never;
+    $unknown?: never;
 };
 
 // @public (undocumented)

packages/ai-constructs/src/conversation/runtime/conversation_message_history_retriever.test.ts

@@ -342,6 +342,58 @@ void describe('Conversation message history retriever', () => {
         },
       ],
     },
+    {
+      name: 'Replaces null values with undefined',
+      mockListResponseMessages: [
+        {
+          id: event.currentMessageId,
+          conversationId: event.conversationId,
+          role: 'user',
+          content: [
+            {
+              text: 'some_text',
+              // @ts-expect-error Intentionally providing null outside of typing
+              image: null,
+              // @ts-expect-error Intentionally providing null outside of typing
+              document: null,
+              // @ts-expect-error Intentionally providing null outside of typing
+              toolUse: null,
+              // @ts-expect-error Intentionally providing null outside of typing
+              toolResult: null,
+              // @ts-expect-error Intentionally providing null outside of typing
+              guardContent: null,
+              // @ts-expect-error Intentionally providing null outside of typing
+              $unknown: null,
+            },
+            {
+              // @ts-expect-error Intentionally providing null outside of typing
+              text: null,
+              document: { format: 'csv', name: 'test_name', source: undefined },
+            },
+          ],
+        },
+      ],
+      expectedMessages: [
+        {
+          role: 'user',
+          content: [
+            {
+              text: 'some_text',
+              image: undefined,
+              document: undefined,
+              toolUse: undefined,
+              toolResult: undefined,
+              guardContent: undefined,
+              $unknown: undefined,
+            },
+            {
+              text: undefined,
+              document: { format: 'csv', name: 'test_name', source: undefined },
+            },
+          ],
+        },
+      ],
+    },
   ];
 
   for (const testCase of testCases) {

packages/ai-constructs/src/conversation/runtime/conversation_message_history_retriever.ts

@@ -235,6 +235,24 @@ export class ConversationMessageHistoryRetriever {
       variables,
     });
 
-    return response.data[this.event.messageHistoryQuery.listQueryName].items;
+    const items =
+      response.data[this.event.messageHistoryQuery.listQueryName].items;
+
+    items.forEach((item) => {
+      item.content?.forEach((contentBlock) => {
+        let property: keyof typeof contentBlock;
+        for (property in contentBlock) {
+          // Deserialization of GraphQl query result sets these properties to 'null'
+          // This can trigger Bedrock SDK validation as it expects 'undefined' if properties are not set.
+          // We can't fix how GraphQl response is deserialized.
+          // Therefore, we apply this transformation to fix the data.
+          if (contentBlock[property] === null) {
+            contentBlock[property] = undefined;
+          }
+        }
+      });
+    });
+
+    return items;
   };
 }

packages/ai-constructs/src/conversation/runtime/types.ts

@@ -26,6 +26,14 @@ export type ConversationMessageContentBlock =
         // Upstream (Appsync) may send images in a form of Base64 encoded strings
         source: { bytes: string };
       };
+      // These are needed so that union with other content block types works.
+      // See https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-bedrock-runtime/TypeAlias/ContentBlock/.
+      text?: never;
+      document?: never;
+      toolUse?: never;
+      toolResult?: never;
+      guardContent?: never;
+      $unknown?: never;
     };
 
 export type ToolDefinition<TJSONSchema extends JSONSchema = JSONSchema> = {