@ai-sdk/amazon-bedrock 5.0.27 → 5.0.28

package/dist/mantle/index.cjs

@@ -35,7 +35,7 @@ var import_provider_utils = require("@ai-sdk/provider-utils");
 var import_aws4fetch = require("aws4fetch");
 
 // src/version.ts
-var VERSION = true ? "5.0.27" : "0.0.0-test";
+var VERSION = true ? "5.0.28" : "0.0.0-test";
 
 // src/amazon-bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {

package/dist/mantle/index.js

@@ -23,7 +23,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "5.0.27" : "0.0.0-test";
+var VERSION = true ? "5.0.28" : "0.0.0-test";
 
 // src/amazon-bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/amazon-bedrock",
-  "version": "5.0.27",
+  "version": "5.0.28",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -45,7 +45,7 @@
     "@smithy/util-utf8": "^4.3.3",
     "aws4fetch": "^1.0.20",
     "@ai-sdk/anthropic": "4.0.18",
-    "@ai-sdk/openai": "4.0.17",
+    "@ai-sdk/openai": "4.0.18",
     "@ai-sdk/provider": "4.0.3",
     "@ai-sdk/provider-utils": "5.0.12"
   },

package/src/amazon-bedrock-api-types.ts

@@ -170,9 +170,15 @@ export interface AmazonBedrockGuardrailConverseContentBlock {
 export interface AmazonBedrockImageBlock {
   image: {
     format: AmazonBedrockImageFormat;
-    source: {
-      bytes: string;
-    };
+    source:
+      | {
+          bytes: string;
+        }
+      | {
+          s3Location: {
+            uri: string;
+          };
+        };
   };
 }
 

package/src/amazon-bedrock-chat-language-model.ts

@@ -488,7 +488,7 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
   }
 
   readonly supportedUrls: Record<string, RegExp[]> = {
-    // no supported urls for bedrock
+    'image/*': [/^s3:\/\//],
   };
 
   private async getHeaders({

package/src/convert-to-amazon-bedrock-chat-messages.ts

@@ -1,6 +1,7 @@
 import {
   UnsupportedFunctionalityError,
   type JSONObject,
+  type LanguageModelV4FilePart,
   type JSONValue,
   type LanguageModelV4Message,
   type LanguageModelV4Prompt,
@@ -21,6 +22,7 @@ import {
   type AmazonBedrockCachePoint,
   type AmazonBedrockDocumentFormat,
   type AmazonBedrockDocumentMimeType,
+  type AmazonBedrockImageBlock,
   type AmazonBedrockImageFormat,
   type AmazonBedrockImageMimeType,
   type AmazonBedrockMessages,
@@ -58,6 +60,32 @@ function pushCachePoint(
   }
 }
 
+function sanitizeToolName(toolName: string): string {
+  return toolName.replace(/[^a-zA-Z0-9_-]/g, '') || '_';
+}
+
+function getAmazonBedrockImageSource({
+  data,
+  functionality,
+}: {
+  data: Extract<LanguageModelV4FilePart['data'], { type: 'data' | 'url' }>;
+  functionality: string;
+}): AmazonBedrockImageBlock['image']['source'] {
+  switch (data.type) {
+    case 'data':
+      return { bytes: convertToBase64(data.data) };
+    case 'url':
+      if (data.url.protocol !== 's3:') {
+        throw new UnsupportedFunctionalityError({ functionality });
+      }
+      return {
+        s3Location: {
+          uri: data.url.toString(),
+        },
+      };
+  }
+}
+
 async function shouldEnableCitations(
   providerMetadata: SharedV4ProviderMetadata | undefined,
 ): Promise<boolean> {
@@ -142,9 +170,30 @@ export async function convertToAmazonBedrockChatMessages(
                         });
                       }
                       case 'url': {
-                        throw new UnsupportedFunctionalityError({
-                          functionality: 'File URL data',
+                        if (part.data.url.protocol !== 's3:') {
+                          throw new UnsupportedFunctionalityError({
+                            functionality: 'File URL data',
+                          });
+                        }
+
+                        const fullMediaType = resolveFullMediaType({ part });
+
+                        if (getTopLevelMediaType(fullMediaType) !== 'image') {
+                          throw new UnsupportedFunctionalityError({
+                            functionality: 'File URL data',
+                          });
+                        }
+
+                        amazonBedrockContent.push({
+                          image: {
+                            format: getAmazonBedrockImageFormat(fullMediaType),
+                            source: getAmazonBedrockImageSource({
+                              data: part.data,
+                              functionality: 'File URL data',
+                            }),
+                          },
                         });
+                        break;
                       }
                       case 'text': {
                         const textMediaType = isFullMediaType(part.mediaType)
@@ -181,9 +230,10 @@ export async function convertToAmazonBedrockChatMessages(
                             image: {
                               format:
                                 getAmazonBedrockImageFormat(fullMediaType),
-                              source: {
-                                bytes: convertToBase64(part.data.data),
-                              },
+                              source: getAmazonBedrockImageSource({
+                                data: part.data,
+                                functionality: 'File URL data',
+                              }),
                             },
                           });
                         } else {
@@ -236,7 +286,11 @@ export async function convertToAmazonBedrockChatMessages(
                           case 'text':
                             return { text: contentPart.text };
                           case 'file': {
-                            if (contentPart.data.type !== 'data') {
+                            if (
+                              contentPart.data.type !== 'data' &&
+                              (contentPart.data.type !== 'url' ||
+                                contentPart.data.url.protocol !== 's3:')
+                            ) {
                               throw new UnsupportedFunctionalityError({
                                 functionality: `tool result file data of type "${contentPart.data.type}"`,
                               });
@@ -249,6 +303,12 @@ export async function convertToAmazonBedrockChatMessages(
                             if (
                               getTopLevelMediaType(fullMediaType) !== 'image'
                             ) {
+                              if (contentPart.data.type !== 'data') {
+                                throw new UnsupportedFunctionalityError({
+                                  functionality: `tool result file data of type "${contentPart.data.type}"`,
+                                });
+                              }
+
                               const enableCitations =
                                 await shouldEnableCitations(
                                   contentPart.providerOptions,
@@ -279,9 +339,10 @@ export async function convertToAmazonBedrockChatMessages(
                               image: {
                                 format:
                                   getAmazonBedrockImageFormat(fullMediaType),
-                                source: {
-                                  bytes: convertToBase64(contentPart.data.data),
-                                },
+                                source: getAmazonBedrockImageSource({
+                                  data: contentPart.data,
+                                  functionality: `tool result file data of type "${contentPart.data.type}"`,
+                                }),
                               },
                             };
                           }
@@ -421,7 +482,7 @@ export async function convertToAmazonBedrockChatMessages(
                 amazonBedrockContent.push({
                   toolUse: {
                     toolUseId: normalizeToolCallId(part.toolCallId, isMistral),
-                    name: part.toolName,
+                    name: sanitizeToolName(part.toolName),
                     input: toBedrockToolInput(part.input),
                   },
                 });