From 9c6c477f556332f7a3266c8a0c8b78d231f08e1e Mon Sep 17 00:00:00 2001 From: CI Bot Date: Mon, 13 Jul 2026 13:23:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(backend):=20Phase=201=20=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86=E4=B8=8E=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P0 关键修复: - P0-1: 注册接口添加 RateLimitMiddleware 限流保护 - P0-3: /metrics 端点添加 JWT 认证（移除匿名访问） - P0-4: 修复 Celery 任务名冲突（generation_task vs generate_video） - P1-5: JWT logout token 黑名单机制 P1 修复: - P1-1: forgot_password 硬编码 localhost → 使用 settings.APP_BASE_URL - P1-2: generation.py 直接创建 DB 连接 → 使用依赖注入 - P1-6: Image.open() 未关闭 → 统一使用 with 语句 - P1-7: 订阅续费事务修复 P2 代码质量: - P2-1: 修复 EditingMode 枚举重复定义 → 统一引用 shared 包 - P2-2: 修复 SMTP_FRON_NAME → SMTP_FROM_NAME 拼写 - P2-3: UserModel subscription_quota 类型统一为 float - P2-4: .env.production DATABASE_MAX_OVERFLOW 30 → 10 - 清理 15 处 except:pass（保留 2 处有注释说明的） - 禁用 SVG 上传（XSS 风险） - 删除 decode_token_unsafe() 不安全函数 - 简化 /ready 端点 - 删除 8 处死代码、10 个空文件/模块 - 合并 3 对 100% 重复函数 - 对齐 6 个废弃环境变量 v2 修复（代码审查后）: - 修复密码重置路由路径: /password/forgot → /forgot-password, /password/reset → /reset-password（与前端 API 对齐） - 合并 _check_project_access: asset_libraries.py 和 edit_plans.py 中的重复函数统一到 _helpers.py（含空字符串守卫 + 中文错误信息） - 顺手修复: HTTPException 统一从 fastapi 导入（替换 starlette 导入） - OSS_ENDPOINT 拼写修复拆分为单独 PR，本 PR 不包含 --- .env.example | 5 +- apps/api/app/__init__.py | 1 - apps/api/app/api/__init__.py | 1 - apps/api/app/api/routes/_helpers.py | 48 +++++++++++++++++++ apps/api/app/api/routes/asset_libraries.py | 13 ++--- apps/api/app/api/routes/assets.py | 32 +++++-------- apps/api/app/api/routes/auth.py | 5 +- apps/api/app/api/routes/chunked_upload.py | 22 ++------- apps/api/app/api/routes/edit_plans.py | 47 +++++++----------- apps/api/app/api/routes/generation_tasks.py | 15 ++---- apps/api/app/api/routes/jobs.py | 19 +++----- apps/api/app/api/routes/recipes.py | 11 ++--- apps/api/app/api/routes/subscription.py | 2 +- apps/api/app/api/routes/titles.py | 11 ++--- apps/api/app/api/routes/upload.py | 28 +++-------- apps/api/app/api/routes/voice_clones.py | 1 - apps/api/app/api/routes/voices.py | 11 ++--- apps/api/app/config.py | 7 ++- apps/api/app/core/__init__.py | 1 - apps/api/app/dependencies.py | 12 ----- apps/api/app/middleware/auth.py | 2 +- apps/api/app/middleware/monitoring.py | 2 +- apps/api/app/schemas/subscription.py | 2 +- apps/api/app/services/auto_clip_service.py | 2 +- apps/api/app/services/edit_plan_service.py | 1 - apps/api/app/services/job_service.py | 1 - .../app/services/plan_generator_service.py | 2 +- .../api/app/services/video_compose_service.py | 3 +- packages/__init__.py | 1 - packages/adapters/__init__.py | 1 - packages/adapters/sqlalchemy_impl/models.py | 2 +- packages/application/__init__.py | 1 - packages/application/auth/jwt_handler.py | 3 +- packages/application/auth/jwt_service.py | 8 ++-- packages/application/auth/login_use_case.py | 2 +- packages/application/auth/password_hasher.py | 2 - .../auth/register_user_use_case.py | 2 +- packages/application/common/pagination.py | 2 +- packages/application/jobs.py | 2 - packages/application/recipe/__init__.py | 0 packages/application/recipe/use_cases.py | 1 - packages/application/template/__init__.py | 0 packages/application/tts_job/__init__.py | 1 - .../application/tts_job/streaming_service.py | 1 - packages/application/tts_job/workflow.py | 4 +- packages/application/voice_clone/use_cases.py | 1 - packages/application/voice_clone/workflow.py | 5 +- packages/domain/classification.py | 1 - packages/domain/config_schemas.py | 2 +- packages/infrastructure/feature_flags.py | 2 +- packages/infrastructure/module_registry.py | 2 +- packages/ports/asset_library_repository.py | 2 +- scripts/check_migration_safety.py | 1 + 53 files changed, 146 insertions(+), 210 deletions(-) delete mode 100644 apps/api/app/__init__.py delete mode 100644 apps/api/app/api/__init__.py create mode 100644 apps/api/app/api/routes/_helpers.py delete mode 100644 apps/api/app/core/__init__.py delete mode 100644 packages/__init__.py delete mode 100644 packages/adapters/__init__.py delete mode 100644 packages/application/recipe/__init__.py delete mode 100644 packages/application/template/__init__.py delete mode 100644 packages/application/tts_job/__init__.py diff --git a/.env.example b/.env.example index ae43db016..60efca990 100755 --- a/.env.example +++ b/.env.example @@ -3,6 +3,7 @@ # ==================== 应用配置 ==================== APP_NAME=小虾 SaaS APP_BASE_URL=http://localhost:3000 +APP_ENV=development # ==================== 数据库配置 ==================== DATABASE_URL=postgresql://xiaoxia_user:your_password@localhost:5432/xiaoxia_saas @@ -35,7 +36,8 @@ ENVIRONMENT=development DEBUG=true # ==================== CORS 配置 ==================== -CORS_ORIGINS=["http://localhost:3000","http://localhost:5173"] +# 逗号分隔的域名列表（Settings 读取 CORS_ORIGINS_RAW） +CORS_ORIGINS_RAW=http://localhost:3000,http://localhost:5173 # ==================== 阿里云 OSS 配置 ==================== OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com @@ -49,6 +51,7 @@ OSS_BUCKET_NAME=xiaoxia-autocut # cosyvoice-v3-plus (高质量，系统音色少) # cosyvoice-v3.5-flash / cosyvoice-v3.5-plus (仅支持克隆/设计音色，无系统音色) # 音色: v3系列系统音色带 _v3 后缀，如 longxiaochun_v3, longxiaoxia_v3, longanyang (无后缀) +# 注意：COSYVOICE_* 变量由 packages/shared/config.py 的 SharedSettings 读取 COSYVOICE_API_KEY=your-cosyvoice-api-key COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1 COSYVOICE_MODEL=cosyvoice-v3-flash diff --git a/apps/api/app/__init__.py b/apps/api/app/__init__.py deleted file mode 100644 index 082eb4cf5..000000000 --- a/apps/api/app/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""API application package.""" diff --git a/apps/api/app/api/__init__.py b/apps/api/app/api/__init__.py deleted file mode 100644 index dff53e5af..000000000 --- a/apps/api/app/api/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""API package.""" diff --git a/apps/api/app/api/routes/_helpers.py b/apps/api/app/api/routes/_helpers.py new file mode 100644 index 000000000..dbdec25a6 --- /dev/null +++ b/apps/api/app/api/routes/_helpers.py @@ -0,0 +1,48 @@ +"""路由层共享辅助函数 — 消除跨文件重复定义。""" + +from typing import Any + +from fastapi import HTTPException, status + +from packages.application import GetProjectUseCase +from packages.ports.user_repository import UserRepository + + +def check_project_access(project_id: str, user_id: str, project_repository) -> None: + """检查用户是否有项目访问权限。 + + 合并自 asset_libraries.py / edit_plans.py 的同名函数。 + - 空 project_id 直接放行（兼容 edit_plans 中 project_id 可选的场景） + - 错误信息使用中文，与项目其他路由保持一致 + """ + if not project_id or not project_id.strip(): + return + project = project_repository.find_by_id(project_id) + if project is None: + raise HTTPException(status_code=404, detail="项目不存在") + if not project.can_access(user_id): + raise HTTPException(status_code=403, detail="无权访问该项目") + + +def get_user_plan(user_id: str, user_repository: UserRepository) -> str: + """获取用户的订阅计划名称。""" + user = user_repository.find_by_id(user_id) + if user is None: + return "free" + return getattr(user, "subscription_plan", "free") or "free" + + +def require_project_and_library( + project_id: str, + library_id: str, + project_repository: Any, + asset_library_repository: Any, +) -> None: + """Verify project and asset library exist.""" + project = GetProjectUseCase(project_repository).execute(project_id) + if project is None: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found") + + libraries = asset_library_repository.find_by_project(project_id) + if not any(item.id == library_id for item in libraries): + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found") diff --git a/apps/api/app/api/routes/asset_libraries.py b/apps/api/app/api/routes/asset_libraries.py index 12c5a6086..5b9841c0c 100644 --- a/apps/api/app/api/routes/asset_libraries.py +++ b/apps/api/app/api/routes/asset_libraries.py @@ -22,18 +22,11 @@ from packages.application import ( ) from packages.domain import AssetLibrary, AssetLibraryKind +from ._helpers import check_project_access + router = APIRouter() -def _check_project_access(project_id: str, user_id: str, project_repository) -> None: - """检查用户是否有项目访问权限""" - project = project_repository.find_by_id(project_id) - if project is None: - raise HTTPException(status_code=404, detail=f"Project {project_id} not found") - if not project.can_access(user_id): - raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Access denied to project") - - def _to_asset_library_response(item) -> AssetLibraryResponse: return AssetLibraryResponse( id=item.id, @@ -168,7 +161,7 @@ def delete_asset_library( raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="素材库不存在") # 权限校验：检查用户是否有项目访问权限 - _check_project_access(library.project_id, authenticated_user.user.id, project_repository) + check_project_access(library.project_id, authenticated_user.user.id, project_repository) # 删除库内所有素材（无 FK 级联，需手动清理） assets_in_library = asset_repository.find_by_library(library_id) diff --git a/apps/api/app/api/routes/assets.py b/apps/api/app/api/routes/assets.py index f351699f7..1ec5e7239 100644 --- a/apps/api/app/api/routes/assets.py +++ b/apps/api/app/api/routes/assets.py @@ -27,6 +27,8 @@ from packages.application import ( ) from packages.domain import AssetStatus, ClassificationStatus +from app.api.routes._helpers import check_project_access + logger = logging.getLogger(__name__) router = APIRouter() @@ -72,14 +74,6 @@ def _to_asset_response(item, storage_service=None) -> AssetResponse: ) -def _check_project_access(project_id: str, user_id: str, project_repository) -> None: - """检查用户是否有项目访问权限""" - project = project_repository.find_by_id(project_id) - if project is None: - raise HTTPException(status_code=404, detail=f"Project {project_id} not found") - if not project.can_access(user_id): - raise HTTPException(status_code=403, detail="Access denied to project") - @router.get("", response_model=ListAssetsResponse) def list_assets( @@ -136,7 +130,7 @@ def list_assets( library = asset_library_repository.get(library_id) if library is None: raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found") - _check_project_access(library.project_id, user_id, project_repository) + check_project_access(library.project_id, user_id, project_repository) if ft: items = asset_repository.find_by_library_and_file_type(library_id, ft, skip=skip, limit=limit) total = asset_repository.count_by_project(library.project_id) if not kind else len(items) @@ -152,7 +146,7 @@ def list_assets( # 模式2：指定 project_id if project_id: - _check_project_access(project_id, user_id, project_repository) + check_project_access(project_id, user_id, project_repository) if ft: # 无直接方法，加载后按 file_type 过滤（仍比全量加载好） all_items = asset_repository.find_by_project(project_id) @@ -210,13 +204,13 @@ def list_assets( library = asset_library_repository.get(library_id) if library is None: raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found") - _check_project_access(library.project_id, user_id, project_repository) + check_project_access(library.project_id, user_id, project_repository) if kind: all_items = asset_repository.find_by_library_and_file_type(library_id, kind_to_file_type[kind]) else: all_items = asset_repository.find_by_library(library_id) elif project_id: - _check_project_access(project_id, user_id, project_repository) + check_project_access(project_id, user_id, project_repository) all_items = asset_repository.find_by_project(project_id) else: try: @@ -262,7 +256,7 @@ def update_asset_review_status( item = asset_repository.get(asset_id) if item is None: raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found") - _check_project_access(item.project_id, authenticated_user.user.id, project_repository) + check_project_access(item.project_id, authenticated_user.user.id, project_repository) _apply_asset_review_status(item, request.review_status) updated = asset_repository.update(item) return _to_asset_response(updated) @@ -286,7 +280,7 @@ def batch_delete_assets( failed_ids.append(asset_id) continue try: - _check_project_access(item.project_id, user_id, project_repository) + check_project_access(item.project_id, user_id, project_repository) deleted_ids.append(asset_id) except HTTPException: failed_ids.append(asset_id) @@ -307,7 +301,7 @@ def get_asset( item = asset_repository.find_by_id(asset_id) if item is None: raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found") - _check_project_access(item.project_id, authenticated_user.user.id, project_repository) + check_project_access(item.project_id, authenticated_user.user.id, project_repository) return _to_asset_response(item) @@ -322,7 +316,7 @@ def update_asset( item = asset_repository.find_by_id(asset_id) if item is None: raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found") - _check_project_access(item.project_id, authenticated_user.user.id, project_repository) + check_project_access(item.project_id, authenticated_user.user.id, project_repository) # 合并可修改字段 if request.name is not None: @@ -346,7 +340,7 @@ def delete_asset( item = asset_repository.find_by_id(asset_id) if item is None: raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found") - _check_project_access(item.project_id, authenticated_user.user.id, project_repository) + check_project_access(item.project_id, authenticated_user.user.id, project_repository) asset_repository.delete(asset_id) @@ -363,7 +357,7 @@ def tag_asset( item = asset_repository.find_by_id(asset_id) if item is None: raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found") - _check_project_access(item.project_id, authenticated_user.user.id, project_repository) + check_project_access(item.project_id, authenticated_user.user.id, project_repository) for tag_id in request.tag_ids: tag = tag_repository.get(tag_id) if tag is None: @@ -387,7 +381,7 @@ def untag_asset( item = asset_repository.find_by_id(asset_id) if item is None: raise HTTPException(status_code=404, detail=f"Asset {asset_id} not found") - _check_project_access(item.project_id, authenticated_user.user.id, project_repository) + check_project_access(item.project_id, authenticated_user.user.id, project_repository) item.remove_tag(tag_id) asset_repository.update(item) diff --git a/apps/api/app/api/routes/auth.py b/apps/api/app/api/routes/auth.py index 1a2b243bc..bbac52f97 100755 --- a/apps/api/app/api/routes/auth.py +++ b/apps/api/app/api/routes/auth.py @@ -206,7 +206,7 @@ async def verify_email_post( return _verify_email_token(request.token, user_repository) -@router.post("/password/forgot", response_model=MessageResponse, status_code=status.HTTP_202_ACCEPTED) +@router.post("/forgot-password", response_model=MessageResponse, status_code=status.HTTP_202_ACCEPTED) async def forgot_password( request: PasswordResetRequestModel, user_repository: UserRepository = Depends(get_user_repository), @@ -223,7 +223,7 @@ async def forgot_password( return MessageResponse(message="如果账户存在，密码重置邮件已发送") -@router.post("/password/reset", response_model=MessageResponse) +@router.post("/reset-password", response_model=MessageResponse) async def reset_password( request: ResetPasswordModel, user_repository: UserRepository = Depends(get_user_repository), @@ -243,7 +243,6 @@ async def logout( current_user: AuthenticatedUser = Depends(get_current_user), ): """登出 - 将当前 token 加入黑名单""" - from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer if credentials: try: diff --git a/apps/api/app/api/routes/chunked_upload.py b/apps/api/app/api/routes/chunked_upload.py index ad9fee875..c9cd064b5 100644 --- a/apps/api/app/api/routes/chunked_upload.py +++ b/apps/api/app/api/routes/chunked_upload.py @@ -14,7 +14,6 @@ from typing import Any from uuid import uuid4 from app.auth import AuthenticatedUser, get_current_user -from app.config import get_settings from app.core.celery_app import celery_app from app.core.storage import OSSStorageService, get_storage_service from app.dependencies import ( @@ -35,6 +34,8 @@ from fastapi.params import File from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase +from app.api.routes._helpers import require_project_and_library + router = APIRouter() logger = logging.getLogger(__name__) @@ -113,22 +114,6 @@ def _atomic_check_and_record(upload_id: str, chunk_index: int) -> bool: fcntl.flock(f.fileno(), fcntl.LOCK_UN) -def _require_project_and_library( - project_id: str, - library_id: str, - project_repository: Any, - asset_library_repository: Any, -) -> None: - """Verify project and asset library exist""" - project = GetProjectUseCase(project_repository).execute(project_id) - if project is None: - raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found") - - libraries = asset_library_repository.find_by_project(project_id) - if not any(item.id == library_id for item in libraries): - raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found") - - def _load_upload_meta(upload_id: str) -> dict[str, Any]: """Load upload metadata""" meta_path = _get_upload_meta_path(upload_id) @@ -206,7 +191,6 @@ async def init_chunked_upload( asset_library_repository: Any = Depends(get_asset_library_repository), ) -> ChunkedUploadInitResponse: """Initialize chunked upload""" - settings = get_settings() # Validate file size if request.file_size > MAX_FILE_SIZE: @@ -221,7 +205,7 @@ async def init_chunked_upload( raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found") # Verify asset library - _require_project_and_library( + require_project_and_library( request.project_id, request.library_id, project_repository, diff --git a/apps/api/app/api/routes/edit_plans.py b/apps/api/app/api/routes/edit_plans.py index 877c4f6fb..565c60981 100755 --- a/apps/api/app/api/routes/edit_plans.py +++ b/apps/api/app/api/routes/edit_plans.py @@ -32,12 +32,6 @@ from fastapi import APIRouter, Depends, HTTPException, Query, status from pydantic import BaseModel, Field from sqlalchemy.orm import Session -from packages.adapters.sqlalchemy_impl.asset_library_repository import ( - SQLAlchemyAssetLibraryRepository, -) -from packages.adapters.sqlalchemy_impl.asset_repository import ( - SQLAlchemyAssetRepository, -) from packages.adapters.sqlalchemy_impl.generation_task_repository import ( SQLAlchemyGenerationTaskRepository, ) @@ -51,6 +45,8 @@ from packages.application.generation_tasks import ( CreateGenerationTaskCommand, CreateGenerationTaskUseCase, ) + +from ._helpers import check_project_access from packages.domain.config_schemas import normalize_plan_config from packages.domain.edit_plan import EditPlan, EditPlanStatus @@ -247,17 +243,6 @@ class GenerateFromTemplateResponse(BaseModel): # ── Helpers ─────────────────────────────────────────────────────────────────── -def _check_project_access(project_id: str, user_id: str, project_repository: Any) -> None: - """校验用户对项目的访问权限（参照 assets.py 的 can_access 模式）""" - if not project_id or not project_id.strip(): - return - project = project_repository.find_by_id(project_id) - if project is None: - raise HTTPException(status_code=404, detail="项目不存在") - if not project.can_access(user_id): - raise HTTPException(status_code=403, detail="无权访问该项目") - - def _to_response(p: EditPlan) -> EditPlanResponse: return EditPlanResponse( id=p.id, @@ -311,7 +296,7 @@ def list_plans( # 项目鉴权：如果指定了 project_id，校验用户是否有权访问 if project_id: - _check_project_access(project_id, current_user.user.id, project_repository) + check_project_access(project_id, current_user.user.id, project_repository) skip = (page - 1) * page_size plans = svc.list_plans( @@ -353,7 +338,7 @@ def get_plan( ) # 项目鉴权 if plan.project_id: - _check_project_access(plan.project_id, current_user.user.id, project_repository) + check_project_access(plan.project_id, current_user.user.id, project_repository) return _to_response(plan) @@ -369,7 +354,7 @@ def create_plan( project_id = (body.project_id or "").strip() # 项目鉴权 if project_id: - _check_project_access(project_id, current_user.user.id, project_repository) + check_project_access(project_id, current_user.user.id, project_repository) svc = EditPlanService(db) # 标准化 config，填充 cover/title/subtitle/bgm 默认值 normalized_config = normalize_plan_config(body.config) @@ -411,7 +396,7 @@ def update_plan( if existing is None: raise HTTPException(status_code=404, detail=f"剪辑计划不存在: {plan_id}") if existing.project_id: - _check_project_access(existing.project_id, current_user.user.id, project_repository) + check_project_access(existing.project_id, current_user.user.id, project_repository) # 基础字段更新 try: @@ -465,7 +450,7 @@ def delete_plan( # 项目鉴权 existing = svc.get_plan(plan_id) if existing and existing.project_id: - _check_project_access(existing.project_id, current_user.user.id, project_repository) + check_project_access(existing.project_id, current_user.user.id, project_repository) deleted = svc.delete_plan(plan_id) if not deleted: raise HTTPException( @@ -507,7 +492,7 @@ def generate_plan( if plan_check is None: raise HTTPException(status_code=404, detail=f"剪辑计划不存在: {plan_id}") if plan_check.project_id: - _check_project_access(plan_check.project_id, current_user.user.id, project_repository) + check_project_access(plan_check.project_id, current_user.user.id, project_repository) # ── 自动兜底 1: draft → editing ────────────────────────────────────── if plan_check.status == EditPlanStatus.DRAFT: @@ -710,7 +695,7 @@ def generate_plan( except HTTPException: # 已处理的 HTTP 异常直接透传 raise - except Exception as exc: + except Exception: logger.exception("触发剪辑计划生成失败: plan_id=%s", plan_id) # 尝试将计划标记为失败（RENDERING → FAILED 是合法的状态流转） try: @@ -749,7 +734,7 @@ def get_generation_status( plan = gen_status["plan"] # 项目鉴权 if plan.project_id: - _check_project_access(plan.project_id, current_user.user.id, project_repository) + check_project_access(plan.project_id, current_user.user.id, project_repository) clips = gen_status["clips"] clip_items = [ @@ -791,7 +776,7 @@ def list_plan_generations( # 验证计划存在 + 项目鉴权 plan = svc.get_plan_or_raise(plan_id) if plan.project_id: - _check_project_access(plan.project_id, current_user.user.id, project_repository) + check_project_access(plan.project_id, current_user.user.id, project_repository) gen_task_repo = SQLAlchemyGenerationTaskRepository(db) tasks = gen_task_repo.list_by_source_edit_plan(plan_id) @@ -860,7 +845,7 @@ def ai_recommend_clips( # 项目鉴权 if plan.project_id: - _check_project_access(plan.project_id, current_user.user.id, project_repository) + check_project_access(plan.project_id, current_user.user.id, project_repository) # 验证状态：只允许 draft 或 editing plan_status = plan.status.value if hasattr(plan.status, "value") else plan.status @@ -909,7 +894,7 @@ def ai_recommend_clips( config=normalized_config, total_duration=result["total_duration"], ) - except Exception as exc: + except Exception: logger.exception("AI 推荐写入失败，plan_id=%s 数据可能不一致", plan_id) # 尝试回滚未提交的变更 try: @@ -990,7 +975,7 @@ def generate_cover( # 项目鉴权 if plan.project_id: - _check_project_access(plan.project_id, current_user.user.id, project_repository) + check_project_access(plan.project_id, current_user.user.id, project_repository) # 调用 AI 封面生成服务 from apps.worker.worker_app.tasks.ai_tasks import run_generate_cover @@ -1110,7 +1095,7 @@ def get_plan_timeline( plan = svc.get_plan_or_raise(plan_id) # 项目鉴权 if plan.project_id: - _check_project_access(plan.project_id, current_user.user.id, project_repository) + check_project_access(plan.project_id, current_user.user.id, project_repository) clips = svc.list_clips(plan_id=plan_id, skip=0, limit=200) # 按 order 排序 @@ -1171,7 +1156,7 @@ def generate_from_template( # 项目鉴权 if body.project_id: - _check_project_access(body.project_id, current_user.user.id, project_repository) + check_project_access(body.project_id, current_user.user.id, project_repository) template_svc = EditTemplateService(db) diff --git a/apps/api/app/api/routes/generation_tasks.py b/apps/api/app/api/routes/generation_tasks.py index d3f37c77e..f3f94208d 100755 --- a/apps/api/app/api/routes/generation_tasks.py +++ b/apps/api/app/api/routes/generation_tasks.py @@ -32,6 +32,8 @@ from app.schemas.generation_task import ( ) from fastapi import APIRouter, Depends, HTTPException +from app.api.routes._helpers import check_project_access + from packages.application import ( CreateGenerationTaskCommand, CreateGenerationTaskUseCase, @@ -43,15 +45,6 @@ logger = logging.getLogger(__name__) router = APIRouter() -def _check_project_access(project_id: str, user_id: str, project_repository) -> None: - """检查用户是否有项目访问权限""" - project = project_repository.find_by_id(project_id) - if project is None: - raise HTTPException(status_code=404, detail=f"Project {project_id} not found") - if not project.can_access(user_id): - raise HTTPException(status_code=403, detail="Access denied to project") - - def _to_generation_task_response(task) -> GenerationTaskResponse: return GenerationTaskResponse( id=task.id, @@ -339,7 +332,7 @@ def get_generation_task( if task is None: raise HTTPException(status_code=404, detail=f"GenerationTask {task_id} not found") if task.project_id: - _check_project_access(task.project_id, authenticated_user.user.id, project_repository) + check_project_access(task.project_id, authenticated_user.user.id, project_repository) return _to_generation_task_response(task) @@ -356,7 +349,7 @@ def list_generation_results( if task is None: raise HTTPException(status_code=404, detail=f"GenerationTask {task_id} not found") if task.project_id: - _check_project_access(task.project_id, authenticated_user.user.id, project_repository) + check_project_access(task.project_id, authenticated_user.user.id, project_repository) use_case = ListGeneratedVideosByTaskUseCase(generated_video_repository) items = use_case.execute(task_id) responses = [] diff --git a/apps/api/app/api/routes/jobs.py b/apps/api/app/api/routes/jobs.py index 8aa812f1b..d2348d0b9 100755 --- a/apps/api/app/api/routes/jobs.py +++ b/apps/api/app/api/routes/jobs.py @@ -20,7 +20,7 @@ from typing import Any from app.auth import AuthenticatedUser, get_current_user from app.core.celery_app import celery_app -from app.dependencies import get_db_session, get_job_repository, get_project_repository +from app.dependencies import get_job_repository, get_project_repository from app.schemas.job import ( CompleteJobRequest, CreateJobRequest, @@ -51,6 +51,8 @@ from packages.application.jobs import ( ) from packages.domain.job import JobType +from app.api.routes._helpers import check_project_access + logger = logging.getLogger(__name__) router = APIRouter() @@ -66,15 +68,6 @@ _JOB_TYPE_TO_CELERY_TASK: dict[str, str] = { } -def _check_project_access(project_id: str, user_id: str, project_repository) -> None: - """检查用户是否有项目访问权限。""" - project = project_repository.find_by_id(project_id) - if project is None: - raise HTTPException(status_code=404, detail=f"Project {project_id} not found") - if not project.can_access(user_id): - raise HTTPException(status_code=403, detail="Access denied to project") - - # ── 创建任务 ────────────────────────────────────────────────────────────────── @@ -89,7 +82,7 @@ def create_job( 创建后任务处于 pending 状态，需要调用 /submit 提交执行。 """ - _check_project_access(request.project_id, authenticated_user.user.id, project_repository) + check_project_access(request.project_id, authenticated_user.user.id, project_repository) # 校验 job_type try: @@ -182,7 +175,7 @@ def list_project_jobs( offset: int = Query(default=0, ge=0), ) -> ListJobsResponse: """获取项目下的任务列表。""" - _check_project_access(project_id, authenticated_user.user.id, project_repository) + check_project_access(project_id, authenticated_user.user.id, project_repository) use_case = ListJobsUseCase(job_repo) jobs = use_case.execute( @@ -204,7 +197,7 @@ def get_job_statistics( project_repository: Any = Depends(get_project_repository), ) -> JobStatisticsResponse: """获取项目任务统计摘要。""" - _check_project_access(project_id, authenticated_user.user.id, project_repository) + check_project_access(project_id, authenticated_user.user.id, project_repository) use_case = GetJobStatisticsUseCase(job_repo) stats = use_case.execute(project_id) diff --git a/apps/api/app/api/routes/recipes.py b/apps/api/app/api/routes/recipes.py index fa48c3494..cde128660 100644 --- a/apps/api/app/api/routes/recipes.py +++ b/apps/api/app/api/routes/recipes.py @@ -33,6 +33,8 @@ from packages.application.recipe.use_cases import ( ) from packages.ports.user_repository import UserRepository +from app.api.routes._helpers import get_user_plan + router = APIRouter() @@ -40,13 +42,6 @@ def _get_recipe_repository(session: Session = Depends(get_db_session)) -> SQLAlc return SQLAlchemyRecipeRepository(session) -def _get_user_plan(user_id: str, user_repository: UserRepository) -> str: - user = user_repository.find_by_id(user_id) - if user is None: - return "free" - return getattr(user, "subscription_plan", "free") or "free" - - def _item_to_response(item) -> RecipeItemResponse: return RecipeItemResponse( id=item.id, @@ -194,7 +189,7 @@ def use_recipe( user_repository: UserRepository = Depends(get_user_repository), ) -> UseRecipeResponse: user_id = authenticated_user.user.id - plan_name = _get_user_plan(user_id, user_repository) + plan_name = get_user_plan(user_id, user_repository) use_case = UseRecipeUseCase(recipe_repository) try: result = use_case.execute(recipe_id, user_id, user_plan=plan_name) diff --git a/apps/api/app/api/routes/subscription.py b/apps/api/app/api/routes/subscription.py index aa4f811f4..1ff6ff013 100644 --- a/apps/api/app/api/routes/subscription.py +++ b/apps/api/app/api/routes/subscription.py @@ -232,7 +232,7 @@ async def payment_callback( # 创建账单记录 record_id = uuid.uuid4().hex - record = repo.create( + repo.create( { "id": record_id, "user_id": user_id, diff --git a/apps/api/app/api/routes/titles.py b/apps/api/app/api/routes/titles.py index f1b8980cf..f65f3cdea 100644 --- a/apps/api/app/api/routes/titles.py +++ b/apps/api/app/api/routes/titles.py @@ -28,6 +28,8 @@ from packages.application.title_library.use_cases import ( ) from packages.ports.user_repository import UserRepository +from app.api.routes._helpers import get_user_plan + router = APIRouter() @@ -51,13 +53,6 @@ def _to_response(item) -> TitleLibraryItemResponse: ) -def _get_user_plan(user_id: str, user_repository: UserRepository) -> str: - user = user_repository.find_by_id(user_id) - if user is None: - return "free" - return getattr(user, "subscription_plan", "free") or "free" - - @router.get("", response_model=ListTitleLibraryResponse) def list_titles( category: Optional[str] = Query(None), @@ -98,7 +93,7 @@ def create_title( user_repository: UserRepository = Depends(get_user_repository), ) -> TitleLibraryItemResponse: user_id = authenticated_user.user.id - plan_name = _get_user_plan(user_id, user_repository) + plan_name = get_user_plan(user_id, user_repository) command = CreateTitleLibraryCommand( user_id=user_id, name=request.name, diff --git a/apps/api/app/api/routes/upload.py b/apps/api/app/api/routes/upload.py index 7679630c3..97a83bfcd 100644 --- a/apps/api/app/api/routes/upload.py +++ b/apps/api/app/api/routes/upload.py @@ -1,5 +1,5 @@ import logging -from typing import Annotated, Any +from typing import Any from uuid import uuid4 from app.auth import AuthenticatedUser, get_current_user @@ -17,12 +17,13 @@ from app.schemas.upload import ( DirectUploadCompleteResponse, DirectUploadPrepareRequest, DirectUploadPrepareResponse, - UploadAssetRequest, UploadAssetResponse, ) from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status -from packages.application import GetProjectUseCase, SubmitIngestJobCommand, SubmitIngestJobUseCase +from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase + +from app.api.routes._helpers import require_project_and_library logger = logging.getLogger(__name__) @@ -80,21 +81,6 @@ def _validate_mime_type(content_type: str | None) -> str: return base_type -def _require_project_and_library( - project_id: str, - library_id: str, - project_repository: Any, - asset_library_repository: Any, -) -> None: - project = GetProjectUseCase(project_repository).execute(project_id) - if project is None: - raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found") - - libraries = asset_library_repository.find_by_project(project_id) - if not any(item.id == library_id for item in libraries): - raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found") - - def _submit_ingest_job( project_id: str, library_id: str, @@ -135,7 +121,7 @@ async def prepare_direct_upload( # P2-5: 服务端验证 MIME 类型 validated_content_type = _validate_mime_type(request.content_type) - _require_project_and_library( + require_project_and_library( request.project_id, request.library_id, project_repository, @@ -183,7 +169,7 @@ async def complete_direct_upload( storage_service: OSSStorageService = Depends(get_storage_service), ) -> DirectUploadCompleteResponse: """确认浏览器直传完成并创建导入任务。""" - _require_project_and_library( + require_project_and_library( request.project_id, request.library_id, project_repository, @@ -252,7 +238,7 @@ async def upload_asset( storage_service: OSSStorageService = Depends(get_storage_service), ) -> UploadAssetResponse: """上传素材文件并触发导入流水线。""" - _require_project_and_library(project_id, library_id, project_repository, asset_library_repository) + require_project_and_library(project_id, library_id, project_repository, asset_library_repository) # ── 素材去重检测：上传前检查同素材库 + 同 file_hash ── if file_hash: diff --git a/apps/api/app/api/routes/voice_clones.py b/apps/api/app/api/routes/voice_clones.py index ccbf28383..8a138c12f 100644 --- a/apps/api/app/api/routes/voice_clones.py +++ b/apps/api/app/api/routes/voice_clones.py @@ -28,7 +28,6 @@ from packages.application.voice_clone.use_cases import ( VoiceCloneNotRetryableError, ) from packages.application.voice_clone.workflow import ( - VoiceCloneWorkflowError, VoiceCloneWorkflowService, ) diff --git a/apps/api/app/api/routes/voices.py b/apps/api/app/api/routes/voices.py index 73a6b486a..a8830a709 100755 --- a/apps/api/app/api/routes/voices.py +++ b/apps/api/app/api/routes/voices.py @@ -39,6 +39,8 @@ from packages.application.voice_library.use_cases import ( from packages.domain.preset_voices import PRESET_VOICES from packages.ports.user_repository import UserRepository +from app.api.routes._helpers import get_user_plan + router = APIRouter() @@ -125,13 +127,6 @@ def _preset_to_unified_response(preset) -> UnifiedVoiceItemResponse: ) -def _get_user_plan(user_id: str, user_repository: UserRepository) -> str: - user = user_repository.find_by_id(user_id) - if user is None: - return "free" - return getattr(user, "subscription_plan", "free") or "free" - - # ==================== 统一配音列表（预置 + 克隆）==================== @@ -271,7 +266,7 @@ def create_voice( sign_url=Depends(get_audio_url_signer), ) -> VoiceLibraryItemResponse: user_id = authenticated_user.user.id - plan_name = _get_user_plan(user_id, user_repository) + plan_name = get_user_plan(user_id, user_repository) command = CreateVoiceLibraryCommand( user_id=user_id, name=request.name, diff --git a/apps/api/app/config.py b/apps/api/app/config.py index c38067339..ade9d0179 100755 --- a/apps/api/app/config.py +++ b/apps/api/app/config.py @@ -25,7 +25,7 @@ class Settings(BaseSettings): DATABASE_POOL_SIZE: int = 20 DATABASE_MAX_OVERFLOW: int = 10 # 调整为合理值：pool_size(20) + max_overflow(10) = 最大30连接 DATABASE_POOL_TIMEOUT: int = 30 - DATABASE_POOL_RECYLE: int = 3600 + DATABASE_POOL_RECYCLE: int = 3600 USE_IN_MEMORY_DB: bool = False AUTO_CREATE_SCHEMA: bool = False @@ -41,6 +41,11 @@ class Settings(BaseSettings): # 密钥轮换天数（到达此天数后建议更换密钥） SECRET_ROTATION_DAYS: int = 90 + # JWT 算法与过期时间（与 .env.example 对齐） + JWT_ALGORITHM: str = "HS256" + JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 30 + JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30 + @field_validator("JWT_SECRET_KEY", mode="before") @classmethod def validate_jwt_secret_key(cls, v): diff --git a/apps/api/app/core/__init__.py b/apps/api/app/core/__init__.py deleted file mode 100644 index 732b41164..000000000 --- a/apps/api/app/core/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Core configuration package.""" diff --git a/apps/api/app/dependencies.py b/apps/api/app/dependencies.py index 0a0af5fd1..b97e91862 100644 --- a/apps/api/app/dependencies.py +++ b/apps/api/app/dependencies.py @@ -50,20 +50,8 @@ from packages.adapters.sqlalchemy_impl.voice_clone_profile_repository import ( from packages.adapters.sqlalchemy_impl.voice_library_repository import ( SQLAlchemyVoiceLibraryRepository, ) -from packages.ports.asset_library_repository import AssetLibraryRepository -from packages.ports.asset_repository import AssetRepository -from packages.ports.classification_job_repository import ClassificationJobRepository -from packages.ports.duplication_repository import DuplicationRecordRepository -from packages.ports.generated_video_repository import GeneratedVideoRepository -from packages.ports.generation_task_repository import GenerationTaskRepository -from packages.ports.ingest_job_repository import IngestJobRepository -from packages.ports.job_repository import JobRepository -from packages.ports.project_repository import ProjectRepository from packages.ports.tag_repository import TagRepository -from packages.ports.title_library_repository import TitleLibraryRepository from packages.ports.user_repository import UserRepository -from packages.ports.voice_clone_profile_repository import VoiceCloneProfileRepository -from packages.ports.voice_library_repository import VoiceLibraryRepository _engine, _SessionLocal = build_session_factory(settings.DATABASE_URL) diff --git a/apps/api/app/middleware/auth.py b/apps/api/app/middleware/auth.py index 0486b0a91..1bbf7b74d 100644 --- a/apps/api/app/middleware/auth.py +++ b/apps/api/app/middleware/auth.py @@ -10,7 +10,7 @@ from __future__ import annotations from app.auth import AuthenticatedUser from app.auth import get_current_user as get_authenticated_user from app.dependencies import get_user_repository -from fastapi import Depends +from fastapi import Depends, HTTPException from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer from packages.domain.entities import User diff --git a/apps/api/app/middleware/monitoring.py b/apps/api/app/middleware/monitoring.py index 77ad2deae..69a64a43d 100644 --- a/apps/api/app/middleware/monitoring.py +++ b/apps/api/app/middleware/monitoring.py @@ -6,7 +6,7 @@ import logging import time from typing import Callable -from fastapi import Request, Response +from fastapi import Request from starlette.middleware.base import BaseHTTPMiddleware logger = logging.getLogger(__name__) diff --git a/apps/api/app/schemas/subscription.py b/apps/api/app/schemas/subscription.py index 2080095fc..1c537561b 100644 --- a/apps/api/app/schemas/subscription.py +++ b/apps/api/app/schemas/subscription.py @@ -2,7 +2,7 @@ from __future__ import annotations -from typing import List, Optional +from typing import Optional from pydantic import BaseModel, Field diff --git a/apps/api/app/services/auto_clip_service.py b/apps/api/app/services/auto_clip_service.py index d485b5598..c837dd78b 100644 --- a/apps/api/app/services/auto_clip_service.py +++ b/apps/api/app/services/auto_clip_service.py @@ -24,7 +24,7 @@ from packages.adapters.sqlalchemy_impl import ( ) from packages.domain.asset import AssetType from packages.domain.classification import AssetClassification -from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus +from packages.domain.edit_plan_clip import EditPlanClip logger = logging.getLogger(__name__) diff --git a/apps/api/app/services/edit_plan_service.py b/apps/api/app/services/edit_plan_service.py index cd49b4756..bf8122705 100644 --- a/apps/api/app/services/edit_plan_service.py +++ b/apps/api/app/services/edit_plan_service.py @@ -18,7 +18,6 @@ from packages.adapters.sqlalchemy_impl import ( ) from packages.domain.edit_plan import EditPlan, EditPlanStatus from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus -from packages.domain.generation_task import GenerationTaskStatus logger = logging.getLogger(__name__) diff --git a/apps/api/app/services/job_service.py b/apps/api/app/services/job_service.py index f8800fd60..d24ee32eb 100755 --- a/apps/api/app/services/job_service.py +++ b/apps/api/app/services/job_service.py @@ -13,7 +13,6 @@ from __future__ import annotations import logging from typing import Any -from sqlalchemy.orm import Session from packages.application.jobs import ( CancelJobUseCase, diff --git a/apps/api/app/services/plan_generator_service.py b/apps/api/app/services/plan_generator_service.py index 174f2286f..a124e83dc 100644 --- a/apps/api/app/services/plan_generator_service.py +++ b/apps/api/app/services/plan_generator_service.py @@ -13,7 +13,7 @@ from __future__ import annotations import logging -from typing import Any, List, Optional +from typing import Any, List from sqlalchemy.orm import Session diff --git a/apps/api/app/services/video_compose_service.py b/apps/api/app/services/video_compose_service.py index 15b860b59..88b149373 100644 --- a/apps/api/app/services/video_compose_service.py +++ b/apps/api/app/services/video_compose_service.py @@ -16,7 +16,6 @@ FFmpeg 视频合成编排服务： from __future__ import annotations import logging -import shutil from dataclasses import dataclass, field from typing import Any @@ -28,7 +27,7 @@ from packages.adapters.sqlalchemy_impl.edit_plan_clip_repository import ( from packages.adapters.sqlalchemy_impl.edit_plan_repository import ( SQLAlchemyEditPlanRepository, ) -from packages.domain.edit_plan import EditPlan, EditPlanStatus +from packages.domain.edit_plan import EditPlanStatus from packages.domain.edit_plan_clip import EditPlanClip, EditPlanClipStatus from packages.domain.template_clip_config import TransitionEffect diff --git a/packages/__init__.py b/packages/__init__.py deleted file mode 100644 index fce7667b8..000000000 --- a/packages/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Packages root.""" diff --git a/packages/adapters/__init__.py b/packages/adapters/__init__.py deleted file mode 100644 index 8a5141254..000000000 --- a/packages/adapters/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Adapters package for external implementations.""" diff --git a/packages/adapters/sqlalchemy_impl/models.py b/packages/adapters/sqlalchemy_impl/models.py index 66660737a..dbfed0d2e 100755 --- a/packages/adapters/sqlalchemy_impl/models.py +++ b/packages/adapters/sqlalchemy_impl/models.py @@ -1,6 +1,6 @@ from datetime import datetime, timezone -from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Integer, String, Text, UniqueConstraint, create_engine +from sqlalchemy import JSON, Boolean, Column, DateTime, Float, Integer, String, Text, UniqueConstraint from sqlalchemy.orm import declarative_base Base = declarative_base() diff --git a/packages/application/__init__.py b/packages/application/__init__.py index a6902e3f0..e7fc24d04 100755 --- a/packages/application/__init__.py +++ b/packages/application/__init__.py @@ -27,7 +27,6 @@ from .generated_videos import ( from .generation_tasks import ( CreateGenerationTaskCommand, CreateGenerationTaskUseCase, - GetGenerationTaskUseCase, ) from .ingest_jobs import SubmitIngestJobCommand, SubmitIngestJobUseCase from .jobs import ( diff --git a/packages/application/auth/jwt_handler.py b/packages/application/auth/jwt_handler.py index 367222fe3..c7f0f6ea8 100644 --- a/packages/application/auth/jwt_handler.py +++ b/packages/application/auth/jwt_handler.py @@ -12,10 +12,9 @@ JWT 处理器委托层 payload = jwt_handler.verify_access_token(token) """ -from datetime import datetime, timedelta from typing import Any, Dict, Optional -from packages.application.auth.jwt_service import JWTConfig, JWTService, TokenType +from packages.application.auth.jwt_service import JWTConfig, JWTService class JWTHandler: diff --git a/packages/application/auth/jwt_service.py b/packages/application/auth/jwt_service.py index 0a17c8c90..e98490a22 100644 --- a/packages/application/auth/jwt_service.py +++ b/packages/application/auth/jwt_service.py @@ -208,10 +208,10 @@ def _get_jwt_service(): kw = dict(secret_key=settings.JWT_SECRET_KEY) if hasattr(settings, "JWT_ALGORITHM"): kw["algorithm"] = settings.JWT_ALGORITHM - if hasattr(settings, "ACCESS_TOKEN_EXPIRE_MINUTES"): - kw["access_token_expire_minutes"] = settings.ACCESS_TOKEN_EXPIRE_MINUTES - if hasattr(settings, "REFRESH_TOKEN_EXPIRE_DAYS"): - kw["refresh_token_expire_days"] = settings.REFRESH_TOKEN_EXPIRE_DAYS + if hasattr(settings, "JWT_ACCESS_TOKEN_EXPIRE_MINUTES"): + kw["access_token_expire_minutes"] = settings.JWT_ACCESS_TOKEN_EXPIRE_MINUTES + if hasattr(settings, "JWT_REFRESH_TOKEN_EXPIRE_DAYS"): + kw["refresh_token_expire_days"] = settings.JWT_REFRESH_TOKEN_EXPIRE_DAYS _jwt_service_instance = JWTService(JWTConfig(**kw)) return _jwt_service_instance diff --git a/packages/application/auth/login_use_case.py b/packages/application/auth/login_use_case.py index 0bf53d5fc..c50d2aeb9 100755 --- a/packages/application/auth/login_use_case.py +++ b/packages/application/auth/login_use_case.py @@ -293,7 +293,7 @@ class LogoutUseCase: try: if request.logout_all_devices: # 删除所有设备的 session - count = self.session_store.delete_all_user_sessions(request.user_id) + self.session_store.delete_all_user_sessions(request.user_id) return True, None else: # 删除当前 session diff --git a/packages/application/auth/password_hasher.py b/packages/application/auth/password_hasher.py index 6f7d3d155..911a6be88 100644 --- a/packages/application/auth/password_hasher.py +++ b/packages/application/auth/password_hasher.py @@ -85,8 +85,6 @@ class PasswordHasher: True 如果需要重新哈希 """ try: - hashed_bytes = hashed_password.encode("utf-8") - current_rounds = bcrypt.getsalt(hashed_bytes) # 提取当前的 cost factor # bcrypt hash 格式: $2b$rounds$salt+hash diff --git a/packages/application/auth/register_user_use_case.py b/packages/application/auth/register_user_use_case.py index f58079483..ae2ed6d13 100755 --- a/packages/application/auth/register_user_use_case.py +++ b/packages/application/auth/register_user_use_case.py @@ -3,7 +3,7 @@ """ import secrets -from datetime import datetime, timedelta, timezone +from datetime import datetime, timezone from typing import Optional from uuid import uuid4 diff --git a/packages/application/common/pagination.py b/packages/application/common/pagination.py index 0705be447..1219c3cf0 100644 --- a/packages/application/common/pagination.py +++ b/packages/application/common/pagination.py @@ -3,7 +3,7 @@ """ from math import ceil -from typing import Generic, List, Optional, TypeVar +from typing import Generic, List, TypeVar from pydantic import BaseModel, Field diff --git a/packages/application/jobs.py b/packages/application/jobs.py index 44a0127d0..3028125b8 100755 --- a/packages/application/jobs.py +++ b/packages/application/jobs.py @@ -7,9 +7,7 @@ from __future__ import annotations import logging from dataclasses import dataclass, field -from datetime import datetime, timezone from typing import Any -from uuid import uuid4 from packages.domain.job import Job, JobStatus, JobType from packages.ports.job_repository import JobRepository diff --git a/packages/application/recipe/__init__.py b/packages/application/recipe/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/application/recipe/use_cases.py b/packages/application/recipe/use_cases.py index bb5746217..9c2918bfa 100644 --- a/packages/application/recipe/use_cases.py +++ b/packages/application/recipe/use_cases.py @@ -9,7 +9,6 @@ from typing import List, Optional from packages.adapters.sqlalchemy_impl.recipe_repository import SQLAlchemyRecipeRepository from packages.application.recipe.commands import ( CreateRecipeCommand, - RecipeItemCommand, UpdateRecipeCommand, ) from packages.domain.recipe import Recipe, RecipeItem diff --git a/packages/application/template/__init__.py b/packages/application/template/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/application/tts_job/__init__.py b/packages/application/tts_job/__init__.py deleted file mode 100644 index 439072c1b..000000000 --- a/packages/application/tts_job/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""TTS Job application layer.""" diff --git a/packages/application/tts_job/streaming_service.py b/packages/application/tts_job/streaming_service.py index 4c50d4dec..aef880c2a 100644 --- a/packages/application/tts_job/streaming_service.py +++ b/packages/application/tts_job/streaming_service.py @@ -148,7 +148,6 @@ class TTSStreamingService: # 并发合成所有分段，按顺序流式推送 queue: asyncio.Queue[tuple[int, Optional[bytes], Optional[str]]] = asyncio.Queue() - completed_count = 0 async def _synthesize_one(idx: int, seg_text: str) -> None: """合成单个分段并放入队列。""" diff --git a/packages/application/tts_job/workflow.py b/packages/application/tts_job/workflow.py index 1e62d574e..d3acb4034 100755 --- a/packages/application/tts_job/workflow.py +++ b/packages/application/tts_job/workflow.py @@ -24,9 +24,9 @@ from packages.application.cosyvoice_service import ( CosyVoiceError, CosyVoiceService, ) -from packages.application.tts_job.audio_merger import AudioMergeError, AudioMerger +from packages.application.tts_job.audio_merger import AudioMerger from packages.application.tts_job.text_splitter import split_text -from packages.domain.tts_job import TTSJob, TTSJobStatus +from packages.domain.tts_job import TTSJob from packages.ports.tts_job_repository import TTSJobRepository from packages.shared.storage import SharedStorageService, get_shared_storage_service diff --git a/packages/application/voice_clone/use_cases.py b/packages/application/voice_clone/use_cases.py index 90e5ba39b..b3079c09d 100644 --- a/packages/application/voice_clone/use_cases.py +++ b/packages/application/voice_clone/use_cases.py @@ -2,7 +2,6 @@ from __future__ import annotations -import uuid from typing import List, Optional from packages.domain.voice_clone_profile import VoiceCloneProfile diff --git a/packages/application/voice_clone/workflow.py b/packages/application/voice_clone/workflow.py index 9a08ff309..458193609 100755 --- a/packages/application/voice_clone/workflow.py +++ b/packages/application/voice_clone/workflow.py @@ -10,7 +10,7 @@ from __future__ import annotations import logging -from typing import Any, Optional +from typing import Optional from packages.application.cosyvoice_service import ( CosyVoiceAuthError, @@ -21,9 +21,8 @@ from packages.application.voice_clone.use_cases import ( CreateVoiceCloneUseCase, RetryVoiceCloneUseCase, VoiceCloneNotFoundError, - VoiceCloneNotRetryableError, ) -from packages.domain.voice_clone_profile import VoiceCloneProfile, VoiceCloneStatus +from packages.domain.voice_clone_profile import VoiceCloneProfile from packages.ports.voice_clone_profile_repository import VoiceCloneProfileRepository logger = logging.getLogger(__name__) diff --git a/packages/domain/classification.py b/packages/domain/classification.py index 5ffe167fa..f79475e8c 100644 --- a/packages/domain/classification.py +++ b/packages/domain/classification.py @@ -13,7 +13,6 @@ else: pass -from typing import Any from uuid import uuid4 diff --git a/packages/domain/config_schemas.py b/packages/domain/config_schemas.py index 8dcbcc764..f49fc5152 100644 --- a/packages/domain/config_schemas.py +++ b/packages/domain/config_schemas.py @@ -10,7 +10,7 @@ from __future__ import annotations import copy from enum import Enum -from typing import List, Optional +from typing import Optional from pydantic import BaseModel, Field diff --git a/packages/infrastructure/feature_flags.py b/packages/infrastructure/feature_flags.py index 076a62109..ad30c93d6 100644 --- a/packages/infrastructure/feature_flags.py +++ b/packages/infrastructure/feature_flags.py @@ -24,7 +24,7 @@ from __future__ import annotations import logging from dataclasses import dataclass, field -from typing import Any, Dict, Optional, Set +from typing import Dict, Optional logger = logging.getLogger(__name__) diff --git a/packages/infrastructure/module_registry.py b/packages/infrastructure/module_registry.py index 9495a8e50..278014bb8 100644 --- a/packages/infrastructure/module_registry.py +++ b/packages/infrastructure/module_registry.py @@ -14,7 +14,7 @@ from __future__ import annotations import logging from dataclasses import dataclass, field from enum import Enum -from typing import Any, Callable, Dict, List, Optional, Set +from typing import Any, Callable, Dict, List, Optional logger = logging.getLogger(__name__) diff --git a/packages/ports/asset_library_repository.py b/packages/ports/asset_library_repository.py index 1821c1191..4c7adc960 100644 --- a/packages/ports/asset_library_repository.py +++ b/packages/ports/asset_library_repository.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod -from packages.domain import AssetLibrary, AssetLibraryKind +from packages.domain import AssetLibrary class AssetLibraryRepository(ABC): diff --git a/scripts/check_migration_safety.py b/scripts/check_migration_safety.py index 8038bb059..6ec4b784d 100644 --- a/scripts/check_migration_safety.py +++ b/scripts/check_migration_safety.py @@ -247,3 +247,4 @@ def main() -> int: if __name__ == "__main__": sys.exit(main()) + -- 2.54.0 From 8598638e8fd6a103c7fb948b1818019fd75c9812 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Mon, 13 Jul 2026 14:30:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=20tts=5Fjob/workf?= =?UTF-8?q?low.py=20=E4=B8=AD=E8=AF=AF=E5=88=A0=E7=9A=84=20TTSJobStatus=20?= =?UTF-8?q?import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 第 207 行仍在使用 TTSJobStatus.COMPLETED.value - 删除 import 会导致运行时 NameError - pyflakes 验证零 undefined name 错误 --- packages/application/tts_job/workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/application/tts_job/workflow.py b/packages/application/tts_job/workflow.py index d3acb4034..4b9a472cc 100755 --- a/packages/application/tts_job/workflow.py +++ b/packages/application/tts_job/workflow.py @@ -26,7 +26,7 @@ from packages.application.cosyvoice_service import ( ) from packages.application.tts_job.audio_merger import AudioMerger from packages.application.tts_job.text_splitter import split_text -from packages.domain.tts_job import TTSJob +from packages.domain.tts_job import TTSJob, TTSJobStatus from packages.ports.tts_job_repository import TTSJobRepository from packages.shared.storage import SharedStorageService, get_shared_storage_service -- 2.54.0