@ai-sdk/amazon-bedrock 3.0.125 → 3.0.127

package/dist/index.mjs

@@ -8,7 +8,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "3.0.125" : "0.0.0-test";
+var VERSION = true ? "3.0.127" : "0.0.0-test";
 
 // src/bedrock-provider.ts
 import { anthropicTools as anthropicTools2 } from "@ai-sdk/anthropic/internal";
@@ -74,6 +74,14 @@ var bedrockFilePartProviderOptions = z.object({
   }).optional()
 });
 var bedrockProviderOptions = 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
@@ -645,7 +653,7 @@ async function convertToBedrockChatMessages(prompt) {
             bedrockContent.push(BEDROCK_CACHE_POINT);
           }
         }
-        if (bedrockContent.length > 0) {
+        if (bedrockContent.some((block2) => !("cachePoint" in block2))) {
           messages.push({ role: "assistant", content: bedrockContent });
         }
         break;
@@ -757,7 +765,8 @@ function mapBedrockFinishReason(finishReason, isJsonResponseFromTool) {
 
 // src/bedrock-chat-language-model.ts
 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) {
@@ -784,7 +793,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,
@@ -841,7 +850,24 @@ var BedrockChatLanguageModel = class {
     const isOpenAIModel = openAIModelId != null;
     const isOpenAIGptOssModel = (_c = openAIModelId == null ? void 0 : openAIModelId.startsWith("openai.gpt-oss-")) != null ? _c : false;
     const isThinkingRequested = ((_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.type) === "enabled" || ((_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type) === "adaptive";
-    const useNativeStructuredOutput = isAnthropicModel && supportsNativeStructuredOutput(this.modelId) && isThinkingRequested && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null;
+    const structuredOutputMode = (_g = (_f = bedrockOptions.structuredOutputMode) != null ? _f : anthropicOptions == null ? void 0 : anthropicOptions.structuredOutputMode) != null ? _g : "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 useNativeStructuredOutput = isAnthropicModel && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && (structuredOutputMode === "outputFormat" || structuredOutputMode === "auto" && supportsNativeStructuredOutput(this.modelId) && isThinkingRequested);
     const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !useNativeStructuredOutput ? {
       type: "function",
       name: "json",
@@ -862,16 +888,16 @@ var BedrockChatLanguageModel = class {
       };
     }
     if (betas.size > 0 || bedrockOptions.anthropicBeta) {
-      const existingBetas = (_f = bedrockOptions.anthropicBeta) != null ? _f : [];
+      const existingBetas = (_h = bedrockOptions.anthropicBeta) != null ? _h : [];
       const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         anthropic_beta: mergedBetas
       };
     }
-    const thinkingType = (_g = bedrockOptions.reasoningConfig) == null ? void 0 : _g.type;
-    const thinkingBudget = thinkingType === "enabled" ? (_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.budgetTokens : void 0;
-    const thinkingDisplay = thinkingType === "adaptive" ? (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.display : void 0;
+    const thinkingType = (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.type;
+    const thinkingBudget = thinkingType === "enabled" ? (_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.budgetTokens : void 0;
+    const thinkingDisplay = thinkingType === "adaptive" ? (_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.display : void 0;
     const isAnthropicThinkingEnabled = isAnthropicModel && isThinkingRequested;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -904,7 +930,7 @@ var BedrockChatLanguageModel = class {
         };
       }
     } else if (!isAnthropicModel) {
-      if (((_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.budgetTokens) != null) {
+      if (((_l = bedrockOptions.reasoningConfig) == null ? void 0 : _l.budgetTokens) != null) {
         warnings.push({
           type: "unsupported-setting",
           setting: "budgetTokens",
@@ -919,13 +945,13 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
-    const maxReasoningEffort = (_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.maxReasoningEffort;
+    const maxReasoningEffort = (_m = bedrockOptions.reasoningConfig) == null ? void 0 : _m.maxReasoningEffort;
     if (maxReasoningEffort != null) {
       if (isAnthropicModel) {
         bedrockOptions.additionalModelRequestFields = {
           ...bedrockOptions.additionalModelRequestFields,
           output_config: {
-            ...(_l = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _l.output_config,
+            ...(_n = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _n.output_config,
             effort: maxReasoningEffort
           }
         };
@@ -936,7 +962,7 @@ var BedrockChatLanguageModel = class {
         } : {
           ...bedrockOptions.additionalModelRequestFields,
           reasoning: {
-            ...(_m = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.reasoning,
+            ...(_o = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _o.reasoning,
             effort: maxReasoningEffort
           }
         };
@@ -944,7 +970,7 @@ var BedrockChatLanguageModel = class {
         bedrockOptions.additionalModelRequestFields = {
           ...bedrockOptions.additionalModelRequestFields,
           reasoningConfig: {
-            ...((_n = bedrockOptions.reasoningConfig) == null ? void 0 : _n.type) != null && {
+            ...((_p = bedrockOptions.reasoningConfig) == null ? void 0 : _p.type) != null && {
               type: bedrockOptions.reasoningConfig.type
             },
             maxReasoningEffort
@@ -956,7 +982,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)
@@ -988,7 +1014,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(
@@ -1019,6 +1045,7 @@ var BedrockChatLanguageModel = class {
       reasoningConfig: _,
       additionalModelRequestFields: __,
       serviceTier: ___,
+      structuredOutputMode: ____,
       ...filteredBedrockOptions
     } = (providerOptions == null ? void 0 : providerOptions.bedrock) || {};
     const additionalModelResponseFieldPaths = isAnthropicModel ? ["/delta/stop_sequence"] : void 0;
@@ -1485,8 +1512,17 @@ var BedrockChatLanguageModel = class {
     return `${this.config.baseUrl()}/model/${encodedModelId}`;
   }
 };
+var MODELS_WITHOUT_RELIABLE_NATIVE_STRUCTURED_OUTPUT = [
+  "anthropic.claude-sonnet-4-6",
+  "anthropic.claude-haiku-4-5"
+];
 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");
+  if (MODELS_WITHOUT_RELIABLE_NATIVE_STRUCTURED_OUTPUT.some(
+    (model) => modelId.includes(model)
+  )) {
+    return false;
+  }
+  return modelId.includes("anthropic.claude-sonnet-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),
@@ -1555,6 +1591,9 @@ var BedrockStreamSchema = z4.object({
     contentBlockIndex: z4.number(),
     delta: z4.union([
       z4.object({ text: z4.string() }),
+      z4.object({
+        citation: z4.record(z4.string(), z4.unknown())
+      }),
       z4.object({ toolUse: z4.object({ input: z4.string() }) }),
       z4.object({
         reasoningContent: z4.object({ text: z4.string() })