fix: caching error of images with Amazon Nova (#1077)

Author: toshikwa

packages/cdk/lambda/utils/models.ts

@@ -343,10 +343,9 @@ const createConverseCommandInput = (
   // Add the string of user role and assistant role other than the system role to the conversation
   messages = messages.filter((message) => message.role !== 'system');
   const conversation = messages.map((message) => {
-    const contentBlocks: ContentBlock[] = [
-      { text: message.content } as ContentBlock.TextMember,
-    ];
+    const contentBlocks: ContentBlock[] = [];
 
+    // Put images, videos, and documents before the task, instruction, and user query
     if (message.extraData) {
       message.extraData.forEach((extra) => {
         if (extra.type === 'image' && extra.source.type === 'base64') {
@@ -394,6 +393,7 @@ const createConverseCommandInput = (
       });
     }
 
+    contentBlocks.push({ text: message.content });
     return {
       role:
         message.role === 'user'

packages/cdk/lambda/utils/promptCache.ts

@@ -32,11 +32,7 @@ export const applyAutoCacheToMessages = (
   const isToolsSupported = cacheFields.includes('tools');
   const cachableIndices = messages
     .map((message, index) => ({ message, index }))
-    .filter(
-      ({ message }) =>
-        message.role === 'user' &&
-        !message.content?.some((block) => block.document || block.video)
-    )
+    .filter(({ message }) => message.role === 'user')
     .filter(
       ({ message }) =>
         isToolsSupported ||