oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1509 from QuantumNous/responses-input-cache-token

Browse Source 
fix: responses cache token 未计费
This commit is contained in:
Calcium-Ion
2025-08-06 11:22:14 +08:00
committed by GitHub
parent 306a1a3f57 a746309a8e
commit 7370b4fbcd
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
relay/channel/openai/relay_responses.go
View File

@@ -37,9 +37,14 @@ func OaiResponsesHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http
// compute usage // compute usage
usage := dto.Usage{} usage := dto.Usage{}
usage.PromptTokens = responsesResponse.Usage.InputTokens if responsesResponse.Usage != nil {
usage.CompletionTokens = responsesResponse.Usage.OutputTokens usage.PromptTokens = responsesResponse.Usage.InputTokens
usage.TotalTokens = responsesResponse.Usage.TotalTokens usage.CompletionTokens = responsesResponse.Usage.OutputTokens
usage.TotalTokens = responsesResponse.Usage.TotalTokens
if responsesResponse.Usage.InputTokensDetails != nil {
usage.PromptTokensDetails.CachedTokens = responsesResponse.Usage.InputTokensDetails.CachedTokens
}
}
// 解析 Tools 用量 // 解析 Tools 用量
for _, tool := range responsesResponse.Tools { for _, tool := range responsesResponse.Tools {
info.ResponsesUsageInfo.BuiltInTools[common.Interface2String(tool["type"])].CallCount++ info.ResponsesUsageInfo.BuiltInTools[common.Interface2String(tool["type"])].CallCount++
@@ -64,9 +69,14 @@ func OaiResponsesStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp
sendResponsesStreamData(c, streamResponse, data) sendResponsesStreamData(c, streamResponse, data)
switch streamResponse.Type { switch streamResponse.Type {
case "response.completed": case "response.completed":
usage.PromptTokens = streamResponse.Response.Usage.InputTokens if streamResponse.Response.Usage != nil {
usage.CompletionTokens = streamResponse.Response.Usage.OutputTokens usage.PromptTokens = streamResponse.Response.Usage.InputTokens
usage.TotalTokens = streamResponse.Response.Usage.TotalTokens usage.CompletionTokens = streamResponse.Response.Usage.OutputTokens
usage.TotalTokens = streamResponse.Response.Usage.TotalTokens
if streamResponse.Response.Usage.InputTokensDetails != nil {
usage.PromptTokensDetails.CachedTokens = streamResponse.Response.Usage.InputTokensDetails.CachedTokens
}
}
case "response.output_text.delta": case "response.output_text.delta":
// 处理输出文本 // 处理输出文本
responseTextBuilder.WriteString(streamResponse.Delta) responseTextBuilder.WriteString(streamResponse.Delta)

10
web/src/helpers/render.js
View File

@@ -1156,6 +1156,7 @@ export function renderLogContent(
modelPrice = -1, modelPrice = -1,
groupRatio, groupRatio,
user_group_ratio, user_group_ratio,
cacheRatio = 1.0,
image = false, image = false,
imageRatio = 1.0, imageRatio = 1.0,
webSearch = false, webSearch = false,
@@ -1174,9 +1175,10 @@ export function renderLogContent(
} else { } else {
if (image) { if (image) {
return i18next.t( return i18next.t(
'模型倍率 {{modelRatio}}，输出倍率 {{completionRatio}}，图片输入倍率 {{imageRatio}}，{{ratioType}} {{ratio}}', '模型倍率 {{modelRatio}}，缓存倍率 {{cacheRatio}}，输出倍率 {{completionRatio}}，图片输入倍率 {{imageRatio}}，{{ratioType}} {{ratio}}',
{ {
modelRatio: modelRatio, modelRatio: modelRatio,
cacheRatio: cacheRatio,
completionRatio: completionRatio, completionRatio: completionRatio,
imageRatio: imageRatio, imageRatio: imageRatio,
ratioType: ratioLabel, ratioType: ratioLabel,
@@ -1185,9 +1187,10 @@ export function renderLogContent(
); );
} else if (webSearch) { } else if (webSearch) {
return i18next.t( return i18next.t(
'模型倍率 {{modelRatio}}，输出倍率 {{completionRatio}}，{{ratioType}} {{ratio}}，Web 搜索调用 {{webSearchCallCount}} 次', '模型倍率 {{modelRatio}}，缓存倍率 {{cacheRatio}}，输出倍率 {{completionRatio}}，{{ratioType}} {{ratio}}，Web 搜索调用 {{webSearchCallCount}} 次',
{ {
modelRatio: modelRatio, modelRatio: modelRatio,
cacheRatio: cacheRatio,
completionRatio: completionRatio, completionRatio: completionRatio,
ratioType: ratioLabel, ratioType: ratioLabel,
ratio, ratio,
@@ -1196,9 +1199,10 @@ export function renderLogContent(
); );
} else { } else {
return i18next.t( return i18next.t(
'模型倍率 {{modelRatio}}，输出倍率 {{completionRatio}}，{{ratioType}} {{ratio}}', '模型倍率 {{modelRatio}}，缓存倍率 {{cacheRatio}}，输出倍率 {{completionRatio}}，{{ratioType}} {{ratio}}',
{ {
modelRatio: modelRatio, modelRatio: modelRatio,
cacheRatio: cacheRatio,
completionRatio: completionRatio, completionRatio: completionRatio,
ratioType: ratioLabel, ratioType: ratioLabel,
ratio, ratio,

1
web/src/hooks/usage-logs/useUsageLogsData.js
View File

@@ -366,6 +366,7 @@ export const useLogsData = () => {
other.model_price, other.model_price,
other.group_ratio, other.group_ratio,
other?.user_group_ratio, other?.user_group_ratio,
other.cache_ratio || 1.0,
false, false,
1.0, 1.0,
other.web_search || false, other.web_search || false,