@ai-sdk/amazon-bedrock 4.0.161 → 4.0.163

package/dist/index.mjs

@@ -908,7 +908,7 @@ var BedrockChatLanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const bedrockOptions = (_a = await parseProviderOptions2({
       provider: "bedrock",
       providerOptions,
@@ -956,7 +956,10 @@ 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 openAIModelId = (_b = /^(?:[^.]+\.)?(openai\..+)$/.exec(this.modelId)) == null ? void 0 : _b[1];
+    const isOpenAIModel = openAIModelId != null;
+    const isOpenAIGptOssModel = (_c = openAIModelId == null ? void 0 : openAIModelId.startsWith("openai.gpt-oss-")) != null ? _c : false;
+    const isThinkingEnabled = ((_d = bedrockOptions.reasoningConfig) == null ? void 0 : _d.type) === "enabled" || ((_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.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;
@@ -979,16 +982,16 @@ var BedrockChatLanguageModel = class {
       };
     }
     if (betas.size > 0 || bedrockOptions.anthropicBeta) {
-      const existingBetas = (_d = bedrockOptions.anthropicBeta) != null ? _d : [];
+      const existingBetas = (_f = bedrockOptions.anthropicBeta) != null ? _f : [];
       const mergedBetas = betas.size > 0 ? [...existingBetas, ...Array.from(betas)] : existingBetas;
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         anthropic_beta: mergedBetas
       };
     }
-    const thinkingType = (_e = bedrockOptions.reasoningConfig) == null ? void 0 : _e.type;
-    const thinkingBudget = thinkingType === "enabled" ? (_f = bedrockOptions.reasoningConfig) == null ? void 0 : _f.budgetTokens : void 0;
-    const thinkingDisplay = thinkingType === "adaptive" ? (_g = bedrockOptions.reasoningConfig) == null ? void 0 : _g.display : void 0;
+    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 isAnthropicThinkingEnabled = isAnthropicModel && isThinkingEnabled;
     const inferenceConfig = {
       ...maxOutputTokens != null && { maxTokens: maxOutputTokens },
@@ -1021,7 +1024,7 @@ var BedrockChatLanguageModel = class {
         };
       }
     } else if (!isAnthropicModel) {
-      if (((_h = bedrockOptions.reasoningConfig) == null ? void 0 : _h.budgetTokens) != null) {
+      if (((_j = bedrockOptions.reasoningConfig) == null ? void 0 : _j.budgetTokens) != null) {
         warnings.push({
           type: "unsupported",
           feature: "budgetTokens",
@@ -1036,21 +1039,26 @@ var BedrockChatLanguageModel = class {
         });
       }
     }
-    const maxReasoningEffort = (_i = bedrockOptions.reasoningConfig) == null ? void 0 : _i.maxReasoningEffort;
-    const isOpenAIModel = this.modelId.startsWith("openai.");
+    const maxReasoningEffort = (_k = bedrockOptions.reasoningConfig) == null ? void 0 : _k.maxReasoningEffort;
     if (maxReasoningEffort != null) {
       if (isAnthropicModel) {
         bedrockOptions.additionalModelRequestFields = {
           ...bedrockOptions.additionalModelRequestFields,
           output_config: {
-            ...(_j = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _j.output_config,
+            ...(_l = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _l.output_config,
             effort: maxReasoningEffort
           }
         };
       } else if (isOpenAIModel) {
-        bedrockOptions.additionalModelRequestFields = {
+        bedrockOptions.additionalModelRequestFields = isOpenAIGptOssModel ? {
           ...bedrockOptions.additionalModelRequestFields,
           reasoning_effort: maxReasoningEffort
+        } : {
+          ...bedrockOptions.additionalModelRequestFields,
+          reasoning: {
+            ...(_m = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _m.reasoning,
+            effort: maxReasoningEffort
+          }
         };
       } else {
         bedrockOptions.additionalModelRequestFields = {
@@ -1067,7 +1075,7 @@ var BedrockChatLanguageModel = class {
       bedrockOptions.additionalModelRequestFields = {
         ...bedrockOptions.additionalModelRequestFields,
         output_config: {
-          ...(_k = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _k.output_config,
+          ...(_n = bedrockOptions.additionalModelRequestFields) == null ? void 0 : _n.output_config,
           format: {
             type: "json_schema",
             schema: sanitizeJsonSchema(responseFormat.schema)
@@ -1099,7 +1107,7 @@ var BedrockChatLanguageModel = class {
         details: "topK is not supported when thinking is enabled"
       });
     }
-    const hasAnyTools = ((_m = (_l = toolConfig.tools) == null ? void 0 : _l.length) != null ? _m : 0) > 0 || additionalTools;
+    const hasAnyTools = ((_p = (_o = toolConfig.tools) == null ? void 0 : _o.length) != null ? _p : 0) > 0 || additionalTools;
     let filteredPrompt = prompt;
     if (!hasAnyTools) {
       const hasToolContent = prompt.some(
@@ -1729,6 +1737,10 @@ var BedrockReasoningTextSchema = z4.object({
 var BedrockRedactedReasoningSchema = z4.object({
   data: z4.string()
 });
+var AmazonBedrockCacheDetailSchema = z4.object({
+  inputTokens: z4.number(),
+  ttl: z4.string()
+}).catchall(z4.json());
 var BedrockResponseSchema = z4.object({
   metrics: z4.object({
     latencyMs: z4.number()
@@ -1770,8 +1782,8 @@ var BedrockResponseSchema = 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 BedrockStreamSchema = z4.object({
   contentBlockDelta: z4.object({
@@ -1819,10 +1831,11 @@ var BedrockStreamSchema = 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(),
@@ -2255,7 +2268,7 @@ import {
 import { AwsV4Signer } from "aws4fetch";
 
 // src/version.ts
-var VERSION = true ? "4.0.161" : "0.0.0-test";
+var VERSION = true ? "4.0.163" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch, service = "bedrock") {