Skip to content

fix(usage): sum cache reads across attempts that report different fields #7337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vadymhimself wants to merge 1 commit into from
+19 −1
Closed

fix(usage): sum cache reads across attempts that report different fields #7337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/server/request-log.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,10 @@ export function aggregateAttemptUsage(
return present.length > 0 ? present.reduce((sum, value) => sum + value, 0) : undefined;
};
const cachedInputTokens = sumOptional("cachedInputTokens");
const cacheReadInputTokens = sumOptional("cacheReadInputTokens");
// Readers take `cacheReadInputTokens ?? cachedInputTokens` (usage/cost.ts), so once any attempt
// reports the read field, an attempt that only reports `cachedInputTokens` must count in it too.
const cacheReadInputTokens = sumOptional("cacheReadInputTokens") === undefined ? undefined
: usages.reduce((sum, usage) => sum + (usage.cacheReadInputTokens ?? usage.cachedInputTokens ?? 0), 0);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
const providerCredits = sumOptional("providerCredits");
Expand Down
15 changes: 15 additions & 0 deletions tests/usage/request-log-attempt-identity.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,19 @@ describe("request log attempt identity", () => {
},
});
});

test("cache reads sum across attempts that report them under different fields", () => {
// An Anthropic leg reports both fields; an OpenAI-shaped leg only cachedInputTokens.
const anthropic = beginRequestAttempt(1, "anthropic", "model-a", "anthropic");
noteAttemptSend(anthropic, undefined);
finishRequestAttempt(anthropic, 502, 1, { inputTokens: 100, outputTokens: 0, cachedInputTokens: 60, cacheReadInputTokens: 60 });
const openai = beginRequestAttempt(2, "openai", "model-b", "openai-chat");
noteAttemptSend(openai, undefined);
finishRequestAttempt(openai, 200, 1, { inputTokens: 100, outputTokens: 5, cachedInputTokens: 40 });

expect(aggregateAttemptUsage([anthropic, openai]).usage).toMatchObject({
cachedInputTokens: 100,
cacheReadInputTokens: 100,
});
});
});
Loading