mirror of
https://github.com/snailyp/gemini-balance.git
synced 2026-06-02 14:19:55 +08:00
本次提交主要包含以下更新:
- **错误日志页面增强**:
- 重构了 [`app/static/js/error_logs.js`](app/static/js/error_logs.js) 中的分页逻辑,将样式控制移至 CSS,简化了 JavaScript 代码。
- 更新了 [`app/templates/error_logs.html`](app/templates/error_logs.html) 中的分页样式,使其与 `keys_status.html` 保持一致,提升了视觉统一性。
- 在错误日志页面新增了“清空全部”按钮,方便用户一键清除所有错误记录。
- 调整了错误日志表格头部的文本颜色为白色,以改善深色主题下的可读性。
- **应用初始化与配置优化**:
- 调整了 [`app/config/config.py`](app/config/config.py) 中日志记录器的获取方式,确保在配置加载早期即可用。
- 在 [`app/core/application.py`](app/core/application.py) 中引入了更明确的数据库连接管理(连接、断开、初始化)逻辑。
- 优化了 [`app/utils/helpers.py`](app/utils/helpers.py) 中项目路径和版本文件路径的定义方式,使其在模块级别初始化。
- **依赖清理**:
- 从 [`requirements.txt`](requirements.txt) 中移除了不必要的注释。
这些更改旨在提升错误日志模块的用户体验和功能性,并优化应用程序的启动和配置管理流程。
160 lines
6.1 KiB
Python
160 lines
6.1 KiB
Python
|
||
from apscheduler.schedulers.asyncio import AsyncIOScheduler
|
||
|
||
from app.config.config import settings
|
||
from app.domain.gemini_models import GeminiContent, GeminiRequest
|
||
from app.log.logger import Logger
|
||
from app.service.chat.gemini_chat_service import GeminiChatService
|
||
from app.service.error_log.error_log_service import delete_old_error_logs
|
||
from app.service.key.key_manager import get_key_manager_instance
|
||
from app.service.request_log.request_log_service import delete_old_request_logs_task
|
||
|
||
logger = Logger.setup_logger("scheduler")
|
||
|
||
|
||
async def check_failed_keys():
|
||
"""
|
||
定时检查失败次数大于0的API密钥,并尝试验证它们。
|
||
如果验证成功,重置失败计数;如果失败,增加失败计数。
|
||
"""
|
||
logger.info("Starting scheduled check for failed API keys...")
|
||
try:
|
||
key_manager = await get_key_manager_instance()
|
||
# 确保 KeyManager 已经初始化
|
||
if not key_manager or not hasattr(key_manager, "key_failure_counts"):
|
||
logger.warning(
|
||
"KeyManager instance not available or not initialized. Skipping check."
|
||
)
|
||
return
|
||
|
||
# 创建 GeminiChatService 实例用于验证
|
||
# 注意:这里直接创建实例,而不是通过依赖注入,因为这是后台任务
|
||
chat_service = GeminiChatService(settings.BASE_URL, key_manager)
|
||
|
||
# 获取需要检查的 key 列表 (失败次数 > 0)
|
||
keys_to_check = []
|
||
async with key_manager.failure_count_lock: # 访问共享数据需要加锁
|
||
# 复制一份以避免在迭代时修改字典
|
||
failure_counts_copy = key_manager.key_failure_counts.copy()
|
||
keys_to_check = [
|
||
key for key, count in failure_counts_copy.items() if count > 0
|
||
] # 检查所有失败次数大于0的key
|
||
|
||
if not keys_to_check:
|
||
logger.info("No keys with failure count > 0 found. Skipping verification.")
|
||
return
|
||
|
||
logger.info(
|
||
f"Found {len(keys_to_check)} keys with failure count > 0 to verify."
|
||
)
|
||
|
||
for key in keys_to_check:
|
||
# 隐藏部分 key 用于日志记录
|
||
log_key = f"{key[:4]}...{key[-4:]}" if len(key) > 8 else key
|
||
logger.info(f"Verifying key: {log_key}...")
|
||
try:
|
||
# 构造测试请求
|
||
gemini_request = GeminiRequest(
|
||
contents=[
|
||
GeminiContent(
|
||
role="user",
|
||
parts=[{"text": "hi"}],
|
||
)
|
||
]
|
||
)
|
||
await chat_service.generate_content(
|
||
settings.TEST_MODEL, gemini_request, key
|
||
)
|
||
logger.info(
|
||
f"Key {log_key} verification successful. Resetting failure count."
|
||
)
|
||
await key_manager.reset_key_failure_count(key)
|
||
except Exception as e:
|
||
logger.warning(
|
||
f"Key {log_key} verification failed: {str(e)}. Incrementing failure count."
|
||
)
|
||
# 直接操作计数器,需要加锁
|
||
async with key_manager.failure_count_lock:
|
||
# 再次检查 key 是否存在且失败次数未达上限
|
||
if (
|
||
key in key_manager.key_failure_counts
|
||
and key_manager.key_failure_counts[key]
|
||
< key_manager.MAX_FAILURES
|
||
):
|
||
key_manager.key_failure_counts[key] += 1
|
||
logger.info(
|
||
f"Failure count for key {log_key} incremented to {key_manager.key_failure_counts[key]}."
|
||
)
|
||
elif key in key_manager.key_failure_counts:
|
||
logger.warning(
|
||
f"Key {log_key} reached MAX_FAILURES ({key_manager.MAX_FAILURES}). Not incrementing further."
|
||
)
|
||
|
||
except Exception as e:
|
||
logger.error(
|
||
f"An error occurred during the scheduled key check: {str(e)}", exc_info=True
|
||
)
|
||
|
||
|
||
def setup_scheduler():
|
||
"""设置并启动 APScheduler"""
|
||
scheduler = AsyncIOScheduler(timezone=str(settings.TIMEZONE)) # 从配置读取时区
|
||
# 添加检查失败密钥的定时任务
|
||
scheduler.add_job(
|
||
check_failed_keys,
|
||
"interval",
|
||
hours=settings.CHECK_INTERVAL_HOURS,
|
||
id="check_failed_keys_job",
|
||
name="Check Failed API Keys",
|
||
)
|
||
logger.info(
|
||
f"Key check job scheduled to run every {settings.CHECK_INTERVAL_HOURS} hour(s)."
|
||
)
|
||
|
||
# 新增:添加自动删除错误日志的定时任务,每天凌晨3点执行
|
||
scheduler.add_job(
|
||
delete_old_error_logs,
|
||
"cron",
|
||
hour=3,
|
||
minute=0,
|
||
id="delete_old_error_logs_job",
|
||
name="Delete Old Error Logs",
|
||
)
|
||
logger.info("Auto-delete error logs job scheduled to run daily at 3:00 AM.")
|
||
|
||
# 新增:添加自动删除请求日志的定时任务,每天凌晨3点05分执行
|
||
scheduler.add_job(
|
||
delete_old_request_logs_task,
|
||
"cron",
|
||
hour=3,
|
||
minute=5,
|
||
id="delete_old_request_logs_job",
|
||
name="Delete Old Request Logs",
|
||
)
|
||
logger.info(
|
||
f"Auto-delete request logs job scheduled to run daily at 3:05 AM, if enabled and AUTO_DELETE_REQUEST_LOGS_DAYS is set to {settings.AUTO_DELETE_REQUEST_LOGS_DAYS} days."
|
||
)
|
||
|
||
scheduler.start()
|
||
logger.info("Scheduler started with all jobs.")
|
||
return scheduler
|
||
|
||
|
||
# 可以在这里添加一个全局的 scheduler 实例,以便在应用关闭时优雅地停止
|
||
scheduler_instance = None
|
||
|
||
|
||
def start_scheduler():
|
||
global scheduler_instance
|
||
if scheduler_instance is None or not scheduler_instance.running:
|
||
logger.info("Starting scheduler...")
|
||
scheduler_instance = setup_scheduler()
|
||
logger.info("Scheduler is already running.")
|
||
|
||
|
||
def stop_scheduler():
|
||
global scheduler_instance
|
||
if scheduler_instance and scheduler_instance.running:
|
||
scheduler_instance.shutdown()
|
||
logger.info("Scheduler stopped.")
|