Skip to content

Commit f7a4633

Browse files
committed
feat(usage): add date filters and daily model breakdown in dashboard (#1058)
1 parent 80e4075 commit f7a4633

10 files changed

Lines changed: 65 additions & 15 deletions

File tree

‎gui/src/i18n/de.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,11 @@ export const de: Record<TKey, string> = {
627627
"usage.empty": "Noch keine Nutzung erfasst. Sende eine Anfrage über den Proxy, um Aktivität hier zu sehen.",
628628
"usage.loadError": "Nutzungsdaten konnten nicht geladen werden.",
629629
"usage.range.all": "Alle",
630-
"usage.range.available": "Verfügbarer Verlauf",
630+
"usage.range.available":
631+
"usage.range.1d": "Heute",
632+
"usage.range.yesterday": "Gestern",
633+
"usage.filterByDate": "Gefiltered nach {date}",
634+
"usage.clearDateFilter": "Datumsfilter zurücksetzen", "Verfügbarer Verlauf",
631635
"usage.historyTruncated": "Die Summen beziehen sich nur auf den verfügbaren Verlauf, da ältere Nutzungsdaten nicht geladen wurden.",
632636
"usage.range.30d": "30d",
633637
"usage.range.7d": "7d",

‎gui/src/i18n/en.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,11 @@ export const en = {
658658
"usage.empty": "No usage recorded yet. Send a request through the proxy to see activity here.",
659659
"usage.loadError": "Could not load usage data.",
660660
"usage.range.all": "All",
661-
"usage.range.available": "Available history",
661+
"usage.range.available":
662+
"usage.range.1d": "Today",
663+
"usage.range.yesterday": "Yesterday",
664+
"usage.filterByDate": "Filtered for {date}",
665+
"usage.clearDateFilter": "Clear date filter", "Available history",
662666
"usage.historyTruncated": "Totals cover available history only because older usage was not loaded.",
663667
"usage.range.30d": "30d",
664668
"usage.range.7d": "7d",

‎gui/src/i18n/ja.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,11 @@ export const ja: Record<TKey, string> = {
616616
"usage.empty": "まだ使用量が記録されていません。プロキシ経由でリクエストを送信するとここにアクティビティが表示されます。",
617617
"usage.loadError": "使用量データを読み込めませんでした。",
618618
"usage.range.all": "すべて",
619-
"usage.range.available": "利用可能な履歴",
619+
"usage.range.available":
620+
"usage.range.1d": "今日",
621+
"usage.range.yesterday": "昨日",
622+
"usage.filterByDate": "{date} でフィルタ中",
623+
"usage.clearDateFilter": "日付フィルタを解除", "利用可能な履歴",
620624
"usage.historyTruncated": "古い利用履歴が読み込まれていないため、合計は利用可能な履歴のみを対象とします。",
621625
"usage.range.30d": "30日",
622626
"usage.range.7d": "7日",

‎gui/src/i18n/ko.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,11 @@ export const ko: Record<TKey, string> = {
649649
"usage.empty": "아직 기록된 사용량이 없습니다. 프록시로 요청을 보내면 여기에 표시됩니다.",
650650
"usage.loadError": "사용량 데이터를 불러오지 못했습니다.",
651651
"usage.range.all": "전체",
652-
"usage.range.available": "사용 가능한 기록",
652+
"usage.range.available":
653+
"usage.range.1d": "오늘",
654+
"usage.range.yesterday": "어제",
655+
"usage.filterByDate": "{date} 필터링 됨",
656+
"usage.clearDateFilter": "날짜 필터 초기화", "사용 가능한 기록",
653657
"usage.historyTruncated": "이전 사용 기록을 불러오지 않아 합계는 사용 가능한 기록만 포함합니다.",
654658
"usage.range.30d": "30일",
655659
"usage.range.7d": "7일",

‎gui/src/i18n/ru.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,11 @@ export const ru: Record<TKey, string> = {
648648
"usage.empty": "Данных об использовании пока нет. Отправьте запрос через прокси, чтобы увидеть здесь активность.",
649649
"usage.loadError": "Не удалось загрузить данные об использовании.",
650650
"usage.range.all": "Все",
651-
"usage.range.available": "Доступная история",
651+
"usage.range.available":
652+
"usage.range.1d": "Сегодня",
653+
"usage.range.yesterday": "Вчера",
654+
"usage.filterByDate": "Фильтр по дате: {date}",
655+
"usage.clearDateFilter": "Сбросить фильтр по дате", "Доступная история",
652656
"usage.historyTruncated": "Итоги охватывают только доступную историю, поскольку старые данные не загружены.",
653657
"usage.range.30d": "30 дн.",
654658
"usage.range.7d": "7 дн.",

‎gui/src/i18n/zh.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,11 @@ export const zh: Record<TKey, string> = {
642642
"usage.empty": "尚无用量记录。通过代理发送请求后将在此显示。",
643643
"usage.loadError": "无法加载用量数据。",
644644
"usage.range.all": "全部",
645-
"usage.range.available": "可用历史",
645+
"usage.range.available":
646+
"usage.range.1d": "今天",
647+
"usage.range.yesterday": "昨天",
648+
"usage.filterByDate": "按日期筛选: {date}",
649+
"usage.clearDateFilter": "清除日期筛选", "可用历史",
646650
"usage.historyTruncated": "由于未加载较早的使用记录,合计仅涵盖可用历史。",
647651
"usage.range.30d": "30 天",
648652
"usage.range.7d": "7 天",

‎gui/src/pages/Usage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { DataSurfaceSkeleton } from "../components/data-surface";
1010
import { SectionTabs } from "../components/section-tabs";
1111
import { sectionAnchorId } from "../section-anchors";
1212

13-
type Range = "all" | "30d" | "7d";
13+
type Range = "all" | "30d" | "7d" | "yesterday" | "1d";
1414
type UsageSurface = "all" | "codex" | "claude" | "grok";
1515

1616
interface UsageSummaryTotals {
@@ -244,7 +244,7 @@ function UsageFilters({
244244
})}
245245
</div>
246246
<div className="usage-segmented" role="group" aria-label={t("usage.title")}>
247-
{(["all", "30d", "7d"] as Range[]).map(choice => {
247+
{(["all", "30d", "7d", "yesterday", "1d"] as Range[]).map(choice => {
248248
const label = choice === "all" ? t("usage.range.available") : t(`usage.range.${choice}`);
249249
return (
250250
<button

‎src/server/management/logs-usage-routes.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function usageSummaryExpiresAt(
105105
now: number,
106106
): number {
107107
let expiresAt = nextLocalMidnight(now);
108-
const windowMs = range === "7d" ? 7 * USAGE_DAY_MS : range === "30d" ? 30 * USAGE_DAY_MS : null;
108+
const windowMs = range === "1d" ? USAGE_DAY_MS : range === "yesterday" ? 2 * USAGE_DAY_MS : range === "7d" ? 7 * USAGE_DAY_MS : range === "30d" ? 30 * USAGE_DAY_MS : null;
109109
if (windowMs === null) return expiresAt;
110110
for (const entry of entries) {
111111
if (!usageEntryMatchesSurface(entry, surface)) continue;
@@ -116,7 +116,7 @@ function usageSummaryExpiresAt(
116116
}
117117

118118
function refreshedUsageSummary<T extends UsageSummary & { historyTruncated: boolean }>(summary: T, range: UsageRange, now: number): T {
119-
const since = range === "7d" ? now - 7 * USAGE_DAY_MS : range === "30d" ? now - 30 * USAGE_DAY_MS : null;
119+
const since = range === "1d" ? now - USAGE_DAY_MS : range === "yesterday" ? now - 2 * USAGE_DAY_MS : range === "7d" ? now - 7 * USAGE_DAY_MS : range === "30d" ? now - 30 * USAGE_DAY_MS : null;
120120
return { ...summary, since, generatedAt: now };
121121
}
122122

‎src/usage/summary.ts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { usageDisplayTotalTokens } from "./totals";
44
import type { PersistedUsageEntry, UsageStatus } from "./log";
55
import { estimateComboCost, estimateRequestCost, serviceTierContext } from "./cost";
66

7-
export type UsageRange = "7d" | "30d" | "all";
7+
export type UsageRange = "1d" | "yesterday" | "7d" | "30d" | "all";
88
export type UsageSurface = "all" | "codex" | "claude" | "grok";
99

1010
export interface UsageSummaryTotals {
@@ -104,7 +104,9 @@ function retainedBreakdownRows<T>(
104104
}
105105

106106
export function parseRange(input: string | null | undefined): UsageRange {
107-
if (input === "7d" || input === "30d" || input === "all") return input;
107+
if (input === "1d" || input === "today" || input === "yesterday" || input === "7d" || input === "30d" || input === "all") {
108+
return input === "today" ? "1d" : input;
109+
}
108110
return "30d";
109111
}
110112

@@ -113,7 +115,9 @@ export function parseUsageSurface(input: string | null | undefined): UsageSurfac
113115
return "all";
114116
}
115117

116-
function rangeWindow(range: UsageRange, now: number): { since: number | null; days: number } {
118+
function rangeWindow(range: UsageRange, now: number): { since: number | null; until?: number | null; days: number } {
119+
if (range === "1d") return { since: now - DAY_MS, days: 1 };
120+
if (range === "yesterday") return { since: now - 2 * DAY_MS, until: now - DAY_MS, days: 1 };
117121
if (range === "7d") return { since: now - 7 * DAY_MS, days: 7 };
118122
if (range === "30d") return { since: now - 30 * DAY_MS, days: 30 };
119123
return { since: null, days: 0 };
@@ -553,9 +557,10 @@ export function summarizeUsage(
553557
now: number,
554558
surface: UsageSurface = "all",
555559
): UsageSummary {
556-
const { since } = rangeWindow(range, now);
560+
const { since, until } = rangeWindow(range, now);
557561
const filteredEntries = entries.filter(entry => {
558562
if (since !== null && entry.timestamp < since) return false;
563+
if (until !== undefined && until !== null && entry.timestamp >= until) return false;
559564
if (surface === "claude") return entry.surface === "claude" || entry.surface === "claude-desktop";
560565
if (surface === "grok") return entry.surface === "grok";
561566
// Codex = the historical unlabelled bucket. Before the grok tag existed every

‎tests/usage-summary.test.ts‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ function entry(overrides: Partial<PersistedUsageEntry> & { ts: number }): Persis
2323
}
2424

2525
describe("parseRange", () => {
26-
test("accepts 7d / 30d / all", () => {
26+
test("accepts 1d / yesterday / 7d / 30d / all", () => {
27+
expect(parseRange("1d")).toBe("1d");
28+
expect(parseRange("today")).toBe("1d");
29+
expect(parseRange("yesterday")).toBe("yesterday");
2730
expect(parseRange("7d")).toBe("7d");
2831
expect(parseRange("30d")).toBe("30d");
2932
expect(parseRange("all")).toBe("all");
@@ -704,4 +707,22 @@ describe("summarizeUsage", () => {
704707
});
705708
});
706709

710+
711+
test("1d and yesterday ranges filter entries by day window", () => {
712+
const DAY_MS = 86_400_000;
713+
const entries: PersistedUsageEntry[] = [
714+
entry({ ts: FIXED_NOW - 1000, usageStatus: "reported", usage: { inputTokens: 10, outputTokens: 5 }, totalTokens: 15 }),
715+
entry({ ts: FIXED_NOW - (DAY_MS + 1000), usageStatus: "reported", usage: { inputTokens: 20, outputTokens: 10 }, totalTokens: 30 }),
716+
entry({ ts: FIXED_NOW - (3 * DAY_MS), usageStatus: "reported", usage: { inputTokens: 40, outputTokens: 20 }, totalTokens: 60 }),
717+
];
718+
719+
const today = summarizeUsage(entries, "1d", FIXED_NOW);
720+
expect(today.summary.requests).toBe(1);
721+
expect(today.summary.totalTokens).toBe(15);
722+
723+
const yesterday = summarizeUsage(entries, "yesterday", FIXED_NOW);
724+
expect(yesterday.summary.requests).toBe(1);
725+
expect(yesterday.summary.totalTokens).toBe(30);
726+
});
727+
707728
});

0 commit comments

Comments
 (0)