@ai-sdk/amazon-bedrock 4.0.0-beta.60 → 4.0.0-beta.62

package/dist/index.mjs

@@ -77,7 +77,11 @@ var bedrockProviderOptions = z.object({
   reasoningConfig: z.object({
     type: z.union([z.literal("enabled"), z.literal("disabled")]).optional(),
     budgetTokens: z.number().optional()
-  }).optional()
+  }).optional(),
+  /**
+   * Anthropic beta features to enable
+   */
+  anthropicBeta: z.array(z.string()).optional()
 });
 
 // src/bedrock-error.ts
@@ -646,7 +650,7 @@ function groupIntoBlocks(prompt) {
 }
 
 // src/map-bedrock-finish-reason.ts
-function mapBedrockFinishReason(finishReason) {
+function mapBedrockFinishReason(finishReason, isJsonResponseFromTool) {
   switch (finishReason) {
     case "stop_sequence":
     case "end_turn":
@@ -657,7 +661,7 @@ function mapBedrockFinishReason(finishReason) {
     case "guardrail_intervened":
       return "content-filter";
     case "tool_use":
-      return "tool-calls";
+      return isJsonResponseFromTool ? "stop" : "tool-calls";
     default:
       return "unknown";
   }
@@ -689,7 +693,7 @@ var BedrockChatLanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const bedrockOptions = (_a = await parseProviderOptions2({
       provider: "bedrock",
       providerOptions,
@@ -736,14 +740,6 @@ var BedrockChatLanguageModel = class {
         details: "Only text and json response formats are supported."
       });
     }
-    if (tools != null && (responseFormat == null ? void 0 : responseFormat.type) === "json") {
-      if (tools.length > 0) {
-        warnings.push({
-          type: "other",
-          message: "JSON response format does not support tools. The provided tools are ignored."
-        });
-      }
-    }
     const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null ? {
       type: "function",
       name: "json",
@@ -751,8 +747,8 @@ var BedrockChatLanguageModel = class {
       inputSchema: responseFormat.schema
     } : void 0;
     const { toolConfig, additionalTools, toolWarnings, betas } = await prepareTools({
-      tools: jsonResponseTool ? [jsonResponseTool, ...tools != null ? tools : []] : tools,
-      toolChoice: jsonResponseTool != null ? { type: "tool", toolName: jsonResponseTool.name } : toolChoice,
+      tools: jsonResponseTool ? [...tools != null ? tools : [], jsonResponseTool] : tools,
+      toolChoice: jsonResponseTool != null ? { type: "required" } : toolChoice,
       modelId: this.modelId
     });
     warnings.push(...toolWarnings);
@@ -762,8 +758,16 @@ var BedrockChatLanguageModel = class {
         ...additionalTools
       };
     }
-    const isThinking = ((_b = bedrockOptions.reasoningConfig) == null ? void 0 : _b.type) === "enabled";
-    const thinkingBudget = (_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.budgetTokens;
+    if (betas.size > 0 || bedrockOptions.anthropicBeta) {
+      const existingBetas = (_b = bedrockOptions.anthropicBeta) != null ? _b : [];
+      const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
+      bedrockOptions.additionalModelRequestFields = {
+        ...bedrockOptions.additionalModelRequestFields,
+        anthropic_beta: mergedBetas
+      };
+    }
+    const isThinking = ((_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.type) === "enabled";
+    const thinkingBudget = (_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.budgetTokens;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
       ...temperature != null && { temperature },
@@ -780,7 +784,7 @@ var BedrockChatLanguageModel = class {
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         thinking: {
-          type: (_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.type,
+          type: (_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type,
           budget_tokens: thinkingBudget
         }
       };
@@ -809,7 +813,7 @@ var BedrockChatLanguageModel = class {
         details: "topK is not supported when thinking is enabled"
       });
     }
-    const hasAnyTools = ((_f = (_e = toolConfig.tools) == null ? void 0 : _e.length) != null ? _f : 0) > 0 || additionalTools;
+    const hasAnyTools = ((_g = (_f = toolConfig.tools) == null ? void 0 : _f.length) != null ? _g : 0) > 0 || additionalTools;
     let filteredPrompt = prompt;
     if (!hasAnyTools) {
       const hasToolContent = prompt.some(
@@ -858,27 +862,21 @@ var BedrockChatLanguageModel = class {
     };
   }
   async getHeaders({
-    betas,
     headers
   }) {
-    return combineHeaders(
-      await resolve(this.config.headers),
-      betas.size > 0 ? { "anthropic-beta": Array.from(betas).join(",") } : {},
-      headers
-    );
+    return combineHeaders(await resolve(this.config.headers), headers);
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     const {
       command: args,
       warnings,
-      usesJsonResponseTool,
-      betas
+      usesJsonResponseTool
     } = await this.getArgs(options);
     const url = `${this.getUrl(this.modelId)}/converse`;
     const { value: response, responseHeaders } = await postJsonToApi({
       url,
-      headers: await this.getHeaders({ betas, headers: options.headers }),
+      headers: await this.getHeaders({ headers: options.headers }),
       body: args,
       failedResponseHandler: createJsonErrorResponseHandler({
         errorSchema: BedrockErrorSchema,
@@ -894,11 +892,10 @@ var BedrockChatLanguageModel = class {
       fetch: this.config.fetch
     });
     const content = [];
+    let isJsonResponseFromTool = false;
     for (const part of response.output.message.content) {
       if (part.text) {
-        if (!usesJsonResponseTool) {
-          content.push({ type: "text", text: part.text });
-        }
+        content.push({ type: "text", text: part.text });
       }
       if (part.reasoningContent) {
         if ("reasoningText" in part.reasoningContent) {
@@ -927,21 +924,24 @@ var BedrockChatLanguageModel = class {
         }
       }
       if (part.toolUse) {
-        content.push(
-          // when a json response tool is used, the tool call becomes the text:
-          usesJsonResponseTool ? {
+        const isJsonResponseTool = usesJsonResponseTool && part.toolUse.name === "json";
+        if (isJsonResponseTool) {
+          isJsonResponseFromTool = true;
+          content.push({
             type: "text",
             text: JSON.stringify(part.toolUse.input)
-          } : {
+          });
+        } else {
+          content.push({
             type: "tool-call",
             toolCallId: (_c = (_b = part.toolUse) == null ? void 0 : _b.toolUseId) != null ? _c : this.config.generateId(),
             toolName: (_e = (_d = part.toolUse) == null ? void 0 : _d.name) != null ? _e : `tool-${this.config.generateId()}`,
             input: JSON.stringify((_g = (_f = part.toolUse) == null ? void 0 : _f.input) != null ? _g : "")
-          }
-        );
+          });
+        }
       }
     }
-    const providerMetadata = response.trace || response.usage || usesJsonResponseTool ? {
+    const providerMetadata = response.trace || response.usage || isJsonResponseFromTool ? {
       bedrock: {
         ...response.trace && typeof response.trace === "object" ? { trace: response.trace } : {},
         ...((_h = response.usage) == null ? void 0 : _h.cacheWriteInputTokens) != null && {
@@ -949,13 +949,14 @@ var BedrockChatLanguageModel = class {
             cacheWriteInputTokens: response.usage.cacheWriteInputTokens
           }
         },
-        ...usesJsonResponseTool && { isJsonResponseFromTool: true }
+        ...isJsonResponseFromTool && { isJsonResponseFromTool: true }
       }
     } : void 0;
     return {
       content,
       finishReason: mapBedrockFinishReason(
-        response.stopReason
+        response.stopReason,
+        isJsonResponseFromTool
       ),
       usage: {
         inputTokens: (_i = response.usage) == null ? void 0 : _i.inputTokens,
@@ -975,13 +976,12 @@ var BedrockChatLanguageModel = class {
     const {
       command: args,
       warnings,
-      usesJsonResponseTool,
-      betas
+      usesJsonResponseTool
     } = await this.getArgs(options);
     const url = `${this.getUrl(this.modelId)}/converse-stream`;
     const { value: response, responseHeaders } = await postJsonToApi({
       url,
-      headers: await this.getHeaders({ betas, headers: options.headers }),
+      headers: await this.getHeaders({ headers: options.headers }),
       body: args,
       failedResponseHandler: createJsonErrorResponseHandler({
         errorSchema: BedrockErrorSchema,
@@ -998,6 +998,7 @@ var BedrockChatLanguageModel = class {
       totalTokens: void 0
     };
     let providerMetadata = void 0;
+    let isJsonResponseFromTool = false;
     const contentBlocks = {};
     return {
       stream: response.pipeThrough(
@@ -1037,7 +1038,8 @@ var BedrockChatLanguageModel = class {
             }
             if (value.messageStop) {
               finishReason = mapBedrockFinishReason(
-                value.messageStop.stopReason
+                value.messageStop.stopReason,
+                isJsonResponseFromTool
               );
             }
             if (value.metadata) {
@@ -1053,14 +1055,11 @@ var BedrockChatLanguageModel = class {
               const trace = value.metadata.trace ? {
                 trace: value.metadata.trace
               } : void 0;
-              if (cacheUsage || trace || usesJsonResponseTool) {
+              if (cacheUsage || trace) {
                 providerMetadata = {
                   bedrock: {
                     ...cacheUsage,
-                    ...trace,
-                    ...usesJsonResponseTool && {
-                      isJsonResponseFromTool: true
-                    }
+                    ...trace
                   }
                 };
               }
@@ -1077,20 +1076,16 @@ var BedrockChatLanguageModel = class {
               const blockIndex = value.contentBlockDelta.contentBlockIndex || 0;
               if (contentBlocks[blockIndex] == null) {
                 contentBlocks[blockIndex] = { type: "text" };
-                if (!usesJsonResponseTool) {
-                  controller.enqueue({
-                    type: "text-start",
-                    id: String(blockIndex)
-                  });
-                }
-              }
-              if (!usesJsonResponseTool) {
                 controller.enqueue({
-                  type: "text-delta",
-                  id: String(blockIndex),
-                  delta: value.contentBlockDelta.delta.text
+                  type: "text-start",
+                  id: String(blockIndex)
                 });
               }
+              controller.enqueue({
+                type: "text-delta",
+                id: String(blockIndex),
+                delta: value.contentBlockDelta.delta.text
+              });
             }
             if (((_n = value.contentBlockStop) == null ? void 0 : _n.contentBlockIndex) != null) {
               const blockIndex = value.contentBlockStop.contentBlockIndex;
@@ -1102,14 +1097,13 @@ var BedrockChatLanguageModel = class {
                     id: String(blockIndex)
                   });
                 } else if (contentBlock.type === "text") {
-                  if (!usesJsonResponseTool) {
-                    controller.enqueue({
-                      type: "text-end",
-                      id: String(blockIndex)
-                    });
-                  }
+                  controller.enqueue({
+                    type: "text-end",
+                    id: String(blockIndex)
+                  });
                 } else if (contentBlock.type === "tool-call") {
-                  if (usesJsonResponseTool) {
+                  if (contentBlock.isJsonResponseTool) {
+                    isJsonResponseFromTool = true;
                     controller.enqueue({
                       type: "text-start",
                       id: String(blockIndex)
@@ -1183,13 +1177,15 @@ var BedrockChatLanguageModel = class {
             if (((_p = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _p.toolUse) != null) {
               const toolUse = contentBlockStart.start.toolUse;
               const blockIndex = contentBlockStart.contentBlockIndex;
+              const isJsonResponseTool = usesJsonResponseTool && toolUse.name === "json";
               contentBlocks[blockIndex] = {
                 type: "tool-call",
                 toolCallId: toolUse.toolUseId,
                 toolName: toolUse.name,
-                jsonText: ""
+                jsonText: "",
+                isJsonResponseTool
               };
-              if (!usesJsonResponseTool) {
+              if (!isJsonResponseTool) {
                 controller.enqueue({
                   type: "tool-input-start",
                   id: toolUse.toolUseId,
@@ -1203,7 +1199,7 @@ var BedrockChatLanguageModel = class {
               const contentBlock = contentBlocks[blockIndex];
               if ((contentBlock == null ? void 0 : contentBlock.type) === "tool-call") {
                 const delta = (_q = contentBlockDelta.delta.toolUse.input) != null ? _q : "";
-                if (!usesJsonResponseTool) {
+                if (!contentBlock.isJsonResponseTool) {
                   controller.enqueue({
                     type: "tool-input-delta",
                     id: contentBlock.toolCallId,
@@ -1215,6 +1211,20 @@ var BedrockChatLanguageModel = class {
             }
           },
           flush(controller) {
+            if (isJsonResponseFromTool) {
+              if (providerMetadata) {
+                providerMetadata.bedrock = {
+                  ...providerMetadata.bedrock,
+                  isJsonResponseFromTool: true
+                };
+              } else {
+                providerMetadata = {
+                  bedrock: {
+                    isJsonResponseFromTool: true
+                  }
+                };
+              }
+            }
             controller.enqueue({
               type: "finish",
               finishReason,
@@ -1542,7 +1552,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.0-beta.60" : "0.0.0-test";
+var VERSION = true ? "4.0.0-beta.62" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch = globalThis.fetch) {