Upload main.py

main.py

@@ -77,8 +77,8 @@ from core import storage
 
 # ---------- 日志配置 ----------
 
-# 内存日志缓冲区 (保留最近 3000 条日志，重启后清空)
-log_buffer = deque(maxlen=3000)
+# 内存日志缓冲区 (保留最近 1000 条日志，重启后清空)
+log_buffer = deque(maxlen=1000)
 log_lock = Lock()
 
 # 统计数据持久化
@@ -938,7 +938,8 @@ async def admin_get_settings(request: Request):
         },
         "image_generation": {
             "enabled": config.image_generation.enabled,
-            "supported_models": config.image_generation.supported_models
+            "supported_models": config.image_generation.supported_models,
+            "output_format": config.image_generation.output_format
         },
         "retry": {
             "max_new_session_tries": config.retry.max_new_session_tries,
@@ -968,6 +969,13 @@ async def admin_update_settings(request: Request, new_settings: dict = Body(...)
     global SESSION_EXPIRE_HOURS, multi_account_mgr, http_client
 
     try:
+        image_generation = dict(new_settings.get("image_generation") or {})
+        output_format = str(image_generation.get("output_format") or config_manager.image_output_format).lower()
+        if output_format not in ("base64", "url"):
+            output_format = "base64"
+        image_generation["output_format"] = output_format
+        new_settings["image_generation"] = image_generation
+
         # 保存旧配置用于对比
         old_proxy = PROXY
         old_retry_config = {
@@ -1040,7 +1048,7 @@ async def admin_update_settings(request: Request, new_settings: dict = Body(...)
 @require_login()
 async def admin_get_logs(
     request: Request,
-    limit: int = 1500,
+    limit: int = 300,
     level: str = None,
     search: str = None,
     start_time: str = None,
@@ -1070,7 +1078,7 @@ async def admin_get_logs(
     if end_time:
         logs = [log for log in logs if log["time"] <= end_time]
 
-    limit = min(limit, 3000)
+    limit = min(limit, log_buffer.maxlen)
     filtered_logs = logs[-limit:]
 
     return {
@@ -1412,17 +1420,17 @@ async def chat_impl(
                 # 检查是否为429错误（Rate Limit）
                 is_rate_limit = isinstance(e, HTTPException) and e.status_code == 429
 
-                # 增加账户失败计数（触发熔断机制）
-                account_manager.last_error_time = time.time()
+                # 429错误单独处理（不增加error_count，只设置冷却时间）
                 if is_rate_limit:
                     account_manager.last_429_time = time.time()
-
-                account_manager.error_count += 1
-                if account_manager.error_count >= ACCOUNT_FAILURE_THRESHOLD:
-                    account_manager.is_available = False
-                    if is_rate_limit:
-                        logger.error(f"[ACCOUNT] [{account_manager.config.account_id}] [req_{request_id}] 遇到429错误{account_manager.error_count}次，账户已禁用（需休息{RATE_LIMIT_COOLDOWN_SECONDS}秒）")
-                    else:
+                    account_manager.is_available = False  # 临时禁用，冷却期后自动恢复
+                    logger.warning(f"[ACCOUNT] [{account_manager.config.account_id}] [req_{request_id}] 遇到429限流，账户将休息{RATE_LIMIT_COOLDOWN_SECONDS}秒后自动恢复")
+                else:
+                    # 非429错误才增加失败计数
+                    account_manager.last_error_time = time.time()
+                    account_manager.error_count += 1
+                    if account_manager.error_count >= ACCOUNT_FAILURE_THRESHOLD:
+                        account_manager.is_available = False
                         logger.error(f"[ACCOUNT] [{account_manager.config.account_id}] [req_{request_id}] 请求连续失败{account_manager.error_count}次，账户已永久禁用")
 
                 retry_count += 1
@@ -1443,10 +1451,26 @@ async def chat_impl(
                 # 检查是否还能继续重试
                 if retry_count <= max_retries:
                     logger.warning(f"[CHAT] [{account_manager.config.account_id}] [req_{request_id}] 正在重试 ({retry_count}/{max_retries})")
+
+                    # 快速失败：检查是否还有可用账户（避免无效重试）
+                    available_count = sum(
+                        1 for acc in multi_account_mgr.accounts.values()
+                        if (acc.should_retry() and
+                            not acc.config.is_expired() and
+                            not acc.config.disabled and
+                            acc.config.account_id not in failed_accounts)
+                    )
+
+                    if available_count == 0:
+                        logger.error(f"[CHAT] [req_{request_id}] 所有账户均不可用，快速失败")
+                        await finalize_result("error", 503, "All accounts unavailable")
+                        if req.stream: yield f"data: {json.dumps({'error': {'message': 'All accounts unavailable'}})}\n\n"
+                        return
+
                     # 尝试切换到其他账户（客户端会传递完整上下文）
                     try:
                         # 获取新账户，跳过已失败的账户
-                        max_account_tries = MAX_ACCOUNT_SWITCH_TRIES  # 使用配置的账户切换尝试次数
+                        max_account_tries = min(MAX_ACCOUNT_SWITCH_TRIES, available_count)  # 限制尝试次数
                         new_account = None
 
                         for _ in range(max_account_tries):
@@ -1456,9 +1480,9 @@ async def chat_impl(
                                 break
 
                         if not new_account:
-                            logger.error(f"[CHAT] [req_{request_id}] All accounts failed, no available account")
-                            await finalize_result("error", 503, "All Accounts Failed")
-                            if req.stream: yield f"data: {json.dumps({'error': {'message': 'All Accounts Failed'}})}\n\n"
+                            logger.error(f"[CHAT] [req_{request_id}] 所有可用账户均已失败")
+                            await finalize_result("error", 503, "All available accounts failed")
+                            if req.stream: yield f"data: {json.dumps({'error': {'message': 'All available accounts failed'}})}\n\n"
                             return
 
                         logger.info(f"[CHAT] [req_{request_id}] 切换账户: {account_manager.config.account_id} -> {new_account.config.account_id}")