Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy
Rust
improve count_tokens estimation
Raine Virta7c82476f5b58
diff --git a/src/count-tokens.ts b/src/count-tokens.tsindex ef8df5f..db0c5d0 100644--- a/src/count-tokens.ts+++ b/src/count-tokens.ts@@ -3,6 +3,8 @@ import type { AnthropicRequest } from "./anthropic/schema.ts"import type { ResponsesRequest } from "./translate/request.ts"import { buildInstructions, normalizeContent, toolResultToString } from "./translate/request.ts"+const IMAGE_TOKEN_ESTIMATE = 2000+export function countTokens(req: AnthropicRequest): number {let total = 0const instructions = buildInstructions(req.system)@@ -14,8 +16,7 @@ export function countTokens(req: AnthropicRequest): number {if (block.type === "text") {total += encode(block.text).length} else if (block.type === "image") {- const value = block.source.type === "url" ? block.source.url : `data:${block.source.media_type};base64,${block.source.data}`- total += encode(value).length+ total += IMAGE_TOKEN_ESTIMATE} else if (block.type === "tool_use") {total += encode(block.name).lengthtotal += encode(JSON.stringify(block.input ?? {})).length@@ -35,7 +36,9 @@ export function countTokens(req: AnthropicRequest): number {return total}-export function countTranslatedTokens(req: Pick<ResponsesRequest, "instructions" | "input" | "tools">): number {+export function countTranslatedTokens(+ req: Pick<ResponsesRequest, "instructions" | "input" | "tools" | "text" | "tool_choice">,+): number {let total = 0if (req.instructions) total += encode(req.instructions).length@@ -45,7 +48,7 @@ export function countTranslatedTokens(req: Pick<ResponsesRequest, "instructions"if (part.type === "input_text" || part.type === "output_text") {total += encode(part.text).length} else if (part.type === "input_image") {- total += encode(part.image_url).length+ total += IMAGE_TOKEN_ESTIMATE}}} else if (item.type === "function_call") {@@ -64,6 +67,18 @@ export function countTranslatedTokens(req: Pick<ResponsesRequest, "instructions"total += encode(JSON.stringify(tool.parameters ?? {})).length}+ if (req.text?.format?.type === "json_schema") {+ total += encode(req.text.format.name).length+ total += encode(JSON.stringify(req.text.format.schema)).length+ }++ if (typeof req.tool_choice === "string") {+ total += encode(req.tool_choice).length+ } else if (req.tool_choice?.type === "function") {+ total += encode(req.tool_choice.type).length+ total += encode(req.tool_choice.name).length+ }+total += req.input.length * 4return total}diff --git a/src/server.ts b/src/server.tsindex b0e0e07..c0312ec 100644--- a/src/server.ts+++ b/src/server.ts@@ -89,7 +89,9 @@ async function route(req: Request, url: URL, reqId: string): Promise<Response> {if (req.method === "POST" && url.pathname === "/v1/messages/count_tokens") {const body = (await req.json()) as AnthropicRequest- const tokens = countTokens(body)+ const resolvedModel = resolveModel(body.model)+ const translated = translateRequest({ ...body, model: resolvedModel })+ const tokens = countTranslatedTokens(translated)const sessionId = req.headers.get("x-claude-code-session-id") || undefinedconst { state, sessionSeq } = nextSessionTimeline(sessionId)const messageCount = body.messages?.length ?? 0@@ -112,6 +114,7 @@ async function route(req: Request, url: URL, reqId: string): Promise<Response> {sessionId,sessionSeq,model: body.model,+ resolvedModel,tokens,messageCount,toolCount,