@ai-sdk/amazon-bedrock 4.0.0-beta.88 → 4.0.0-beta.90

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @ai-sdk/amazon-bedrock
 
+## 4.0.0-beta.90
+
+### Patch Changes
+
+- Updated dependencies [05d5b9a]
+  - @ai-sdk/anthropic@3.0.0-beta.80
+
+## 4.0.0-beta.89
+
+### Patch Changes
+
+- 3bd2689: feat: extended token usage
+- Updated dependencies [3bd2689]
+  - @ai-sdk/anthropic@3.0.0-beta.79
+  - @ai-sdk/provider@3.0.0-beta.26
+  - @ai-sdk/provider-utils@4.0.0-beta.45
+
 ## 4.0.0-beta.88
 
 ### Patch Changes

package/dist/index.js

@@ -107,6 +107,45 @@ var BedrockErrorSchema = import_v42.z.object({
   type: import_v42.z.string().nullish()
 });
 
+// src/convert-bedrock-usage.ts
+function convertBedrockUsage(usage) {
+  var _a, _b;
+  if (usage == null) {
+    return {
+      inputTokens: {
+        total: void 0,
+        noCache: void 0,
+        cacheRead: void 0,
+        cacheWrite: void 0
+      },
+      outputTokens: {
+        total: void 0,
+        text: void 0,
+        reasoning: void 0
+      },
+      raw: void 0
+    };
+  }
+  const inputTokens = usage.inputTokens;
+  const outputTokens = usage.outputTokens;
+  const cacheReadTokens = (_a = usage.cacheReadInputTokens) != null ? _a : 0;
+  const cacheWriteTokens = (_b = usage.cacheWriteInputTokens) != null ? _b : 0;
+  return {
+    inputTokens: {
+      total: inputTokens,
+      noCache: inputTokens - cacheReadTokens,
+      cacheRead: cacheReadTokens,
+      cacheWrite: cacheWriteTokens
+    },
+    outputTokens: {
+      total: outputTokens,
+      text: outputTokens,
+      reasoning: void 0
+    },
+    raw: usage
+  };
+}
+
 // src/bedrock-event-stream-response-handler.ts
 var import_provider = require("@ai-sdk/provider");
 var import_provider_utils = require("@ai-sdk/provider-utils");
@@ -897,7 +936,7 @@ var BedrockChatLanguageModel = class {
     return (0, import_provider_utils4.combineHeaders)(await (0, import_provider_utils4.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;
     const {
       command: args,
       warnings,
@@ -988,12 +1027,7 @@ var BedrockChatLanguageModel = class {
         response.stopReason,
         isJsonResponseFromTool
       ),
-      usage: {
-        inputTokens: (_i = response.usage) == null ? void 0 : _i.inputTokens,
-        outputTokens: (_j = response.usage) == null ? void 0 : _j.outputTokens,
-        totalTokens: ((_k = response.usage) == null ? void 0 : _k.inputTokens) + ((_l = response.usage) == null ? void 0 : _l.outputTokens),
-        cachedInputTokens: (_n = (_m = response.usage) == null ? void 0 : _m.cacheReadInputTokens) != null ? _n : void 0
-      },
+      usage: convertBedrockUsage(response.usage),
       response: {
         // TODO add id, timestamp, etc
         headers: responseHeaders
@@ -1022,11 +1056,7 @@ var BedrockChatLanguageModel = class {
       fetch: this.config.fetch
     });
     let finishReason = "unknown";
-    const usage = {
-      inputTokens: void 0,
-      outputTokens: void 0,
-      totalTokens: void 0
-    };
+    let usage = void 0;
     let providerMetadata = void 0;
     let isJsonResponseFromTool = false;
     const contentBlocks = {};
@@ -1037,7 +1067,7 @@ var BedrockChatLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            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;
             function enqueueError(bedrockError) {
               finishReason = "error";
               controller.enqueue({ type: "error", error: bedrockError });
@@ -1073,11 +1103,10 @@ var BedrockChatLanguageModel = class {
               );
             }
             if (value.metadata) {
-              usage.inputTokens = (_b = (_a = value.metadata.usage) == null ? void 0 : _a.inputTokens) != null ? _b : usage.inputTokens;
-              usage.outputTokens = (_d = (_c = value.metadata.usage) == null ? void 0 : _c.outputTokens) != null ? _d : usage.outputTokens;
-              usage.totalTokens = ((_e = usage.inputTokens) != null ? _e : 0) + ((_f = usage.outputTokens) != null ? _f : 0);
-              usage.cachedInputTokens = (_h = (_g = value.metadata.usage) == null ? void 0 : _g.cacheReadInputTokens) != null ? _h : usage.cachedInputTokens;
-              const cacheUsage = ((_i = value.metadata.usage) == null ? void 0 : _i.cacheWriteInputTokens) != null ? {
+              if (value.metadata.usage) {
+                usage = value.metadata.usage;
+              }
+              const cacheUsage = ((_a = value.metadata.usage) == null ? void 0 : _a.cacheWriteInputTokens) != null ? {
                 usage: {
                   cacheWriteInputTokens: value.metadata.usage.cacheWriteInputTokens
                 }
@@ -1094,7 +1123,7 @@ var BedrockChatLanguageModel = class {
                 };
               }
             }
-            if (((_j = value.contentBlockStart) == null ? void 0 : _j.contentBlockIndex) != null && !((_l = (_k = value.contentBlockStart) == null ? void 0 : _k.start) == null ? void 0 : _l.toolUse)) {
+            if (((_b = value.contentBlockStart) == null ? void 0 : _b.contentBlockIndex) != null && !((_d = (_c = value.contentBlockStart) == null ? void 0 : _c.start) == null ? void 0 : _d.toolUse)) {
               const blockIndex = value.contentBlockStart.contentBlockIndex;
               contentBlocks[blockIndex] = { type: "text" };
               controller.enqueue({
@@ -1102,7 +1131,7 @@ var BedrockChatLanguageModel = class {
                 id: String(blockIndex)
               });
             }
-            if (((_m = value.contentBlockDelta) == null ? void 0 : _m.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
+            if (((_e = value.contentBlockDelta) == null ? void 0 : _e.delta) && "text" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.text) {
               const blockIndex = value.contentBlockDelta.contentBlockIndex || 0;
               if (contentBlocks[blockIndex] == null) {
                 contentBlocks[blockIndex] = { type: "text" };
@@ -1117,7 +1146,7 @@ var BedrockChatLanguageModel = class {
                 delta: value.contentBlockDelta.delta.text
               });
             }
-            if (((_n = value.contentBlockStop) == null ? void 0 : _n.contentBlockIndex) != null) {
+            if (((_f = value.contentBlockStop) == null ? void 0 : _f.contentBlockIndex) != null) {
               const blockIndex = value.contentBlockStop.contentBlockIndex;
               const contentBlock = contentBlocks[blockIndex];
               if (contentBlock != null) {
@@ -1163,7 +1192,7 @@ var BedrockChatLanguageModel = class {
                 delete contentBlocks[blockIndex];
               }
             }
-            if (((_o = value.contentBlockDelta) == null ? void 0 : _o.delta) && "reasoningContent" in value.contentBlockDelta.delta && value.contentBlockDelta.delta.reasoningContent) {
+            if (((_g = value.contentBlockDelta) == null ? void 0 : _g.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) {
@@ -1204,7 +1233,7 @@ var BedrockChatLanguageModel = class {
               }
             }
             const contentBlockStart = value.contentBlockStart;
-            if (((_p = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _p.toolUse) != null) {
+            if (((_h = contentBlockStart == null ? void 0 : contentBlockStart.start) == null ? void 0 : _h.toolUse) != null) {
               const toolUse = contentBlockStart.start.toolUse;
               const blockIndex = contentBlockStart.contentBlockIndex;
               const isJsonResponseTool = usesJsonResponseTool && toolUse.name === "json";
@@ -1228,7 +1257,7 @@ var BedrockChatLanguageModel = class {
               const blockIndex = contentBlockDelta.contentBlockIndex;
               const contentBlock = contentBlocks[blockIndex];
               if ((contentBlock == null ? void 0 : contentBlock.type) === "tool-call") {
-                const delta = (_q = contentBlockDelta.delta.toolUse.input) != null ? _q : "";
+                const delta = (_i = contentBlockDelta.delta.toolUse.input) != null ? _i : "";
                 if (!contentBlock.isJsonResponseTool) {
                   controller.enqueue({
                     type: "tool-input-delta",
@@ -1258,7 +1287,7 @@ var BedrockChatLanguageModel = class {
             controller.enqueue({
               type: "finish",
               finishReason,
-              usage,
+              usage: convertBedrockUsage(usage),
               ...providerMetadata && { providerMetadata }
             });
           }
@@ -1563,7 +1592,7 @@ var import_provider_utils7 = require("@ai-sdk/provider-utils");
 var import_aws4fetch = require("aws4fetch");
 
 // src/version.ts
-var VERSION = true ? "4.0.0-beta.88" : "0.0.0-test";
+var VERSION = true ? "4.0.0-beta.90" : "0.0.0-test";
 
 // src/bedrock-sigv4-fetch.ts
 function createSigV4FetchFunction(getCredentials, fetch = globalThis.fetch) {