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

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @ai-sdk/amazon-bedrock
 
+## 4.0.0-beta.62
+
+### Patch Changes
+
+- 88b2c7e: feat(provider/amazon-bedrock,provider/google-vertex-anthropic): add support for tool calling with structured output
+
+  Added support for combining tool calling with structured outputs in both Amazon Bedrock and Google Vertex Anthropic providers. This allows developers to use tools (like weather lookups, web search, etc.) alongside structured JSON output schemas, enabling multi-step agentic workflows with structured final outputs.
+
+  **Amazon Bedrock Changes:**
+
+  - Removed incorrect warning that prevented using tools with JSON response format
+  - Updated tool choice to use `{ type: 'required' }` instead of specific tool selection when using structured outputs
+  - Added `isJsonResponseFromTool` parameter to finish reason mapping
+  - JSON tool responses are correctly converted to text content and finish reason is mapped from `tool_use` to `stop`
+  - Added comprehensive test coverage for combining tools with structured outputs
+  - Added example files demonstrating the feature
+
+  **Google Vertex Anthropic Changes:**
+
+  - Inherits support from underlying Anthropic provider implementation
+  - Added test coverage to verify the feature works correctly
+  - Added example files demonstrating the feature
+
+  This brings Anthropic provider's structured output capabilities to the Amazon Bedrock and Google Vertex Anthropic providers.
+
+## 4.0.0-beta.61
+
+### Patch Changes
+
+- 0a6fd91: fix(amazon-bedrock): move anthropic_beta to request body
+
 ## 4.0.0-beta.60
 
 ### Patch Changes

package/dist/index.d.mts

@@ -11,6 +11,7 @@ declare const bedrockProviderOptions: z.ZodObject<{
         type: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"enabled">, z.ZodLiteral<"disabled">]>>;
         budgetTokens: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
+    anthropicBeta: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
 type BedrockProviderOptions = z.infer<typeof bedrockProviderOptions>;
 

package/dist/index.d.ts

@@ -11,6 +11,7 @@ declare const bedrockProviderOptions: z.ZodObject<{
         type: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"enabled">, z.ZodLiteral<"disabled">]>>;
         budgetTokens: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
+    anthropicBeta: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
 type BedrockProviderOptions = z.infer<typeof bedrockProviderOptions>;
 

package/dist/index.js

@@ -92,7 +92,11 @@ var bedrockProviderOptions = import_v4.z.object({
   reasoningConfig: import_v4.z.object({
     type: import_v4.z.union([import_v4.z.literal("enabled"), import_v4.z.literal("disabled")]).optional(),
     budgetTokens: import_v4.z.number().optional()
-  }).optional()
+  }).optional(),
+  /**
+   * Anthropic beta features to enable
+   */
+  anthropicBeta: import_v4.z.array(import_v4.z.string()).optional()
 });
 
 // src/bedrock-error.ts
@@ -650,7 +654,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":
@@ -661,7 +665,7 @@ function mapBedrockFinishReason(finishReason) {
     case "guardrail_intervened":
       return "content-filter";
     case "tool_use":
-      return "tool-calls";
+      return isJsonResponseFromTool ? "stop" : "tool-calls";
     default:
       return "unknown";
   }
@@ -693,7 +697,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 (0, import_provider_utils4.parseProviderOptions)({
       provider: "bedrock",
       providerOptions,
@@ -740,14 +744,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",
@@ -755,8 +751,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);
@@ -766,8 +762,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 },
@@ -784,7 +788,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
         }
       };
@@ -813,7 +817,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(
@@ -862,27 +866,21 @@ var BedrockChatLanguageModel = class {
     };
   }
   async getHeaders({
-    betas,
     headers
   }) {
-    return (0, import_provider_utils4.combineHeaders)(
-      await (0, import_provider_utils4.resolve)(this.config.headers),
-      betas.size > 0 ? { "anthropic-beta": Array.from(betas).join(",") } : {},
-      headers
-    );
+    return (0, import_provider_utils4.combineHeaders)(await (0, import_provider_utils4.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 (0, import_provider_utils4.postJsonToApi)({
       url,
-      headers: await this.getHeaders({ betas, headers: options.headers }),
+      headers: await this.getHeaders({ headers: options.headers }),
       body: args,
       failedResponseHandler: (0, import_provider_utils4.createJsonErrorResponseHandler)({
         errorSchema: BedrockErrorSchema,
@@ -898,11 +896,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) {
@@ -931,21 +928,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 && {
@@ -953,13 +953,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,
@@ -979,13 +980,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 (0, import_provider_utils4.postJsonToApi)({
       url,
-      headers: await this.getHeaders({ betas, headers: options.headers }),
+      headers: await this.getHeaders({ headers: options.headers }),
       body: args,
       failedResponseHandler: (0, import_provider_utils4.createJsonErrorResponseHandler)({
         errorSchema: BedrockErrorSchema,
@@ -1002,6 +1002,7 @@ var BedrockChatLanguageModel = class {
       totalTokens: void 0
     };
     let providerMetadata = void 0;
+    let isJsonResponseFromTool = false;
     const contentBlocks = {};
     return {
       stream: response.pipeThrough(
@@ -1041,7 +1042,8 @@ var BedrockChatLanguageModel = class {
             }
             if (value.messageStop) {
               finishReason = mapBedrockFinishReason(
-                value.messageStop.stopReason
+                value.messageStop.stopReason,
+                isJsonResponseFromTool
               );
             }
             if (value.metadata) {
@@ -1057,14 +1059,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
                   }
                 };
               }
@@ -1081,20 +1080,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;
@@ -1106,14 +1101,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)
@@ -1187,13 +1181,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,
@@ -1207,7 +1203,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,
@@ -1219,6 +1215,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,
@@ -1526,7 +1536,7 @@ var import_provider_utils7 = require("@ai-sdk/provider-utils");
 var import_aws4fetch = require("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) {