Skip to content

Improve reporting of token counts in UsageDetails #70

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

Merged
sd-st merged 3 commits into from
Dec 11, 2025
Merged

Improve reporting of token counts in UsageDetails #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
577d4eb
Improve reporting of token counts in UsageDetails
stephentoub Dec 10, 2025
962fa72
lint
stephentoub Dec 10, 2025
5a26c78
lint take 2
stephentoub Dec 11, 2025
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
6 changes: 4 additions & 2 deletions src/Anthropic.Tests/AnthropicClientExtensionsTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,8 +1290,9 @@ public async Task GetResponseAsync_WithCacheCreationTokens()
Assert.NotNull(response);

Assert.NotNull(response.Usage);
Assert.Equal(100, response.Usage.InputTokenCount);
Assert.Equal(175, response.Usage.InputTokenCount);
Assert.Equal(10, response.Usage.OutputTokenCount);
Assert.Equal(185, response.Usage.TotalTokenCount);
Assert.NotNull(response.Usage.AdditionalCounts);
Assert.Equal(50L, response.Usage.AdditionalCounts["CacheCreationInputTokens"]);
Assert.Equal(25L, response.Usage.AdditionalCounts["CacheReadInputTokens"]);
Expand Down Expand Up @@ -2490,8 +2491,9 @@ public async Task GetResponseAsync_WithAdditionalUsageCounts()
Assert.NotNull(response);

Assert.NotNull(response.Usage);
Assert.Equal(100, response.Usage.InputTokenCount);
Assert.Equal(175, response.Usage.InputTokenCount);
Assert.Equal(20, response.Usage.OutputTokenCount);
Assert.Equal(195, response.Usage.OutputTokenCount);
Assert.NotNull(response.Usage.AdditionalCounts);
Assert.Equal(50L, response.Usage.AdditionalCounts["CacheCreationInputTokens"]);
Assert.Equal(25L, response.Usage.AdditionalCounts["CacheReadInputTokens"]);
Expand Down
40 changes: 30 additions & 10 deletions src/Anthropic/AnthropicClientExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,47 +905,67 @@ private static UsageDetails ToUsageDetails(Usage usage) =>
usage.InputTokens,
usage.OutputTokens,
usage.CacheCreationInputTokens,
usage.CacheReadInputTokens
usage.CacheReadInputTokens,
usage.ServerToolUse
);

private static UsageDetails ToUsageDetails(MessageDeltaUsage usage) =>
ToUsageDetails(
usage.InputTokens,
usage.OutputTokens,
usage.CacheCreationInputTokens,
usage.CacheReadInputTokens
usage.CacheReadInputTokens,
usage.ServerToolUse
);

private static UsageDetails ToUsageDetails(
long? inputTokens,
long? outputTokens,
long? cacheCreationInputTokens,
long? cacheReadInputTokens
long? cacheReadInputTokens,
ServerToolUsage? serverToolUsage
)
{
UsageDetails usageDetails = new()
{
InputTokenCount = inputTokens,
// From https://platform.claude.com/docs/en/build-with-claude/prompt-caching:
// "To calculate total input tokens:"
// "total_input_tokens = cache_read_input_tokens + cache_creation_input_tokens + input_tokens"
InputTokenCount = NullableSum(
NullableSum(cacheReadInputTokens, cacheCreationInputTokens),
inputTokens
),

OutputTokenCount = outputTokens,
TotalTokenCount =
(inputTokens is not null || outputTokens is not null)
? (inputTokens ?? 0) + (outputTokens ?? 0)
: null,
};

if (cacheCreationInputTokens is not null)
usageDetails.TotalTokenCount = NullableSum(
usageDetails.InputTokenCount,
usageDetails.OutputTokenCount
);

if (cacheCreationInputTokens is > 0)
{
(usageDetails.AdditionalCounts ??= [])[nameof(Usage.CacheCreationInputTokens)] =
cacheCreationInputTokens.Value;
}

if (cacheReadInputTokens is not null)
if (cacheReadInputTokens is > 0)
{
(usageDetails.AdditionalCounts ??= [])[nameof(Usage.CacheReadInputTokens)] =
cacheReadInputTokens.Value;
}

if (serverToolUsage?.WebSearchRequests is > 0)
{
(usageDetails.AdditionalCounts ??= [])[nameof(ServerToolUsage.WebSearchRequests)] =
serverToolUsage.WebSearchRequests;
}

return usageDetails;

static long? NullableSum(long? a, long? b) =>
a is not null || b is not null ? (a ?? 0) + (b ?? 0) : null;
}

private static ChatFinishReason? ToFinishReason(ApiEnum<string, StopReason>? stopReason) =>
Expand Down
48 changes: 38 additions & 10 deletions src/Anthropic/Services/Beta/Messages/AnthropicBetaClientExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,47 +1153,75 @@ private static UsageDetails ToUsageDetails(BetaUsage usage) =>
usage.InputTokens,
usage.OutputTokens,
usage.CacheCreationInputTokens,
usage.CacheReadInputTokens
usage.CacheReadInputTokens,
usage.ServerToolUse
);

private static UsageDetails ToUsageDetails(BetaMessageDeltaUsage usage) =>
ToUsageDetails(
usage.InputTokens,
usage.OutputTokens,
usage.CacheCreationInputTokens,
usage.CacheReadInputTokens
usage.CacheReadInputTokens,
usage.ServerToolUse
);

private static UsageDetails ToUsageDetails(
long? inputTokens,
long? outputTokens,
long? cacheCreationInputTokens,
long? cacheReadInputTokens
long? cacheReadInputTokens,
BetaServerToolUsage? serverToolUsage
)
{
UsageDetails usageDetails = new()
{
InputTokenCount = inputTokens,
// From https://platform.claude.com/docs/en/build-with-claude/prompt-caching:
// "To calculate total input tokens:"
// "total_input_tokens = cache_read_input_tokens + cache_creation_input_tokens + input_tokens"
InputTokenCount = NullableSum(
NullableSum(cacheReadInputTokens, cacheCreationInputTokens),
inputTokens
),

OutputTokenCount = outputTokens,
TotalTokenCount =
(inputTokens is not null || outputTokens is not null)
? (inputTokens ?? 0) + (outputTokens ?? 0)
: null,
};

if (cacheCreationInputTokens is not null)
usageDetails.TotalTokenCount = NullableSum(
usageDetails.InputTokenCount,
usageDetails.OutputTokenCount
);

if (cacheCreationInputTokens is > 0)
{
(usageDetails.AdditionalCounts ??= [])[nameof(BetaUsage.CacheCreationInputTokens)] =
cacheCreationInputTokens.Value;
}

if (cacheReadInputTokens is not null)
if (cacheReadInputTokens is > 0)
{
(usageDetails.AdditionalCounts ??= [])[nameof(BetaUsage.CacheReadInputTokens)] =
cacheReadInputTokens.Value;
}

if (serverToolUsage?.WebFetchRequests is > 0)
{
(usageDetails.AdditionalCounts ??= [])[
nameof(BetaServerToolUsage.WebFetchRequests)
] = serverToolUsage.WebFetchRequests;
}

if (serverToolUsage?.WebSearchRequests is > 0)
{
(usageDetails.AdditionalCounts ??= [])[
nameof(BetaServerToolUsage.WebSearchRequests)
] = serverToolUsage.WebSearchRequests;
}

return usageDetails;

static long? NullableSum(long? a, long? b) =>
a is not null || b is not null ? (a ?? 0) + (b ?? 0) : null;
}

private static ChatFinishReason? ToFinishReason(
Expand Down
Loading