mirror of
https://github.com/Wei-Shaw/claude-relay-service.git
synced 2026-01-22 16:43:35 +00:00
feat(api-keys): 添加模型筛选功能
This commit is contained in:
@@ -284,7 +284,8 @@ class RedisClient {
|
||||
isActive = '',
|
||||
sortBy = 'createdAt',
|
||||
sortOrder = 'desc',
|
||||
excludeDeleted = true // 默认排除已删除的 API Keys
|
||||
excludeDeleted = true, // 默认排除已删除的 API Keys
|
||||
modelFilter = []
|
||||
} = options
|
||||
|
||||
// 1. 使用 SCAN 获取所有 apikey:* 的 ID 列表(避免阻塞)
|
||||
@@ -332,6 +333,15 @@ class RedisClient {
|
||||
}
|
||||
}
|
||||
|
||||
// 模型筛选
|
||||
if (modelFilter.length > 0) {
|
||||
const keyIdsWithModels = await this.getKeyIdsWithModels(
|
||||
filteredKeys.map((k) => k.id),
|
||||
modelFilter
|
||||
)
|
||||
filteredKeys = filteredKeys.filter((k) => keyIdsWithModels.has(k.id))
|
||||
}
|
||||
|
||||
// 4. 排序
|
||||
filteredKeys.sort((a, b) => {
|
||||
// status 排序实际上使用 isActive 字段(API Key 没有 status 字段)
|
||||
@@ -781,6 +791,56 @@ class RedisClient {
|
||||
await Promise.all(operations)
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取使用了指定模型的 Key IDs(OR 逻辑)
|
||||
*/
|
||||
async getKeyIdsWithModels(keyIds, models) {
|
||||
if (!keyIds.length || !models.length) return new Set()
|
||||
|
||||
const client = this.getClientSafe()
|
||||
const result = new Set()
|
||||
|
||||
// 批量检查每个 keyId 是否使用过任意一个指定模型
|
||||
for (const keyId of keyIds) {
|
||||
for (const model of models) {
|
||||
// 检查是否有该模型的使用记录(daily 或 monthly)
|
||||
const pattern = `usage:${keyId}:model:*:${model}:*`
|
||||
const keys = await client.keys(pattern)
|
||||
if (keys.length > 0) {
|
||||
result.add(keyId)
|
||||
break // 找到一个就够了(OR 逻辑)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有被使用过的模型列表
|
||||
*/
|
||||
async getAllUsedModels() {
|
||||
const client = this.getClientSafe()
|
||||
const models = new Set()
|
||||
|
||||
// 扫描所有模型使用记录
|
||||
const pattern = 'usage:*:model:daily:*'
|
||||
let cursor = '0'
|
||||
do {
|
||||
const [nextCursor, keys] = await client.scan(cursor, 'MATCH', pattern, 'COUNT', 1000)
|
||||
cursor = nextCursor
|
||||
for (const key of keys) {
|
||||
// 从 key 中提取模型名: usage:{keyId}:model:daily:{model}:{date}
|
||||
const match = key.match(/usage:[^:]+:model:daily:([^:]+):/)
|
||||
if (match) {
|
||||
models.add(match[1])
|
||||
}
|
||||
}
|
||||
} while (cursor !== '0')
|
||||
|
||||
return [...models].sort()
|
||||
}
|
||||
|
||||
async getUsageStats(keyId) {
|
||||
const totalKey = `usage:${keyId}`
|
||||
const today = getDateStringInTimezone()
|
||||
|
||||
@@ -103,6 +103,17 @@ router.get('/api-keys/:keyId/cost-debug', authenticateAdmin, async (req, res) =>
|
||||
}
|
||||
})
|
||||
|
||||
// 获取所有被使用过的模型列表
|
||||
router.get('/api-keys/used-models', authenticateAdmin, async (req, res) => {
|
||||
try {
|
||||
const models = await redis.getAllUsedModels()
|
||||
return res.json({ success: true, data: models })
|
||||
} catch (error) {
|
||||
logger.error('❌ Failed to get used models:', error)
|
||||
return res.status(500).json({ error: 'Failed to get used models', message: error.message })
|
||||
}
|
||||
})
|
||||
|
||||
// 获取所有API Keys
|
||||
router.get('/api-keys', authenticateAdmin, async (req, res) => {
|
||||
try {
|
||||
@@ -116,6 +127,7 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
|
||||
// 筛选参数
|
||||
tag = '',
|
||||
isActive = '',
|
||||
models = '', // 模型筛选(逗号分隔)
|
||||
// 排序参数
|
||||
sortBy = 'createdAt',
|
||||
sortOrder = 'desc',
|
||||
@@ -127,6 +139,9 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
|
||||
timeRange = 'all'
|
||||
} = req.query
|
||||
|
||||
// 解析模型筛选参数
|
||||
const modelFilter = models ? models.split(',').filter((m) => m.trim()) : []
|
||||
|
||||
// 验证分页参数
|
||||
const pageNum = Math.max(1, parseInt(page) || 1)
|
||||
const pageSizeNum = [10, 20, 50, 100].includes(parseInt(pageSize)) ? parseInt(pageSize) : 20
|
||||
@@ -217,7 +232,8 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
|
||||
search,
|
||||
searchMode,
|
||||
tag,
|
||||
isActive
|
||||
isActive,
|
||||
modelFilter
|
||||
})
|
||||
|
||||
costSortStatus = {
|
||||
@@ -250,7 +266,8 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
|
||||
search,
|
||||
searchMode,
|
||||
tag,
|
||||
isActive
|
||||
isActive,
|
||||
modelFilter
|
||||
})
|
||||
|
||||
costSortStatus.isRealTimeCalculation = false
|
||||
@@ -265,7 +282,8 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
|
||||
tag,
|
||||
isActive,
|
||||
sortBy: validSortBy,
|
||||
sortOrder: validSortOrder
|
||||
sortOrder: validSortOrder,
|
||||
modelFilter
|
||||
})
|
||||
}
|
||||
|
||||
@@ -322,7 +340,17 @@ router.get('/api-keys', authenticateAdmin, async (req, res) => {
|
||||
* 使用预计算索引进行费用排序的分页查询
|
||||
*/
|
||||
async function getApiKeysSortedByCostPrecomputed(options) {
|
||||
const { page, pageSize, sortOrder, costTimeRange, search, searchMode, tag, isActive } = options
|
||||
const {
|
||||
page,
|
||||
pageSize,
|
||||
sortOrder,
|
||||
costTimeRange,
|
||||
search,
|
||||
searchMode,
|
||||
tag,
|
||||
isActive,
|
||||
modelFilter = []
|
||||
} = options
|
||||
const costRankService = require('../../services/costRankService')
|
||||
|
||||
// 1. 获取排序后的全量 keyId 列表
|
||||
@@ -369,6 +397,15 @@ async function getApiKeysSortedByCostPrecomputed(options) {
|
||||
}
|
||||
}
|
||||
|
||||
// 模型筛选
|
||||
if (modelFilter.length > 0) {
|
||||
const keyIdsWithModels = await redis.getKeyIdsWithModels(
|
||||
orderedKeys.map((k) => k.id),
|
||||
modelFilter
|
||||
)
|
||||
orderedKeys = orderedKeys.filter((k) => keyIdsWithModels.has(k.id))
|
||||
}
|
||||
|
||||
// 5. 收集所有可用标签
|
||||
const allTags = new Set()
|
||||
for (const key of allKeys) {
|
||||
@@ -411,8 +448,18 @@ async function getApiKeysSortedByCostPrecomputed(options) {
|
||||
* 使用实时计算进行 custom 时间范围的费用排序
|
||||
*/
|
||||
async function getApiKeysSortedByCostCustom(options) {
|
||||
const { page, pageSize, sortOrder, startDate, endDate, search, searchMode, tag, isActive } =
|
||||
options
|
||||
const {
|
||||
page,
|
||||
pageSize,
|
||||
sortOrder,
|
||||
startDate,
|
||||
endDate,
|
||||
search,
|
||||
searchMode,
|
||||
tag,
|
||||
isActive,
|
||||
modelFilter = []
|
||||
} = options
|
||||
const costRankService = require('../../services/costRankService')
|
||||
|
||||
// 1. 实时计算所有 Keys 的费用
|
||||
@@ -465,6 +512,15 @@ async function getApiKeysSortedByCostCustom(options) {
|
||||
}
|
||||
}
|
||||
|
||||
// 模型筛选
|
||||
if (modelFilter.length > 0) {
|
||||
const keyIdsWithModels = await redis.getKeyIdsWithModels(
|
||||
orderedKeys.map((k) => k.id),
|
||||
modelFilter
|
||||
)
|
||||
orderedKeys = orderedKeys.filter((k) => keyIdsWithModels.has(k.id))
|
||||
}
|
||||
|
||||
// 6. 收集所有可用标签
|
||||
const allTags = new Set()
|
||||
for (const key of allKeys) {
|
||||
|
||||
Reference in New Issue
Block a user