@ai-sdk/amazon-bedrock 5.0.62 → 5.0.66

package/dist/index.js

@@ -11,6 +11,7 @@ import {
 // src/amazon-bedrock-chat-language-model.ts
 import {
   combineHeaders,
+  createProviderStreamError,
   createJsonErrorResponseHandler,
   createJsonResponseHandler,
   injectJsonInstructionIntoMessages,
@@ -87,6 +88,13 @@ var amazonBedrockFilePartProviderOptions = z.object({
     enabled: z.boolean()
   }).optional()
 });
+var amazonBedrockTextPartProviderOptions = z.object({
+  guardContent: z.boolean().optional(),
+  guardContentQualifiers: z.array(z.enum(["grounding_source", "query", "guard_content"])).optional()
+});
+var amazonBedrockImagePartProviderOptions = z.object({
+  guardContent: z.boolean().optional()
+});
 var amazonBedrockLanguageModelChatOptions = z.object({
   /**
    * Additional inference parameters that the model supports,
@@ -245,6 +253,29 @@ var createAmazonBedrockEventStreamResponseHandler = (chunkSchema) => async ({ re
   };
 };
 
+// src/amazon-bedrock-stream-error.ts
+function getAmazonBedrockStreamErrorMetadata(type) {
+  switch (type) {
+    case "internalServerException":
+    case "InternalServerException":
+      return { statusCode: 500, isRetryable: true };
+    case "modelStreamErrorException":
+    case "ModelStreamErrorException":
+      return { statusCode: 424, isRetryable: true };
+    case "serviceUnavailableException":
+    case "ServiceUnavailableException":
+      return { statusCode: 503, isRetryable: true };
+    case "throttlingException":
+    case "ThrottlingException":
+      return { statusCode: 429, isRetryable: true };
+    case "validationException":
+    case "ValidationException":
+      return { statusCode: 400, isRetryable: false };
+    default:
+      return {};
+  }
+}
+
 // src/amazon-bedrock-prepare-tools.ts
 import {
   UnsupportedFunctionalityError
@@ -257,7 +288,8 @@ import {
 async function prepareTools({
   tools,
   toolChoice,
-  modelId
+  modelId,
+  disableParallelToolUse
 }) {
   var _a;
   const toolWarnings = [];
@@ -303,6 +335,7 @@ async function prepareTools({
     } = await prepareAnthropicTools({
       tools: ProviderTools,
       toolChoice,
+      disableParallelToolUse,
       supportsStructuredOutput: false,
       supportsStrictTools: false
     });
@@ -358,8 +391,17 @@ async function prepareTools({
       }
     });
   }
+  if (isAnthropicModel && !usingAnthropicTools && disableParallelToolUse && amazonBedrockTools.length > 0 && (toolChoice == null ? void 0 : toolChoice.type) !== "none") {
+    additionalTools = {
+      tool_choice: (toolChoice == null ? void 0 : toolChoice.type) === "required" ? { type: "any", disable_parallel_tool_use: true } : (toolChoice == null ? void 0 : toolChoice.type) === "tool" ? {
+        type: "tool",
+        name: toolChoice.toolName,
+        disable_parallel_tool_use: true
+      } : { type: "auto", disable_parallel_tool_use: true }
+    };
+  }
   let amazonBedrockToolChoice = void 0;
-  if (!usingAnthropicTools && amazonBedrockTools.length > 0 && toolChoice) {
+  if (!usingAnthropicTools && (additionalTools == null ? void 0 : additionalTools.tool_choice) == null && amazonBedrockTools.length > 0 && toolChoice) {
     const type = toolChoice.type;
     switch (type) {
       case "auto":
@@ -501,6 +543,30 @@ async function shouldEnableCitations(providerMetadata) {
   });
   return (_c = (_b = amazonBedrockOptions == null ? void 0 : amazonBedrockOptions.citations) == null ? void 0 : _b.enabled) != null ? _c : false;
 }
+async function getTextPartGuardContentOptions(providerMetadata) {
+  var _a;
+  return (_a = await parseProviderOptions({
+    provider: "amazonBedrock",
+    providerOptions: providerMetadata,
+    schema: amazonBedrockTextPartProviderOptions
+  })) != null ? _a : await parseProviderOptions({
+    provider: "bedrock",
+    providerOptions: providerMetadata,
+    schema: amazonBedrockTextPartProviderOptions
+  });
+}
+async function getImagePartGuardContentOptions(providerMetadata) {
+  var _a;
+  return (_a = await parseProviderOptions({
+    provider: "amazonBedrock",
+    providerOptions: providerMetadata,
+    schema: amazonBedrockImagePartProviderOptions
+  })) != null ? _a : await parseProviderOptions({
+    provider: "bedrock",
+    providerOptions: providerMetadata,
+    schema: amazonBedrockImagePartProviderOptions
+  });
+}
 async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
   var _a, _b;
   const blocks = groupIntoBlocks(prompt);
@@ -538,9 +604,23 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                 const part = content[j];
                 switch (part.type) {
                   case "text": {
-                    amazonBedrockContent.push({
-                      text: part.text
-                    });
+                    const textOptions = await getTextPartGuardContentOptions(
+                      part.providerOptions
+                    );
+                    if (textOptions == null ? void 0 : textOptions.guardContent) {
+                      amazonBedrockContent.push({
+                        guardContent: {
+                          text: {
+                            text: part.text,
+                            qualifiers: textOptions.guardContentQualifiers
+                          }
+                        }
+                      });
+                    } else {
+                      amazonBedrockContent.push({
+                        text: part.text
+                      });
+                    }
                     break;
                   }
                   case "file": {
@@ -615,7 +695,10 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                         const fullMediaType = resolveFullMediaType({ part });
                         switch (getTopLevelMediaType(fullMediaType)) {
                           case "image": {
-                            amazonBedrockContent.push({
+                            const imageOptions = await getImagePartGuardContentOptions(
+                              part.providerOptions
+                            );
+                            const imageBlock = {
                               image: {
                                 format: getAmazonBedrockImageFormat(fullMediaType),
                                 source: getAmazonBedrockMediaSource({
@@ -623,7 +706,14 @@ async function convertToAmazonBedrockChatMessages(prompt, isMistral = false) {
                                   functionality: "File URL data"
                                 })
                               }
-                            });
+                            };
+                            if (imageOptions == null ? void 0 : imageOptions.guardContent) {
+                              amazonBedrockContent.push({
+                                guardContent: imageBlock
+                              });
+                            } else {
+                              amazonBedrockContent.push(imageBlock);
+                            }
                             break;
                           }
                           case "video": {
@@ -989,6 +1079,22 @@ function mapAmazonBedrockFinishReason(finishReason, isJsonResponseFromTool) {
 }
 
 // src/amazon-bedrock-chat-language-model.ts
+var anthropicProviderOptions = z4.object({
+  disableParallelToolUse: z4.boolean().optional()
+});
+function createAmazonBedrockStreamError({
+  type,
+  error,
+  data
+}) {
+  const message = typeof error.message === "string" ? error.message : `Amazon Bedrock stream failed with ${type}`;
+  return createProviderStreamError({
+    message,
+    type,
+    ...getAmazonBedrockStreamErrorMetadata(type),
+    data
+  });
+}
 var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
   constructor(modelId, config) {
     this.modelId = modelId;
@@ -1025,7 +1131,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
     reasoning,
     providerOptions
   }) {
-    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, _r, _s;
     let amazonBedrockOptions = (_b = (_a = await parseProviderOptions2({
       provider: "amazonBedrock",
       providerOptions,
@@ -1035,6 +1141,11 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
       providerOptions,
       schema: amazonBedrockLanguageModelChatOptions
     })) != null ? _b : {};
+    const anthropicOptions = await parseProviderOptions2({
+      provider: "anthropic",
+      providerOptions,
+      schema: anthropicProviderOptions
+    });
     const warnings = [];
     if (frequencyPenalty != null) {
       warnings.push({
@@ -1077,7 +1188,9 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
       });
     }
     const isAnthropicModel = this.modelId.includes("anthropic");
-    const isOpenAIModel = this.modelId.startsWith("openai.");
+    const openAIModelId = (_c = /^(?:[^.]+\.)?(openai\..+)$/.exec(this.modelId)) == null ? void 0 : _c[1];
+    const isOpenAIModel = openAIModelId != null;
+    const isOpenAIGptOssModel = (_d = openAIModelId == null ? void 0 : openAIModelId.startsWith("openai.gpt-oss-")) != null ? _d : false;
     amazonBedrockOptions = resolveAmazonBedrockReasoningConfig({
       reasoning,
       amazonBedrockOptions,
@@ -1085,7 +1198,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
       isAnthropicModel,
       modelId: this.modelId
     });
-    const isThinkingEnabled = ((_c = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _c.type) === "enabled" || ((_d = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _d.type) === "adaptive";
+    const isThinkingEnabled = ((_e = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _e.type) === "enabled" || ((_f = amazonBedrockOptions.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;
@@ -1098,7 +1211,8 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
     const { toolConfig, additionalTools, toolWarnings, betas } = await prepareTools({
       tools: jsonResponseTool ? [...tools != null ? tools : [], jsonResponseTool] : tools,
       toolChoice: jsonResponseTool != null ? { type: "required" } : toolChoice,
-      modelId: this.modelId
+      modelId: this.modelId,
+      disableParallelToolUse: anthropicOptions == null ? void 0 : anthropicOptions.disableParallelToolUse
     });
     warnings.push(...toolWarnings);
     if (additionalTools) {
@@ -1108,16 +1222,16 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
       };
     }
     if (betas.size > 0 || amazonBedrockOptions.anthropicBeta) {
-      const existingBetas = (_e = amazonBedrockOptions.anthropicBeta) != null ? _e : [];
+      const existingBetas = (_g = amazonBedrockOptions.anthropicBeta) != null ? _g : [];
       const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
       amazonBedrockOptions.additionalModelRequestFields = {
         ...amazonBedrockOptions.additionalModelRequestFields,
         anthropic_beta: mergedBetas
       };
     }
-    const thinkingType = (_f = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _f.type;
-    const thinkingBudget = thinkingType === "enabled" ? (_g = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _g.budgetTokens : void 0;
-    const thinkingDisplay = thinkingType === "adaptive" ? (_h = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _h.display : void 0;
+    const thinkingType = (_h = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _h.type;
+    const thinkingBudget = thinkingType === "enabled" ? (_i = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _i.budgetTokens : void 0;
+    const thinkingDisplay = thinkingType === "adaptive" ? (_j = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _j.display : void 0;
     const isAnthropicThinkingEnabled = isAnthropicModel && isThinkingEnabled;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -1150,7 +1264,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
         };
       }
     } else if (!isAnthropicModel) {
-      if (((_i = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _i.budgetTokens) != null) {
+      if (((_k = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _k.budgetTokens) != null) {
         warnings.push({
           type: "unsupported",
           feature: "budgetTokens",
@@ -1165,20 +1279,26 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
         });
       }
     }
-    const maxReasoningEffort = (_j = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _j.maxReasoningEffort;
+    const maxReasoningEffort = (_l = amazonBedrockOptions.reasoningConfig) == null ? void 0 : _l.maxReasoningEffort;
     if (maxReasoningEffort != null) {
       if (isAnthropicModel) {
         amazonBedrockOptions.additionalModelRequestFields = {
           ...amazonBedrockOptions.additionalModelRequestFields,
           output_config: {
-            ...(_k = amazonBedrockOptions.additionalModelRequestFields) == null ? void 0 : _k.output_config,
+            ...(_m = amazonBedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.output_config,
             effort: maxReasoningEffort
           }
         };
       } else if (isOpenAIModel) {
-        amazonBedrockOptions.additionalModelRequestFields = {
+        amazonBedrockOptions.additionalModelRequestFields = isOpenAIGptOssModel ? {
           ...amazonBedrockOptions.additionalModelRequestFields,
           reasoning_effort: maxReasoningEffort
+        } : {
+          ...amazonBedrockOptions.additionalModelRequestFields,
+          reasoning: {
+            ...(_n = amazonBedrockOptions.additionalModelRequestFields) == null ? void 0 : _n.reasoning,
+            effort: maxReasoningEffort
+          }
         };
       } else {
         amazonBedrockOptions.additionalModelRequestFields = {
@@ -1195,7 +1315,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
       amazonBedrockOptions.additionalModelRequestFields = {
         ...amazonBedrockOptions.additionalModelRequestFields,
         output_config: {
-          ...(_l = amazonBedrockOptions.additionalModelRequestFields) == null ? void 0 : _l.output_config,
+          ...(_o = amazonBedrockOptions.additionalModelRequestFields) == null ? void 0 : _o.output_config,
           format: {
             type: "json_schema",
             schema: sanitizeJsonSchema(responseFormat.schema)
@@ -1227,7 +1347,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
         details: "topK is not supported when thinking is enabled"
       });
     }
-    const hasAnyTools = ((_n = (_m = toolConfig.tools) == null ? void 0 : _m.length) != null ? _n : 0) > 0 || additionalTools;
+    const hasAnyTools = ((_q = (_p = toolConfig.tools) == null ? void 0 : _p.length) != null ? _q : 0) > 0 || additionalTools;
     let filteredPrompt = prompt;
     if (!hasAnyTools) {
       const hasToolContent = prompt.some(
@@ -1270,7 +1390,7 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
       additionalModelRequestFields: __,
       serviceTier: ___,
       ...filteredAmazonBedrockOptions
-    } = (_p = (_o = providerOptions == null ? void 0 : providerOptions.amazonBedrock) != null ? _o : providerOptions == null ? void 0 : providerOptions.bedrock) != null ? _p : {};
+    } = (_s = (_r = providerOptions == null ? void 0 : providerOptions.amazonBedrock) != null ? _r : providerOptions == null ? void 0 : providerOptions.bedrock) != null ? _s : {};
     const additionalModelResponseFieldPaths = isAnthropicModel ? ["/delta/stop_sequence"] : void 0;
     return {
       command: {
@@ -1499,36 +1619,53 @@ var AmazonBedrockChatLanguageModel = class _AmazonBedrockChatLanguageModel {
           },
           transform(chunk, controller) {
             var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
-            function enqueueError(amazonBedrockError) {
+            function enqueueError(type, amazonBedrockError) {
               finishReason = { unified: "error", raw: void 0 };
-              controller.enqueue({ type: "error", error: amazonBedrockError });
+              controller.enqueue({
+                type: "error",
+                error: createAmazonBedrockStreamError({
+                  type,
+                  error: amazonBedrockError,
+                  data: chunk.rawValue
+                })
+              });
             }
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
             if (!chunk.success) {
-              enqueueError(chunk.error);
+              finishReason = { unified: "error", raw: void 0 };
+              controller.enqueue({ type: "error", error: chunk.error });
               return;
             }
             const value = chunk.value;
             if (value.internalServerException) {
-              enqueueError(value.internalServerException);
+              enqueueError(
+                "internalServerException",
+                value.internalServerException
+              );
               return;
             }
             if (value.modelStreamErrorException) {
-              enqueueError(value.modelStreamErrorException);
+              enqueueError(
+                "modelStreamErrorException",
+                value.modelStreamErrorException
+              );
               return;
             }
             if (value.serviceUnavailableException) {
-              enqueueError(value.serviceUnavailableException);
+              enqueueError(
+                "serviceUnavailableException",
+                value.serviceUnavailableException
+              );
               return;
             }
             if (value.throttlingException) {
-              enqueueError(value.throttlingException);
+              enqueueError("throttlingException", value.throttlingException);
               return;
             }
             if (value.validationException) {
-              enqueueError(value.validationException);
+              enqueueError("validationException", value.validationException);
               return;
             }
             if (value.messageStop) {
@@ -1876,6 +2013,10 @@ var AmazonBedrockReasoningTextSchema = z4.object({
 var AmazonBedrockRedactedReasoningSchema = z4.object({
   data: z4.string()
 });
+var AmazonBedrockCacheDetailSchema = z4.object({
+  inputTokens: z4.number(),
+  ttl: z4.string()
+}).catchall(z4.json());
 var AmazonBedrockResponseSchema = z4.object({
   metrics: z4.object({
     latencyMs: z4.number()
@@ -1917,8 +2058,8 @@ var AmazonBedrockResponseSchema = z4.object({
     totalTokens: z4.number(),
     cacheReadInputTokens: z4.number().nullish(),
     cacheWriteInputTokens: z4.number().nullish(),
-    cacheDetails: z4.array(z4.object({ inputTokens: z4.number(), ttl: z4.string() })).nullish()
-  })
+    cacheDetails: z4.array(AmazonBedrockCacheDetailSchema).nullish()
+  }).catchall(z4.json())
 });
 var AmazonBedrockStreamSchema = z4.object({
   contentBlockDelta: z4.object({
@@ -1966,10 +2107,11 @@ var AmazonBedrockStreamSchema = z4.object({
     usage: z4.object({
       cacheReadInputTokens: z4.number().nullish(),
       cacheWriteInputTokens: z4.number().nullish(),
-      cacheDetails: z4.array(z4.object({ inputTokens: z4.number(), ttl: z4.string() })).nullish(),
+      cacheDetails: z4.array(AmazonBedrockCacheDetailSchema).nullish(),
       inputTokens: z4.number(),
-      outputTokens: z4.number()
-    }).nullish()
+      outputTokens: z4.number(),
+      totalTokens: z4.number().optional()
+    }).catchall(z4.json()).nullish()
   }).nullish(),
   modelStreamErrorException: z4.record(z4.string(), z4.unknown()).nullish(),
   serviceUnavailableException: z4.record(z4.string(), z4.unknown()).nullish(),
@@ -2548,7 +2690,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "5.0.62" : "0.0.0-test";
+var VERSION = true ? "5.0.66" : "0.0.0-test";
 
 // src/amazon-bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {