github/claude-relay-service
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/claude-relay-service.git synced 2026-01-22 16:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复openai-respons计费问题

Browse Source
This commit is contained in:
shaw
2025-09-25 11:31:30 +08:00
parent 6167cff451
commit ad672c3c4c
1 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/services/openaiResponsesRelayService.js
View File

@@ -7,6 +7,32 @@ const unifiedOpenAIScheduler = require('./unifiedOpenAIScheduler')
const config = require('../../config/config')
const crypto = require('crypto')
// 抽取缓存写入 token，兼容多种字段命名
function extractCacheCreationTokens(usageData) {
if (!usageData || typeof usageData !== 'object') {
return 0
}
const details = usageData.input_tokens_details || usageData.prompt_tokens_details || {}
const candidates = [
details.cache_creation_input_tokens,
details.cache_creation_tokens,
usageData.cache_creation_input_tokens,
usageData.cache_creation_tokens
]
for (const value of candidates) {
if (value !== undefined && value !== null && value !== '') {
const parsed = Number(value)
if (!Number.isNaN(parsed)) {
return parsed
}
}
}
return 0
}
class OpenAIResponsesRelayService {
constructor() {
this.defaultTimeout = config.requestTimeout || 600000
@@ -496,24 +522,26 @@ class OpenAIResponsesRelayService {
// 提取缓存相关的 tokens（如果存在）
const cacheReadTokens = usageData.input_tokens_details?.cached_tokens || 0
const cacheCreateTokens = extractCacheCreationTokens(usageData)
// 计算实际输入token（总输入减去缓存部分）
const actualInputTokens = Math.max(0, totalInputTokens - cacheReadTokens)
const totalTokens = usageData.total_tokens || totalInputTokens + outputTokens
const totalTokens =
usageData.total_tokens || totalInputTokens + outputTokens + cacheCreateTokens
const modelToRecord = actualModel || requestedModel || 'gpt-4'
await apiKeyService.recordUsage(
apiKeyData.id,
actualInputTokens, // 传递实际输入（不含缓存）
outputTokens,
0, // OpenAI没有cache_creation_tokens
cacheCreateTokens,
cacheReadTokens,
modelToRecord,
account.id
)
logger.info(
`📊 Recorded usage - Input: ${totalInputTokens}(actual:${actualInputTokens}+cached:${cacheReadTokens}), Output: ${outputTokens}, Total: ${totalTokens}, Model: ${modelToRecord}`
`📊 Recorded usage - Input: ${totalInputTokens}(actual:${actualInputTokens}+cached:${cacheReadTokens}), CacheCreate: ${cacheCreateTokens}, Output: ${outputTokens}, Total: ${totalTokens}, Model: ${modelToRecord}`
)
// 更新账户的 token 使用统计
@@ -527,7 +555,7 @@ class OpenAIResponsesRelayService {
{
input_tokens: actualInputTokens, // 实际输入（不含缓存）
output_tokens: outputTokens,
cache_creation_input_tokens: 0, // OpenAI没有cache_creation
cache_creation_input_tokens: cacheCreateTokens,
cache_read_input_tokens: cacheReadTokens
},
modelToRecord
@@ -623,23 +651,25 @@ class OpenAIResponsesRelayService {
// 提取缓存相关的 tokens（如果存在）
const cacheReadTokens = usageData.input_tokens_details?.cached_tokens || 0
const cacheCreateTokens = extractCacheCreationTokens(usageData)
// 计算实际输入token（总输入减去缓存部分）
const actualInputTokens = Math.max(0, totalInputTokens - cacheReadTokens)
const totalTokens = usageData.total_tokens || totalInputTokens + outputTokens
const totalTokens =
usageData.total_tokens || totalInputTokens + outputTokens + cacheCreateTokens
await apiKeyService.recordUsage(
apiKeyData.id,
actualInputTokens, // 传递实际输入（不含缓存）
outputTokens,
0, // OpenAI没有cache_creation_tokens
cacheCreateTokens,
cacheReadTokens,
actualModel,
account.id
)
logger.info(
`📊 Recorded non-stream usage - Input: ${totalInputTokens}(actual:${actualInputTokens}+cached:${cacheReadTokens}), Output: ${outputTokens}, Total: ${totalTokens}, Model: ${actualModel}`
`📊 Recorded non-stream usage - Input: ${totalInputTokens}(actual:${actualInputTokens}+cached:${cacheReadTokens}), CacheCreate: ${cacheCreateTokens}, Output: ${outputTokens}, Total: ${totalTokens}, Model: ${actualModel}`
)
// 更新账户的 token 使用统计
@@ -653,7 +683,7 @@ class OpenAIResponsesRelayService {
{
input_tokens: actualInputTokens, // 实际输入（不含缓存）
output_tokens: outputTokens,
cache_creation_input_tokens: 0, // OpenAI没有cache_creation
cache_creation_input_tokens: cacheCreateTokens,
cache_read_input_tokens: cacheReadTokens
},
actualModel