@ai-sdk/amazon-bedrock 3.0.0-beta.1 → 3.0.0-beta.10

package/dist/index.mjs

@@ -15,7 +15,7 @@ import {
   postJsonToApi,
   resolve
 } from "@ai-sdk/provider-utils";
-import { z as z3 } from "zod";
+import { z as z3 } from "zod/v4";
 
 // src/bedrock-api-types.ts
 var BEDROCK_CACHE_POINT = {
@@ -33,16 +33,33 @@ var BEDROCK_STOP_REASONS = [
   "tool-calls",
   "tool_use"
 ];
+var BEDROCK_IMAGE_MIME_TYPES = {
+  "image/jpeg": "jpeg",
+  "image/png": "png",
+  "image/gif": "gif",
+  "image/webp": "webp"
+};
+var BEDROCK_DOCUMENT_MIME_TYPES = {
+  "application/pdf": "pdf",
+  "text/csv": "csv",
+  "application/msword": "doc",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+  "application/vnd.ms-excel": "xls",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+  "text/html": "html",
+  "text/plain": "txt",
+  "text/markdown": "md"
+};
 
 // src/bedrock-chat-options.ts
-import { z } from "zod";
+import { z } from "zod/v4";
 var bedrockProviderOptions = z.object({
   /**
    * Additional inference parameters that the model supports,
    * beyond the base set of inference parameters that Converse
    * supports in the inferenceConfig field
    */
-  additionalModelRequestFields: z.record(z.any()).optional(),
+  additionalModelRequestFields: z.record(z.string(), z.any()).optional(),
   reasoningConfig: z.object({
     type: z.union([z.literal("enabled"), z.literal("disabled")]).optional(),
     budgetTokens: z.number().optional()
@@ -50,7 +67,7 @@ var bedrockProviderOptions = z.object({
 });
 
 // src/bedrock-error.ts
-import { z as z2 } from "zod";
+import { z as z2 } from "zod/v4";
 var BedrockErrorSchema = z2.object({
   message: z2.string(),
   type: z2.string().nullish()
@@ -135,14 +152,29 @@ var createBedrockEventStreamResponseHandler = (chunkSchema) => async ({ response
 import {
   UnsupportedFunctionalityError
 } from "@ai-sdk/provider";
+function promptContainsToolContent(prompt) {
+  return prompt.some((message) => {
+    if ("content" in message && Array.isArray(message.content)) {
+      return message.content.some(
+        (part) => part.type === "tool-call" || part.type === "tool-result"
+      );
+    }
+    return false;
+  });
+}
 function prepareTools({
   tools,
-  toolChoice
+  toolChoice,
+  prompt
 }) {
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
+  const hasToolContent = promptContainsToolContent(prompt);
   if (tools == null) {
     return {
-      toolConfig: { tools: void 0, toolChoice: void 0 },
+      toolConfig: {
+        tools: hasToolContent ? [] : void 0,
+        toolChoice: void 0
+      },
       toolWarnings: []
     };
   }
@@ -183,7 +215,10 @@ function prepareTools({
       };
     case "none":
       return {
-        toolConfig: { tools: void 0, toolChoice: void 0 },
+        toolConfig: {
+          tools: hasToolContent ? [] : void 0,
+          toolChoice: void 0
+        },
         toolWarnings
       };
     case "tool":
@@ -213,7 +248,6 @@ function getCachePoint(providerMetadata) {
   return (_a = providerMetadata == null ? void 0 : providerMetadata.bedrock) == null ? void 0 : _a.cachePoint;
 }
 async function convertToBedrockChatMessages(prompt) {
-  var _a, _b, _c, _d;
   const blocks = groupIntoBlocks(prompt);
   let system = [];
   const messages = [];
@@ -260,19 +294,22 @@ async function convertToBedrockChatMessages(prompt) {
                       });
                     }
                     if (part.mediaType.startsWith("image/")) {
-                      const bedrockImageFormat = part.mediaType === "image/*" ? void 0 : (_b = (_a = part.mediaType) == null ? void 0 : _a.split("/")) == null ? void 0 : _b[1];
                       bedrockContent.push({
                         image: {
-                          format: bedrockImageFormat,
+                          format: getBedrockImageFormat(part.mediaType),
                           source: { bytes: convertToBase64(part.data) }
                         }
                       });
                     } else {
+                      if (!part.mediaType) {
+                        throw new UnsupportedFunctionalityError2({
+                          functionality: "file without mime type",
+                          message: "File mime type is required in user message part content"
+                        });
+                      }
                       bedrockContent.push({
                         document: {
-                          format: (_d = (_c = part.mediaType) == null ? void 0 : _c.split(
-                            "/"
-                          )) == null ? void 0 : _d[1],
+                          format: getBedrockDocumentFormat(part.mediaType),
                           name: generateDocumentName(),
                           source: { bytes: convertToBase64(part.data) }
                         }
@@ -300,12 +337,9 @@ async function convertToBedrockChatMessages(prompt) {
                               functionality: `media type: ${contentPart.mediaType}`
                             });
                           }
-                          const format = contentPart.mediaType.split("/")[1];
-                          if (!isBedrockImageFormat(format)) {
-                            throw new UnsupportedFunctionalityError2({
-                              functionality: `media type: ${contentPart.mediaType}`
-                            });
-                          }
+                          const format = getBedrockImageFormat(
+                            contentPart.mediaType
+                          );
                           return {
                             image: {
                               format,
@@ -438,8 +472,31 @@ async function convertToBedrockChatMessages(prompt) {
   }
   return { system, messages };
 }
-function isBedrockImageFormat(format) {
-  return ["jpeg", "png", "gif"].includes(format);
+function getBedrockImageFormat(mimeType) {
+  if (!mimeType) {
+    throw new UnsupportedFunctionalityError2({
+      functionality: "image without mime type",
+      message: "Image mime type is required in user message part content"
+    });
+  }
+  const format = BEDROCK_IMAGE_MIME_TYPES[mimeType];
+  if (!format) {
+    throw new UnsupportedFunctionalityError2({
+      functionality: `image mime type: ${mimeType}`,
+      message: `Unsupported image mime type: ${mimeType}, expected one of: ${Object.keys(BEDROCK_IMAGE_MIME_TYPES).join(", ")}`
+    });
+  }
+  return format;
+}
+function getBedrockDocumentFormat(mimeType) {
+  const format = BEDROCK_DOCUMENT_MIME_TYPES[mimeType];
+  if (!format) {
+    throw new UnsupportedFunctionalityError2({
+      functionality: `file mime type: ${mimeType}`,
+      message: `Unsupported file mime type: ${mimeType}, expected one of: ${Object.keys(BEDROCK_DOCUMENT_MIME_TYPES).join(", ")}`
+    });
+  }
+  return format;
 }
 function trimIfLast(isLastBlock, isLastMessage, isLastContentPart, text) {
   return isLastBlock && isLastMessage && isLastContentPart ? text.trim() : text;
@@ -535,7 +592,7 @@ var BedrockChatLanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const bedrockOptions = (_a = await parseProviderOptions2({
       provider: "bedrock",
       providerOptions,
@@ -590,7 +647,7 @@ var BedrockChatLanguageModel = class {
       }
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
-        reasoningConfig: {
+        thinking: {
           type: (_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.type,
           budget_tokens: thinkingBudget
         }
@@ -612,7 +669,12 @@ var BedrockChatLanguageModel = class {
         details: "topP is not supported when thinking is enabled"
       });
     }
-    const { toolConfig, toolWarnings } = prepareTools({ tools, toolChoice });
+    const { toolConfig, toolWarnings } = prepareTools({
+      tools,
+      toolChoice,
+      prompt
+    });
+    const { reasoningConfig: _, ...filteredBedrockOptions } = (providerOptions == null ? void 0 : providerOptions.bedrock) || {};
     return {
       command: {
         system,
@@ -621,8 +683,8 @@ var BedrockChatLanguageModel = class {
         ...Object.keys(inferenceConfig).length > 0 && {
           inferenceConfig
         },
-        ...providerOptions == null ? void 0 : providerOptions.bedrock,
-        ...((_e = toolConfig.tools) == null ? void 0 : _e.length) ? { toolConfig } : {}
+        ...filteredBedrockOptions,
+        ...toolConfig.tools !== void 0 ? { toolConfig } : {}
       },
       warnings: [...warnings, ...toolWarnings]
     };
@@ -1028,9 +1090,9 @@ var BedrockStreamSchema = z3.object({
   contentBlockStop: z3.object({
     contentBlockIndex: z3.number()
   }).nullish(),
-  internalServerException: z3.record(z3.unknown()).nullish(),
+  internalServerException: z3.record(z3.string(), z3.unknown()).nullish(),
   messageStop: z3.object({
-    additionalModelResponseFields: z3.record(z3.unknown()).nullish(),
+    additionalModelResponseFields: z3.record(z3.string(), z3.unknown()).nullish(),
     stopReason: BedrockStopReasonSchema
   }).nullish(),
   metadata: z3.object({
@@ -1042,9 +1104,9 @@ var BedrockStreamSchema = z3.object({
       outputTokens: z3.number()
     }).nullish()
   }).nullish(),
-  modelStreamErrorException: z3.record(z3.unknown()).nullish(),
-  throttlingException: z3.record(z3.unknown()).nullish(),
-  validationException: z3.record(z3.unknown()).nullish()
+  modelStreamErrorException: z3.record(z3.string(), z3.unknown()).nullish(),
+  throttlingException: z3.record(z3.string(), z3.unknown()).nullish(),
+  validationException: z3.record(z3.string(), z3.unknown()).nullish()
 });
 var bedrockReasoningMetadataSchema = z3.object({
   signature: z3.string().optional(),
@@ -1065,7 +1127,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/bedrock-embedding-options.ts
-import { z as z4 } from "zod";
+import { z as z4 } from "zod/v4";
 var bedrockEmbeddingProviderOptions = z4.object({
   /**
   The number of dimensions the resulting output embeddings should have (defaults to 1024).
@@ -1080,7 +1142,7 @@ var bedrockEmbeddingProviderOptions = z4.object({
 });
 
 // src/bedrock-embedding-model.ts
-import { z as z5 } from "zod";
+import { z as z5 } from "zod/v4";
 var BedrockEmbeddingModel = class {
   constructor(modelId, config) {
     this.modelId = modelId;
@@ -1162,7 +1224,7 @@ var modelMaxImagesPerCall = {
 };
 
 // src/bedrock-image-model.ts
-import { z as z6 } from "zod";
+import { z as z6 } from "zod/v4";
 var BedrockImageModel = class {
   constructor(modelId, config) {
     this.modelId = modelId;
@@ -1188,7 +1250,7 @@ var BedrockImageModel = class {
     headers,
     abortSignal
   }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const warnings = [];
     const [width, height] = size ? size.split("x").map(Number) : [];
     const args = {
@@ -1197,6 +1259,9 @@ var BedrockImageModel = class {
         text: prompt,
         ...((_a = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _a.negativeText) ? {
           negativeText: providerOptions.bedrock.negativeText
+        } : {},
+        ...((_b = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _b.style) ? {
+          style: providerOptions.bedrock.style
         } : {}
       },
       imageGenerationConfig: {
@@ -1204,8 +1269,8 @@ var BedrockImageModel = class {
         ...height ? { height } : {},
         ...seed ? { seed } : {},
         ...n ? { numberOfImages: n } : {},
-        ...((_b = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _b.quality) ? { quality: providerOptions.bedrock.quality } : {},
-        ...((_c = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _c.cfgScale) ? { cfgScale: providerOptions.bedrock.cfgScale } : {}
+        ...((_c = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _c.quality) ? { quality: providerOptions.bedrock.quality } : {},
+        ...((_d = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _d.cfgScale) ? { cfgScale: providerOptions.bedrock.cfgScale } : {}
       }
     };
     if (aspectRatio != void 0) {
@@ -1215,7 +1280,7 @@ var BedrockImageModel = class {
         details: "This model does not support aspect ratio. Use `size` instead."
       });
     }
-    const currentDate = (_f = (_e = (_d = this.config._internal) == null ? void 0 : _d.currentDate) == null ? void 0 : _e.call(_d)) != null ? _f : /* @__PURE__ */ new Date();
+    const currentDate = (_g = (_f = (_e = this.config._internal) == null ? void 0 : _e.currentDate) == null ? void 0 : _f.call(_e)) != null ? _g : /* @__PURE__ */ new Date();
     const { value: response, responseHeaders } = await postJsonToApi3({
       url: this.getUrl(this.modelId),
       headers: await resolve3(
@@ -1318,10 +1383,28 @@ function prepareBodyString(body) {
     return JSON.stringify(body);
   }
 }
+function createApiKeyFetchFunction(apiKey, fetch = globalThis.fetch) {
+  return async (input, init) => {
+    const originalHeaders = extractHeaders(init == null ? void 0 : init.headers);
+    return fetch(input, {
+      ...init,
+      headers: removeUndefinedEntries(
+        combineHeaders4(originalHeaders, {
+          Authorization: `Bearer ${apiKey}`
+        })
+      )
+    });
+  };
+}
 
 // src/bedrock-provider.ts
 function createAmazonBedrock(options = {}) {
-  const sigv4Fetch = createSigV4FetchFunction(async () => {
+  const rawApiKey = loadOptionalSetting({
+    settingValue: options.apiKey,
+    environmentVariableName: "AWS_BEARER_TOKEN_BEDROCK"
+  });
+  const apiKey = rawApiKey && rawApiKey.trim().length > 0 ? rawApiKey.trim() : void 0;
+  const fetchFunction = apiKey ? createApiKeyFetchFunction(apiKey, options.fetch) : createSigV4FetchFunction(async () => {
     const region = loadSetting({
       settingValue: options.region,
       settingName: "region",
@@ -1329,30 +1412,58 @@ function createAmazonBedrock(options = {}) {
       description: "AWS region"
     });
     if (options.credentialProvider) {
+      try {
+        return {
+          ...await options.credentialProvider(),
+          region
+        };
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new Error(
+          `AWS credential provider failed: ${errorMessage}. Please ensure your credential provider returns valid AWS credentials with accessKeyId and secretAccessKey properties.`
+        );
+      }
+    }
+    try {
       return {
-        ...await options.credentialProvider(),
-        region
+        region,
+        accessKeyId: loadSetting({
+          settingValue: options.accessKeyId,
+          settingName: "accessKeyId",
+          environmentVariableName: "AWS_ACCESS_KEY_ID",
+          description: "AWS access key ID"
+        }),
+        secretAccessKey: loadSetting({
+          settingValue: options.secretAccessKey,
+          settingName: "secretAccessKey",
+          environmentVariableName: "AWS_SECRET_ACCESS_KEY",
+          description: "AWS secret access key"
+        }),
+        sessionToken: loadOptionalSetting({
+          settingValue: options.sessionToken,
+          environmentVariableName: "AWS_SESSION_TOKEN"
+        })
       };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      if (errorMessage.includes("AWS_ACCESS_KEY_ID") || errorMessage.includes("accessKeyId")) {
+        throw new Error(
+          `AWS SigV4 authentication requires AWS credentials. Please provide either:
+1. Set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables
+2. Provide accessKeyId and secretAccessKey in options
+3. Use a credentialProvider function
+4. Use API key authentication with AWS_BEARER_TOKEN_BEDROCK or apiKey option
+Original error: ${errorMessage}`
+        );
+      }
+      if (errorMessage.includes("AWS_SECRET_ACCESS_KEY") || errorMessage.includes("secretAccessKey")) {
+        throw new Error(
+          `AWS SigV4 authentication requires both AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY. Please ensure both credentials are provided.
+Original error: ${errorMessage}`
+        );
+      }
+      throw error;
     }
-    return {
-      region,
-      accessKeyId: loadSetting({
-        settingValue: options.accessKeyId,
-        settingName: "accessKeyId",
-        environmentVariableName: "AWS_ACCESS_KEY_ID",
-        description: "AWS access key ID"
-      }),
-      secretAccessKey: loadSetting({
-        settingValue: options.secretAccessKey,
-        settingName: "secretAccessKey",
-        environmentVariableName: "AWS_SECRET_ACCESS_KEY",
-        description: "AWS secret access key"
-      }),
-      sessionToken: loadOptionalSetting({
-        settingValue: options.sessionToken,
-        environmentVariableName: "AWS_SESSION_TOKEN"
-      })
-    };
   }, options.fetch);
   const getBaseUrl = () => {
     var _a, _b;
@@ -1370,7 +1481,7 @@ function createAmazonBedrock(options = {}) {
     return new BedrockChatLanguageModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
-      fetch: sigv4Fetch,
+      fetch: fetchFunction,
       generateId
     });
   };
@@ -1387,7 +1498,7 @@ function createAmazonBedrock(options = {}) {
     return new BedrockEmbeddingModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
-      fetch: sigv4Fetch
+      fetch: fetchFunction
     });
   };
   const createImageModel = (modelId) => {
@@ -1395,7 +1506,7 @@ function createAmazonBedrock(options = {}) {
     return new BedrockImageModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
-      fetch: sigv4Fetch
+      fetch: fetchFunction
     });
   };
   provider.languageModel = createChatModel;