9c6c477f55
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 2m22s
CI/CD Pipeline / Unit Tests (pull_request) Failing after 2m24s
CI/CD Pipeline / Integration Tests (pull_request) Failing after 37s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 4m3s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
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 不包含
174 lines
6.5 KiB
Python
174 lines
6.5 KiB
Python
from typing import Any
|
|
|
|
from app.auth import AuthenticatedUser, get_current_user
|
|
from app.dependencies import (
|
|
get_asset_library_repository,
|
|
get_asset_repository,
|
|
get_project_repository,
|
|
)
|
|
from app.schemas.asset_library import (
|
|
AssetLibraryResponse,
|
|
CreateAssetLibraryRequest,
|
|
EnsureDefaultLibraryRequest,
|
|
ListAssetLibrariesResponse,
|
|
)
|
|
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
|
|
|
from packages.application import (
|
|
CreateAssetLibraryCommand,
|
|
CreateAssetLibraryUseCase,
|
|
GetProjectUseCase,
|
|
ListAssetLibrariesUseCase,
|
|
)
|
|
from packages.domain import AssetLibrary, AssetLibraryKind
|
|
|
|
from ._helpers import check_project_access
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
def _to_asset_library_response(item) -> AssetLibraryResponse:
|
|
return AssetLibraryResponse(
|
|
id=item.id,
|
|
project_id=item.project_id,
|
|
name=item.name,
|
|
kind=item.kind.value,
|
|
asset_count=item.asset_count,
|
|
total_size=item.total_size,
|
|
)
|
|
|
|
|
|
@router.get("", response_model=ListAssetLibrariesResponse)
|
|
def list_asset_libraries(
|
|
project_id: str | None = Query(None),
|
|
kind: str | None = Query(None, pattern="^(video|voice|image)$"),
|
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
asset_library_repository: Any = Depends(get_asset_library_repository),
|
|
project_repository: Any = Depends(get_project_repository),
|
|
) -> ListAssetLibrariesResponse:
|
|
user_id = authenticated_user.user.id
|
|
use_case = ListAssetLibrariesUseCase(asset_library_repository)
|
|
|
|
if project_id:
|
|
# If project_id provided, check access and filter by project
|
|
project = GetProjectUseCase(project_repository).execute(project_id)
|
|
if project is None:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
|
|
if not project.can_access(user_id):
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Access denied to project")
|
|
items = use_case.execute(project_id)
|
|
else:
|
|
# If no project_id, list all libraries from accessible projects
|
|
accessible_projects = project_repository.find_accessible_projects(user_id)
|
|
all_items = []
|
|
for proj in accessible_projects:
|
|
all_items.extend(use_case.execute(proj.id))
|
|
items = all_items
|
|
|
|
# 按 kind 过滤(可选)
|
|
if kind:
|
|
kind_enum = AssetLibraryKind(kind)
|
|
items = [item for item in items if item.kind == kind_enum]
|
|
|
|
return ListAssetLibrariesResponse(items=[_to_asset_library_response(item) for item in items])
|
|
|
|
|
|
@router.post("", response_model=AssetLibraryResponse)
|
|
def create_asset_library(
|
|
request: CreateAssetLibraryRequest,
|
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
asset_library_repository: Any = Depends(get_asset_library_repository),
|
|
project_repository: Any = Depends(get_project_repository),
|
|
) -> AssetLibraryResponse:
|
|
project = project_repository.find_by_id(request.project_id)
|
|
if project is None:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
|
|
if not project.can_access(authenticated_user.user.id):
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Access denied to project")
|
|
use_case = CreateAssetLibraryUseCase(asset_library_repository)
|
|
item = use_case.execute(
|
|
CreateAssetLibraryCommand(
|
|
project_id=request.project_id,
|
|
name=request.name,
|
|
kind=AssetLibraryKind(request.kind),
|
|
)
|
|
)
|
|
return _to_asset_library_response(item)
|
|
|
|
|
|
# 默认素材库名称映射
|
|
_DEFAULT_LIBRARY_NAMES = {
|
|
"video": "视频素材库",
|
|
"voice": "配音素材库",
|
|
"image": "图片素材库",
|
|
}
|
|
|
|
|
|
@router.post("/ensure-default", response_model=AssetLibraryResponse)
|
|
def ensure_default_library(
|
|
request: EnsureDefaultLibraryRequest,
|
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
asset_library_repository: Any = Depends(get_asset_library_repository),
|
|
project_repository: Any = Depends(get_project_repository),
|
|
) -> AssetLibraryResponse:
|
|
"""确保项目下指定 kind 的默认素材库存在,已存在则直接返回,不存在则自动创建。"""
|
|
project = project_repository.find_by_id(request.project_id)
|
|
if project is None:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
|
|
if not project.can_access(authenticated_user.user.id):
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Access denied to project")
|
|
|
|
kind = AssetLibraryKind(request.kind)
|
|
|
|
# 查找该项目下同 kind 的素材库,返回第一个
|
|
existing = asset_library_repository.find_by_project(request.project_id)
|
|
for lib in existing:
|
|
if lib.kind == kind:
|
|
return _to_asset_library_response(lib)
|
|
|
|
# 不存在 → 自动创建
|
|
import uuid
|
|
from datetime import datetime, timezone
|
|
|
|
now = datetime.now(timezone.utc)
|
|
default_name = _DEFAULT_LIBRARY_NAMES.get(request.kind, f"{request.kind}素材库")
|
|
library = AssetLibrary(
|
|
id=str(uuid.uuid4()),
|
|
project_id=request.project_id,
|
|
name=default_name,
|
|
kind=kind,
|
|
asset_count=0,
|
|
total_size=0,
|
|
created_at=now,
|
|
updated_at=now,
|
|
)
|
|
created = asset_library_repository.create(library)
|
|
return _to_asset_library_response(created)
|
|
|
|
|
|
@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT)
|
|
def delete_asset_library(
|
|
library_id: str,
|
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
asset_library_repository: Any = Depends(get_asset_library_repository),
|
|
asset_repository: Any = Depends(get_asset_repository),
|
|
project_repository: Any = Depends(get_project_repository),
|
|
) -> None:
|
|
"""删除素材库,同时删除库内所有素材。"""
|
|
# 查找素材库
|
|
library = asset_library_repository.find_by_id(library_id)
|
|
if library is None:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="素材库不存在")
|
|
|
|
# 权限校验:检查用户是否有项目访问权限
|
|
check_project_access(library.project_id, authenticated_user.user.id, project_repository)
|
|
|
|
# 删除库内所有素材(无 FK 级联,需手动清理)
|
|
assets_in_library = asset_repository.find_by_library(library_id)
|
|
if assets_in_library:
|
|
asset_ids_to_delete = [a.id for a in assets_in_library]
|
|
asset_repository.batch_delete(asset_ids_to_delete)
|
|
|
|
# 删除素材库本身
|
|
asset_library_repository.delete(library_id)
|