fix(gateway): fall back to lastCallUsage on /v1/chat/comp...

Recent Commits to openclaw:main

RenzoMXD · 2026-04-25 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,12 @@`
`1`	`1`	`import { randomUUID } from "node:crypto";`
`2`	`2`	`import type { IncomingMessage, ServerResponse } from "node:http";`
`3`	`3`	`import type { ImageContent } from "../agents/command/types.js";`
`4`		`-import { normalizeUsage, toOpenAiChatCompletionsUsage } from "../agents/usage.js";`
	`4`	`+import {`
	`5`	`+hasNonzeroUsage,`
	`6`	`+normalizeUsage,`
	`7`	`+toOpenAiChatCompletionsUsage,`
	`8`	`+type NormalizedUsage,`
	`9`	`+} from "../agents/usage.js";`
`5`	`10`	`import { createDefaultDeps } from "../cli/deps.js";`
`6`	`11`	`import { agentCommandFromIngress } from "../commands/agent.js";`
`7`	`12`	`import type { GatewayHttpChatCompletionsConfig } from "../config/types.gateway.js";`
`@@ -369,6 +374,7 @@ async function resolveImagesForRequest(`
`369`	`374`	`export const __testOnlyOpenAiHttp = {`
`370`	`375`	`resolveImagesForRequest,`
`371`	`376`	`resolveOpenAiChatCompletionsLimits,`
	`377`	`+ resolveChatCompletionUsage,`
`372`	`378`	`};`
`373`	`379`
`374`	`380`	`function buildAgentPrompt(`
`@@ -466,24 +472,34 @@ type AgentUsageMeta = {`
`466`	`472`	`total?: number;`
`467`	`473`	`};`
`468`	`474`
`469`		`-function resolveRawAgentUsage(result: unknown): AgentUsageMeta \| undefined {`
`470`		`-return (`
	`475`	`+function resolveAgentRunUsage(result: unknown): NormalizedUsage \| undefined {`
	`476`	`+const agentMeta = (`
`471`	`477`	`result as {`
`472`	`478`	`meta?: {`
`473`	`479`	`agentMeta?: {`
`474`	`480`	`usage?: AgentUsageMeta;`
	`481`	`+lastCallUsage?: AgentUsageMeta;`
`475`	`482`	`};`
`476`	`483`	`};`
`477`	`484`	`} \| null`
`478`		`-)?.meta?.agentMeta?.usage;`
	`485`	`+)?.meta?.agentMeta;`
	`486`	`+const primary = normalizeUsage(agentMeta?.usage);`
	`487`	`+if (hasNonzeroUsage(primary)) {`
	`488`	`+return primary;`
	`489`	`+}`
	`490`	`+const fallback = normalizeUsage(agentMeta?.lastCallUsage);`
	`491`	`+if (hasNonzeroUsage(fallback)) {`
	`492`	`+return fallback;`
	`493`	`+}`
	`494`	`+return primary ?? fallback;`
`479`	`495`	`}`
`480`	`496`
`481`	`497`	`function resolveChatCompletionUsage(result: unknown): {`
`482`	`498`	`prompt_tokens: number;`
`483`	`499`	`completion_tokens: number;`
`484`	`500`	`total_tokens: number;`
`485`	`501`	`} {`
`486`		`-return toOpenAiChatCompletionsUsage(normalizeUsage(resolveRawAgentUsage(result)));`
	`502`	`+return toOpenAiChatCompletionsUsage(resolveAgentRunUsage(result));`
`487`	`503`	`}`
`488`	`504`
`489`	`505`	`function resolveIncludeUsageForStreaming(payload: OpenAiChatCompletionRequest): boolean {`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,78 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { __testOnlyOpenAiHttp } from "./openai-http.js";`
	`3`	`+`
	`4`	`+const { resolveChatCompletionUsage } = __testOnlyOpenAiHttp;`
	`5`	`+`
	`6`	`+describe("resolveChatCompletionUsage", () => {`
	`7`	`+it("maps agentMeta.usage to OpenAI prompt/completion/total fields", () => {`
	`8`	`+const result = {`
	`9`	`+meta: {`
	`10`	`+agentMeta: {`
	`11`	`+usage: { input: 120, output: 42, cacheRead: 10, total: 172 },`
	`12`	`+},`
	`13`	`+},`
	`14`	`+};`
	`15`	`+`
	`16`	`+expect(resolveChatCompletionUsage(result)).toEqual({`
	`17`	`+prompt_tokens: 130,`
	`18`	`+completion_tokens: 42,`
	`19`	`+total_tokens: 172,`
	`20`	`+});`
	`21`	`+});`
	`22`	`+`
	`23`	`+it("falls back to agentMeta.lastCallUsage when agentMeta.usage is missing", () => {`
	`24`	`+const result = {`
	`25`	`+meta: {`
	`26`	`+agentMeta: {`
	`27`	`+lastCallUsage: { input: 80, output: 20, total: 100 },`
	`28`	`+},`
	`29`	`+},`
	`30`	`+};`
	`31`	`+`
	`32`	`+expect(resolveChatCompletionUsage(result)).toEqual({`
	`33`	`+prompt_tokens: 80,`
	`34`	`+completion_tokens: 20,`
	`35`	`+total_tokens: 100,`
	`36`	`+});`
	`37`	`+});`
	`38`	`+`
	`39`	`+it("falls back to agentMeta.lastCallUsage when agentMeta.usage is all zero", () => {`
	`40`	`+const result = {`
	`41`	`+meta: {`
	`42`	`+agentMeta: {`
	`43`	`+usage: { input: 0, output: 0, total: 0 },`
	`44`	`+lastCallUsage: { input: 55, output: 7, total: 62 },`
	`45`	`+},`
	`46`	`+},`
	`47`	`+};`
	`48`	`+`
	`49`	`+expect(resolveChatCompletionUsage(result)).toEqual({`
	`50`	`+prompt_tokens: 55,`
	`51`	`+completion_tokens: 7,`
	`52`	`+total_tokens: 62,`
	`53`	`+});`
	`54`	`+});`
	`55`	`+`
	`56`	`+it("returns zeros when both agentMeta.usage and lastCallUsage are absent", () => {`
	`57`	`+const result = { meta: { agentMeta: {} } };`
	`58`	`+`
	`59`	`+expect(resolveChatCompletionUsage(result)).toEqual({`
	`60`	`+prompt_tokens: 0,`
	`61`	`+completion_tokens: 0,`
	`62`	`+total_tokens: 0,`
	`63`	`+});`
	`64`	`+});`
	`65`	`+`
	`66`	`+it("returns zeros when the result has no meta at all", () => {`
	`67`	`+expect(resolveChatCompletionUsage({})).toEqual({`
	`68`	`+prompt_tokens: 0,`
	`69`	`+completion_tokens: 0,`
	`70`	`+total_tokens: 0,`
	`71`	`+});`
	`72`	`+expect(resolveChatCompletionUsage(null)).toEqual({`
	`73`	`+prompt_tokens: 0,`
	`74`	`+completion_tokens: 0,`
	`75`	`+total_tokens: 0,`
	`76`	`+});`
	`77`	`+});`
	`78`	`+});`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main