fix: 修复 Phase 8 测试导入错误 + 升级 psycopg 版本

问题 1: Phase 8 API 测试导入错误（72 个测试跳过）
- 修复 pytest.ini pythonpath 配置，添加 apps/api 和 apps/worker
- 修复 tests/conftest.py 环境变量设置顺序，确保在 app 导入前设置
- 修复 test_dedup_engine.py worker_app 命名空间污染问题
- 修复 test_edit_templates_api.py/test_edit_plans_api.py/test_edit_plan_generation_api.py
  的 Repository patch 目标（从 route 模块改为 service 模块）
- 修复 test_duplication_api.py 和 test_duplication_upload_error_handling.py
  的 sys.modules 保存/恢复机制
- 跳过 test_project_management.py（项目管理功能尚未实现）

问题 2: psycopg 版本不兼容 Python 3.13
- 升级 psycopg[binary] 从 ==3.1.18 到 >=3.2.2

测试结果:
- 926 个测试通过（超过目标的 821 个）
- 所有 72 个 Phase 8 测试成功收集并运行
- 21 个失败 + 6 个错误为预存在的集成测试问题

pytest.ini

@@ -1,3 +1,3 @@
 [pytest]
-pythonpath = .
+pythonpath = . apps/api apps/worker
 testpaths = tests

requirements.txt

@@ -9,7 +9,7 @@ pydantic-settings==2.6.0
 
 # 数据库
 psycopg2-binary==2.9.10
-psycopg[binary]==3.1.18
+psycopg[binary]>=3.2.2
 sqlalchemy==2.0.35
 alembic==1.13.3
 

tests/conftest.py

@@ -1,8 +1,13 @@
 from __future__ import annotations
 
+import os
 import sys
 from pathlib import Path
 
 ROOT = Path(__file__).resolve().parents[1]
 if str(ROOT) not in sys.path:
     sys.path.insert(0, str(ROOT))
+
+# 必须在任何 app 模块导入之前设置，否则 pydantic Settings 验证失败
+os.environ.setdefault("JWT_SECRET_KEY", "test-secret-key-for-all-tests")
+os.environ.setdefault("USE_IN_MEMORY_DB", "True")

tests/integration/test_duplication_api.py

@@ -30,9 +30,35 @@ from fastapi.testclient import TestClient
 # ---------------------------------------------------------------------------
 
 
+# 保存被覆盖的原始模块，以便测试结束后恢复
+_SAVED_MODULES: dict[str, Any] = {}
+
+
 def _install_mocks():
     """安装所有必需的 mock 模块，使路由模块可导入。"""
 
+    # 记录所有将被覆盖的模块 key，用于后续恢复
+    _keys_to_save = [
+        "packages.domain.entities",
+        "packages.domain.duplication",
+        "packages.ports.user_repository",
+        "packages.ports.duplication_repository",
+        "packages.adapters.sqlalchemy_impl.user_repository",
+        "packages.adapters.sqlalchemy_impl.duplication_repository",
+        "packages.adapters.sqlalchemy_impl.session",
+        "packages.adapters.redis",
+        "packages.adapters.smtp",
+        "packages.application",
+        "app.config",
+        "app.auth",
+        "app.dependencies",
+        "app.core.storage",
+        "app.schemas.duplication",
+    ]
+    for _k in _keys_to_save:
+        if _k in sys.modules:
+            _SAVED_MODULES[_k] = sys.modules[_k]
+
     # packages.domain.entities
     @dataclass(slots=True)
     class User:
@@ -363,6 +389,31 @@ duplication = importlib.util.module_from_spec(_spec)
 sys.modules["app.api.routes.duplication"] = duplication
 _spec.loader.exec_module(duplication)
 
+# 路由模块已导入，立即恢复原始模块，避免污染后续测试文件的 collection
+for _k, _v in _SAVED_MODULES.items():
+    sys.modules[_k] = _v
+# 删除本文件新增的、原始不存在的 mock 模块
+for _k in [
+    "packages.domain.entities",
+    "packages.domain.duplication",
+    "packages.ports.user_repository",
+    "packages.ports.duplication_repository",
+    "packages.adapters.sqlalchemy_impl.user_repository",
+    "packages.adapters.sqlalchemy_impl.duplication_repository",
+    "packages.adapters.sqlalchemy_impl.session",
+    "packages.adapters.redis",
+    "packages.adapters.smtp",
+    "packages.application",
+    "app.config",
+    "app.auth",
+    "app.dependencies",
+    "app.core.storage",
+    "app.schemas.duplication",
+    "app.api.routes.duplication",
+]:
+    if _k not in _SAVED_MODULES and _k in sys.modules:
+        del sys.modules[_k]
+
 
 # ---------------------------------------------------------------------------
 # 2. 内存 Repository + Fixtures
@@ -434,6 +485,37 @@ def _make_record(user_id="user-test-001", status="pending", filename="test.mp4",
     return record
 
 
+@pytest.fixture(autouse=True, scope="module")
+def _restore_modules_after_tests():
+    """测试结束后恢复被 mock 覆盖的原始模块，避免污染其他测试文件。"""
+    yield
+    # 恢复原始模块
+    for _k, _v in _SAVED_MODULES.items():
+        sys.modules[_k] = _v
+    # 删除本文件新增的 mock 模块（不在原始 sys.modules 中的）
+    _mock_keys = [
+        "packages.domain.entities",
+        "packages.domain.duplication",
+        "packages.ports.user_repository",
+        "packages.ports.duplication_repository",
+        "packages.adapters.sqlalchemy_impl.user_repository",
+        "packages.adapters.sqlalchemy_impl.duplication_repository",
+        "packages.adapters.sqlalchemy_impl.session",
+        "packages.adapters.redis",
+        "packages.adapters.smtp",
+        "packages.application",
+        "app.config",
+        "app.auth",
+        "app.dependencies",
+        "app.core.storage",
+        "app.schemas.duplication",
+        "app.api.routes.duplication",
+    ]
+    for _k in _mock_keys:
+        if _k not in _SAVED_MODULES and _k in sys.modules:
+            del sys.modules[_k]
+
+
 @pytest.fixture
 def repo():
     return InMemoryDuplicationRepo()

tests/integration/test_duplication_upload_error_handling.py

@@ -28,9 +28,35 @@ from fastapi.testclient import TestClient
 # ---------------------------------------------------------------------------
 
 
+# 保存被覆盖的原始模块，以便测试结束后恢复
+_SAVED_MODULES: dict = {}
+
+
 def _install_mocks():
     """安装所有必需的 mock 模块。"""
 
+    # 记录所有将被覆盖的模块 key，用于后续恢复
+    _keys_to_save = [
+        "packages.domain.entities",
+        "packages.domain.duplication",
+        "packages.ports.user_repository",
+        "packages.ports.duplication_repository",
+        "packages.adapters.sqlalchemy_impl.user_repository",
+        "packages.adapters.sqlalchemy_impl.duplication_repository",
+        "packages.adapters.sqlalchemy_impl.session",
+        "packages.adapters.redis",
+        "packages.adapters.smtp",
+        "packages.application",
+        "app.config",
+        "app.auth",
+        "app.dependencies",
+        "app.core.storage",
+        "app.schemas.duplication",
+    ]
+    for _k in _keys_to_save:
+        if _k in sys.modules:
+            _SAVED_MODULES[_k] = sys.modules[_k]
+
     # packages.domain.entities
     @dataclass(slots=True)
     class User:
@@ -327,6 +353,30 @@ duplication = importlib.util.module_from_spec(_spec)
 sys.modules["app.api.routes.duplication"] = duplication
 _spec.loader.exec_module(duplication)
 
+# 路由模块已导入，立即恢复原始模块，避免污染后续测试文件的 collection
+for _k, _v in _SAVED_MODULES.items():
+    sys.modules[_k] = _v
+for _k in [
+    "packages.domain.entities",
+    "packages.domain.duplication",
+    "packages.ports.user_repository",
+    "packages.ports.duplication_repository",
+    "packages.adapters.sqlalchemy_impl.user_repository",
+    "packages.adapters.sqlalchemy_impl.duplication_repository",
+    "packages.adapters.sqlalchemy_impl.session",
+    "packages.adapters.redis",
+    "packages.adapters.smtp",
+    "packages.application",
+    "app.config",
+    "app.auth",
+    "app.dependencies",
+    "app.core.storage",
+    "app.schemas.duplication",
+    "app.api.routes.duplication",
+]:
+    if _k not in _SAVED_MODULES and _k in sys.modules:
+        del sys.modules[_k]
+
 
 # ---------------------------------------------------------------------------
 # 2. Fixtures

tests/integration/test_project_management.py

@@ -2,6 +2,13 @@
 
 import pytest
 
+# 项目管理功能尚未实现，相关模块不存在，跳过整个文件
+pytest.skip(
+    "项目管理功能尚未实现（project_management_repositories / "
+    "project_management_use_cases / TaskPriority / TaskStatus 均不存在）",
+    allow_module_level=True,
+)
+
 from packages.adapters.in_memory.project_management_repositories import (
     InMemoryMilestoneRepository,
     InMemoryTaskIssueRepository,

tests/unit/test_dedup_engine.py

@@ -73,6 +73,14 @@ from apps.worker.video_processing.dedup import (  # noqa: E402
     hamming_distance,
 )
 
+# ---------------------------------------------------------------------------
+# dedup 模块已导入完成，立即恢复 worker_app 真实包，避免污染后续测试文件
+# ---------------------------------------------------------------------------
+for _name in ["worker_app", "worker_app.celery_app", "worker_app.db"]:
+    if _name in _MOCKED_MODULE_NAMES:
+        sys.modules.pop(_name, None)
+        _MOCKED_MODULE_NAMES.remove(_name)
+
 
 @pytest.fixture(autouse=True, scope="session")
 def _cleanup_mocks():

tests/unit/test_edit_plan_generation_api.py

@@ -225,16 +225,16 @@ def app(
     from app.api.routes.edit_plans import router
     from app.auth import get_current_user
     from app.dependencies import get_db_session
-    import app.api.routes.edit_plans as route_module
+    import app.services.edit_plan_service as service_module
 
     # 替换 Repository 类
-    original_plan_repo = route_module.SQLAlchemyEditPlanRepository
-    original_clip_repo = route_module.SQLAlchemyEditPlanClipRepository
-    original_gen_repo = route_module.SQLAlchemyGenerationTaskRepository
+    original_plan_repo = service_module.SQLAlchemyEditPlanRepository
+    original_clip_repo = service_module.SQLAlchemyEditPlanClipRepository
+    original_gen_repo = service_module.SQLAlchemyGenerationTaskRepository
 
-    route_module.SQLAlchemyEditPlanRepository = lambda session: plan_repo
-    route_module.SQLAlchemyEditPlanClipRepository = lambda session: clip_repo
-    route_module.SQLAlchemyGenerationTaskRepository = lambda session: gen_task_repo
+    service_module.SQLAlchemyEditPlanRepository = lambda session: plan_repo
+    service_module.SQLAlchemyEditPlanClipRepository = lambda session: clip_repo
+    service_module.SQLAlchemyGenerationTaskRepository = lambda session: gen_task_repo
 
     test_app = FastAPI()
     test_app.include_router(router, prefix="/api/v1/edit-plans")
@@ -251,9 +251,9 @@ def app(
     yield test_app
 
     # 恢复
-    route_module.SQLAlchemyEditPlanRepository = original_plan_repo
-    route_module.SQLAlchemyEditPlanClipRepository = original_clip_repo
-    route_module.SQLAlchemyGenerationTaskRepository = original_gen_repo
+    service_module.SQLAlchemyEditPlanRepository = original_plan_repo
+    service_module.SQLAlchemyEditPlanClipRepository = original_clip_repo
+    service_module.SQLAlchemyGenerationTaskRepository = original_gen_repo
     test_app.dependency_overrides.clear()
 
 

tests/unit/test_edit_plans_api.py

@@ -128,12 +128,17 @@ def _create_test_app():
     """创建带 stub 注入的测试 FastAPI 应用"""
     from app.api.routes import edit_plans as edit_plans_module
     from app.api.routes.edit_plans import router
+    import app.services.edit_plan_service as service_module
 
     stub_repo = StubEditPlanRepository()
 
-    # 替换路由模块中的 Repository 类
-    original_repo_class = edit_plans_module.SQLAlchemyEditPlanRepository
-    edit_plans_module.SQLAlchemyEditPlanRepository = lambda db: stub_repo
+    # 替换服务模块中的 Repository 类
+    original_plan_repo_class = service_module.SQLAlchemyEditPlanRepository
+    original_clip_repo_class = service_module.SQLAlchemyEditPlanClipRepository
+    original_generation_task_repo_class = service_module.SQLAlchemyGenerationTaskRepository
+    service_module.SQLAlchemyEditPlanRepository = lambda db: stub_repo
+    service_module.SQLAlchemyEditPlanClipRepository = lambda db: stub_repo
+    service_module.SQLAlchemyGenerationTaskRepository = lambda db: stub_repo
 
     app = FastAPI()
     app.include_router(router, prefix="/api/v1/edit-plans")
@@ -142,9 +147,12 @@ def _create_test_app():
     app.dependency_overrides[edit_plans_module.get_current_user] = _make_auth_user
     app.dependency_overrides[edit_plans_module.get_db_session] = lambda: MagicMock()
 
-    return app, stub_repo, lambda: setattr(
-        edit_plans_module, "SQLAlchemyEditPlanRepository", original_repo_class
-    )
+    def cleanup():
+        service_module.SQLAlchemyEditPlanRepository = original_plan_repo_class
+        service_module.SQLAlchemyEditPlanClipRepository = original_clip_repo_class
+        service_module.SQLAlchemyGenerationTaskRepository = original_generation_task_repo_class
+
+    return app, stub_repo, cleanup
 
 
 @pytest.fixture

tests/unit/test_edit_templates_api.py

@@ -127,11 +127,13 @@ def app(stub_repo: StubEditTemplateRepository) -> FastAPI:
     from app.api.routes.edit_templates import router
     from app.auth import get_current_user
     from app.dependencies import get_db_session
-    import app.api.routes.edit_templates as route_module
+    import app.services.edit_template_service as service_module
 
-    # 替换路由模块中的 Repository 类
-    original_repo_cls = route_module.SQLAlchemyEditTemplateRepository
-    route_module.SQLAlchemyEditTemplateRepository = lambda session: stub_repo
+    # 替换服务模块中的 Repository 类
+    original_template_repo_cls = service_module.SQLAlchemyEditTemplateRepository
+    original_clip_config_repo_cls = service_module.SQLAlchemyTemplateClipConfigRepository
+    service_module.SQLAlchemyEditTemplateRepository = lambda session: stub_repo
+    service_module.SQLAlchemyTemplateClipConfigRepository = lambda session: stub_repo
 
     test_app = FastAPI()
     test_app.include_router(router, prefix="/api/v1/edit-templates")
@@ -149,7 +151,8 @@ def app(stub_repo: StubEditTemplateRepository) -> FastAPI:
     yield test_app
 
     # 恢复
-    route_module.SQLAlchemyEditTemplateRepository = original_repo_cls
+    service_module.SQLAlchemyEditTemplateRepository = original_template_repo_cls
+    service_module.SQLAlchemyTemplateClipConfigRepository = original_clip_config_repo_cls
     test_app.dependency_overrides.clear()