mirror of
https://github.com/Wei-Shaw/claude-relay-service.git
synced 2026-01-23 00:53:33 +00:00
fix: user stats again again again
This commit is contained in:
@@ -498,6 +498,17 @@ class ApiKeyService {
|
|||||||
for (const key of userKeys) {
|
for (const key of userKeys) {
|
||||||
const usage = await redis.getUsageStats(key.id)
|
const usage = await redis.getUsageStats(key.id)
|
||||||
const dailyCost = (await redis.getDailyCost(key.id)) || 0
|
const dailyCost = (await redis.getDailyCost(key.id)) || 0
|
||||||
|
const costStats = await redis.getCostStats(key.id)
|
||||||
|
|
||||||
|
logger.debug(`🔍 getUserApiKeys: Key ${key.id} (${key.name}) usage:`, {
|
||||||
|
keyId: key.id,
|
||||||
|
keyName: key.name,
|
||||||
|
userId: key.userId,
|
||||||
|
rawUsage: usage,
|
||||||
|
dailyCost,
|
||||||
|
costStats,
|
||||||
|
lastUsedAt: key.lastUsedAt
|
||||||
|
})
|
||||||
|
|
||||||
userKeysWithUsage.push({
|
userKeysWithUsage.push({
|
||||||
id: key.id,
|
id: key.id,
|
||||||
@@ -509,8 +520,9 @@ class ApiKeyService {
|
|||||||
createdAt: key.createdAt,
|
createdAt: key.createdAt,
|
||||||
lastUsedAt: key.lastUsedAt,
|
lastUsedAt: key.lastUsedAt,
|
||||||
expiresAt: key.expiresAt,
|
expiresAt: key.expiresAt,
|
||||||
usage: usage || { requests: 0, inputTokens: 0, outputTokens: 0, totalCost: 0 },
|
usage: usage,
|
||||||
dailyCost,
|
dailyCost,
|
||||||
|
totalCost: costStats.total,
|
||||||
dailyCostLimit: parseFloat(key.dailyCostLimit || 0),
|
dailyCostLimit: parseFloat(key.dailyCostLimit || 0),
|
||||||
userId: key.userId,
|
userId: key.userId,
|
||||||
userUsername: key.userUsername,
|
userUsername: key.userUsername,
|
||||||
|
|||||||
@@ -150,11 +150,15 @@ class UserService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (const apiKey of userApiKeys) {
|
for (const apiKey of userApiKeys) {
|
||||||
if (apiKey.usage) {
|
logger.debug(`🔍 Processing API key ${apiKey.id} (${apiKey.name}) for user ${userId}:`, {
|
||||||
totalUsage.requests += apiKey.usage.requests || 0
|
hasUsage: !!apiKey.usage,
|
||||||
totalUsage.inputTokens += apiKey.usage.inputTokens || 0
|
usage: apiKey.usage
|
||||||
totalUsage.outputTokens += apiKey.usage.outputTokens || 0
|
})
|
||||||
totalUsage.totalCost += apiKey.usage.totalCost || 0
|
if (apiKey.usage && apiKey.usage.total) {
|
||||||
|
totalUsage.requests += apiKey.usage.total.requests || 0
|
||||||
|
totalUsage.inputTokens += apiKey.usage.total.inputTokens || 0
|
||||||
|
totalUsage.outputTokens += apiKey.usage.total.outputTokens || 0
|
||||||
|
totalUsage.totalCost += apiKey.totalCost || 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user