The open source coding agent.
TypeScript
Zen: adjust cache tokens
Franka03a2b6eab82
diff --git a/packages/console/app/src/routes/zen/util/handler.ts b/packages/console/app/src/routes/zen/util/handler.tsindex 812e7c8d1ce..9dbadf1eef3 100644--- a/packages/console/app/src/routes/zen/util/handler.ts+++ b/packages/console/app/src/routes/zen/util/handler.ts@@ -461,12 +461,17 @@ export async function handler(...modelProvider,...zenData.providers[modelProvider.id],...(() => {- const format = zenData.providers[modelProvider.id].format+ const providerProps = zenData.providers[modelProvider.id]+ const format = providerProps.formatconst providerModel = modelProvider.modelif (format === "anthropic") return anthropicHelper({ reqModel, providerModel })if (format === "google") return googleHelper({ reqModel, providerModel })if (format === "openai") return openaiHelper({ reqModel, providerModel })- return oaCompatHelper({ reqModel, providerModel })+ return oaCompatHelper({+ reqModel,+ providerModel,+ adjustCacheUsage: providerProps.adjustCacheUsage,+ })})(),}}diff --git a/packages/console/app/src/routes/zen/util/provider/openai-compatible.ts b/packages/console/app/src/routes/zen/util/provider/openai-compatible.tsindex ce97a34d9bc..6cb4b6a7536 100644--- a/packages/console/app/src/routes/zen/util/provider/openai-compatible.ts+++ b/packages/console/app/src/routes/zen/util/provider/openai-compatible.ts@@ -21,7 +21,7 @@ type Usage = {}}-export const oaCompatHelper: ProviderHelper = () => ({+export const oaCompatHelper: ProviderHelper = ({ adjustCacheUsage }) => ({format: "oa-compat",modifyUrl: (providerApi: string) => providerApi + "/chat/completions",modifyHeaders: (headers: Headers, body: Record<string, any>, apiKey: string) => {@@ -57,10 +57,15 @@ export const oaCompatHelper: ProviderHelper = () => ({}},normalizeUsage: (usage: Usage) => {- const inputTokens = usage.prompt_tokens ?? 0+ let inputTokens = usage.prompt_tokens ?? 0const outputTokens = usage.completion_tokens ?? 0const reasoningTokens = usage.completion_tokens_details?.reasoning_tokens ?? undefined- const cacheReadTokens = usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? undefined+ let cacheReadTokens = usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? undefined++ if (adjustCacheUsage && !cacheReadTokens) {+ cacheReadTokens = Math.floor(inputTokens * 0.9)+ }+return {inputTokens: inputTokens - (cacheReadTokens ?? 0),outputTokens,diff --git a/packages/console/app/src/routes/zen/util/provider/provider.ts b/packages/console/app/src/routes/zen/util/provider/provider.tsindex 3afabdae90a..64444ec9e9a 100644--- a/packages/console/app/src/routes/zen/util/provider/provider.ts+++ b/packages/console/app/src/routes/zen/util/provider/provider.ts@@ -33,7 +33,7 @@ export type UsageInfo = {cacheWrite1hTokens?: number}-export type ProviderHelper = (input: { reqModel: string; providerModel: string }) => {+export type ProviderHelper = (input: { reqModel: string; providerModel: string; adjustCacheUsage?: boolean }) => {format: ZenData.FormatmodifyUrl: (providerApi: string, isStream?: boolean) => stringmodifyHeaders: (headers: Headers, body: Record<string, any>, apiKey: string) => voiddiff --git a/packages/console/core/src/model.ts b/packages/console/core/src/model.tsindex c47e4a6d83a..6f28dd798e7 100644--- a/packages/console/core/src/model.ts+++ b/packages/console/core/src/model.ts@@ -48,6 +48,7 @@ export namespace ZenData {headerMappings: z.record(z.string(), z.string()).optional(),payloadModifier: z.record(z.string(), z.any()).optional(),payloadMappings: z.record(z.string(), z.string()).optional(),+ adjustCacheUsage: z.boolean().optional(),})const ModelsSchema = z.object({