laantungir/routstrd
1
0
Fork 0
mirror of https://github.com/Routstr/routstrd.git synced 2026-08-09 11:54:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(usage-summary): compute size buckets in JS after SDK removed token-range filters

Browse Source 
The SDK dropped minTotalTokens/maxTotalTokens from AggregateUsageOptions
(routstr-sdk c98de6b), so replace the five aggregate() calls with a single
list() and bucket entries in-process.
This commit is contained in:
redshift
2026-06-10 17:29:19 +08:00
parent 6536333224
commit ae91c46f01
1 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/http/usage-summary.ts
+35 -16
View File
@@ -99,9 +99,36 @@ function emptyBucket(): SizeBucket {
return { count: 0, cost: 0 };
}
function bucketFromRow(r: UsageAggregateRow | undefined): SizeBucket {
if (!r) return emptyBucket();
return { count: r.requests, cost: r.satsCost };
/** [minInclusive, maxExclusive) token bounds for each size bucket. */
const SIZE_BUCKET_BOUNDS = {
tiny: [0, 1000],
small: [1000, 10000],
medium: [10000, 50000],
large: [50000, 100000],
huge: [100000, Infinity],
} as const;
function computeSizeBuckets(
entries: UsageTrackingEntry[],
): UsageSummary["sizeBuckets"] {
const buckets = {
tiny: emptyBucket(),
small: emptyBucket(),
medium: emptyBucket(),
large: emptyBucket(),
huge: emptyBucket(),
};
for (const entry of entries) {
for (const [name, [min, max]] of Object.entries(SIZE_BUCKET_BOUNDS)) {
if (entry.totalTokens >= min && entry.totalTokens < max) {
const bucket = buckets[name as keyof typeof buckets];
bucket.count++;
bucket.cost += entry.satsCost;
break;
}
}
}
return buckets;
}
/** Returns the UTC ms for the start of the local day containing `now`. */
@@ -275,19 +302,11 @@ export async function getUsageSummary(
}));
// ── Size buckets ───────────────────────────────────────────────────────────
const [tinyRow] = await driver.aggregate({ minTotalTokens: 0, maxTotalTokens: 1000 });
const [smallRow] = await driver.aggregate({ minTotalTokens: 1000, maxTotalTokens: 10000 });
const [mediumRow] = await driver.aggregate({ minTotalTokens: 10000, maxTotalTokens: 50000 });
const [largeRow] = await driver.aggregate({ minTotalTokens: 50000, maxTotalTokens: 100000 });
const [hugeRow] = await driver.aggregate({ minTotalTokens: 100000 });
const sizeBuckets = {
tiny: bucketFromRow(tinyRow),
small: bucketFromRow(smallRow),
medium: bucketFromRow(mediumRow),
large: bucketFromRow(largeRow),
huge: bucketFromRow(hugeRow),
};
// The SDK's aggregate() no longer supports token-range filters
// (minTotalTokens/maxTotalTokens were removed in SDK pr-8), so bucket in
// JS from a single list() call instead of five aggregate() queries.
const allEntries = await driver.list();
const sizeBuckets = computeSizeBuckets(allEntries);
// ── Recent entries ─────────────────────────────────────────────────────────
const recent = await driver.list({ limit: 50 });