ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(console): bill google non-stream zen usage (#28829)

Browse source
This commit is contained in:
Jack 2026-05-26 01:07:50 +08:00 • committed by GitHub
commit e1406e05a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 76 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/console/app/src/routes/zen/util/handler.ts
View file

@ -249,8 +249,9 @@ export async function handler(
if (!isStream || [400, 404, 429].includes(res.status)) {
const json = await res.json()
await rateLimiter?.track()
if (json.usage) {
const usageInfo = providerInfo.normalizeUsage(json.usage)
const usage = providerInfo.extractUsage(json)
if (usage) {
const usageInfo = providerInfo.normalizeUsage(usage)
const costInfo = calculateCost(modelInfo, usageInfo)
await trialLimiter?.track(usageInfo)
await modelTpmLimiter?.track(providerInfo.id, providerInfo.model, usageInfo)

1
packages/console/app/src/routes/zen/util/provider/anthropic.ts
View file

@ -175,6 +175,7 @@ export const anthropicHelper: ProviderHelper = ({ reqModel, providerModel }) =>
retrieve: () => usage,
}
},
extractUsage: (response: any) => response.usage,
normalizeUsage: (usage: Usage) => ({
inputTokens: usage.input_tokens ?? 0,
outputTokens: usage.output_tokens ?? 0,

1
packages/console/app/src/routes/zen/util/provider/google.ts
View file

@ -58,6 +58,7 @@ export const googleHelper: ProviderHelper = ({ providerModel }) => ({
retrieve: () => usage,
}
},
extractUsage: (response: any) => response.usageMetadata,
normalizeUsage: (usage: Usage) => {
const inputTokens = usage.promptTokenCount ?? 0
const outputTokens = usage.candidatesTokenCount ?? 0

1
packages/console/app/src/routes/zen/util/provider/openai-compatible.ts
View file

@ -58,6 +58,7 @@ export const oaCompatHelper: ProviderHelper = ({ adjustCacheUsage }) => ({
retrieve: () => usage,
}
},
extractUsage: (response: any) => response.usage,
normalizeUsage: (usage: Usage) => {
let inputTokens = usage.prompt_tokens ?? 0
const outputTokens = usage.completion_tokens ?? 0

1
packages/console/app/src/routes/zen/util/provider/openai.ts
View file

@ -43,6 +43,7 @@ export const openaiHelper: ProviderHelper = ({ workspaceID }) => ({
retrieve: () => usage,
}
},
extractUsage: (response: any) => response.usage ?? response.response?.usage,
normalizeUsage: (usage: Usage) => {
const inputTokens = usage.input_tokens ?? 0
const outputTokens = usage.output_tokens ?? 0

1
packages/console/app/src/routes/zen/util/provider/provider.ts
View file

@ -49,6 +49,7 @@ export type ProviderHelper = (input: {
parse: (chunk: string) => void
retrieve: () => any
}
extractUsage: (response: any) => any
normalizeUsage: (usage: any) => UsageInfo
}