scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-04 02:31:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 70

fix(ui): include current UTC day in usage activity requests

Browse source
This commit is contained in:
Alex Zhang 2026-09-15 20:02:30 -07:00
parent d108cdc431
commit fd7e5daede
3 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsagePageView.test.tsx
View file

@ -915,7 +915,7 @@ describe("UsagePage", () => {
expect(screen.getByText("UniqueUser (user-unique)")).toBeInTheDocument();
});
it("should pass selected userId to aggregated call", async () => {
it("should include the current UTC day in global usage", async () => {
renderWithProviders(<UsagePage {...defaultProps} />);
await waitFor(() => {
@ -928,6 +928,7 @@ describe("UsagePage", () => {
expect.any(Date),
expect.any(Date),
null,
true,
);
});
});
@ -1020,6 +1021,7 @@ describe("UsagePage", () => {
expect.any(Date),
expect.any(Date),
"user-123",
true,
);
});
});
@ -1133,10 +1135,24 @@ describe("UsagePage", () => {
});
// Verify first page call
expect(mockUserDailyActivityCall).toHaveBeenCalledWith("test-token", expect.any(Date), expect.any(Date), 1, null);
expect(mockUserDailyActivityCall).toHaveBeenCalledWith(
"test-token",
expect.any(Date),
expect.any(Date),
1,
null,
true,
);
// Verify second page call
expect(mockUserDailyActivityCall).toHaveBeenCalledWith("test-token", expect.any(Date), expect.any(Date), 2, null);
expect(mockUserDailyActivityCall).toHaveBeenCalledWith(
"test-token",
expect.any(Date),
expect.any(Date),
2,
null,
true,
);
});
});

4
ui/litellm-dashboard/src/app/(dashboard)/usage/_components/components/UsagePageView.tsx
View file

@ -192,7 +192,7 @@ const UsagePage: React.FC<UsagePageProps> = ({ teams, organizations }) => {
const rangeKey = currentAggregatedRangeKey;
setAggregatedLoading(true);
userDailyActivityAggregatedCall(accessToken, startTime, endTime, effectiveUserId)
userDailyActivityAggregatedCall(accessToken, startTime, endTime, effectiveUserId, true)
.then((data) => {
if (aggregatedFetchIdRef.current !== fetchId) return;
setAggregatedData({ rangeKey, value: data });
@ -237,7 +237,7 @@ const UsagePage: React.FC<UsagePageProps> = ({ teams, organizations }) => {
// Paginated fallback — only enabled when aggregated endpoint fails
const paginatedResult = usePaginatedDailyActivity({
fetchFn: userDailyActivityCall,
args: [accessToken, startTime, endTime, effectiveUserId],
args: [accessToken, startTime, endTime, effectiveUserId, true],
enabled: aggregatedFailed && !!accessToken && !!startTime && !!endTime,
});

29
ui/litellm-dashboard/src/components/networking.test.ts
View file

@ -738,11 +738,12 @@ describe("daily activity api_key filter", () => {
const originalFetch = global.fetch;
const captureFetch = () => {
const mockFetch = vi.fn<typeof fetch>().mockResolvedValue(
new Response(JSON.stringify({ results: [], metadata: {} }), {
status: 200,
headers: { "Content-Type": "application/json" },
}),
const mockFetch = vi.fn<typeof fetch>().mockImplementation(
async () =>
new Response(JSON.stringify({ results: [], metadata: {} }), {
status: 200,
headers: { "Content-Type": "application/json" },
}),
);
global.fetch = mockFetch;
return mockFetch;
@ -757,6 +758,24 @@ describe("daily activity api_key filter", () => {
global.fetch = originalFetch;
});
it.each([false, true])(
"serializes the current UTC day opt-in (%s) on both user activity routes",
async (includeCurrentUtcDay) => {
const mockFetch = captureFetch();
await Networking.userDailyActivityCall("sk-key", start, end, 1, "user-123", includeCurrentUtcDay);
await Networking.userDailyActivityAggregatedCall("sk-key", start, end, "user-123", includeCurrentUtcDay);
expect(mockFetch).toHaveBeenCalledTimes(2);
for (const [input] of mockFetch.mock.calls) {
const url = new URL(String(input), "http://localhost");
expect(url.searchParams.get("include_current_utc_day")).toBe(includeCurrentUtcDay ? "true" : null);
expect(url.searchParams.get("user_id")).toBe("user-123");
expect(url.searchParams.get("timezone")).toBe(String(new Date().getTimezoneOffset()));
}
},
);
it("sends the key hash as api_key from the paginated caller", async () => {
const mockFetch = captureFetch();