Upload 9 files

core/account.py

@@ -18,8 +18,11 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
-# 配置文件路径
-ACCOUNTS_FILE = "accounts.json"
+# 配置文件路径 - 自动检测环境
+if os.path.exists("/data"):
+    ACCOUNTS_FILE = "/data/accounts.json"  # HF Pro 持久化
+else:
+    ACCOUNTS_FILE = "data/accounts.json"  # 本地存储（统一到 data 目录）
 
 
 @dataclass
@@ -403,7 +406,19 @@ def reload_accounts(
     session_cache_ttl_seconds: int,
     global_stats: dict
 ) -> MultiAccountManager:
-    """重新加载账户配置（清空缓存并重新加载）"""
+    """重新加载账户配置（保留现有账户的运行时状态）"""
+    # 保存现有账户的运行时状态
+    old_states = {}
+    for account_id, account_mgr in multi_account_mgr.accounts.items():
+        old_states[account_id] = {
+            "is_available": account_mgr.is_available,
+            "last_error_time": account_mgr.last_error_time,
+            "last_429_time": account_mgr.last_429_time,
+            "error_count": account_mgr.error_count,
+            "conversation_count": account_mgr.conversation_count
+        }
+
+    # 清空会话缓存并重新加载配置
     multi_account_mgr.global_session_cache.clear()
     new_mgr = load_multi_account_config(
         http_client,
@@ -413,6 +428,18 @@ def reload_accounts(
         session_cache_ttl_seconds,
         global_stats
     )
+
+    # 恢复现有账户的运行时状态
+    for account_id, state in old_states.items():
+        if account_id in new_mgr.accounts:
+            account_mgr = new_mgr.accounts[account_id]
+            account_mgr.is_available = state["is_available"]
+            account_mgr.last_error_time = state["last_error_time"]
+            account_mgr.last_429_time = state["last_429_time"]
+            account_mgr.error_count = state["error_count"]
+            account_mgr.conversation_count = state["conversation_count"]
+            logger.debug(f"[CONFIG] 账户 {account_id} 运行时状态已恢复")
+
     logger.info(f"[CONFIG] 配置已重载，当前账户数: {len(new_mgr.accounts)}")
     return new_mgr
 

core/config.py

@@ -0,0 +1,308 @@
+"""
+统一配置管理系统
+
+优先级规则：
+1. 环境变量（最高优先级）
+2. YAML 配置文件
+3. 默认值（最低优先级）
+
+配置分类：
+- 安全配置：仅从环境变量读取，不可热更新（ADMIN_KEY, PATH_PREFIX, SESSION_SECRET_KEY）
+- 业务配置：环境变量 > YAML，支持热更新（API_KEY, PROXY, 重试策略等）
+"""
+
+import os
+import yaml
+import secrets
+from pathlib import Path
+from typing import Optional, List
+from pydantic import BaseModel, Field, validator
+from dotenv import load_dotenv
+
+# 加载 .env 文件
+load_dotenv()
+
+
+# ==================== 配置模型定义 ====================
+
+class BasicConfig(BaseModel):
+    """基础配置"""
+    api_key: str = Field(default="", description="API访问密钥（留空则公开访问）")
+    base_url: str = Field(default="", description="服务器URL（留空则自动检测）")
+    proxy: str = Field(default="", description="代理地址")
+
+
+class ImageGenerationConfig(BaseModel):
+    """图片生成配置"""
+    enabled: bool = Field(default=True, description="是否启用图片生成")
+    supported_models: List[str] = Field(
+        default=["gemini-3-pro-preview"],
+        description="支持图片生成的模型列表"
+    )
+
+
+class RetryConfig(BaseModel):
+    """重试策略配置"""
+    max_new_session_tries: int = Field(default=5, ge=1, le=20, description="新会话尝试账户数")
+    max_request_retries: int = Field(default=3, ge=1, le=10, description="请求失败重试次数")
+    max_account_switch_tries: int = Field(default=5, ge=1, le=20, description="账户切换尝试次数")
+    account_failure_threshold: int = Field(default=3, ge=1, le=10, description="账户失败阈值")
+    rate_limit_cooldown_seconds: int = Field(default=600, ge=60, le=3600, description="429冷却时间（秒）")
+    session_cache_ttl_seconds: int = Field(default=3600, ge=300, le=86400, description="会话缓存时间（秒）")
+
+
+class PublicDisplayConfig(BaseModel):
+    """公开展示配置"""
+    logo_url: str = Field(default="", description="Logo URL")
+    chat_url: str = Field(default="", description="开始对话链接")
+
+
+class SessionConfig(BaseModel):
+    """Session配置"""
+    expire_hours: int = Field(default=24, ge=1, le=168, description="Session过期时间（小时）")
+
+
+class SecurityConfig(BaseModel):
+    """安全配置（仅从环境变量读取，不可热更新）"""
+    admin_key: str = Field(default="", description="管理员密钥（必需）")
+    path_prefix: str = Field(default="", description="路径前缀（隐藏管理端点）")
+    session_secret_key: str = Field(..., description="Session密钥")
+
+
+class AppConfig(BaseModel):
+    """应用配置（统一管理）"""
+    # 安全配置（仅从环境变量）
+    security: SecurityConfig
+
+    # 业务配置（环境变量 > YAML > 默认值）
+    basic: BasicConfig
+    image_generation: ImageGenerationConfig
+    retry: RetryConfig
+    public_display: PublicDisplayConfig
+    session: SessionConfig
+
+
+# ==================== 配置管理器 ====================
+
+class ConfigManager:
+    """配置管理器（单例）"""
+
+    def __init__(self, yaml_path: str = None):
+        # 自动检测环境并设置默认路径
+        if yaml_path is None:
+            if os.path.exists("/data"):
+                yaml_path = "/data/settings.yaml"  # HF Pro 持久化
+            else:
+                yaml_path = "data/settings.yaml"  # 本地存储
+        self.yaml_path = Path(yaml_path)
+        self._config: Optional[AppConfig] = None
+        self.load()
+
+    def load(self):
+        """
+        加载配置
+
+        优先级规则：
+        1. 安全配置（ADMIN_KEY, PATH_PREFIX, SESSION_SECRET_KEY）：仅从环境变量读取
+        2. 其他配置：YAML > 环境变量 > 默认值
+        """
+        # 1. 加载 YAML 配置
+        yaml_data = self._load_yaml()
+
+        # 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())
+        )
+
+        # 3. 加载基础配置（YAML > 环境变量 > 默认值）
+        basic_data = yaml_data.get("basic", {})
+        basic_config = BasicConfig(
+            api_key=basic_data.get("api_key") or os.getenv("API_KEY", ""),
+            base_url=basic_data.get("base_url") or os.getenv("BASE_URL", ""),
+            proxy=basic_data.get("proxy") or os.getenv("PROXY", "")
+        )
+
+        # 4. 加载其他配置（从 YAML）
+        image_generation_config = ImageGenerationConfig(
+            **yaml_data.get("image_generation", {})
+        )
+
+        retry_config = RetryConfig(
+            **yaml_data.get("retry", {})
+        )
+
+        public_display_config = PublicDisplayConfig(
+            **yaml_data.get("public_display", {})
+        )
+
+        session_config = SessionConfig(
+            **yaml_data.get("session", {})
+        )
+
+        # 5. 构建完整配置
+        self._config = AppConfig(
+            security=security_config,
+            basic=basic_config,
+            image_generation=image_generation_config,
+            retry=retry_config,
+            public_display=public_display_config,
+            session=session_config
+        )
+
+    def _load_yaml(self) -> dict:
+        """加载 YAML 文件"""
+        if self.yaml_path.exists():
+            try:
+                with open(self.yaml_path, 'r', encoding='utf-8') as f:
+                    return yaml.safe_load(f) or {}
+            except Exception as e:
+                print(f"[WARN] 加载配置文件失败: {e}，使用默认配置")
+        return {}
+
+    def _generate_secret(self) -> str:
+        """生成随机密钥"""
+        return secrets.token_urlsafe(32)
+
+    def save_yaml(self, data: dict):
+        """保存 YAML 配置"""
+        self.yaml_path.parent.mkdir(exist_ok=True)
+        with open(self.yaml_path, 'w', encoding='utf-8') as f:
+            yaml.dump(data, f, allow_unicode=True, default_flow_style=False, sort_keys=False)
+
+    def reload(self):
+        """重新加载配置（热更新）"""
+        self.load()
+
+    @property
+    def config(self) -> AppConfig:
+        """获取配置"""
+        return self._config
+
+    # ==================== 便捷访问属性 ====================
+
+    @property
+    def api_key(self) -> str:
+        """API访问密钥"""
+        return self._config.basic.api_key
+
+    @property
+    def admin_key(self) -> str:
+        """管理员密钥"""
+        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密钥"""
+        return self._config.security.session_secret_key
+
+    @property
+    def proxy(self) -> str:
+        """代理地址"""
+        return self._config.basic.proxy
+
+    @property
+    def base_url(self) -> str:
+        """服务器URL"""
+        return self._config.basic.base_url
+
+    @property
+    def logo_url(self) -> str:
+        """Logo URL"""
+        return self._config.public_display.logo_url
+
+    @property
+    def chat_url(self) -> str:
+        """开始对话链接"""
+        return self._config.public_display.chat_url
+
+    @property
+    def image_generation_enabled(self) -> bool:
+        """是否启用图片生成"""
+        return self._config.image_generation.enabled
+
+    @property
+    def image_generation_models(self) -> List[str]:
+        """支持图片生成的模型列表"""
+        return self._config.image_generation.supported_models
+
+    @property
+    def session_expire_hours(self) -> int:
+        """Session过期时间（小时）"""
+        return self._config.session.expire_hours
+
+    @property
+    def max_new_session_tries(self) -> int:
+        """新会话尝试账户数"""
+        return self._config.retry.max_new_session_tries
+
+    @property
+    def max_request_retries(self) -> int:
+        """请求失败重试次数"""
+        return self._config.retry.max_request_retries
+
+    @property
+    def max_account_switch_tries(self) -> int:
+        """账户切换尝试次数"""
+        return self._config.retry.max_account_switch_tries
+
+    @property
+    def account_failure_threshold(self) -> int:
+        """账户失败阈值"""
+        return self._config.retry.account_failure_threshold
+
+    @property
+    def rate_limit_cooldown_seconds(self) -> int:
+        """429冷却时间（秒）"""
+        return self._config.retry.rate_limit_cooldown_seconds
+
+    @property
+    def session_cache_ttl_seconds(self) -> int:
+        """会话缓存时间（秒）"""
+        return self._config.retry.session_cache_ttl_seconds
+
+
+# ==================== 全局配置管理器 ====================
+
+config_manager = ConfigManager()
+
+# 注意：不要直接引用 config_manager.config，因为 reload() 后引用会失效
+# 应该始终通过 config_manager.config 访问配置
+def get_config() -> AppConfig:
+    """获取当前配置（支持热更新）"""
+    return config_manager.config
+
+# 为了向后兼容，保留 config 变量，但使用属性访问
+class _ConfigProxy:
+    """配置代理，确保始终访问最新配置"""
+    @property
+    def basic(self):
+        return config_manager.config.basic
+
+    @property
+    def security(self):
+        return config_manager.config.security
+
+    @property
+    def image_generation(self):
+        return config_manager.config.image_generation
+
+    @property
+    def retry(self):
+        return config_manager.config.retry
+
+    @property
+    def public_display(self):
+        return config_manager.config.public_display
+
+    @property
+    def session(self):
+        return config_manager.config.session
+
+config = _ConfigProxy()

core/uptime.py

@@ -0,0 +1,78 @@
+"""
+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