Files
OmniRoute/open-sse/handlers/usageExtractor.ts
ikelvingo f0d976c341 [v3.8.50] fix: passthrough non-standard cache token fields for DeepSeek / MiniMax / Bedrock across streaming, non-streaming, and Dashboard paths (#8591)
* fix(#8171): map DeepSeek prompt_cache_hit_tokens into prompt_tokens_details.cached_tokens

DeepSeek native API returns cache stats in flat top-level fields
(prompt_cache_hit_tokens / prompt_cache_miss_tokens) instead of
the standard prompt_tokens_details.cached_tokens. The usage
sanitizer (sanitizeUsage / sanitizeResponsesUsage) was stripping
these non-standard fields, so clients never received real cache
hit counts even when the upstream served cached responses.

Changes:
- sanitizeUsage(): map prompt_cache_hit_tokens into
  prompt_tokens_details.cached_tokens when the latter is unset
- sanitizeResponsesUsage(): same mapping for input_tokens_details
- filterUsageForFormat(): add prompt_cache_hit_tokens and
  prompt_cache_miss_tokens to the default format allow list
  so they survive field-level filtering

* fix: passthrough non-standard cache token fields for DeepSeek / MiniMax / Bedrock across streaming, non-streaming, and Dashboard paths

* fix(sse): shrink cache-hit token passthrough to fit file-size gate

PR #8591 added a DeepSeek/MiniMax/Bedrock flat cache-hit-token ->
nested prompt_tokens_details.cached_tokens mapping (#8171) that grew
responseSanitizer.ts and stream.ts past their frozen file-size
baselines.

- Extract the chat-completions/Responses-API mapping logic into a new
  leaf module (responseSanitizer/cacheHitTokens.ts).
- Move the streaming-path rebuild into filterUsageForFormat()
  (usageTracking.ts), the single conversion chokepoint both stream.ts
  call sites already used, eliminating the duplicated stream.ts patch
  entirely.
- Rebaseline responseSanitizer.ts by the 2 lines that remain
  irreducible (the mandatory ES import for the extracted helper).

Behavior verified unchanged via the existing response-sanitizer and
stream-handler unit suites.

Co-authored-by: ikelvingo <ikelvingo@users.noreply.github.com>

---------

Co-authored-by: diegosouzapw <diegosouzapw@users.noreply.github.com>
Co-authored-by: ikelvingo <ikelvingo@users.noreply.github.com>
2026-08-11 07:15:08 -03:00

110 lines
4.6 KiB
TypeScript

/**
* Extract usage from non-streaming response body
* Handles different provider response formats
*/
export function extractUsageFromResponse(responseBody, provider) {
if (!responseBody || typeof responseBody !== "object") return null;
const providerId = typeof provider === "string" ? provider.toLowerCase() : "";
const isClaudeProvider =
providerId === "claude" ||
providerId === "anthropic" ||
providerId.startsWith("anthropic-compatible");
// OpenAI format (has prompt_tokens / completion_tokens)
if (
responseBody.usage &&
typeof responseBody.usage === "object" &&
responseBody.usage.prompt_tokens !== undefined
) {
return {
prompt_tokens: responseBody.usage.prompt_tokens || 0,
completion_tokens: responseBody.usage.completion_tokens || 0,
// DeepSeek native API uses flat prompt_cache_hit_tokens (NOT
// prompt_tokens_details.cached_tokens). Fall back to it so V4 cache
// gets surfaced into kanban call_logs alongside the OpenAI/Claude paths.
cached_tokens:
responseBody.usage.prompt_tokens_details?.cached_tokens ??
responseBody.usage.input_tokens_details?.cached_tokens ??
responseBody.usage.prompt_cache_hit_tokens ??
responseBody.usage.cached_tokens ??
responseBody.usage.cache_read_input_tokens,
reasoning_tokens:
responseBody.usage.completion_tokens_details?.reasoning_tokens ??
responseBody.usage.output_tokens_details?.reasoning_tokens ??
responseBody.usage.reasoning_tokens,
// xAI's exact provider-reported cost (port of decolua/9router#2453, capability A —
// @ryanngit). Only set the key when present so non-xAI OpenAI-shaped usage
// (Codex, DeepSeek, etc.) is unaffected. Ticks → USD conversion happens in
// costCalculator.ts, not here.
...(typeof responseBody.usage.cost_in_usd_ticks === "number" &&
Number.isFinite(responseBody.usage.cost_in_usd_ticks) &&
responseBody.usage.cost_in_usd_ticks >= 0
? { cost_in_usd_ticks: responseBody.usage.cost_in_usd_ticks }
: {}),
};
}
// Claude format
if (
isClaudeProvider &&
responseBody.usage &&
typeof responseBody.usage === "object" &&
(responseBody.usage.input_tokens !== undefined ||
responseBody.usage.output_tokens !== undefined)
) {
const inputTokens = responseBody.usage.input_tokens || 0;
const cacheRead = responseBody.usage.cache_read_input_tokens || 0;
const cacheCreation = responseBody.usage.cache_creation_input_tokens || 0;
// Total prompt tokens = input + cache_read + cache_creation (per Claude API docs)
const promptTokens = inputTokens + cacheRead + cacheCreation;
return {
prompt_tokens: promptTokens,
completion_tokens: responseBody.usage.output_tokens || 0,
cache_read_input_tokens: cacheRead,
cache_creation_input_tokens: cacheCreation,
...(typeof responseBody.usage.output_tokens_details?.thinking_tokens === "number"
? { reasoning_tokens: responseBody.usage.output_tokens_details.thinking_tokens }
: {}),
};
}
// OpenAI Responses API format (input_tokens / output_tokens)
const responsesUsage = responseBody.response?.usage || responseBody.usage;
if (
responsesUsage &&
typeof responsesUsage === "object" &&
(responsesUsage.input_tokens !== undefined || responsesUsage.output_tokens !== undefined)
) {
return {
prompt_tokens: responsesUsage.input_tokens || 0,
completion_tokens: responsesUsage.output_tokens || 0,
cache_read_input_tokens: responsesUsage.cache_read_input_tokens,
cached_tokens:
responsesUsage.input_tokens_details?.cached_tokens ??
responsesUsage.prompt_tokens_details?.cached_tokens ??
responsesUsage.cache_read_input_tokens,
cache_creation_input_tokens: responsesUsage.cache_creation_input_tokens,
reasoning_tokens:
responsesUsage.output_tokens_details?.reasoning_tokens ??
responsesUsage.completion_tokens_details?.reasoning_tokens ??
responsesUsage.reasoning_tokens,
};
}
// Gemini format
if (responseBody.usageMetadata && typeof responseBody.usageMetadata === "object") {
// Gemini reports thoughts outside candidates. Fold them into completion so
// every provider keeps reasoning as a subset of completion tokens.
const thoughts = responseBody.usageMetadata.thoughtsTokenCount || 0;
return {
prompt_tokens: responseBody.usageMetadata.promptTokenCount || 0,
completion_tokens: (responseBody.usageMetadata.candidatesTokenCount || 0) + thoughts,
reasoning_tokens: thoughts,
};
}
return null;
}