@diogonzafe/tokenwatch 0.9.0 → 0.10.0

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { T as TrackerConfig, a as Tracker, L as LazyTracker, b as TrackingMeta } from './index-fD5QLTWg.cjs';
-export { A as AnomalyDetectionConfig, B as BudgetConfig, C as CostForecast, F as FeatureStats, c as ForecastOptions, I as IExporter, d as IStorage, M as ModelPrice, e as ModelStats, P as PriceMap, f as PricesFile, R as Report, g as ReportOptions, S as SessionStats, U as UsageEntry, h as UserStats } from './index-fD5QLTWg.cjs';
+import { T as TrackerConfig, a as Tracker, L as LazyTracker, b as TrackingMeta } from './index-B5OF0YCl.cjs';
+export { A as AnomalyDetectionConfig, B as BudgetConfig, C as CostForecast, F as FeatureStats, c as ForecastOptions, I as IExporter, d as IStorage, M as ModelPrice, e as ModelStats, P as PriceMap, f as PricesFile, R as Report, g as ReportOptions, S as SessionStats, U as UsageEntry, h as UserStats } from './index-B5OF0YCl.cjs';
 
 declare function createTracker(config?: TrackerConfig): Tracker;
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { T as TrackerConfig, a as Tracker, L as LazyTracker, b as TrackingMeta } from './index-fD5QLTWg.js';
-export { A as AnomalyDetectionConfig, B as BudgetConfig, C as CostForecast, F as FeatureStats, c as ForecastOptions, I as IExporter, d as IStorage, M as ModelPrice, e as ModelStats, P as PriceMap, f as PricesFile, R as Report, g as ReportOptions, S as SessionStats, U as UsageEntry, h as UserStats } from './index-fD5QLTWg.js';
+import { T as TrackerConfig, a as Tracker, L as LazyTracker, b as TrackingMeta } from './index-B5OF0YCl.js';
+export { A as AnomalyDetectionConfig, B as BudgetConfig, C as CostForecast, F as FeatureStats, c as ForecastOptions, I as IExporter, d as IStorage, M as ModelPrice, e as ModelStats, P as PriceMap, f as PricesFile, R as Report, g as ReportOptions, S as SessionStats, U as UsageEntry, h as UserStats } from './index-B5OF0YCl.js';
 
 declare function createTracker(config?: TrackerConfig): Tracker;
 

package/dist/index.js

@@ -60,6 +60,7 @@ var CloudExporter = class {
         sessionId: entry.sessionId,
         userId: entry.userId,
         feature: entry.feature,
+        metadata: entry.metadata,
         timestamp: entry.timestamp
       })
     }).catch(() => {
@@ -157,6 +158,7 @@ var SqliteStorage = class {
         user_id               TEXT,
         feature               TEXT,
         app_id                TEXT,
+        metadata              TEXT,
         timestamp             TEXT    NOT NULL
       )
     `);
@@ -176,13 +178,16 @@ var SqliteStorage = class {
     if (!cols.includes("app_id")) {
       this.db.exec(`ALTER TABLE usage ADD COLUMN app_id TEXT`);
     }
+    if (!cols.includes("metadata")) {
+      this.db.exec(`ALTER TABLE usage ADD COLUMN metadata TEXT`);
+    }
   }
   record(entry) {
     this.db.prepare(
       `INSERT INTO usage
          (model, input_tokens, output_tokens, reasoning_tokens, cached_tokens, cache_creation_tokens,
-          cost_usd, session_id, user_id, feature, app_id, timestamp)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+          cost_usd, session_id, user_id, feature, app_id, metadata, timestamp)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     ).run(
       entry.model,
       entry.inputTokens,
@@ -195,6 +200,7 @@ var SqliteStorage = class {
       entry.userId ?? null,
       entry.feature ?? null,
       entry.appId ?? null,
+      entry.metadata != null ? JSON.stringify(entry.metadata) : null,
       entry.timestamp
     );
   }
@@ -212,6 +218,7 @@ var SqliteStorage = class {
       ...r.user_id != null && { userId: r.user_id },
       ...r.feature != null && { feature: r.feature },
       ...r.app_id != null && { appId: r.app_id },
+      ...r.metadata != null && { metadata: JSON.parse(r.metadata) },
       timestamp: r.timestamp
     }));
   }
@@ -1899,6 +1906,7 @@ ${issues}`);
     const byUser = {};
     const byFeature = {};
     const byApp = {};
+    const byMetadata = {};
     let totalInput = 0;
     let totalOutput = 0;
     let totalCost = 0;
@@ -1940,6 +1948,14 @@ ${issues}`);
         a.costUSD += e.costUSD;
         a.calls += 1;
       }
+      if (e.metadata) {
+        for (const [key, val] of Object.entries(e.metadata)) {
+          const group = byMetadata[key] ??= {};
+          const slot = group[val] ??= { costUSD: 0, calls: 0 };
+          slot.costUSD += e.costUSD;
+          slot.calls += 1;
+        }
+      }
     }
     if (options && entries.length > 0) {
       periodFrom = entries[0]?.timestamp ?? periodFrom;
@@ -1952,6 +1968,7 @@ ${issues}`);
       byUser,
       byFeature,
       byApp,
+      byMetadata,
       period: { from: periodFrom, to: lastTimestamp },
       ...pricesUpdatedAt ? { pricesUpdatedAt } : {}
     };
@@ -2056,7 +2073,7 @@ ${issues}`);
   }
   async function exportCSV() {
     const entries = await Promise.resolve(storage.getAll());
-    const header = "timestamp,model,inputTokens,outputTokens,reasoningTokens,cachedTokens,cacheCreationTokens,costUSD,sessionId,userId,feature,appId";
+    const header = "timestamp,model,inputTokens,outputTokens,reasoningTokens,cachedTokens,cacheCreationTokens,costUSD,sessionId,userId,feature,appId,metadata";
     const rows = entries.map(
       (e) => [
         csvEscape(e.timestamp),
@@ -2070,7 +2087,8 @@ ${issues}`);
         csvEscape(e.sessionId ?? ""),
         csvEscape(e.userId ?? ""),
         csvEscape(e.feature ?? ""),
-        csvEscape(e.appId ?? "")
+        csvEscape(e.appId ?? ""),
+        csvEscape(e.metadata ? JSON.stringify(e.metadata) : "")
       ].join(",")
     );
     return [header, ...rows].join("\n");
@@ -2142,6 +2160,7 @@ function emptyReport() {
     byUser: {},
     byFeature: {},
     byApp: {},
+    byMetadata: {},
     period: { from: now, to: now }
   };
 }
@@ -2198,12 +2217,13 @@ function createLazyTracker() {
 
 // src/providers/openai.ts
 function extractMeta(params) {
-  const { __sessionId, __userId, __feature, ...cleaned } = params;
+  const { __sessionId, __userId, __feature, __metadata, ...cleaned } = params;
   return {
     cleaned,
     sessionId: typeof __sessionId === "string" ? __sessionId : void 0,
     userId: typeof __userId === "string" ? __userId : void 0,
-    feature: typeof __feature === "string" ? __feature : void 0
+    feature: typeof __feature === "string" ? __feature : void 0,
+    metadata: __metadata != null && typeof __metadata === "object" ? __metadata : void 0
   };
 }
 function extractUsage(usage) {
@@ -2218,7 +2238,7 @@ function extractUsage(usage) {
     cachedTokens
   };
 }
-function trackWithMeta(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens = 0) {
+function trackWithMeta(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens = 0, metadata) {
   tracker.track({
     model,
     inputTokens,
@@ -2227,10 +2247,11 @@ function trackWithMeta(tracker, model, inputTokens, outputTokens, reasoningToken
     ...cachedTokens > 0 && { cachedTokens },
     ...sessionId !== void 0 && { sessionId },
     ...userId !== void 0 && { userId },
-    ...feature !== void 0 && { feature }
+    ...feature !== void 0 && { feature },
+    ...metadata !== void 0 && { metadata }
   });
 }
-async function* wrapStream(stream, model, sessionId, userId, feature, tracker) {
+async function* wrapStream(stream, model, sessionId, userId, feature, tracker, metadata) {
   let lastChunk;
   for await (const chunk of stream) {
     lastChunk = chunk;
@@ -2242,7 +2263,7 @@ async function* wrapStream(stream, model, sessionId, userId, feature, tracker) {
       `[tokenwatch] No usage data in stream for model "${model}". Cost recorded as $0. Pass stream_options: { include_usage: true } to get accurate costs.`
     );
   }
-  trackWithMeta(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens);
+  trackWithMeta(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens, metadata);
 }
 function wrapOpenAI(client, tracker) {
   const proxiedCompletions = new Proxy(client.chat.completions, {
@@ -2250,7 +2271,7 @@ function wrapOpenAI(client, tracker) {
       if (prop !== "create")
         return target[prop];
       return async function(params) {
-        const { cleaned, sessionId, userId, feature } = extractMeta(params);
+        const { cleaned, sessionId, userId, feature, metadata } = extractMeta(params);
         const model = typeof cleaned["model"] === "string" ? cleaned["model"] : "unknown";
         const result = await target.create(cleaned);
         if (result && typeof result === "object" && Symbol.asyncIterator in result) {
@@ -2260,7 +2281,8 @@ function wrapOpenAI(client, tracker) {
             sessionId,
             userId,
             feature,
-            tracker
+            tracker,
+            metadata
           );
         }
         const completion = result;
@@ -2274,7 +2296,8 @@ function wrapOpenAI(client, tracker) {
           sessionId,
           userId,
           feature,
-          cachedTokens
+          cachedTokens,
+          metadata
         );
         return result;
       };
@@ -2291,12 +2314,12 @@ function wrapOpenAI(client, tracker) {
       if (prop !== "create")
         return target[prop];
       return async function(params) {
-        const { cleaned, sessionId, userId, feature } = extractMeta(params);
+        const { cleaned, sessionId, userId, feature, metadata } = extractMeta(params);
         const model = typeof cleaned["model"] === "string" ? cleaned["model"] : "unknown";
         const result = await target.create(cleaned);
         const embedding = result;
         const inputTokens = embedding.usage?.total_tokens ?? 0;
-        trackWithMeta(tracker, embedding.model ?? model, inputTokens, 0, 0, sessionId, userId, feature);
+        trackWithMeta(tracker, embedding.model ?? model, inputTokens, 0, 0, sessionId, userId, feature, 0, metadata);
         return result;
       };
     }
@@ -2312,12 +2335,13 @@ function wrapOpenAI(client, tracker) {
 
 // src/providers/anthropic.ts
 function extractMeta2(params) {
-  const { __sessionId, __userId, __feature, ...cleaned } = params;
+  const { __sessionId, __userId, __feature, __metadata, ...cleaned } = params;
   return {
     cleaned,
     sessionId: typeof __sessionId === "string" ? __sessionId : void 0,
     userId: typeof __userId === "string" ? __userId : void 0,
-    feature: typeof __feature === "string" ? __feature : void 0
+    feature: typeof __feature === "string" ? __feature : void 0,
+    metadata: __metadata != null && typeof __metadata === "object" ? __metadata : void 0
   };
 }
 function extractUsage2(usage) {
@@ -2334,7 +2358,7 @@ function extractThinkingTokenApprox(content) {
   const chars = content.filter((b) => b.type === "thinking").reduce((sum, b) => sum + (b.thinking?.length ?? 0), 0);
   return chars > 0 ? Math.round(chars / 4) : 0;
 }
-function trackWithMeta2(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens = 0, cacheCreationTokens = 0) {
+function trackWithMeta2(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens = 0, cacheCreationTokens = 0, metadata) {
   tracker.track({
     model,
     inputTokens,
@@ -2344,10 +2368,11 @@ function trackWithMeta2(tracker, model, inputTokens, outputTokens, reasoningToke
     ...cacheCreationTokens > 0 && { cacheCreationTokens },
     ...sessionId !== void 0 && { sessionId },
     ...userId !== void 0 && { userId },
-    ...feature !== void 0 && { feature }
+    ...feature !== void 0 && { feature },
+    ...metadata !== void 0 && { metadata }
   });
 }
-async function* wrapStream2(stream, model, sessionId, userId, feature, tracker) {
+async function* wrapStream2(stream, model, sessionId, userId, feature, tracker, metadata) {
   let inputTokens = 0;
   let outputTokens = 0;
   let cachedTokens = 0;
@@ -2375,7 +2400,7 @@ async function* wrapStream2(stream, model, sessionId, userId, feature, tracker)
     }
   }
   const reasoningTokens = thinkingCharCount > 0 ? Math.round(thinkingCharCount / 4) : 0;
-  trackWithMeta2(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens, cacheCreationTokens);
+  trackWithMeta2(tracker, model, inputTokens, outputTokens, reasoningTokens, sessionId, userId, feature, cachedTokens, cacheCreationTokens, metadata);
 }
 function wrapAnthropic(client, tracker) {
   const proxiedMessages = new Proxy(client.messages, {
@@ -2383,7 +2408,7 @@ function wrapAnthropic(client, tracker) {
       if (prop !== "create")
         return target[prop];
       return async function(params) {
-        const { cleaned, sessionId, userId, feature } = extractMeta2(params);
+        const { cleaned, sessionId, userId, feature, metadata } = extractMeta2(params);
         const model = typeof cleaned["model"] === "string" ? cleaned["model"] : "unknown";
         const result = await target.create(cleaned);
         if (result && typeof result === "object" && Symbol.asyncIterator in result) {
@@ -2393,7 +2418,8 @@ function wrapAnthropic(client, tracker) {
             sessionId,
             userId,
             feature,
-            tracker
+            tracker,
+            metadata
           );
         }
         const message = result;
@@ -2409,7 +2435,8 @@ function wrapAnthropic(client, tracker) {
           userId,
           feature,
           cachedTokens,
-          cacheCreationTokens
+          cacheCreationTokens,
+          metadata
         );
         return result;
       };
@@ -2430,10 +2457,11 @@ function wrapGemini(client, tracker) {
       if (prop !== "getGenerativeModel")
         return target[prop];
       return function(modelParams) {
-        const { __sessionId, __userId, __feature, ...cleanedParams } = modelParams;
+        const { __sessionId, __userId, __feature, __metadata, ...cleanedParams } = modelParams;
         const feature = typeof __feature === "string" ? __feature : void 0;
         const sessionId = typeof __sessionId === "string" ? __sessionId : void 0;
         const userId = typeof __userId === "string" ? __userId : void 0;
+        const metadata = __metadata != null && typeof __metadata === "object" ? __metadata : void 0;
         const modelInstance = target.getGenerativeModel(cleanedParams);
         const modelId = modelParams.model;
         return new Proxy(modelInstance, {
@@ -2448,7 +2476,8 @@ function wrapGemini(client, tracker) {
                   outputTokens: meta?.candidatesTokenCount ?? 0,
                   ...sessionId !== void 0 && { sessionId },
                   ...userId !== void 0 && { userId },
-                  ...feature !== void 0 && { feature }
+                  ...feature !== void 0 && { feature },
+                  ...metadata !== void 0 && { metadata }
                 });
                 return result;
               };
@@ -2464,7 +2493,8 @@ function wrapGemini(client, tracker) {
                     outputTokens: meta?.candidatesTokenCount ?? 0,
                     ...sessionId !== void 0 && { sessionId },
                     ...userId !== void 0 && { userId },
-                    ...feature !== void 0 && { feature }
+                    ...feature !== void 0 && { feature },
+                    ...metadata !== void 0 && { metadata }
                   });
                 }).catch(() => {
                 });