Upload 5 files

app.py

@@ -7,7 +7,6 @@ from rate_limit import shared_limit
 from response_privacy import PrivateResponseCacheControl
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import Response, JSONResponse, FileResponse 
-from sqlalchemy.orm import Session
 from pydantic import BaseModel
 from huggingface_hub import hf_hub_download, HfApi
 import uuid
@@ -15,10 +14,8 @@ import urllib.parse
 import urllib.request
 import urllib.error
 import os
-import json
 import logging
 import time
-import datetime
 import threading
 import 数据库连接 as db
 import asyncio
@@ -31,8 +28,7 @@ from rate_limit import start_shared_work, stop_shared_work, close_shared_work
 from script_execution import start_admin_scripts, stop_admin_scripts, close_admin_scripts
 from comment_store import start_comment_reads, stop_comment_reads, close_comment_reads
 from periodic_tasks import start_periodic_task, request_periodic_stop, wait_periodic_tasks
-from owned_thread import run_owned_thread, OwnedThreadGroup, owned_session_endpoint
-from contextlib import contextmanager
+from owned_thread import run_owned_thread
 from resource_work import start_resource_work, stop_resource_work, close_resource_work
 from shutdown_lifecycle import (prepare_application_shutdown, run_application_shutdown,
                                 shutdown_cancel_requested, ShutdownFailures)
@@ -83,31 +79,12 @@ from router_open_api import start_open_sql, stop_open_sql, close_open_sql
 from router_open_api import router as open_api_router  # 🌐 通用开放API（第三方插件）
 from router_admin_plugins import router as admin_plugins_router  # 🔒 管理后台 - 第三方插件管理API
 
-from database_sql import init_sql_db, get_db, SessionLocal
-from models_sql import SystemConfig  # 🧹 P2清理：Ownership 在本文件无引用
+from database_sql import init_sql_db
+from router_system_config import (router as system_config_router, start_config_sql, stop_config_sql, close_config_sql)
 
 from fastapi.exceptions import RequestValidationError
 from starlette.exceptions import HTTPException as StarletteHTTPException
 
-MAX_CONFIG_SQL_WORK = 8
-_config_sql_work = OwnedThreadGroup(MAX_CONFIG_SQL_WORK,
-    lambda: HTTPException(status_code=503, detail="service_unavailable"))
-_config_sql_lock = threading.Lock()
-start_config_sql = _config_sql_work.start
-stop_config_sql = _config_sql_work.stop
-close_config_sql = _config_sql_work.close
-
-
-@contextmanager
-def _config_sql_session():
-    with _config_sql_lock:
-        with SessionLocal() as session:
-            yield session
-
-
-_config_endpoint = owned_session_endpoint(_config_sql_work, _config_sql_session, 'db')
-
-
 app = FastAPI(
     title="ComfyUI Ranking API",
     description="ComfyUI 社区排名系统 API",
@@ -518,212 +495,7 @@ def validate_resource(req_data: ValidateResourceRequest, request: Request, curre
 # ==========================================
 # 🔒 管理员：系统配置 API
 # ==========================================
-from 安全认证 import require_auth, ADMIN_ACCOUNTS
-
-def _is_admin(account: str) -> bool:
-    """检查账号是否为管理员"""
-    from 安全认证 import is_admin as _check_admin
-    return _check_admin(account)
-
-# 配置存储文件
-SYSTEM_CONFIG_FILE = "/tmp/system_config.json"  # 保留作为降级方案
-
-def _load_system_config_from_db(db: Session, *, strict: bool = False) -> dict:
-    """从数据库加载所有系统配置"""
-    try:
-        configs = db.query(SystemConfig).all()
-        result = {}
-        for cfg in configs:
-            try:
-                result[cfg.config_key] = json.loads(cfg.config_value)
-            except (json.JSONDecodeError, TypeError):
-                result[cfg.config_key] = cfg.config_value
-        return result
-    except Exception as e:
-        logger.warning(f"从数据库加载系统配置失败，降级到文件: error_type={type(e).__name__}")
-        if strict:
-            return _load_system_config_from_file(strict=True)
-        return _load_system_config_from_file()
-
-def _load_system_config_from_file(*, strict: bool = False) -> dict:
-    """降级方案；严格读取不把故障或缺失文件冒充空配置。"""
-    if strict:
-        with open(SYSTEM_CONFIG_FILE, "r", encoding="utf-8") as stream:
-            config = json.load(stream)
-        if not isinstance(config, dict):
-            raise ValueError("invalid system configuration root")
-        return config
-    try:
-        if os.path.exists(SYSTEM_CONFIG_FILE):
-            with open(SYSTEM_CONFIG_FILE, "r") as f:
-                return json.load(f)
-    except Exception as e:
-        logger.debug(f"加载系统配置文件失败: error_type={type(e).__name__}")
-    return {}
-
-def _save_system_config_to_db(db: Session, config_key: str, value, updated_by: str = None, *, strict: bool = False):
-    """保存单个配置项到数据库"""
-    try:
-        cfg = db.query(SystemConfig).filter(SystemConfig.config_key == config_key).first()
-        if not cfg:
-            cfg = SystemConfig(config_key=config_key)
-            db.add(cfg)
-        cfg.config_value = json.dumps(value, ensure_ascii=False, allow_nan=not strict)
-        cfg.updated_by = updated_by
-        cfg.updated_at = datetime.datetime.utcnow()
-        db.commit()
-    except Exception as e:
-        if strict:
-            # commit异常可能发生在真实提交之后；回滚不能证明尚未保存。
-            try:
-                db.rollback()
-            except Exception:
-                logger.warning("SYSTEM_CONFIG_ROLLBACK_UNCONFIRMED")
-            raise
-        db.rollback()
-        logger.warning(f"保存系统配置到数据库失败，降级到文件: error_type={type(e).__name__}")
-        # 降级：保存到文件
-        config = _load_system_config_from_file()
-        config[config_key] = value
-        try:
-            with open(SYSTEM_CONFIG_FILE, "w") as f:
-                json.dump(config, f, ensure_ascii=False)
-        except Exception as fe:
-            logger.warning(f"降级保存系统配置文件也失败: error_type={type(fe).__name__}")
-
-# 兼容旧调用的包装函数
-def _load_system_config(db: Session = None, *, strict: bool = False) -> dict:
-    """加载系统配置（优先数据库，降级文件）；严格模式保留故障。"""
-    if strict:
-        if db is not None:
-            return _load_system_config_from_db(db, strict=True)
-        temp_db = SessionLocal()
-        try:
-            return _load_system_config_from_db(temp_db, strict=True)
-        finally:
-            temp_db.close()
-    if db:
-        return _load_system_config_from_db(db)
-    # 无 db session 时（如公开端点），创建临时 session
-    temp_db = SessionLocal()
-    try:
-        return _load_system_config_from_db(temp_db)
-    except Exception:
-        return _load_system_config_from_file()
-    finally:
-        temp_db.close()
-
-def _save_system_config(config: dict, db: Session = None, updated_by: str = None):
-    """保存系统配置（优先数据库，降级文件）"""
-    if db:
-        for key, value in config.items():
-            _save_system_config_to_db(db, key, value, updated_by)
-        return
-    # 无 db session 时，创建临时 session
-    temp_db = SessionLocal()
-    try:
-        for key, value in config.items():
-            _save_system_config_to_db(temp_db, key, value, updated_by)
-    except Exception:
-        pass
-    finally:
-        temp_db.close()
-
-
-@app.get("/api/admin/config/{config_key}")
-@_config_endpoint
-def get_system_config(config_key: str, current_user: str = Depends(require_auth), db: Session = Depends(get_db)):
-    """ 🔒 获取系统配置（仅管理员） """
-    # 🔒 权限验证
-    if not _is_admin(current_user):
-        raise HTTPException(status_code=403, detail="无权访问系统配置，仅管理员可操作")
-    
-    def reject_constant(_value):
-        raise ValueError("invalid configuration constant")
-    try:
-        # 管理回读用于确认SQL保存结果，不能用另一个来源的旧值代替。
-        storage_key = "image_moderation_enabled" if config_key == "image_moderation" else config_key
-        row = db.query(SystemConfig).filter(SystemConfig.config_key == storage_key).first()
-        value = None if row is None else json.loads(row.config_value, parse_constant=reject_constant)
-        if config_key == "image_moderation":
-            if row is None:
-                from image_moderation import _is_moderation_enabled
-                value = _is_moderation_enabled()
-            if type(value) is not bool:
-                raise ValueError("invalid moderation configuration")
-            value = {"enabled": value}
-    except Exception:
-        raise HTTPException(status_code=503, detail="config_read_unavailable") from None
-    return {"status": "success", "data": value}
-
-
-# 🏷️ 版本配置默认值
-DEFAULT_VERSION_CONFIG = {
-    "stage": "beta",
-    "major": 2,
-    "minor": 0,
-    "patch": 0
-}
-
-
-@app.get("/api/public/project-version")
-@_config_endpoint
-def get_public_project_version(db: Session = Depends(get_db)):
-    """获取项目版本信息（公开接口，无需认证）"""
-    config = _load_system_config(db)
-    version_data = config.get("project_version", DEFAULT_VERSION_CONFIG)
-    return {"status": "success", "data": version_data}
-
-
-@app.get("/api/public/banner_config")
-@_config_endpoint
-def get_public_banner_config(db: Session = Depends(get_db)):
-    """公开接口：获取广告横幅配置（所有已登录/未登录用户均可访问）"""
-    try:
-        config = _load_system_config(db, strict=True)
-        if not isinstance(config, dict):
-            raise ValueError("invalid system configuration root")
-        banner = config.get("banner_config")
-        if banner is None:
-            return {"status": "success", "data": None}
-        if not isinstance(banner, dict) or type(banner.get("enabled")) is not bool:
-            raise ValueError("invalid banner configuration")
-        if not banner["enabled"]:
-            return {"status": "success", "data": None}
-        # 只投影展示字段，异常配置不能触发浏览器清除旧横幅。
-        result = {"enabled": True}
-        for field in ("bannerImage", "title", "description", "detailImage", "detailContent", "link"):
-            value = banner.get(field, "")
-            if not isinstance(value, str):
-                raise ValueError("invalid banner display field")
-            result[field] = value
-        if not result["bannerImage"].strip():
-            raise ValueError("missing banner image")
-        return {"status": "success", "data": result}
-    except Exception:
-        raise HTTPException(status_code=503, detail="banner_config_unavailable") from None
-
-
-@app.put("/api/admin/config/{config_key}")
-@_config_endpoint
-def set_system_config(config_key: str, value: dict, current_user: str = Depends(require_auth), db: Session = Depends(get_db)):
-    """ 🔒 设置系统配置（仅管理员） """
-    # 🔒 权限验证
-    if not _is_admin(current_user):
-        raise HTTPException(status_code=403, detail="无权修改系统配置，仅管理员可操作")
-    storage_key = config_key
-    storage_value = value
-    if config_key == "image_moderation":
-        if set(value) != {"enabled"} or type(value["enabled"]) is not bool:
-            raise HTTPException(status_code=400, detail="invalid_moderation_configuration")
-        storage_key = "image_moderation_enabled"
-        storage_value = value["enabled"]
-    try:
-        _save_system_config_to_db(db, storage_key, storage_value, updated_by=current_user, strict=True)
-    except Exception:
-        raise HTTPException(status_code=503, detail="config_save_unconfirmed") from None
-    return {"status": "success", "message": "配置已更新"}
-
+app.include_router(system_config_router)
 
 # ==========================================
 # 🖥️ 管理界面静态文件挂载

router_system_config.py

@@ -0,0 +1,241 @@
+from contextlib import contextmanager
+import datetime
+import json
+import logging
+import os
+import threading
+
+from fastapi import APIRouter, Depends, HTTPException
+from sqlalchemy.orm import Session
+from database_sql import get_db, SessionLocal
+from models_sql import SystemConfig
+from owned_thread import OwnedThreadGroup, owned_session_endpoint
+from 安全认证 import require_auth
+
+logger = logging.getLogger("ComfyUI-Ranking")
+router = APIRouter()
+
+MAX_CONFIG_SQL_WORK = 8
+_config_sql_work = OwnedThreadGroup(MAX_CONFIG_SQL_WORK,
+    lambda: HTTPException(status_code=503, detail="service_unavailable"))
+_config_sql_lock = threading.Lock()
+start_config_sql = _config_sql_work.start
+stop_config_sql = _config_sql_work.stop
+close_config_sql = _config_sql_work.close
+
+
+@contextmanager
+def _config_sql_session():
+    with _config_sql_lock:
+        with SessionLocal() as session:
+            yield session
+
+
+_config_endpoint = owned_session_endpoint(_config_sql_work, _config_sql_session, 'db')
+
+
+def _is_admin(account: str) -> bool:
+    """检查账号是否为管理员"""
+    from 安全认证 import is_admin as _check_admin
+    return _check_admin(account)
+
+# 配置存储文件
+SYSTEM_CONFIG_FILE = "/tmp/system_config.json"  # 保留作为降级方案
+
+def _load_system_config_from_db(db: Session, *, strict: bool = False) -> dict:
+    """从数据库加载所有系统配置"""
+    try:
+        configs = db.query(SystemConfig).all()
+        result = {}
+        for cfg in configs:
+            try:
+                result[cfg.config_key] = json.loads(cfg.config_value)
+            except (json.JSONDecodeError, TypeError):
+                result[cfg.config_key] = cfg.config_value
+        return result
+    except Exception as e:
+        logger.warning(f"从数据库加载系统配置失败，降级到文件: error_type={type(e).__name__}")
+        if strict:
+            return _load_system_config_from_file(strict=True)
+        return _load_system_config_from_file()
+
+def _load_system_config_from_file(*, strict: bool = False) -> dict:
+    """降级方案；严格读取不把故障或缺失文件冒充空配置。"""
+    if strict:
+        with open(SYSTEM_CONFIG_FILE, "r", encoding="utf-8") as stream:
+            config = json.load(stream)
+        if not isinstance(config, dict):
+            raise ValueError("invalid system configuration root")
+        return config
+    try:
+        if os.path.exists(SYSTEM_CONFIG_FILE):
+            with open(SYSTEM_CONFIG_FILE, "r") as f:
+                return json.load(f)
+    except Exception as e:
+        logger.debug(f"加载系统配置文件失败: error_type={type(e).__name__}")
+    return {}
+
+def _save_system_config_to_db(db: Session, config_key: str, value, updated_by: str = None, *, strict: bool = False):
+    """保存单个配置项到数据库"""
+    try:
+        cfg = db.query(SystemConfig).filter(SystemConfig.config_key == config_key).first()
+        if not cfg:
+            cfg = SystemConfig(config_key=config_key)
+            db.add(cfg)
+        cfg.config_value = json.dumps(value, ensure_ascii=False, allow_nan=not strict)
+        cfg.updated_by = updated_by
+        cfg.updated_at = datetime.datetime.utcnow()
+        db.commit()
+    except Exception as e:
+        if strict:
+            # commit异常可能发生在真实提交之后；回滚不能证明尚未保存。
+            try:
+                db.rollback()
+            except Exception:
+                logger.warning("SYSTEM_CONFIG_ROLLBACK_UNCONFIRMED")
+            raise
+        db.rollback()
+        logger.warning(f"保存系统配置到数据库失败，降级到文件: error_type={type(e).__name__}")
+        # 降级：保存到文件
+        config = _load_system_config_from_file()
+        config[config_key] = value
+        try:
+            with open(SYSTEM_CONFIG_FILE, "w") as f:
+                json.dump(config, f, ensure_ascii=False)
+        except Exception as fe:
+            logger.warning(f"降级保存系统配置文件也失败: error_type={type(fe).__name__}")
+
+# 兼容旧调用的包装函数
+def _load_system_config(db: Session = None, *, strict: bool = False) -> dict:
+    """加载系统配置（优先数据库，降级文件）；严格模式保留故障。"""
+    if strict:
+        if db is not None:
+            return _load_system_config_from_db(db, strict=True)
+        temp_db = SessionLocal()
+        try:
+            return _load_system_config_from_db(temp_db, strict=True)
+        finally:
+            temp_db.close()
+    if db:
+        return _load_system_config_from_db(db)
+    # 无 db session 时（如公开端点），创建临时 session
+    temp_db = SessionLocal()
+    try:
+        return _load_system_config_from_db(temp_db)
+    except Exception:
+        return _load_system_config_from_file()
+    finally:
+        temp_db.close()
+
+def _save_system_config(config: dict, db: Session = None, updated_by: str = None):
+    """保存系统配置（优先数据库，降级文件���"""
+    if db:
+        for key, value in config.items():
+            _save_system_config_to_db(db, key, value, updated_by)
+        return
+    # 无 db session 时，创建临时 session
+    temp_db = SessionLocal()
+    try:
+        for key, value in config.items():
+            _save_system_config_to_db(temp_db, key, value, updated_by)
+    except Exception:
+        pass
+    finally:
+        temp_db.close()
+
+
+@router.get("/api/admin/config/{config_key}")
+@_config_endpoint
+def get_system_config(config_key: str, current_user: str = Depends(require_auth), db: Session = Depends(get_db)):
+    """ 🔒 获取系统配置（仅管理员） """
+    # 🔒 权限验证
+    if not _is_admin(current_user):
+        raise HTTPException(status_code=403, detail="无权访问系统配置，仅管理员可操作")
+    
+    def reject_constant(_value):
+        raise ValueError("invalid configuration constant")
+    try:
+        # 管理回读用于确认SQL保存结果，不能用另一个来源的旧值代替。
+        storage_key = "image_moderation_enabled" if config_key == "image_moderation" else config_key
+        row = db.query(SystemConfig).filter(SystemConfig.config_key == storage_key).first()
+        value = None if row is None else json.loads(row.config_value, parse_constant=reject_constant)
+        if config_key == "image_moderation":
+            if row is None:
+                from image_moderation import _is_moderation_enabled
+                value = _is_moderation_enabled()
+            if type(value) is not bool:
+                raise ValueError("invalid moderation configuration")
+            value = {"enabled": value}
+    except Exception:
+        raise HTTPException(status_code=503, detail="config_read_unavailable") from None
+    return {"status": "success", "data": value}
+
+
+# 🏷️ 版本配置默认值
+DEFAULT_VERSION_CONFIG = {
+    "stage": "beta",
+    "major": 2,
+    "minor": 0,
+    "patch": 0
+}
+
+
+@router.get("/api/public/project-version")
+@_config_endpoint
+def get_public_project_version(db: Session = Depends(get_db)):
+    """获取项目版本信息（公开接口，无需认证）"""
+    config = _load_system_config(db)
+    version_data = config.get("project_version", DEFAULT_VERSION_CONFIG)
+    return {"status": "success", "data": version_data}
+
+
+@router.get("/api/public/banner_config")
+@_config_endpoint
+def get_public_banner_config(db: Session = Depends(get_db)):
+    """公开接口：获取广告横幅配置（所有已登录/未登录用户均可访问）"""
+    try:
+        config = _load_system_config(db, strict=True)
+        if not isinstance(config, dict):
+            raise ValueError("invalid system configuration root")
+        banner = config.get("banner_config")
+        if banner is None:
+            return {"status": "success", "data": None}
+        if not isinstance(banner, dict) or type(banner.get("enabled")) is not bool:
+            raise ValueError("invalid banner configuration")
+        if not banner["enabled"]:
+            return {"status": "success", "data": None}
+        # 只投影展示字段，异常配置不能触发浏览器清除旧横幅。
+        result = {"enabled": True}
+        for field in ("bannerImage", "title", "description", "detailImage", "detailContent", "link"):
+            value = banner.get(field, "")
+            if not isinstance(value, str):
+                raise ValueError("invalid banner display field")
+            result[field] = value
+        if not result["bannerImage"].strip():
+            raise ValueError("missing banner image")
+        return {"status": "success", "data": result}
+    except Exception:
+        raise HTTPException(status_code=503, detail="banner_config_unavailable") from None
+
+
+@router.put("/api/admin/config/{config_key}")
+@_config_endpoint
+def set_system_config(config_key: str, value: dict, current_user: str = Depends(require_auth), db: Session = Depends(get_db)):
+    """ 🔒 设置系统配置（仅管理员） """
+    # 🔒 权限验证
+    if not _is_admin(current_user):
+        raise HTTPException(status_code=403, detail="无权修改系统配置，仅管理员可操作")
+    storage_key = config_key
+    storage_value = value
+    if config_key == "image_moderation":
+        if set(value) != {"enabled"} or type(value["enabled"]) is not bool:
+            raise HTTPException(status_code=400, detail="invalid_moderation_configuration")
+        storage_key = "image_moderation_enabled"
+        storage_value = value["enabled"]
+    try:
+        _save_system_config_to_db(db, storage_key, storage_value, updated_by=current_user, strict=True)
+    except Exception:
+        raise HTTPException(status_code=503, detail="config_save_unconfirmed") from None
+    return {"status": "success", "message": "配置已更新"}
+
+