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

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ai-sdk/amazon-bedrock
 
+## 3.0.0-beta.12
+
+### Patch Changes
+
+- 0893170: fix(amazon-bedrock): handle empty activeTools with tool conversation history
+- Updated dependencies [e7fcc86]
+  - @ai-sdk/provider-utils@3.0.0-beta.7
+
+## 3.0.0-beta.11
+
+### Patch Changes
+
+- a89add7: fix(amazon-bedrock): add structured output support for claude models
+
 ## 3.0.0-beta.10
 
 ### Patch Changes

package/dist/index.js

@@ -181,7 +181,7 @@ function prepareTools({
   if (tools == null) {
     return {
       toolConfig: {
-        tools: hasToolContent ? [] : void 0,
+        tools: void 0,
         toolChoice: void 0
       },
       toolWarnings: []
@@ -225,7 +225,7 @@ function prepareTools({
     case "none":
       return {
         toolConfig: {
-          tools: hasToolContent ? [] : void 0,
+          tools: void 0,
           toolChoice: void 0
         },
         toolWarnings
@@ -630,14 +630,27 @@ var BedrockChatLanguageModel = class {
         setting: "topK"
       });
     }
-    if (responseFormat != null && responseFormat.type !== "text") {
+    if (responseFormat != null && responseFormat.type !== "text" && responseFormat.type !== "json") {
       warnings.push({
         type: "unsupported-setting",
         setting: "responseFormat",
-        details: "JSON response format is not supported."
+        details: "Only text and json response formats are supported."
       });
     }
-    const { system, messages } = await convertToBedrockChatMessages(prompt);
+    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",
+      description: "Respond with a JSON object.",
+      inputSchema: responseFormat.schema
+    } : void 0;
     const isThinking = ((_b = bedrockOptions.reasoningConfig) == null ? void 0 : _b.type) === "enabled";
     const thinkingBudget = (_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.budgetTokens;
     const inferenceConfig = {
@@ -676,10 +689,37 @@ var BedrockChatLanguageModel = class {
         details: "topP is not supported when thinking is enabled"
       });
     }
+    const activeTools = jsonResponseTool != null ? [jsonResponseTool] : tools != null ? tools : [];
+    let filteredPrompt = prompt;
+    if (activeTools.length === 0) {
+      const hasToolContent = prompt.some(
+        (message) => "content" in message && Array.isArray(message.content) && message.content.some(
+          (part) => part.type === "tool-call" || part.type === "tool-result"
+        )
+      );
+      if (hasToolContent) {
+        filteredPrompt = prompt.map(
+          (message) => message.role === "system" ? message : {
+            ...message,
+            content: message.content.filter(
+              (part) => part.type !== "tool-call" && part.type !== "tool-result"
+            )
+          }
+        ).filter(
+          (message) => message.role === "system" || message.content.length > 0
+        );
+        warnings.push({
+          type: "unsupported-setting",
+          setting: "toolContent",
+          details: "Tool calls and results removed from conversation because Bedrock does not support tool content without active tools."
+        });
+      }
+    }
+    const { system, messages } = await convertToBedrockChatMessages(filteredPrompt);
     const { toolConfig, toolWarnings } = prepareTools({
-      tools,
-      toolChoice,
-      prompt
+      tools: activeTools,
+      toolChoice: jsonResponseTool != null ? { type: "tool", toolName: jsonResponseTool.name } : toolChoice,
+      prompt: filteredPrompt
     });
     const { reasoningConfig: _, ...filteredBedrockOptions } = (providerOptions == null ? void 0 : providerOptions.bedrock) || {};
     return {
@@ -693,12 +733,17 @@ var BedrockChatLanguageModel = class {
         ...filteredBedrockOptions,
         ...toolConfig.tools !== void 0 ? { toolConfig } : {}
       },
-      warnings: [...warnings, ...toolWarnings]
+      warnings: [...warnings, ...toolWarnings],
+      usesJsonResponseTool: jsonResponseTool != null
     };
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
-    const { command: args, warnings } = await this.getArgs(options);
+    const {
+      command: args,
+      warnings,
+      usesJsonResponseTool
+    } = await this.getArgs(options);
     const url = `${this.getUrl(this.modelId)}/converse`;
     const { value: response, responseHeaders } = await (0, import_provider_utils3.postJsonToApi)({
       url,
@@ -723,7 +768,9 @@ var BedrockChatLanguageModel = class {
     const content = [];
     for (const part of response.output.message.content) {
       if (part.text) {
-        content.push({ type: "text", text: part.text });
+        if (!usesJsonResponseTool) {
+          content.push({ type: "text", text: part.text });
+        }
       }
       if (part.reasoningContent) {
         if ("reasoningText" in part.reasoningContent) {
@@ -752,22 +799,29 @@ var BedrockChatLanguageModel = class {
         }
       }
       if (part.toolUse) {
-        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 : "")
-        });
+        content.push(
+          // when a json response tool is used, the tool call becomes the text:
+          usesJsonResponseTool ? {
+            type: "text",
+            text: JSON.stringify(part.toolUse.input)
+          } : {
+            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 ? {
+    const providerMetadata = response.trace || response.usage || usesJsonResponseTool ? {
       bedrock: {
         ...response.trace && typeof response.trace === "object" ? { trace: response.trace } : {},
         ...((_h = response.usage) == null ? void 0 : _h.cacheWriteInputTokens) != null && {
           usage: {
             cacheWriteInputTokens: response.usage.cacheWriteInputTokens
           }
-        }
+        },
+        ...usesJsonResponseTool && { isJsonResponseFromTool: true }
       }
     } : void 0;
     return {
@@ -790,7 +844,11 @@ var BedrockChatLanguageModel = class {
     };
   }
   async doStream(options) {
-    const { command: args, warnings } = await this.getArgs(options);
+    const {
+      command: args,
+      warnings,
+      usesJsonResponseTool
+    } = await this.getArgs(options);
     const url = `${this.getUrl(this.modelId)}/converse-stream`;
     const { value: response, responseHeaders } = await (0, import_provider_utils3.postJsonToApi)({
       url,
@@ -869,11 +927,14 @@ var BedrockChatLanguageModel = class {
               const trace = value.metadata.trace ? {
                 trace: value.metadata.trace
               } : void 0;
-              if (cacheUsage || trace) {
+              if (cacheUsage || trace || usesJsonResponseTool) {
                 providerMetadata = {
                   bedrock: {
                     ...cacheUsage,
-                    ...trace
+                    ...trace,
+                    ...usesJsonResponseTool && {
+                      isJsonResponseFromTool: true
+                    }
                   }
                 };
               }
@@ -890,16 +951,20 @@ 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-start",
-                  id: String(blockIndex)
+                  type: "text-delta",
+                  id: String(blockIndex),
+                  delta: value.contentBlockDelta.delta.text
                 });
               }
-              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;
@@ -911,21 +976,39 @@ var BedrockChatLanguageModel = class {
                     id: String(blockIndex)
                   });
                 } else if (contentBlock.type === "text") {
-                  controller.enqueue({
-                    type: "text-end",
-                    id: String(blockIndex)
-                  });
+                  if (!usesJsonResponseTool) {
+                    controller.enqueue({
+                      type: "text-end",
+                      id: String(blockIndex)
+                    });
+                  }
                 } else if (contentBlock.type === "tool-call") {
-                  controller.enqueue({
-                    type: "tool-input-end",
-                    id: contentBlock.toolCallId
-                  });
-                  controller.enqueue({
-                    type: "tool-call",
-                    toolCallId: contentBlock.toolCallId,
-                    toolName: contentBlock.toolName,
-                    input: contentBlock.jsonText
-                  });
+                  if (usesJsonResponseTool) {
+                    controller.enqueue({
+                      type: "text-start",
+                      id: String(blockIndex)
+                    });
+                    controller.enqueue({
+                      type: "text-delta",
+                      id: String(blockIndex),
+                      delta: contentBlock.jsonText
+                    });
+                    controller.enqueue({
+                      type: "text-end",
+                      id: String(blockIndex)
+                    });
+                  } else {
+                    controller.enqueue({
+                      type: "tool-input-end",
+                      id: contentBlock.toolCallId
+                    });
+                    controller.enqueue({
+                      type: "tool-call",
+                      toolCallId: contentBlock.toolCallId,
+                      toolName: contentBlock.toolName,
+                      input: contentBlock.jsonText
+                    });
+                  }
                 }
                 delete contentBlocks[blockIndex];
               }
@@ -980,11 +1063,13 @@ var BedrockChatLanguageModel = class {
                 toolName: toolUse.name,
                 jsonText: ""
               };
-              controller.enqueue({
-                type: "tool-input-start",
-                id: toolUse.toolUseId,
-                toolName: toolUse.name
-              });
+              if (!usesJsonResponseTool) {
+                controller.enqueue({
+                  type: "tool-input-start",
+                  id: toolUse.toolUseId,
+                  toolName: toolUse.name
+                });
+              }
             }
             const contentBlockDelta = value.contentBlockDelta;
             if ((contentBlockDelta == null ? void 0 : contentBlockDelta.delta) && "toolUse" in contentBlockDelta.delta && contentBlockDelta.delta.toolUse) {
@@ -992,11 +1077,13 @@ 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 : "";
-                controller.enqueue({
-                  type: "tool-input-delta",
-                  id: contentBlock.toolCallId,
-                  delta
-                });
+                if (!usesJsonResponseTool) {
+                  controller.enqueue({
+                    type: "tool-input-delta",
+                    id: contentBlock.toolCallId,
+                    delta
+                  });
+                }
                 contentBlock.jsonText += delta;
               }
             }