@ai-sdk/amazon-bedrock 4.0.167 → 4.0.169

package/dist/index.mjs

@@ -70,6 +70,14 @@ var bedrockFilePartProviderOptions = z.object({
   }).optional()
 });
 var amazonBedrockLanguageModelOptions = z.object({
+  /**
+   * Determines how structured outputs are generated for Anthropic models.
+   *
+   * - `outputFormat`: Use the native `output_config.format` parameter.
+   * - `jsonTool`: Use a special 'json' tool to specify the structured output format.
+   * - `auto`: Use `outputFormat` when supported, otherwise use `jsonTool` (default).
+   */
+  structuredOutputMode: z.enum(["outputFormat", "jsonTool", "auto"]).optional(),
   /**
    * Additional inference parameters that the model supports,
    * beyond the base set of inference parameters that Converse
@@ -104,22 +112,28 @@ var amazonBedrockLanguageModelOptions = z.object({
 
 // src/bedrock-anthropic-model-support.ts
 function supportsStrictTools(modelId) {
-  return !rejectsNewerSchemaFields(modelId);
+  return !matchesModel(modelId, MODELS_WITHOUT_STRICT_TOOL_SUPPORT);
 }
 function supportsNativeStructuredOutput(modelId) {
-  return !rejectsNewerSchemaFields(modelId);
+  return !matchesModel(
+    modelId,
+    MODELS_WITHOUT_RELIABLE_NATIVE_STRUCTURED_OUTPUT
+  );
 }
-var MODELS_REJECTING_NEWER_SCHEMA_FIELDS = [
+var MODELS_WITHOUT_STRICT_TOOL_SUPPORT = [
   "claude-opus-4-7",
   "claude-opus-4-8",
   "claude-opus-5",
   "claude-fable-5",
   "claude-sonnet-5"
 ];
-function rejectsNewerSchemaFields(modelId) {
-  return MODELS_REJECTING_NEWER_SCHEMA_FIELDS.some(
-    (model) => modelId.includes(model)
-  );
+var MODELS_WITHOUT_RELIABLE_NATIVE_STRUCTURED_OUTPUT = [
+  ...MODELS_WITHOUT_STRICT_TOOL_SUPPORT,
+  "claude-sonnet-4-6",
+  "claude-haiku-4-5"
+];
+function matchesModel(modelId, models) {
+  return models.some((model) => modelId.includes(model));
 }
 
 // src/bedrock-error.ts
@@ -917,8 +931,12 @@ function mapBedrockFinishReason(finishReason, isJsonResponseFromTool) {
 }
 
 // src/bedrock-chat-language-model.ts
+function isJsonResponseToolName(name) {
+  return name === "json" || name === "json<|channel|>commentary";
+}
 var anthropicProviderOptions = z4.object({
-  disableParallelToolUse: z4.boolean().optional()
+  disableParallelToolUse: z4.boolean().optional(),
+  structuredOutputMode: z4.enum(["outputFormat", "jsonTool", "auto"]).optional()
 });
 var BedrockChatLanguageModel = class {
   constructor(modelId, config) {
@@ -945,7 +963,7 @@ var BedrockChatLanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     const bedrockOptions = (_a = await parseProviderOptions2({
       provider: "bedrock",
       providerOptions,
@@ -1003,8 +1021,26 @@ var BedrockChatLanguageModel = class {
     const isOpenAIGptOssModel = (_d = openAIModelId == null ? void 0 : openAIModelId.startsWith("openai.gpt-oss-")) != null ? _d : false;
     const isThinkingEnabled = ((_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type) === "enabled" || ((_f = bedrockOptions.reasoningConfig) == null ? void 0 : _f.type) === "adaptive";
     const { supportsStructuredOutput: modelSupportsStructuredOutput } = getModelCapabilities(this.modelId);
-    const useNativeStructuredOutput = isAnthropicModel && supportsNativeStructuredOutput(this.modelId) && (modelSupportsStructuredOutput || isThinkingEnabled) && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null;
-    const useJsonInstructionForStructuredOutput = isAnthropicModel && !supportsStrictTools(this.modelId) && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && tools != null && tools.length > 0;
+    const structuredOutputMode = (_h = (_g = bedrockOptions.structuredOutputMode) != null ? _g : anthropicOptions == null ? void 0 : anthropicOptions.structuredOutputMode) != null ? _h : "auto";
+    if (structuredOutputMode === "jsonTool") {
+      const additionalModelRequestFields = {
+        ...bedrockOptions.additionalModelRequestFields
+      };
+      const outputConfig = additionalModelRequestFields.output_config;
+      if (outputConfig != null && typeof outputConfig === "object" && !Array.isArray(outputConfig)) {
+        const outputConfigWithoutFormat = { ...outputConfig };
+        delete outputConfigWithoutFormat.format;
+        if (Object.keys(outputConfigWithoutFormat).length > 0) {
+          additionalModelRequestFields.output_config = outputConfigWithoutFormat;
+        } else {
+          delete additionalModelRequestFields.output_config;
+        }
+        bedrockOptions.additionalModelRequestFields = additionalModelRequestFields;
+      }
+    }
+    const modelSupportsNativeStructuredOutput = supportsNativeStructuredOutput(this.modelId) && (modelSupportsStructuredOutput || isThinkingEnabled);
+    const useNativeStructuredOutput = isAnthropicModel && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && (structuredOutputMode === "outputFormat" || structuredOutputMode === "auto" && modelSupportsNativeStructuredOutput);
+    const useJsonInstructionForStructuredOutput = !useNativeStructuredOutput && structuredOutputMode !== "jsonTool" && isAnthropicModel && !supportsStrictTools(this.modelId) && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && tools != null && tools.length > 0;
     const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !useNativeStructuredOutput && !useJsonInstructionForStructuredOutput ? {
       type: "function",
       name: "json",
@@ -1025,16 +1061,16 @@ var BedrockChatLanguageModel = class {
       };
     }
     if (betas.size > 0 || bedrockOptions.anthropicBeta) {
-      const existingBetas = (_g = bedrockOptions.anthropicBeta) != null ? _g : [];
+      const existingBetas = (_i = bedrockOptions.anthropicBeta) != null ? _i : [];
       const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         anthropic_beta: mergedBetas
       };
     }
-    const thinkingType = (_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.type;
-    const thinkingBudget = thinkingType === "enabled" ? (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.budgetTokens : void 0;
-    const thinkingDisplay = thinkingType === "adaptive" ? (_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.display : void 0;
+    const thinkingType = (_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.type;
+    const thinkingBudget = thinkingType === "enabled" ? (_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.budgetTokens : void 0;
+    const thinkingDisplay = thinkingType === "adaptive" ? (_l = bedrockOptions.reasoningConfig) == null ? void 0 : _l.display : void 0;
     const isAnthropicThinkingEnabled = isAnthropicModel && isThinkingEnabled;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -1067,7 +1103,7 @@ var BedrockChatLanguageModel = class {
         };
       }
     } else if (!isAnthropicModel) {
-      if (((_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.budgetTokens) != null) {
+      if (((_m = bedrockOptions.reasoningConfig) == null ? void 0 : _m.budgetTokens) != null) {
         warnings.push({
           type: "unsupported",
           feature: "budgetTokens",
@@ -1082,13 +1118,13 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
-    const maxReasoningEffort = (_l = bedrockOptions.reasoningConfig) == null ? void 0 : _l.maxReasoningEffort;
+    const maxReasoningEffort = (_n = bedrockOptions.reasoningConfig) == null ? void 0 : _n.maxReasoningEffort;
     if (maxReasoningEffort != null) {
       if (isAnthropicModel) {
         bedrockOptions.additionalModelRequestFields = {
           ...bedrockOptions.additionalModelRequestFields,
           output_config: {
-            ...(_m = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.output_config,
+            ...(_o = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _o.output_config,
             effort: maxReasoningEffort
           }
         };
@@ -1099,7 +1135,7 @@ var BedrockChatLanguageModel = class {
         } : {
           ...bedrockOptions.additionalModelRequestFields,
           reasoning: {
-            ...(_n = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _n.reasoning,
+            ...(_p = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _p.reasoning,
             effort: maxReasoningEffort
           }
         };
@@ -1118,7 +1154,7 @@ var BedrockChatLanguageModel = class {
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         output_config: {
-          ...(_o = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _o.output_config,
+          ...(_q = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _q.output_config,
           format: {
             type: "json_schema",
             schema: sanitizeJsonSchema(responseFormat.schema)
@@ -1150,7 +1186,7 @@ var BedrockChatLanguageModel = class {
         details: "topK is not supported when thinking is enabled"
       });
     }
-    const hasAnyTools = ((_q = (_p = toolConfig.tools) == null ? void 0 : _p.length) != null ? _q : 0) > 0 || additionalTools;
+    const hasAnyTools = ((_s = (_r = toolConfig.tools) == null ? void 0 : _r.length) != null ? _s : 0) > 0 || additionalTools;
     let filteredPrompt = prompt;
     if (!hasAnyTools) {
       const hasToolContent = prompt.some(
@@ -1192,6 +1228,7 @@ var BedrockChatLanguageModel = class {
       reasoningConfig: _,
       additionalModelRequestFields: __,
       serviceTier: ___,
+      structuredOutputMode: ____,
       ...filteredBedrockOptions
     } = (providerOptions == null ? void 0 : providerOptions.bedrock) || {};
     const additionalModelResponseFieldPaths = isAnthropicModel ? ["/delta/stop_sequence"] : void 0;
@@ -1298,7 +1335,7 @@ var BedrockChatLanguageModel = class {
         }
       }
       if (part.toolUse) {
-        const isJsonResponseTool = usesJsonResponseTool && part.toolUse.name === "json";
+        const isJsonResponseTool = usesJsonResponseTool && isJsonResponseToolName(part.toolUse.name);
         if (isJsonResponseTool) {
           isJsonResponseFromTool = true;
           content.push({
@@ -1633,7 +1670,7 @@ var BedrockChatLanguageModel = class {
             if (((_q = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _q.toolUse) != null) {
               const toolUse = contentBlockStart.start.toolUse;
               const blockIndex = contentBlockStart.contentBlockIndex;
-              const isJsonResponseTool = usesJsonResponseTool && toolUse.name === "json";
+              const isJsonResponseTool = usesJsonResponseTool && isJsonResponseToolName(toolUse.name);
               const normalizedToolCallId = normalizeToolCallId(
                 toolUse.toolUseId,
                 isMistral
@@ -2320,7 +2357,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.167" : "0.0.0-test";
+var VERSION = true ? "4.0.169" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {