@ai-sdk/amazon-bedrock 5.0.20 → 5.0.22

package/dist/mantle/index.cjs

@@ -35,7 +35,7 @@ var import_provider_utils = require("@ai-sdk/provider-utils");
 var import_aws4fetch = require("aws4fetch");
 
 // src/version.ts
-var VERSION = true ? "5.0.20" : "0.0.0-test";
+var VERSION = true ? "5.0.22" : "0.0.0-test";
 
 // src/amazon-bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {

package/dist/mantle/index.js

@@ -23,7 +23,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "5.0.20" : "0.0.0-test";
+var VERSION = true ? "5.0.22" : "0.0.0-test";
 
 // src/amazon-bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/amazon-bedrock",
-  "version": "5.0.20",
+  "version": "5.0.22",
   "type": "module",
   "license": "Apache-2.0",
   "sideEffects": false,
@@ -44,10 +44,10 @@
     "@smithy/eventstream-codec": "^4.3.3",
     "@smithy/util-utf8": "^4.3.3",
     "aws4fetch": "^1.0.20",
-    "@ai-sdk/anthropic": "4.0.14",
-    "@ai-sdk/openai": "4.0.13",
+    "@ai-sdk/anthropic": "4.0.15",
+    "@ai-sdk/openai": "4.0.14",
     "@ai-sdk/provider": "4.0.3",
-    "@ai-sdk/provider-utils": "5.0.9"
+    "@ai-sdk/provider-utils": "5.0.10"
   },
   "devDependencies": {
     "@types/node": "22.19.19",

package/src/amazon-bedrock-chat-language-model.ts

@@ -16,6 +16,7 @@ import {
   combineHeaders,
   createJsonErrorResponseHandler,
   createJsonResponseHandler,
+  injectJsonInstructionIntoMessages,
   isCustomReasoning,
   mapReasoningToProviderBudget,
   mapReasoningToProviderEffort,
@@ -101,6 +102,7 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
   }: LanguageModelV4CallOptions): Promise<{
     command: AmazonBedrockConverseInput;
     warnings: SharedV4Warning[];
+    usesJsonInstruction: boolean;
     usesJsonResponseTool: boolean;
     betas: Set<string>;
   }> {
@@ -188,16 +190,33 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
     const { supportsStructuredOutput: modelSupportsStructuredOutput } =
       getModelCapabilities(this.modelId);
 
+    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 useNativeStructuredOutput =
       isAnthropicModel &&
+      !modelRejectsNativeStructuredOutput &&
       (modelSupportsStructuredOutput || isThinkingEnabled) &&
       responseFormat?.type === 'json' &&
       responseFormat.schema != null;
 
+    const useJsonInstructionForStructuredOutput =
+      isAnthropicModel &&
+      (this.modelId.includes('claude-opus-4-7') ||
+        this.modelId.includes('claude-opus-4-8')) &&
+      responseFormat?.type === 'json' &&
+      responseFormat.schema != null &&
+      tools != null &&
+      tools.length > 0;
+
     const jsonResponseTool: LanguageModelV4FunctionTool | undefined =
       responseFormat?.type === 'json' &&
       responseFormat.schema != null &&
-      !useNativeStructuredOutput
+      !useNativeStructuredOutput &&
+      !useJsonInstructionForStructuredOutput
         ? {
             type: 'function',
             name: 'json',
@@ -409,6 +428,15 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
       }
     }
 
+    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 convertToAmazonBedrockChatMessages(
       filteredPrompt,
@@ -450,6 +478,7 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
           : {}),
       },
       warnings,
+      usesJsonInstruction: useJsonInstructionForStructuredOutput,
       usesJsonResponseTool: jsonResponseTool != null,
       betas,
     };
@@ -476,6 +505,7 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
     const {
       command: args,
       warnings,
+      usesJsonInstruction,
       usesJsonResponseTool,
     } = await this.getArgs(options);
 
@@ -497,12 +527,18 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
 
     const content: Array<LanguageModelV4Content> = [];
     let isJsonResponseFromTool = false;
+    const jsonObjectTextExtractor = usesJsonInstruction
+      ? new JsonObjectTextExtractor()
+      : undefined;
 
     // map response content to content array
     for (const part of response.output.message.content) {
       // text
       if (part.text != null) {
-        content.push({ type: 'text', text: part.text });
+        content.push({
+          type: 'text',
+          text: jsonObjectTextExtractor?.process(part.text) ?? part.text,
+        });
       }
 
       // reasoning
@@ -629,6 +665,7 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
         headers: responseHeaders,
       },
       warnings,
+      request: { body: args },
       ...(providerMetadata && { providerMetadata }),
     };
   }
@@ -639,6 +676,7 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
     const {
       command: args,
       warnings,
+      usesJsonInstruction,
       usesJsonResponseTool,
     } = await this.getArgs(options);
     const modelId = this.modelId;
@@ -668,6 +706,9 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
     let providerMetadata: SharedV4ProviderMetadata | undefined = undefined;
     let isJsonResponseFromTool = false;
     let stopSequence: string | null = null;
+    const jsonObjectTextExtractor = usesJsonInstruction
+      ? new JsonObjectTextExtractor()
+      : undefined;
 
     const contentBlocks: Record<
       number,
@@ -829,11 +870,18 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
                 });
               }
 
-              controller.enqueue({
-                type: 'text-delta',
-                id: String(blockIndex),
-                delta: value.contentBlockDelta.delta.text,
-              });
+              const textDelta =
+                jsonObjectTextExtractor?.process(
+                  value.contentBlockDelta.delta.text,
+                ) ?? value.contentBlockDelta.delta.text;
+
+              if (textDelta.length > 0) {
+                controller.enqueue({
+                  type: 'text-delta',
+                  id: String(blockIndex),
+                  delta: textDelta,
+                });
+              }
             }
 
             if (value.contentBlockStop?.contentBlockIndex != null) {
@@ -1043,7 +1091,7 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
           },
         }),
       ),
-      // TODO request?
+      request: { body: args },
       response: { headers: responseHeaders },
     };
   }
@@ -1054,6 +1102,68 @@ export class AmazonBedrockChatLanguageModel implements LanguageModelV4 {
   }
 }
 
+class JsonObjectTextExtractor {
+  private started = false;
+  private completed = false;
+  private depth = 0;
+  private inString = false;
+  private escaped = false;
+
+  process(text: string): string {
+    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;
+  }
+}
+
 const AmazonBedrockStopReasonSchema = z.union([
   z.enum(BEDROCK_STOP_REASONS),
   z.string(),