switchroom 0.21.1 → 0.21.3

package/dist/auth-broker/index.js

@@ -20351,6 +20351,8 @@ var EXTERNAL_SPEND_TOP_N = 3;
 var DEFAULT_LITELLM_BASE = "http://127.0.0.1:4010";
 var EXTERNAL_SPEND_CACHE_TTL_MS = 90000;
 var EXTERNAL_SPEND_FETCH_TIMEOUT_MS = 5000;
+var EXTERNAL_SPEND_PAGE_SIZE = 1000;
+var EXTERNAL_SPEND_MAX_PAGES = 50;
 var LITELLM_MASTER_KEY_STATE_BASENAME = "litellm-master-key";
 var BARE_EXTERNAL_NEEDLES = [
   "gpt-oss",
@@ -20447,54 +20449,72 @@ function summarizeExternalSpend(days, now = new Date) {
   const top = Object.entries(byModel).filter(([, usd]) => usd > 0).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, EXTERNAL_SPEND_TOP_N).map(([name, usd]) => ({ label: shortModelLabel(name), usd }));
   return { day24hUsd, day7dUsd, top };
 }
-function normalizeSpendLogRows(body) {
-  if (Array.isArray(body))
-    return body;
-  if (body && typeof body === "object") {
-    const data = body.data;
-    if (Array.isArray(data))
-      return data;
+function normalizeDailyActivityRows(body) {
+  const results = body && typeof body === "object" && Array.isArray(body.results) ? body.results : [];
+  const rows = [];
+  for (const day of results) {
+    if (!day || typeof day !== "object")
+      continue;
+    const models = {};
+    const breakdown = day.breakdown?.models ?? {};
+    for (const [name, entry] of Object.entries(breakdown)) {
+      const raw = entry?.metrics?.spend;
+      const n = typeof raw === "number" ? raw : Number(raw);
+      if (!Number.isFinite(n))
+        continue;
+      models[name] = (models[name] ?? 0) + n;
+    }
+    rows.push({ startTime: day.date, models });
   }
-  return [];
+  return rows;
 }
 async function fetchAndSummarizeExternalSpend(opts) {
   const now = opts.now ?? new Date;
   const base = (opts.baseUrl ?? DEFAULT_LITELLM_BASE).replace(/\/+$/, "");
   const today = utcDateString(now);
   const start = addUtcDays(today, -6);
-  const end = addUtcDays(today, 1);
-  const url = `${base}/spend/logs?start_date=${encodeURIComponent(start)}` + `&end_date=${encodeURIComponent(end)}`;
   const fetchImpl = opts.fetchImpl ?? fetch;
   const timeoutMs = opts.timeoutMs ?? EXTERNAL_SPEND_FETCH_TIMEOUT_MS;
-  const ac = new AbortController;
-  const timer = setTimeout(() => ac.abort(), timeoutMs);
-  try {
-    const res = await fetchImpl(url, {
-      method: "GET",
-      headers: {
-        Authorization: `Bearer ${opts.adminKey}`,
-        Accept: "application/json"
-      },
-      signal: ac.signal
-    });
-    if (!res.ok) {
-      console.warn(`external-spend: LiteLLM /spend/logs returned HTTP ${res.status} — ` + `External /usage row will be blank (check master key / proxy)`);
-      return null;
-    }
-    let body;
+  const rows = [];
+  for (let page = 1;page <= EXTERNAL_SPEND_MAX_PAGES; page++) {
+    const url = `${base}/user/daily/activity?start_date=${encodeURIComponent(start)}` + `&end_date=${encodeURIComponent(today)}` + `&page=${page}&page_size=${EXTERNAL_SPEND_PAGE_SIZE}&timezone=0`;
+    const ac = new AbortController;
+    const timer = setTimeout(() => ac.abort(), timeoutMs);
     try {
-      body = await res.json();
+      const res = await fetchImpl(url, {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${opts.adminKey}`,
+          Accept: "application/json"
+        },
+        signal: ac.signal
+      });
+      if (!res.ok) {
+        console.warn(`external-spend: LiteLLM /user/daily/activity returned HTTP ${res.status} — ` + `External /usage row will be blank (check master key / proxy)`);
+        return null;
+      }
+      let body;
+      try {
+        body = await res.json();
+      } catch (err) {
+        console.warn(`external-spend: failed to parse /user/daily/activity JSON: ${err?.message ?? err}`);
+        return null;
+      }
+      rows.push(...normalizeDailyActivityRows(body));
+      const meta = body && typeof body === "object" ? body.metadata : undefined;
+      if (!meta?.has_more)
+        break;
+      if (page === EXTERNAL_SPEND_MAX_PAGES) {
+        console.warn(`external-spend: LiteLLM /user/daily/activity still reports has_more at ` + `page ${EXTERNAL_SPEND_MAX_PAGES} (pagination cap) — External /usage ` + `total is under-reported (collected ${rows.length} day rows)`);
+      }
     } catch (err) {
-      console.warn(`external-spend: failed to parse /spend/logs JSON: ${err?.message ?? err}`);
+      console.warn(`external-spend: LiteLLM /user/daily/activity fetch failed: ${err?.message ?? err}`);
       return null;
+    } finally {
+      clearTimeout(timer);
     }
-    return summarizeExternalSpend(normalizeSpendLogRows(body), now);
-  } catch (err) {
-    console.warn(`external-spend: LiteLLM /spend/logs fetch failed: ${err?.message ?? err}`);
-    return null;
-  } finally {
-    clearTimeout(timer);
   }
+  return summarizeExternalSpend(rows, now);
 }
 
 // src/auth/broker/mirror-write.ts