bitfab 0.19.0 → 0.19.1

package/dist/index.cjs

@@ -497,7 +497,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/version.generated.ts
-var __version__ = "0.19.0";
+var __version__ = "0.19.1";
 
 // src/constants.ts
 var DEFAULT_SERVICE_URL = "https://bitfab.ai";
@@ -918,23 +918,30 @@ function extractContentBlocks(content) {
   }
   return content.map((block) => safeSerialize(block));
 }
+function asTokenCount(val) {
+  return typeof val === "number" && Number.isFinite(val) ? val : null;
+}
 function extractUsage(message) {
   const usageInfo = {};
   const usage = message.usage;
   if (!usage) {
     return usageInfo;
   }
-  const mapping = {
-    input_tokens: "inputTokens",
-    output_tokens: "outputTokens",
-    cache_read_input_tokens: "cacheReadTokens",
-    cache_creation_input_tokens: "cacheCreationTokens"
-  };
-  for (const [srcKey, dstKey] of Object.entries(mapping)) {
-    const val = usage[srcKey];
-    if (val !== void 0 && val !== null) {
-      usageInfo[dstKey] = val;
-    }
+  const baseInput = asTokenCount(usage.input_tokens);
+  const cacheRead = asTokenCount(usage.cache_read_input_tokens);
+  const cacheCreation = asTokenCount(usage.cache_creation_input_tokens);
+  if (baseInput !== null || cacheRead !== null || cacheCreation !== null) {
+    usageInfo.inputTokens = (baseInput ?? 0) + (cacheRead ?? 0) + (cacheCreation ?? 0);
+  }
+  const output = asTokenCount(usage.output_tokens);
+  if (output !== null) {
+    usageInfo.outputTokens = output;
+  }
+  if (cacheRead !== null) {
+    usageInfo.cacheReadTokens = cacheRead;
+  }
+  if (cacheCreation !== null) {
+    usageInfo.cacheCreationTokens = cacheCreation;
   }
   return usageInfo;
 }
@@ -1728,7 +1735,7 @@ function extractModelName(serialized, metadata) {
   }
   return void 0;
 }
-function asTokenCount(value) {
+function asTokenCount2(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
 function normalizeTokenUsage(raw) {
@@ -1737,10 +1744,10 @@ function normalizeTokenUsage(raw) {
   }
   const u = raw;
   if ("cache_read_input_tokens" in u || "cache_creation_input_tokens" in u) {
-    const cacheRead = asTokenCount(u.cache_read_input_tokens);
-    const cacheCreation = asTokenCount(u.cache_creation_input_tokens);
-    const baseInput = asTokenCount(u.input_tokens);
-    const outputTokens = asTokenCount(u.output_tokens);
+    const cacheRead = asTokenCount2(u.cache_read_input_tokens);
+    const cacheCreation = asTokenCount2(u.cache_creation_input_tokens);
+    const baseInput = asTokenCount2(u.input_tokens);
+    const outputTokens = asTokenCount2(u.output_tokens);
     if (cacheRead === null && cacheCreation === null && baseInput === null && outputTokens === null) {
       return null;
     }
@@ -1755,25 +1762,25 @@ function normalizeTokenUsage(raw) {
   if ("prompt_tokens" in u || "completion_tokens" in u || "promptTokens" in u || "completionTokens" in u) {
     const promptDetails = u.prompt_tokens_details ?? {};
     return withAnyTokenCount({
-      inputTokens: asTokenCount(u.prompt_tokens) ?? asTokenCount(u.promptTokens),
-      outputTokens: asTokenCount(u.completion_tokens) ?? asTokenCount(u.completionTokens),
-      totalTokens: asTokenCount(u.total_tokens) ?? asTokenCount(u.totalTokens),
-      cachedInputTokens: asTokenCount(promptDetails.cached_tokens)
+      inputTokens: asTokenCount2(u.prompt_tokens) ?? asTokenCount2(u.promptTokens),
+      outputTokens: asTokenCount2(u.completion_tokens) ?? asTokenCount2(u.completionTokens),
+      totalTokens: asTokenCount2(u.total_tokens) ?? asTokenCount2(u.totalTokens),
+      cachedInputTokens: asTokenCount2(promptDetails.cached_tokens)
     });
   }
   if ("prompt_token_count" in u || "candidates_token_count" in u) {
     return withAnyTokenCount({
-      inputTokens: asTokenCount(u.prompt_token_count),
-      outputTokens: asTokenCount(u.candidates_token_count),
-      totalTokens: asTokenCount(u.total_token_count),
-      cachedInputTokens: asTokenCount(u.cached_content_token_count)
+      inputTokens: asTokenCount2(u.prompt_token_count),
+      outputTokens: asTokenCount2(u.candidates_token_count),
+      totalTokens: asTokenCount2(u.total_token_count),
+      cachedInputTokens: asTokenCount2(u.cached_content_token_count)
     });
   }
   if ("input_tokens" in u || "output_tokens" in u) {
     const inputDetails = u.input_token_details ?? {};
-    const inputTokens = asTokenCount(u.input_tokens);
-    const outputTokens = asTokenCount(u.output_tokens);
-    let totalTokens = asTokenCount(u.total_tokens);
+    const inputTokens = asTokenCount2(u.input_tokens);
+    const outputTokens = asTokenCount2(u.output_tokens);
+    let totalTokens = asTokenCount2(u.total_tokens);
     if (totalTokens === null && inputTokens !== null && outputTokens !== null) {
       totalTokens = inputTokens + outputTokens;
     }
@@ -1781,7 +1788,7 @@ function normalizeTokenUsage(raw) {
       inputTokens,
       outputTokens,
       totalTokens,
-      cachedInputTokens: asTokenCount(inputDetails.cache_read)
+      cachedInputTokens: asTokenCount2(inputDetails.cache_read)
     });
   }
   return null;