@ai-sdk/amazon-bedrock 4.0.134 → 4.0.136

package/dist/index.mjs

@@ -13,6 +13,7 @@ import {
   combineHeaders,
   createJsonErrorResponseHandler,
   createJsonResponseHandler,
+  injectJsonInstructionIntoMessages,
   parseProviderOptions as parseProviderOptions2,
   postJsonToApi,
   resolve
@@ -865,8 +866,11 @@ var BedrockChatLanguageModel = class {
     }
     const isAnthropicModel = this.modelId.includes("anthropic");
     const isThinkingEnabled = ((_b = bedrockOptions.reasoningConfig) == null ? void 0 : _b.type) === "enabled" || ((_c = bedrockOptions.reasoningConfig) == null ? void 0 : _c.type) === "adaptive";
-    const useNativeStructuredOutput = isAnthropicModel && isThinkingEnabled && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null;
-    const jsonResponseTool = (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !useNativeStructuredOutput ? {
+    const modelRejectsNativeStructuredOutput = this.modelId.includes("claude-opus-4-7") || this.modelId.includes("claude-opus-4-8") || this.modelId.includes("claude-fable-5") || this.modelId.includes("claude-sonnet-5");
+    const modelSupportsStructuredOutput = bedrockChatModelSupportsStructuredOutput(this.modelId);
+    const useNativeStructuredOutput = isAnthropicModel && !modelRejectsNativeStructuredOutput && (modelSupportsStructuredOutput || isThinkingEnabled) && (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null;
+    const useJsonInstructionForStructuredOutput = isAnthropicModel && (this.modelId.includes("claude-opus-4-7") || this.modelId.includes("claude-opus-4-8")) && (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",
       description: "Respond with a JSON object.",
@@ -1031,6 +1035,13 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
+    if (useJsonInstructionForStructuredOutput) {
+      filteredPrompt = injectJsonInstructionIntoMessages({
+        messages: filteredPrompt,
+        schema: responseFormat.schema,
+        schemaSuffix: "You MUST answer with only a JSON object that matches the JSON schema above. Do not wrap it in markdown fences or include any other text."
+      });
+    }
     const isMistral = isMistralModel(this.modelId);
     const { system, messages } = await convertToBedrockChatMessages(
       filteredPrompt,
@@ -1063,6 +1074,7 @@ var BedrockChatLanguageModel = class {
         ...toolConfig.tools !== void 0 && toolConfig.tools.length > 0 ? { toolConfig } : {}
       },
       warnings,
+      usesJsonInstruction: useJsonInstructionForStructuredOutput,
       usesJsonResponseTool: jsonResponseTool != null,
       betas
     };
@@ -1073,10 +1085,11 @@ var BedrockChatLanguageModel = class {
     return combineHeaders(await resolve(this.config.headers), headers);
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     const {
       command: args,
       warnings,
+      usesJsonInstruction,
       usesJsonResponseTool
     } = await this.getArgs(options);
     const url = `${this.getUrl(this.modelId)}/converse`;
@@ -1099,9 +1112,13 @@ var BedrockChatLanguageModel = class {
     });
     const content = [];
     let isJsonResponseFromTool = false;
+    const jsonObjectTextExtractor = usesJsonInstruction ? new JsonObjectTextExtractor() : void 0;
     for (const part of response.output.message.content) {
       if (part.text != null) {
-        content.push({ type: "text", text: part.text });
+        content.push({
+          type: "text",
+          text: (_a = jsonObjectTextExtractor == null ? void 0 : jsonObjectTextExtractor.process(part.text)) != null ? _a : part.text
+        });
       }
       if (part.reasoningContent) {
         if ("reasoningText" in part.reasoningContent) {
@@ -1123,7 +1140,7 @@ var BedrockChatLanguageModel = class {
             text: "",
             providerMetadata: {
               bedrock: {
-                redactedData: (_a = part.reasoningContent.redactedReasoning.data) != null ? _a : ""
+                redactedData: (_b = part.reasoningContent.redactedReasoning.data) != null ? _b : ""
               }
             }
           });
@@ -1139,17 +1156,17 @@ var BedrockChatLanguageModel = class {
           });
         } else {
           const isMistral = isMistralModel(this.modelId);
-          const rawToolCallId = (_c = (_b = part.toolUse) == null ? void 0 : _b.toolUseId) != null ? _c : this.config.generateId();
+          const rawToolCallId = (_d = (_c = part.toolUse) == null ? void 0 : _c.toolUseId) != null ? _d : this.config.generateId();
           content.push({
             type: "tool-call",
             toolCallId: normalizeToolCallId(rawToolCallId, isMistral),
-            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 : {})
+            toolName: (_f = (_e = part.toolUse) == null ? void 0 : _e.name) != null ? _f : `tool-${this.config.generateId()}`,
+            input: JSON.stringify((_h = (_g = part.toolUse) == null ? void 0 : _g.input) != null ? _h : {})
           });
         }
       }
     }
-    const stopSequence = (_j = (_i = (_h = response.additionalModelResponseFields) == null ? void 0 : _h.delta) == null ? void 0 : _i.stop_sequence) != null ? _j : null;
+    const stopSequence = (_k = (_j = (_i = response.additionalModelResponseFields) == null ? void 0 : _i.delta) == null ? void 0 : _j.stop_sequence) != null ? _k : null;
     const providerMetadata = response.trace || response.usage || response.performanceConfig || response.serviceTier || isJsonResponseFromTool || stopSequence ? {
       bedrock: {
         ...response.trace && typeof response.trace === "object" ? { trace: response.trace } : {},
@@ -1159,7 +1176,7 @@ var BedrockChatLanguageModel = class {
         ...response.serviceTier && {
           serviceTier: response.serviceTier
         },
-        ...(((_k = response.usage) == null ? void 0 : _k.cacheWriteInputTokens) != null || ((_l = response.usage) == null ? void 0 : _l.cacheDetails) != null) && {
+        ...(((_l = response.usage) == null ? void 0 : _l.cacheWriteInputTokens) != null || ((_m = response.usage) == null ? void 0 : _m.cacheDetails) != null) && {
           usage: {
             ...response.usage.cacheWriteInputTokens != null && {
               cacheWriteInputTokens: response.usage.cacheWriteInputTokens
@@ -1180,16 +1197,17 @@ var BedrockChatLanguageModel = class {
           response.stopReason,
           isJsonResponseFromTool
         ),
-        raw: (_m = response.stopReason) != null ? _m : void 0
+        raw: (_n = response.stopReason) != null ? _n : void 0
       },
       usage: convertBedrockUsage(response.usage),
       response: {
-        id: (_n = responseHeaders == null ? void 0 : responseHeaders["x-amzn-requestid"]) != null ? _n : void 0,
+        id: (_o = responseHeaders == null ? void 0 : responseHeaders["x-amzn-requestid"]) != null ? _o : void 0,
         timestamp: (responseHeaders == null ? void 0 : responseHeaders["date"]) != null ? new Date(responseHeaders["date"]) : void 0,
         modelId: this.modelId,
         headers: responseHeaders
       },
       warnings,
+      request: { body: args },
       ...providerMetadata && { providerMetadata }
     };
   }
@@ -1197,6 +1215,7 @@ var BedrockChatLanguageModel = class {
     const {
       command: args,
       warnings,
+      usesJsonInstruction,
       usesJsonResponseTool
     } = await this.getArgs(options);
     const modelId = this.modelId;
@@ -1222,6 +1241,7 @@ var BedrockChatLanguageModel = class {
     let providerMetadata = void 0;
     let isJsonResponseFromTool = false;
     let stopSequence = null;
+    const jsonObjectTextExtractor = usesJsonInstruction ? new JsonObjectTextExtractor() : void 0;
     const contentBlocks = {};
     return {
       stream: response.pipeThrough(
@@ -1237,7 +1257,7 @@ var BedrockChatLanguageModel = class {
             });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
             function enqueueError(bedrockError) {
               finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({ type: "error", error: bedrockError });
@@ -1325,13 +1345,18 @@ var BedrockChatLanguageModel = class {
                   id: String(blockIndex)
                 });
               }
-              controller.enqueue({
-                type: "text-delta",
-                id: String(blockIndex),
-                delta: value.contentBlockDelta.delta.text
-              });
+              const textDelta = (_m = jsonObjectTextExtractor == null ? void 0 : jsonObjectTextExtractor.process(
+                value.contentBlockDelta.delta.text
+              )) != null ? _m : value.contentBlockDelta.delta.text;
+              if (textDelta.length > 0) {
+                controller.enqueue({
+                  type: "text-delta",
+                  id: String(blockIndex),
+                  delta: textDelta
+                });
+              }
             }
-            if (((_m = value.contentBlockStop) == null ? void 0 : _m.contentBlockIndex) != null) {
+            if (((_n = value.contentBlockStop) == null ? void 0 : _n.contentBlockIndex) != null) {
               const blockIndex = value.contentBlockStop.contentBlockIndex;
               const contentBlock = contentBlocks[blockIndex];
               if (contentBlock != null) {
@@ -1377,7 +1402,7 @@ var BedrockChatLanguageModel = class {
                 delete contentBlocks[blockIndex];
               }
             }
-            if (((_n = value.contentBlockDelta) == null ? void 0 : _n.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
+            if (((_o = value.contentBlockDelta) == null ? void 0 : _o.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
               const blockIndex = value.contentBlockDelta.contentBlockIndex || 0;
               const reasoningContent = value.contentBlockDelta.delta.reasoningContent;
               if ("text" in reasoningContent && reasoningContent.text) {
@@ -1432,7 +1457,7 @@ var BedrockChatLanguageModel = class {
               }
             }
             const contentBlockStart = value.contentBlockStart;
-            if (((_o = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _o.toolUse) != null) {
+            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";
@@ -1460,7 +1485,7 @@ var BedrockChatLanguageModel = class {
               const blockIndex = contentBlockDelta.contentBlockIndex;
               const contentBlock = contentBlocks[blockIndex];
               if ((contentBlock == null ? void 0 : contentBlock.type) === "tool-call") {
-                const delta = (_p = contentBlockDelta.delta.toolUse.input) != null ? _p : "";
+                const delta = (_q = contentBlockDelta.delta.toolUse.input) != null ? _q : "";
                 if (!contentBlock.isJsonResponseTool) {
                   controller.enqueue({
                     type: "tool-input-delta",
@@ -1502,7 +1527,7 @@ var BedrockChatLanguageModel = class {
           }
         })
       ),
-      // TODO request?
+      request: { body: args },
       response: { headers: responseHeaders }
     };
   }
@@ -1511,6 +1536,60 @@ var BedrockChatLanguageModel = class {
     return `${this.config.baseUrl()}/model/${encodedModelId}`;
   }
 };
+function bedrockChatModelSupportsStructuredOutput(modelId) {
+  return modelId.includes("claude-opus-4-8") || modelId.includes("claude-opus-4-7") || modelId.includes("claude-fable-5") || modelId.includes("claude-sonnet-5") || modelId.includes("claude-sonnet-4-6") || modelId.includes("claude-opus-4-6") || modelId.includes("claude-sonnet-4-5") || modelId.includes("claude-opus-4-5") || modelId.includes("claude-haiku-4-5") || modelId.includes("claude-opus-4-1");
+}
+var JsonObjectTextExtractor = class {
+  constructor() {
+    this.started = false;
+    this.completed = false;
+    this.depth = 0;
+    this.inString = false;
+    this.escaped = false;
+  }
+  process(text) {
+    let result = "";
+    for (const character of text) {
+      if (this.completed) {
+        break;
+      }
+      if (!this.started) {
+        if (character !== "{") {
+          continue;
+        }
+        this.started = true;
+        this.depth = 1;
+        result += character;
+        continue;
+      }
+      result += character;
+      if (this.escaped) {
+        this.escaped = false;
+        continue;
+      }
+      if (character === "\\" && this.inString) {
+        this.escaped = true;
+        continue;
+      }
+      if (character === '"') {
+        this.inString = !this.inString;
+        continue;
+      }
+      if (this.inString) {
+        continue;
+      }
+      if (character === "{") {
+        this.depth++;
+      } else if (character === "}") {
+        this.depth--;
+        if (this.depth === 0) {
+          this.completed = true;
+        }
+      }
+    }
+    return result;
+  }
+};
 var BedrockStopReasonSchema = z4.union([
   z4.enum(BEDROCK_STOP_REASONS),
   z4.string()
@@ -2044,7 +2123,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.134" : "0.0.0-test";
+var VERSION = true ? "4.0.136" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {