@ai-sdk/amazon-bedrock 3.0.0-canary.5 → 3.0.0-canary.7

package/dist/index.mjs

@@ -7,17 +7,15 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/bedrock-chat-language-model.ts
-import {
-  InvalidArgumentError
-} from "@ai-sdk/provider";
 import {
   combineHeaders,
   createJsonErrorResponseHandler,
   createJsonResponseHandler,
   postJsonToApi,
-  resolve
+  resolve,
+  parseProviderOptions
 } from "@ai-sdk/provider-utils";
-import { z as z2 } from "zod";
+import { z as z3 } from "zod";
 
 // src/bedrock-api-types.ts
 var BEDROCK_CACHE_POINT = {
@@ -36,11 +34,26 @@ var BEDROCK_STOP_REASONS = [
   "tool_use"
 ];
 
-// src/bedrock-error.ts
+// src/bedrock-chat-options.ts
 import { z } from "zod";
-var BedrockErrorSchema = z.object({
-  message: z.string(),
-  type: z.string().nullish()
+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(),
+  reasoningConfig: z.object({
+    type: z.union([z.literal("enabled"), z.literal("disabled")]).nullish(),
+    budgetTokens: z.number().nullish()
+  }).nullish()
+});
+
+// src/bedrock-error.ts
+import { z as z2 } from "zod";
+var BedrockErrorSchema = z2.object({
+  message: z2.string(),
+  type: z2.string().nullish()
 });
 
 // src/bedrock-event-stream-response-handler.ts
@@ -194,7 +207,7 @@ function prepareTools({
 import {
   UnsupportedFunctionalityError as UnsupportedFunctionalityError2
 } from "@ai-sdk/provider";
-import { createIdGenerator } from "@ai-sdk/provider-utils";
+import { convertToBase64, createIdGenerator } from "@ai-sdk/provider-utils";
 var generateFileId = createIdGenerator({ prefix: "file", size: 16 });
 function getCachePoint(providerMetadata) {
   var _a;
@@ -250,7 +263,7 @@ function convertToBedrockChatMessages(prompt) {
                       bedrockContent.push({
                         image: {
                           format: bedrockImageFormat,
-                          source: { bytes: part.data }
+                          source: { bytes: convertToBase64(part.data) }
                         }
                       });
                     } else {
@@ -260,9 +273,7 @@ function convertToBedrockChatMessages(prompt) {
                             "/"
                           )) == null ? void 0 : _d[1],
                           name: generateFileId(),
-                          source: {
-                            bytes: part.data
-                          }
+                          source: { bytes: convertToBase64(part.data) }
                         }
                       });
                     }
@@ -479,9 +490,8 @@ function mapBedrockFinishReason(finishReason) {
 
 // src/bedrock-chat-language-model.ts
 var BedrockChatLanguageModel = class {
-  constructor(modelId, settings, config) {
+  constructor(modelId, config) {
     this.modelId = modelId;
-    this.settings = settings;
     this.config = config;
     this.specificationVersion = "v2";
     this.provider = "amazon-bedrock";
@@ -490,7 +500,7 @@ var BedrockChatLanguageModel = class {
   }
   getArgs({
     prompt,
-    maxTokens,
+    maxOutputTokens,
     temperature,
     topP,
     topK,
@@ -503,7 +513,12 @@ var BedrockChatLanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e;
+    const bedrockOptions = (_a = parseProviderOptions({
+      provider: "bedrock",
+      providerOptions,
+      schema: bedrockProviderOptions
+    })) != null ? _a : {};
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -537,34 +552,24 @@ var BedrockChatLanguageModel = class {
       });
     }
     const { system, messages } = convertToBedrockChatMessages(prompt);
-    const reasoningConfigOptions = BedrockReasoningConfigOptionsSchema.safeParse(
-      (_a = providerOptions == null ? void 0 : providerOptions.bedrock) == null ? void 0 : _a.reasoning_config
-    );
-    if (!reasoningConfigOptions.success) {
-      throw new InvalidArgumentError({
-        argument: "providerOptions.bedrock.reasoning_config",
-        message: "invalid reasoning configuration options",
-        cause: reasoningConfigOptions.error
-      });
-    }
-    const isThinking = ((_b = reasoningConfigOptions.data) == null ? void 0 : _b.type) === "enabled";
-    const thinkingBudget = (_e = (_c = reasoningConfigOptions.data) == null ? void 0 : _c.budgetTokens) != null ? _e : (_d = reasoningConfigOptions.data) == null ? void 0 : _d.budget_tokens;
+    const isThinking = ((_b = bedrockOptions.reasoningConfig) == null ? void 0 : _b.type) === "enabled";
+    const thinkingBudget = (_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.budgetTokens;
     const inferenceConfig = {
-      ...maxTokens != null && { maxTokens },
+      ...maxOutputTokens != null && { maxOutputTokens },
       ...temperature != null && { temperature },
       ...topP != null && { topP },
       ...stopSequences != null && { stopSequences }
     };
     if (isThinking && thinkingBudget != null) {
-      if (inferenceConfig.maxTokens != null) {
-        inferenceConfig.maxTokens += thinkingBudget;
+      if (inferenceConfig.maxOutputTokens != null) {
+        inferenceConfig.maxOutputTokens += thinkingBudget;
       } else {
-        inferenceConfig.maxTokens = thinkingBudget + 4096;
+        inferenceConfig.maxOutputTokens = thinkingBudget + 4096;
       }
-      this.settings.additionalModelRequestFields = {
-        ...this.settings.additionalModelRequestFields,
-        reasoning_config: {
-          type: (_f = reasoningConfigOptions.data) == null ? void 0 : _f.type,
+      bedrockOptions.additionalModelRequestFields = {
+        ...bedrockOptions.additionalModelRequestFields,
+        reasoningConfig: {
+          type: (_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.type,
           budget_tokens: thinkingBudget
         }
       };
@@ -590,18 +595,18 @@ var BedrockChatLanguageModel = class {
       command: {
         system,
         messages,
-        additionalModelRequestFields: this.settings.additionalModelRequestFields,
+        additionalModelRequestFields: bedrockOptions.additionalModelRequestFields,
         ...Object.keys(inferenceConfig).length > 0 && {
           inferenceConfig
         },
         ...providerOptions == null ? void 0 : providerOptions.bedrock,
-        ...((_g = toolConfig.tools) == null ? void 0 : _g.length) ? { toolConfig } : {}
+        ...((_e = toolConfig.tools) == null ? void 0 : _e.length) ? { toolConfig } : {}
       },
       warnings: [...warnings, ...toolWarnings]
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     const { command: args, warnings } = this.getArgs(options);
     const url = `${this.getUrl(this.modelId)}/converse`;
     const { value: response, responseHeaders } = await postJsonToApi({
@@ -635,33 +640,41 @@ var BedrockChatLanguageModel = class {
         }
       }
     } : void 0;
-    const reasoning = response.output.message.content.filter((content) => content.reasoningContent).map((content) => {
-      var _a2;
-      if (content.reasoningContent && "reasoningText" in content.reasoningContent) {
-        return {
-          type: "text",
-          text: content.reasoningContent.reasoningText.text,
-          ...content.reasoningContent.reasoningText.signature && {
-            signature: content.reasoningContent.reasoningText.signature
+    const reasoning = [];
+    for (const content of response.output.message.content) {
+      if (content.reasoningContent) {
+        if ("reasoningText" in content.reasoningContent) {
+          reasoning.push({
+            type: "reasoning",
+            reasoningType: "text",
+            text: content.reasoningContent.reasoningText.text
+          });
+          if (content.reasoningContent.reasoningText.signature) {
+            reasoning.push({
+              type: "reasoning",
+              reasoningType: "signature",
+              signature: content.reasoningContent.reasoningText.signature
+            });
           }
-        };
-      } else if (content.reasoningContent && "redactedReasoning" in content.reasoningContent) {
-        return {
-          type: "redacted",
-          data: (_a2 = content.reasoningContent.redactedReasoning.data) != null ? _a2 : ""
-        };
-      } else {
-        return void 0;
+        } else if ("redactedReasoning" in content.reasoningContent) {
+          reasoning.push({
+            type: "reasoning",
+            reasoningType: "redacted",
+            data: (_e = content.reasoningContent.redactedReasoning.data) != null ? _e : ""
+          });
+        }
       }
-    }).filter((item) => item !== void 0);
+    }
+    const text = (_h = (_g = (_f = response.output) == null ? void 0 : _f.message) == null ? void 0 : _g.content) == null ? void 0 : _h.map((part) => {
+      var _a2;
+      return (_a2 = part.text) != null ? _a2 : "";
+    }).join("");
     return {
-      text: (_h = (_g = (_f = (_e = response.output) == null ? void 0 : _e.message) == null ? void 0 : _f.content) == null ? void 0 : _g.map((part) => {
-        var _a2;
-        return (_a2 = part.text) != null ? _a2 : "";
-      }).join("")) != null ? _h : void 0,
+      text: text != null ? { type: "text", text } : void 0,
       toolCalls: (_l = (_k = (_j = (_i = response.output) == null ? void 0 : _i.message) == null ? void 0 : _j.content) == null ? void 0 : _k.filter((part) => !!part.toolUse)) == null ? void 0 : _l.map((part) => {
         var _a2, _b2, _c2, _d2, _e2, _f2;
         return {
+          type: "tool-call",
           toolCallType: "function",
           toolCallId: (_b2 = (_a2 = part.toolUse) == null ? void 0 : _a2.toolUseId) != null ? _b2 : this.config.generateId(),
           toolName: (_d2 = (_c2 = part.toolUse) == null ? void 0 : _c2.name) != null ? _d2 : `tool-${this.config.generateId()}`,
@@ -672,8 +685,8 @@ var BedrockChatLanguageModel = class {
         response.stopReason
       ),
       usage: {
-        promptTokens: (_n = (_m = response.usage) == null ? void 0 : _m.inputTokens) != null ? _n : Number.NaN,
-        completionTokens: (_p = (_o = response.usage) == null ? void 0 : _o.outputTokens) != null ? _p : Number.NaN
+        inputTokens: (_m = response.usage) == null ? void 0 : _m.inputTokens,
+        outputTokens: (_n = response.usage) == null ? void 0 : _n.outputTokens
       },
       response: {
         // TODO add id, timestamp, etc
@@ -703,9 +716,9 @@ var BedrockChatLanguageModel = class {
       fetch: this.config.fetch
     });
     let finishReason = "unknown";
-    let usage = {
-      promptTokens: Number.NaN,
-      completionTokens: Number.NaN
+    const usage = {
+      inputTokens: void 0,
+      outputTokens: void 0
     };
     let providerMetadata = void 0;
     const toolCallContentBlocks = {};
@@ -745,10 +758,8 @@ var BedrockChatLanguageModel = class {
               );
             }
             if (value.metadata) {
-              usage = {
-                promptTokens: (_b = (_a = value.metadata.usage) == null ? void 0 : _a.inputTokens) != null ? _b : Number.NaN,
-                completionTokens: (_d = (_c = value.metadata.usage) == null ? void 0 : _c.outputTokens) != null ? _d : Number.NaN
-              };
+              usage.inputTokens = (_b = (_a = value.metadata.usage) == null ? void 0 : _a.inputTokens) != null ? _b : usage.inputTokens;
+              usage.outputTokens = (_d = (_c = value.metadata.usage) == null ? void 0 : _c.outputTokens) != null ? _d : usage.outputTokens;
               const cacheUsage = ((_e = value.metadata.usage) == null ? void 0 : _e.cacheReadInputTokens) != null || ((_f = value.metadata.usage) == null ? void 0 : _f.cacheWriteInputTokens) != null ? {
                 usage: {
                   cacheReadInputTokens: (_h = (_g = value.metadata.usage) == null ? void 0 : _g.cacheReadInputTokens) != null ? _h : Number.NaN,
@@ -769,8 +780,8 @@ var BedrockChatLanguageModel = class {
             }
             if (((_k = value.contentBlockDelta) == null ? void 0 : _k.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
               controller.enqueue({
-                type: "text-delta",
-                textDelta: value.contentBlockDelta.delta.text
+                type: "text",
+                text: value.contentBlockDelta.delta.text
               });
             }
             if (((_l = value.contentBlockDelta) == null ? void 0 : _l.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
@@ -778,16 +789,19 @@ var BedrockChatLanguageModel = class {
               if ("text" in reasoningContent && reasoningContent.text) {
                 controller.enqueue({
                   type: "reasoning",
-                  textDelta: reasoningContent.text
+                  reasoningType: "text",
+                  text: reasoningContent.text
                 });
               } else if ("signature" in reasoningContent && reasoningContent.signature) {
                 controller.enqueue({
-                  type: "reasoning-signature",
+                  type: "reasoning",
+                  reasoningType: "signature",
                   signature: reasoningContent.signature
                 });
               } else if ("data" in reasoningContent && reasoningContent.data) {
                 controller.enqueue({
-                  type: "redacted-reasoning",
+                  type: "reasoning",
+                  reasoningType: "redacted",
                   data: reasoningContent.data
                 });
               }
@@ -849,105 +863,100 @@ var BedrockChatLanguageModel = class {
     return `${this.config.baseUrl()}/model/${encodedModelId}`;
   }
 };
-var BedrockReasoningConfigOptionsSchema = z2.object({
-  type: z2.union([z2.literal("enabled"), z2.literal("disabled")]).nullish(),
-  budget_tokens: z2.number().nullish(),
-  budgetTokens: z2.number().nullish()
-}).nullish();
-var BedrockStopReasonSchema = z2.union([
-  z2.enum(BEDROCK_STOP_REASONS),
-  z2.string()
+var BedrockStopReasonSchema = z3.union([
+  z3.enum(BEDROCK_STOP_REASONS),
+  z3.string()
 ]);
-var BedrockToolUseSchema = z2.object({
-  toolUseId: z2.string(),
-  name: z2.string(),
-  input: z2.unknown()
+var BedrockToolUseSchema = z3.object({
+  toolUseId: z3.string(),
+  name: z3.string(),
+  input: z3.unknown()
 });
-var BedrockReasoningTextSchema = z2.object({
-  signature: z2.string().nullish(),
-  text: z2.string()
+var BedrockReasoningTextSchema = z3.object({
+  signature: z3.string().nullish(),
+  text: z3.string()
 });
-var BedrockRedactedReasoningSchema = z2.object({
-  data: z2.string()
+var BedrockRedactedReasoningSchema = z3.object({
+  data: z3.string()
 });
-var BedrockResponseSchema = z2.object({
-  metrics: z2.object({
-    latencyMs: z2.number()
+var BedrockResponseSchema = z3.object({
+  metrics: z3.object({
+    latencyMs: z3.number()
   }).nullish(),
-  output: z2.object({
-    message: z2.object({
-      content: z2.array(
-        z2.object({
-          text: z2.string().nullish(),
+  output: z3.object({
+    message: z3.object({
+      content: z3.array(
+        z3.object({
+          text: z3.string().nullish(),
           toolUse: BedrockToolUseSchema.nullish(),
-          reasoningContent: z2.union([
-            z2.object({
+          reasoningContent: z3.union([
+            z3.object({
               reasoningText: BedrockReasoningTextSchema
             }),
-            z2.object({
+            z3.object({
               redactedReasoning: BedrockRedactedReasoningSchema
             })
           ]).nullish()
         })
       ),
-      role: z2.string()
+      role: z3.string()
     })
   }),
   stopReason: BedrockStopReasonSchema,
-  trace: z2.unknown().nullish(),
-  usage: z2.object({
-    inputTokens: z2.number(),
-    outputTokens: z2.number(),
-    totalTokens: z2.number(),
-    cacheReadInputTokens: z2.number().nullish(),
-    cacheWriteInputTokens: z2.number().nullish()
+  trace: z3.unknown().nullish(),
+  usage: z3.object({
+    inputTokens: z3.number(),
+    outputTokens: z3.number(),
+    totalTokens: z3.number(),
+    cacheReadInputTokens: z3.number().nullish(),
+    cacheWriteInputTokens: z3.number().nullish()
   })
 });
-var BedrockStreamSchema = z2.object({
-  contentBlockDelta: z2.object({
-    contentBlockIndex: z2.number(),
-    delta: z2.union([
-      z2.object({ text: z2.string() }),
-      z2.object({ toolUse: z2.object({ input: z2.string() }) }),
-      z2.object({
-        reasoningContent: z2.object({ text: z2.string() })
+var BedrockStreamSchema = z3.object({
+  contentBlockDelta: z3.object({
+    contentBlockIndex: z3.number(),
+    delta: z3.union([
+      z3.object({ text: z3.string() }),
+      z3.object({ toolUse: z3.object({ input: z3.string() }) }),
+      z3.object({
+        reasoningContent: z3.object({ text: z3.string() })
       }),
-      z2.object({
-        reasoningContent: z2.object({
-          signature: z2.string()
+      z3.object({
+        reasoningContent: z3.object({
+          signature: z3.string()
         })
       }),
-      z2.object({
-        reasoningContent: z2.object({ data: z2.string() })
+      z3.object({
+        reasoningContent: z3.object({ data: z3.string() })
       })
     ]).nullish()
   }).nullish(),
-  contentBlockStart: z2.object({
-    contentBlockIndex: z2.number(),
-    start: z2.object({
+  contentBlockStart: z3.object({
+    contentBlockIndex: z3.number(),
+    start: z3.object({
       toolUse: BedrockToolUseSchema.nullish()
     }).nullish()
   }).nullish(),
-  contentBlockStop: z2.object({
-    contentBlockIndex: z2.number()
+  contentBlockStop: z3.object({
+    contentBlockIndex: z3.number()
   }).nullish(),
-  internalServerException: z2.record(z2.unknown()).nullish(),
-  messageStop: z2.object({
-    additionalModelResponseFields: z2.record(z2.unknown()).nullish(),
+  internalServerException: z3.record(z3.unknown()).nullish(),
+  messageStop: z3.object({
+    additionalModelResponseFields: z3.record(z3.unknown()).nullish(),
     stopReason: BedrockStopReasonSchema
   }).nullish(),
-  metadata: z2.object({
-    trace: z2.unknown().nullish(),
-    usage: z2.object({
-      cacheReadInputTokens: z2.number().nullish(),
-      cacheWriteInputTokens: z2.number().nullish(),
-      inputTokens: z2.number(),
-      outputTokens: z2.number()
+  metadata: z3.object({
+    trace: z3.unknown().nullish(),
+    usage: z3.object({
+      cacheReadInputTokens: z3.number().nullish(),
+      cacheWriteInputTokens: z3.number().nullish(),
+      inputTokens: z3.number(),
+      outputTokens: z3.number()
     }).nullish()
   }).nullish(),
-  modelStreamErrorException: z2.record(z2.unknown()).nullish(),
-  throttlingException: z2.record(z2.unknown()).nullish(),
-  validationException: z2.record(z2.unknown()).nullish()
+  modelStreamErrorException: z3.record(z3.unknown()).nullish(),
+  throttlingException: z3.record(z3.unknown()).nullish(),
+  validationException: z3.record(z3.unknown()).nullish()
 });
 
 // src/bedrock-embedding-model.ts
@@ -958,13 +967,13 @@ import {
   postJsonToApi as postJsonToApi2,
   resolve as resolve2
 } from "@ai-sdk/provider-utils";
-import { z as z3 } from "zod";
+import { z as z4 } from "zod";
 var BedrockEmbeddingModel = class {
   constructor(modelId, settings, config) {
     this.modelId = modelId;
     this.settings = settings;
     this.config = config;
-    this.specificationVersion = "v1";
+    this.specificationVersion = "v2";
     this.provider = "amazon-bedrock";
     this.maxEmbeddingsPerCall = void 0;
     this.supportsParallelCalls = true;
@@ -1017,9 +1026,9 @@ var BedrockEmbeddingModel = class {
     );
   }
 };
-var BedrockEmbeddingResponseSchema = z3.object({
-  embedding: z3.array(z3.number()),
-  inputTextTokenCount: z3.number()
+var BedrockEmbeddingResponseSchema = z4.object({
+  embedding: z4.array(z4.number()),
+  inputTextTokenCount: z4.number()
 });
 
 // src/bedrock-image-model.ts
@@ -1037,7 +1046,7 @@ var modelMaxImagesPerCall = {
 };
 
 // src/bedrock-image-model.ts
-import { z as z4 } from "zod";
+import { z as z5 } from "zod";
 var BedrockImageModel = class {
   constructor(modelId, settings, config) {
     this.modelId = modelId;
@@ -1119,8 +1128,8 @@ var BedrockImageModel = class {
     };
   }
 };
-var bedrockImageResponseSchema = z4.object({
-  images: z4.array(z4.string())
+var bedrockImageResponseSchema = z5.object({
+  images: z5.array(z5.string())
 });
 
 // src/headers-utils.ts
@@ -1245,22 +1254,22 @@ function createAmazonBedrock(options = {}) {
       })}.amazonaws.com`
     )) != null ? _b : `https://bedrock-runtime.us-east-1.amazonaws.com`;
   };
-  const createChatModel = (modelId, settings = {}) => {
+  const createChatModel = (modelId) => {
     var _a;
-    return new BedrockChatLanguageModel(modelId, settings, {
+    return new BedrockChatLanguageModel(modelId, {
       baseUrl: getBaseUrl,
       headers: (_a = options.headers) != null ? _a : {},
       fetch: sigv4Fetch,
       generateId
     });
   };
-  const provider = function(modelId, settings) {
+  const provider = function(modelId) {
     if (new.target) {
       throw new Error(
         "The Amazon Bedrock model function cannot be called with the new keyword."
       );
     }
-    return createChatModel(modelId, settings);
+    return createChatModel(modelId);
   };
   const createEmbeddingModel = (modelId, settings = {}) => {
     var _a;