Skip to content

fix: correct token extraction for Claude non-streaming responses #131

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
decolua merged 1 commit into from
Feb 20, 2026
Merged

fix: correct token extraction for Claude non-streaming responses #131

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
33 changes: 22 additions & 11 deletions open-sse/handlers/chatCore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,18 @@ function translateNonStreamingResponse(responseBody, targetFormat, sourceFormat)
function extractUsageFromResponse(responseBody, provider) {
if (!responseBody || typeof responseBody !== 'object') return null;

// Claude format - check first to avoid conflict with OpenAI check
if (responseBody.usage && typeof responseBody.usage === 'object' && responseBody.usage.input_tokens !== undefined) {
return {
prompt_tokens: responseBody.usage.input_tokens || 0,
completion_tokens: responseBody.usage.output_tokens || 0,
cache_read_input_tokens: responseBody.usage.cache_read_input_tokens,
cache_creation_input_tokens: responseBody.usage.cache_creation_input_tokens
};
}

// OpenAI format
if (responseBody.usage && typeof responseBody.usage === 'object') {
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,
Expand All @@ -204,16 +214,6 @@ function extractUsageFromResponse(responseBody, provider) {
};
}

// Claude format
if (responseBody.usage && typeof responseBody.usage === 'object' && (responseBody.usage.input_tokens !== undefined || responseBody.usage.output_tokens !== undefined)) {
return {
prompt_tokens: responseBody.usage.input_tokens || 0,
completion_tokens: responseBody.usage.output_tokens || 0,
cache_read_input_tokens: responseBody.usage.cache_read_input_tokens,
cache_creation_input_tokens: responseBody.usage.cache_creation_input_tokens
};
}

// Gemini format
if (responseBody.usageMetadata && typeof responseBody.usageMetadata === 'object') {
return {
Expand Down Expand Up @@ -723,6 +723,14 @@ export async function handleChatCore({ body, modelInfo, credentials, log, onCred
}
}

// Log provider response (raw response from provider)
reqLogger.logProviderResponse(
providerResponse.status,
providerResponse.statusText,
providerResponse.headers,
responseBody
);

// Notify success - caller can clear error status if needed
if (onRequestSuccess) {
await onRequestSuccess();
Expand Down Expand Up @@ -758,6 +766,9 @@ export async function handleChatCore({ body, modelInfo, credentials, log, onCred
translatedResponse.usage = filterUsageForFormat(buffered, sourceFormat);
}

// Log converted response (final response to client)
reqLogger.logConvertedResponse(translatedResponse);

const totalLatency = Date.now() - requestStartTime;
const requestDetail = {
provider: provider || "unknown",
Expand Down