Upload 9 files

core/account.py

@@ -390,12 +390,14 @@ def load_multi_account_config(
             disabled=acc.get("disabled", False)  # 读取手动禁用状态，默认为 False
         )
 
-        # 检查账户是否已过期
-        if config.is_expired():
-            logger.warning(f"[CONFIG] 账户 {config.account_id} 已过期，跳过加载")
-            continue
-
-        manager.add_account(config, http_client, user_agent, account_failure_threshold, rate_limit_cooldown_seconds, global_stats)
+        # 检查账户是否已过期（已过期也加载到管理面板）
+        is_expired = config.is_expired()
+        if is_expired:
+            logger.warning(f"[CONFIG] 账户 {config.account_id} 已过期，仍加载用于展示")
+
+        manager.add_account(config, http_client, user_agent, account_failure_threshold, rate_limit_cooldown_seconds, global_stats)
+        if is_expired:
+            manager.accounts[config.account_id].is_available = False
 
     if not manager.accounts:
         logger.warning(f"[CONFIG] 没有有效的账户配置，服务将启动但无法处理请求，请在管理面板添加账户")

core/config.py

@@ -39,6 +39,7 @@ class ImageGenerationConfig(BaseModel):
         default=["gemini-3-pro-preview"],
         description="支持图片生成的模型列表"
     )
+    output_format: str = Field(default="base64", description="图片输出格式：base64 或 url")
 
 
 class RetryConfig(BaseModel):
@@ -65,7 +66,6 @@ class SessionConfig(BaseModel):
 class SecurityConfig(BaseModel):
     """安全配置（仅从环境变量读取，不可热更新）"""
     admin_key: str = Field(default="", description="管理员密钥（必需）")
-    path_prefix: str = Field(default="", description="路径前缀（隐藏管理端点）")
     session_secret_key: str = Field(..., description="Session密钥")
 
 
@@ -103,7 +103,7 @@ class ConfigManager:
         加载配置
 
         优先级规则：
-        1. 安全配置（ADMIN_KEY, PATH_PREFIX, SESSION_SECRET_KEY）：仅从环境变量读取
+        1. 安全配置（ADMIN_KEY, SESSION_SECRET_KEY）：仅从环境变量读取
         2. 其他配置：YAML > 环境变量 > 默认值
         """
         # 1. 加载 YAML 配置
@@ -112,7 +112,6 @@ class ConfigManager:
         # 2. 加载安全配置（仅从环境变量，不允许 Web 修改）
         security_config = SecurityConfig(
             admin_key=os.getenv("ADMIN_KEY", ""),
-            path_prefix=os.getenv("PATH_PREFIX", ""),
             session_secret_key=os.getenv("SESSION_SECRET_KEY", self._generate_secret())
         )
 
@@ -192,11 +191,6 @@ class ConfigManager:
         """管理员密钥"""
         return self._config.security.admin_key
 
-    @property
-    def path_prefix(self) -> str:
-        """路径前缀"""
-        return self._config.security.path_prefix
-
     @property
     def session_secret_key(self) -> str:
         """Session密钥"""
@@ -232,6 +226,11 @@ class ConfigManager:
         """支持图片生成的模型列表"""
         return self._config.image_generation.supported_models
 
+    @property
+    def image_output_format(self) -> str:
+        """图片输出格式"""
+        return self._config.image_generation.output_format
+
     @property
     def session_expire_hours(self) -> int:
         """Session过期时间（小时）"""

core/google_api.py

@@ -2,11 +2,12 @@
 
 负责与Google Gemini Business API的所有交互操作
 """
-import asyncio
-import logging
-import os
-import time
-import uuid
+import asyncio
+import json
+import logging
+import os
+import time
+import uuid
 from typing import TYPE_CHECKING, List
 
 import httpx
@@ -162,9 +163,20 @@ async def upload_context_file(
     )
 
     req_tag = f"[req_{request_id}] " if request_id else ""
-    if r.status_code != 200:
-        logger.error(f"[FILE] [{account_manager.config.account_id}] {req_tag}文件上传失败: {r.status_code}")
-        raise HTTPException(r.status_code, f"Upload failed: {r.text}")
+    if r.status_code != 200:
+        logger.error(f"[FILE] [{account_manager.config.account_id}] {req_tag}文件上传失败: {r.status_code}")
+        error_text = r.text
+        if r.status_code == 400:
+            try:
+                payload = json.loads(r.text or "{}")
+                message = payload.get("error", {}).get("message", "")
+            except Exception:
+                message = ""
+            if "Unsupported file type" in message:
+                mime_type = message.split("Unsupported file type:", 1)[-1].strip()
+                hint = f"不支持的文件类型: {mime_type}。请转换为 PDF、图片或纯文本后再上传。"
+                raise HTTPException(400, hint)
+        raise HTTPException(r.status_code, f"Upload failed: {error_text}")
 
     data = r.json()
     file_id = data.get("addContextFileResponse", {}).get("fileId")

core/message.py

@@ -103,23 +103,36 @@ async def parse_last_message(messages: List['Message'], http_client: httpx.Async
                 else:
                     logger.warning(f"[FILE] [req_{request_id}] 不支持的文件格式: {url[:30]}...")
 
-    # 并行下载所有 URL 文件（支持图片、PDF、文档等）
-    if image_urls:
-        async def download_url(url: str):
-            try:
-                resp = await http_client.get(url, timeout=30, follow_redirects=True)
-                resp.raise_for_status()
-                content_type = resp.headers.get("content-type", "application/octet-stream").split(";")[0]
-                # 移除图片类型限制，支持所有文件类型
-                b64 = base64.b64encode(resp.content).decode()
-                logger.info(f"[FILE] [req_{request_id}] URL文件下载成功: {url[:50]}... ({len(resp.content)} bytes, {content_type})")
-                return {"mime": content_type, "data": b64}
-            except Exception as e:
-                logger.warning(f"[FILE] [req_{request_id}] URL文件下载失败: {url[:50]}... - {e}")
-                return None
-
-        results = await asyncio.gather(*[download_url(u) for u in image_urls])
-        images.extend([r for r in results if r])
+    # 并行下载所有 URL 文件（支持图片、PDF、文档等）
+    if image_urls:
+        async def download_url(url: str):
+            try:
+                resp = await http_client.get(url, timeout=30, follow_redirects=True)
+                if resp.status_code == 404:
+                    logger.warning(f"[FILE] [req_{request_id}] URL文件已失效(404)，已跳过: {url[:50]}...")
+                    return None
+                resp.raise_for_status()
+                content_type = resp.headers.get("content-type", "application/octet-stream").split(";")[0]
+                # 移除图片类型限制，支持所有文件类型
+                b64 = base64.b64encode(resp.content).decode()
+                logger.info(f"[FILE] [req_{request_id}] URL文件下载成功: {url[:50]}... ({len(resp.content)} bytes, {content_type})")
+                return {"mime": content_type, "data": b64}
+            except httpx.HTTPStatusError as e:
+                status_code = e.response.status_code if e.response else "unknown"
+                logger.warning(f"[FILE] [req_{request_id}] URL文件下载失败({status_code}): {url[:50]}... - {e}")
+                return None
+            except Exception as e:
+                logger.warning(f"[FILE] [req_{request_id}] URL文件下载失败: {url[:50]}... - {e}")
+                return None
+
+        results = await asyncio.gather(*[download_url(u) for u in image_urls], return_exceptions=True)
+        safe_results = []
+        for result in results:
+            if isinstance(result, Exception):
+                logger.warning(f"[FILE] [req_{request_id}] URL文件下载异常: {type(result).__name__}: {str(result)[:120]}")
+                continue
+            safe_results.append(result)
+        images.extend([r for r in safe_results if r])
 
     return text_content, images
 

core/session_auth.py

@@ -42,23 +42,26 @@ def require_login(redirect_to_login: bool = True):
         async def wrapper(*args, request: Request, **kwargs):
             if not is_logged_in(request):
                 if redirect_to_login:
-                    # 构建登录页面URL（支持可选的PATH_PREFIX）
-                    # 从请求路径中提取PATH_PREFIX（如果有）
-                    path = request.url.path
-
-                    # 动态导入main模块获取PATH_PREFIX（避免循环依赖）
-                    import main
-                    prefix = main.PATH_PREFIX
-
-                    if prefix:
-                        login_url = f"/{prefix}/login"
-                    else:
-                        login_url = "/login"
-
-                    return RedirectResponse(url=login_url, status_code=302)
-                else:
-                    # 返回404假装端点不存在
-                    raise HTTPException(404, "Not Found")
+                    accept_header = (request.headers.get("accept") or "").lower()
+                    wants_html = "text/html" in accept_header or request.url.path.endswith("/html")
+
+                    if wants_html:
+                        # 清理掉 URL 中可能重复的 PATH_PREFIX
+                        # 避免重定向路径出现多层前缀
+                        path = request.url.path
+
+                        # 兼容 main 中 PATH_PREFIX 为空的情况
+                        import main
+                        prefix = main.PATH_PREFIX
+
+                        if prefix:
+                            login_url = f"/{prefix}/login"
+                        else:
+                            login_url = "/login"
+
+                        return RedirectResponse(url=login_url, status_code=302)
+
+                raise HTTPException(401, "Unauthorized")
 
             return await func(*args, request=request, **kwargs)
         return wrapper

core/uptime.py

@@ -1,78 +1,139 @@
-"""
-Uptime 实时监控追踪器
-类似 Uptime Kuma 的心跳监控，显示最近请求状态
-"""
-
-from collections import deque
-from datetime import datetime, timezone, timedelta
-from typing import Dict, List
-
-# 北京时区 UTC+8
-BEIJING_TZ = timezone(timedelta(hours=8))
-
-# 每个服务保留最近 60 条心跳记录
-MAX_HEARTBEATS = 60
-
-# 服务配置
-SERVICES = {
-    "api_service": {"name": "API 服务", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
-    "account_pool": {"name": "服务资源", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
-    "gemini-2.5-flash": {"name": "Gemini 2.5 Flash", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
-    "gemini-2.5-pro": {"name": "Gemini 2.5 Pro", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
-    "gemini-3-flash-preview": {"name": "Gemini 3 Flash Preview", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
-    "gemini-3-pro-preview": {"name": "Gemini 3 Pro Preview", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
-}
-
-SUPPORTED_MODELS = ["gemini-2.5-flash", "gemini-2.5-pro", "gemini-3-flash-preview", "gemini-3-pro-preview"]
-
-
-def record_request(service: str, success: bool):
-    """记录请求心跳"""
-    if service not in SERVICES:
-        return
-
-    SERVICES[service]["heartbeats"].append({
-        "time": datetime.now(BEIJING_TZ).strftime("%H:%M:%S"),
-        "success": success
-    })
-
-
-def get_realtime_status() -> Dict:
-    """获取实时状态数据"""
-    result = {"services": {}}
-
-    for service_id, service_data in SERVICES.items():
-        heartbeats = list(service_data["heartbeats"])
-        total = len(heartbeats)
-        success = sum(1 for h in heartbeats if h["success"])
-
-        # 计算可用率
-        uptime = (success / total * 100) if total > 0 else 100.0
-
-        # 最近状态
-        last_status = "unknown"
-        if heartbeats:
-            last_status = "up" if heartbeats[-1]["success"] else "down"
-
-        result["services"][service_id] = {
-            "name": service_data["name"],
-            "status": last_status,
-            "uptime": round(uptime, 1),
-            "total": total,
-            "success": success,
-            "heartbeats": heartbeats[-MAX_HEARTBEATS:]  # 最近的心跳
-        }
-
-    result["updated_at"] = datetime.now(BEIJING_TZ).strftime("%Y-%m-%d %H:%M:%S")
-    return result
-
-
-# 兼容旧接口
-async def get_uptime_summary(days: int = 90) -> Dict:
-    """兼容旧接口，返回实时数据"""
-    return get_realtime_status()
-
-
-async def uptime_aggregation_task():
-    """后台任务（保留兼容性，实际不需要聚合）"""
-    pass
+"""
+Uptime 实时监控与心跳历史持久化。
+"""
+
+from collections import deque
+from datetime import datetime, timezone, timedelta
+from typing import Dict, List, Optional
+import json
+import os
+from threading import Lock
+
+# 北京时区 UTC+8
+BEIJING_TZ = timezone(timedelta(hours=8))
+
+# 每个服务保留最近 60 条心跳
+MAX_HEARTBEATS = 60
+SLOW_THRESHOLD_MS = 40000
+WARNING_STATUS_CODES = {429}
+
+_storage_path: Optional[str] = None
+_storage_lock = Lock()
+
+# 服务注册表
+SERVICES = {
+    "api_service": {"name": "API 服务", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
+    "account_pool": {"name": "服务资源", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
+    "gemini-2.5-flash": {"name": "Gemini 2.5 Flash", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
+    "gemini-2.5-pro": {"name": "Gemini 2.5 Pro", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
+    "gemini-3-flash-preview": {"name": "Gemini 3 Flash Preview", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
+    "gemini-3-pro-preview": {"name": "Gemini 3 Pro Preview", "heartbeats": deque(maxlen=MAX_HEARTBEATS)},
+}
+
+SUPPORTED_MODELS = ["gemini-2.5-flash", "gemini-2.5-pro", "gemini-3-flash-preview", "gemini-3-pro-preview"]
+
+
+def configure_storage(path: Optional[str]) -> None:
+    """配置心跳持久化路径。"""
+    global _storage_path
+    _storage_path = path
+
+
+def _classify_level(success: bool, status_code: Optional[int], latency_ms: Optional[int]) -> str:
+    if status_code in WARNING_STATUS_CODES:
+        return "warn"
+    if success and latency_ms is not None and latency_ms >= SLOW_THRESHOLD_MS:
+        return "warn"
+    return "up" if success else "down"
+
+
+def _save_heartbeats() -> None:
+    if not _storage_path:
+        return
+    try:
+        payload = {}
+        for service_id, service_data in SERVICES.items():
+            payload[service_id] = list(service_data["heartbeats"])
+        os.makedirs(os.path.dirname(_storage_path), exist_ok=True)
+        with _storage_lock, open(_storage_path, "w", encoding="utf-8") as f:
+            json.dump(payload, f, ensure_ascii=True, indent=2)
+    except Exception:
+        return
+
+
+def load_heartbeats() -> None:
+    if not _storage_path or not os.path.exists(_storage_path):
+        return
+    try:
+        with _storage_lock, open(_storage_path, "r", encoding="utf-8") as f:
+            payload = json.load(f)
+        for service_id, heartbeats in payload.items():
+            if service_id not in SERVICES:
+                continue
+            SERVICES[service_id]["heartbeats"].clear()
+            for beat in heartbeats[-MAX_HEARTBEATS:]:
+                SERVICES[service_id]["heartbeats"].append(beat)
+    except Exception:
+        return
+
+
+def record_request(
+    service: str,
+    success: bool,
+    latency_ms: Optional[int] = None,
+    status_code: Optional[int] = None
+):
+    """记录一次心跳。"""
+    if service not in SERVICES:
+        return
+
+    level = _classify_level(success, status_code, latency_ms)
+    heartbeat = {
+        "time": datetime.now(BEIJING_TZ).strftime("%H:%M:%S"),
+        "success": success,
+        "level": level,
+    }
+    if latency_ms is not None:
+        heartbeat["latency_ms"] = latency_ms
+    if status_code is not None:
+        heartbeat["status_code"] = status_code
+
+    SERVICES[service]["heartbeats"].append(heartbeat)
+    _save_heartbeats()
+
+
+def get_realtime_status() -> Dict:
+    """返回实时监控数据。"""
+    result = {"services": {}}
+
+    for service_id, service_data in SERVICES.items():
+        heartbeats = list(service_data["heartbeats"])
+        total = len(heartbeats)
+        success = sum(1 for h in heartbeats if h.get("success"))
+
+        uptime = (success / total * 100) if total > 0 else 100.0
+
+        last_status = "unknown"
+        if heartbeats:
+            last_level = heartbeats[-1].get("level")
+            if last_level in {"up", "down", "warn"}:
+                last_status = last_level
+            else:
+                last_status = "up" if heartbeats[-1].get("success") else "down"
+
+        result["services"][service_id] = {
+            "name": service_data["name"],
+            "status": last_status,
+            "uptime": round(uptime, 1),
+            "total": total,
+            "success": success,
+            "heartbeats": heartbeats[-MAX_HEARTBEATS:],
+        }
+
+    result["updated_at"] = datetime.now(BEIJING_TZ).strftime("%Y-%m-%d %H:%M:%S")
+    return result
+
+
+async def get_uptime_summary(days: int = 90) -> Dict:
+    """兼容旧接口。"""
+    return get_realtime_status()