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

fix: 1. 修复调度优先级以及手动禁止调度逻辑的问题

Browse Source 
2. 优化列表优先级显示
This commit is contained in:
KevinLiao
2025-07-30 09:30:11 +08:00
parent 89f9f48576
commit 34dca961ef
6 changed files with 140 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/unifiedClaudeScheduler.js
View File

@@ -107,7 +107,8 @@ class UnifiedClaudeScheduler {
if (account.isActive === 'true' &&
account.status !== 'error' &&
account.status !== 'blocked' &&
(account.accountType === 'shared' || !account.accountType)) { // 兼容旧数据
(account.accountType === 'shared' || !account.accountType) && // 兼容旧数据
account.schedulable !== 'false') { // 检查是否可调度
// 检查是否被限流
const isRateLimited = await claudeAccountService.isAccountRateLimited(account.id);
@@ -128,12 +129,13 @@ class UnifiedClaudeScheduler {
logger.info(`📋 Found ${consoleAccounts.length} total Claude Console accounts`);
for (const account of consoleAccounts) {
logger.info(`🔍 Checking Claude Console account: ${account.name} - isActive: ${account.isActive}, status: ${account.status}, accountType: ${account.accountType}`);
logger.info(`🔍 Checking Claude Console account: ${account.name} - isActive: ${account.isActive}, status: ${account.status}, accountType: ${account.accountType}, schedulable: ${account.schedulable}`);
// 注意：getAllAccounts返回的isActive是布尔值
if (account.isActive === true &&
account.status === 'active' &&
account.accountType === 'shared') {
account.accountType === 'shared' &&
account.schedulable !== false) { // 检查是否可调度
// 检查模型支持（如果有请求的模型）
if (requestedModel && account.supportedModels && account.supportedModels.length > 0) {
@@ -158,7 +160,7 @@ class UnifiedClaudeScheduler {
logger.warn(`⚠️ Claude Console account ${account.name} is rate limited`);
}
} else {
logger.info(`❌ Claude Console account ${account.name} not eligible - isActive: ${account.isActive}, status: ${account.status}, accountType: ${account.accountType}`);
logger.info(`❌ Claude Console account ${account.name} not eligible - isActive: ${account.isActive}, status: ${account.status}, accountType: ${account.accountType}, schedulable: ${account.schedulable}`);
}
}
@@ -189,12 +191,22 @@ class UnifiedClaudeScheduler {
if (!account || account.isActive !== 'true' || account.status === 'error') {
return false;
}
// 检查是否可调度
if (account.schedulable === 'false') {
logger.info(`🚫 Account ${accountId} is not schedulable`);
return false;
}
return !(await claudeAccountService.isAccountRateLimited(accountId));
} else if (accountType === 'claude-console') {
const account = await claudeConsoleAccountService.getAccount(accountId);
if (!account || !account.isActive || account.status !== 'active') {
return false;
}
// 检查是否可调度
if (account.schedulable === false) {
logger.info(`🚫 Claude Console account ${accountId} is not schedulable`);
return false;
}
return !(await claudeConsoleAccountService.isAccountRateLimited(accountId));
}
return false;