@ai-sdk/amazon-bedrock 3.0.107 → 3.0.109

package/dist/index.mjs

@@ -8,12 +8,13 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "3.0.107" : "0.0.0-test";
+var VERSION = true ? "3.0.109" : "0.0.0-test";
 
 // src/bedrock-provider.ts
 import { anthropicTools as anthropicTools2 } from "@ai-sdk/anthropic/internal";
 
 // src/bedrock-chat-language-model.ts
+import { sanitizeJsonSchema } from "@ai-sdk/anthropic/internal";
 import {
   combineHeaders,
   createJsonErrorResponseHandler,
@@ -372,6 +373,9 @@ async function shouldEnableCitations(providerMetadata) {
   });
   return (_b = (_a = bedrockOptions == null ? void 0 : bedrockOptions.citations) == null ? void 0 : _a.enabled) != null ? _b : false;
 }
+function sanitizeToolName(toolName) {
+  return toolName.replace(/[^a-zA-Z0-9_-]/g, "") || "_";
+}
 async function convertToBedrockChatMessages(prompt) {
   var _a;
   const blocks = groupIntoBlocks(prompt);
@@ -415,9 +419,22 @@ async function convertToBedrockChatMessages(prompt) {
                   }
                   case "file": {
                     if (part.data instanceof URL) {
-                      throw new UnsupportedFunctionalityError2({
-                        functionality: "File URL data"
+                      if (part.data.protocol !== "s3:" || !part.mediaType.startsWith("image/")) {
+                        throw new UnsupportedFunctionalityError2({
+                          functionality: "File URL data"
+                        });
+                      }
+                      bedrockContent.push({
+                        image: {
+                          format: getBedrockImageFormat(part.mediaType),
+                          source: {
+                            s3Location: {
+                              uri: part.data.toString()
+                            }
+                          }
+                        }
                       });
+                      break;
                     }
                     if (part.mediaType.startsWith("image/")) {
                       bedrockContent.push({
@@ -577,21 +594,6 @@ async function convertToBedrockChatMessages(prompt) {
                       }
                     });
                   }
-                } else if (part.providerOptions == null || Object.keys(part.providerOptions).every(
-                  (k2) => k2 === "bedrock" || k2 === "amazonBedrock"
-                )) {
-                  bedrockContent.push({
-                    reasoningContent: {
-                      reasoningText: {
-                        text: trimIfLast(
-                          isLastBlock,
-                          isLastMessage,
-                          isLastContentPart,
-                          part.text
-                        )
-                      }
-                    }
-                  });
                 }
                 break;
               }
@@ -599,7 +601,7 @@ async function convertToBedrockChatMessages(prompt) {
                 bedrockContent.push({
                   toolUse: {
                     toolUseId: part.toolCallId,
-                    name: part.toolName,
+                    name: sanitizeToolName(part.toolName),
                     input: part.input
                   }
                 });
@@ -724,7 +726,7 @@ var BedrockChatLanguageModel = class {
     this.specificationVersion = "v2";
     this.provider = "amazon-bedrock";
     this.supportedUrls = {
-      // no supported urls for bedrock
+      "image/*": [/^s3:\/\//]
     };
   }
   async getArgs({
@@ -742,7 +744,7 @@ var BedrockChatLanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     const bedrockOptions = (_a = await parseProviderOptions2({
       provider: "bedrock",
       providerOptions,
@@ -789,7 +791,10 @@ var BedrockChatLanguageModel = class {
         details: "Only text and json response formats are supported."
       });
     }
-    const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null ? {
+    const isAnthropicModel = this.modelId.includes("anthropic");
+    const isThinkingRequested = ((_b = bedrockOptions.reasoningConfig) == null ? void 0 : _b.type) === "enabled" || ((_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.type) === "adaptive";
+    const useNativeStructuredOutput = isAnthropicModel && supportsNativeStructuredOutput(this.modelId) && isThinkingRequested && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null;
+    const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !useNativeStructuredOutput ? {
       type: "function",
       name: "json",
       description: "Respond with a JSON object.",
@@ -808,18 +813,16 @@ var BedrockChatLanguageModel = class {
       };
     }
     if (betas.size > 0 || bedrockOptions.anthropicBeta) {
-      const existingBetas = (_b = bedrockOptions.anthropicBeta) != null ? _b : [];
+      const existingBetas = (_d = bedrockOptions.anthropicBeta) != null ? _d : [];
       const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         anthropic_beta: mergedBetas
       };
     }
-    const isAnthropicModel = this.modelId.includes("anthropic");
-    const thinkingType = (_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.type;
-    const isThinkingRequested = thinkingType === "enabled" || thinkingType === "adaptive";
-    const thinkingBudget = thinkingType === "enabled" ? (_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.budgetTokens : void 0;
-    const thinkingDisplay = thinkingType === "adaptive" ? (_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.display : void 0;
+    const thinkingType = (_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type;
+    const thinkingBudget = thinkingType === "enabled" ? (_f = bedrockOptions.reasoningConfig) == null ? void 0 : _f.budgetTokens : void 0;
+    const thinkingDisplay = thinkingType === "adaptive" ? (_g = bedrockOptions.reasoningConfig) == null ? void 0 : _g.display : void 0;
     const isAnthropicThinkingEnabled = isAnthropicModel && isThinkingRequested;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -852,7 +855,7 @@ var BedrockChatLanguageModel = class {
         };
       }
     } else if (!isAnthropicModel) {
-      if (((_f = bedrockOptions.reasoningConfig) == null ? void 0 : _f.budgetTokens) != null) {
+      if (((_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.budgetTokens) != null) {
         warnings.push({
           type: "unsupported-setting",
           setting: "budgetTokens",
@@ -867,12 +870,12 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
-    const maxReasoningEffort = (_g = bedrockOptions.reasoningConfig) == null ? void 0 : _g.maxReasoningEffort;
+    const maxReasoningEffort = (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.maxReasoningEffort;
     if (maxReasoningEffort != null && !isAnthropicModel) {
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         reasoningConfig: {
-          ...((_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.type) != null && {
+          ...((_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.type) != null && {
             type: bedrockOptions.reasoningConfig.type
           },
           maxReasoningEffort
@@ -886,6 +889,18 @@ var BedrockChatLanguageModel = class {
         }
       };
     }
+    if (useNativeStructuredOutput && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null) {
+      bedrockOptions.additionalModelRequestFields = {
+        ...bedrockOptions.additionalModelRequestFields,
+        output_config: {
+          ...(_k = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _k.output_config,
+          format: {
+            type: "json_schema",
+            schema: sanitizeJsonSchema(responseFormat.schema)
+          }
+        }
+      };
+    }
     if (isAnthropicThinkingEnabled && inferenceConfig.temperature != null) {
       delete inferenceConfig.temperature;
       warnings.push({
@@ -910,7 +925,7 @@ var BedrockChatLanguageModel = class {
         details: "topK is not supported when thinking is enabled"
       });
     }
-    const hasAnyTools = ((_j = (_i = toolConfig.tools) == null ? void 0 : _i.length) != null ? _j : 0) > 0 || additionalTools;
+    const hasAnyTools = ((_m = (_l = toolConfig.tools) == null ? void 0 : _l.length) != null ? _m : 0) > 0 || additionalTools;
     let filteredPrompt = prompt;
     if (!hasAnyTools) {
       const hasToolContent = prompt.some(
@@ -1374,6 +1389,9 @@ var BedrockChatLanguageModel = class {
     return `${this.config.baseUrl()}/model/${encodedModelId}`;
   }
 };
+function supportsNativeStructuredOutput(modelId) {
+  return modelId.includes("anthropic.claude-sonnet-4-5") || modelId.includes("anthropic.claude-haiku-4-5") || modelId.includes("anthropic.claude-opus-4-5") || modelId.includes("anthropic.claude-opus-4-6");
+}
 var BedrockStopReasonSchema = z4.union([
   z4.enum(BEDROCK_STOP_REASONS),
   z4.string()