mirror of
https://github.com/snailyp/gemini-balance.git
synced 2026-06-02 22:30:21 +08:00
本次提交主要包含以下内容:
1. **日志自动删除功能**:
* 新增环境变量 (`AUTO_DELETE_ERROR_LOGS_ENABLED`, `AUTO_DELETE_ERROR_LOGS_DAYS`, `AUTO_DELETE_REQUEST_LOGS_ENABLED`, `AUTO_DELETE_REQUEST_LOGS_DAYS`) 用于控制错误日志和请求日志的自动删除策略。
* 在 `app/config/config.py` 中添加了对这些新配置项的支持和验证逻辑 (Pydantic `validator` 更新为 `field_validator`)。
* 修改了 `app/log/logger.py` 以适应新的日志配置。
* 新增 `app/scheduler/scheduled_tasks.py` 用于执行定期的日志清理任务。
* 新增 `app/service/error_log/error_log_service.py` 和 `app/service/request_log/request_log_service.py` 来处理具体的日志删除逻辑。
* 更新了 `app/router/error_log_routes.py` 和 `app/router/scheduler_routes.py` 以集成新功能。
2. **前端配置页面更新**:
* 在 `app/templates/config_editor.html` 和 `app/static/js/config_editor.js` 中添加了用于配置日志自动删除选项的用户界面元素。
3. **代码和文件结构调整**:
* 删除了不再使用的 `app/scheduler/key_checker.py` 文件。
* 在 `.gitignore` 文件中添加了 `default_db` 以忽略该目录。
4. **其他**:
* 对 `app/core/application.py` 进行了相应调整。
该更新旨在增强应用的日志管理能力,提供更灵活的日志保留策略,并优化了配置界面的用户体验。
163 lines
6.3 KiB
Python
163 lines
6.3 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"}], # 使用简单的文本进行验证
|
||
)
|
||
]
|
||
)
|
||
# 调用 generate_content 进行验证
|
||
await chat_service.generate_content(
|
||
settings.TEST_MODEL, gemini_request, key # 使用配置中定义的测试模型
|
||
)
|
||
# 如果没有抛出异常,说明 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.")
|