Compare commits

...

3 Commits

Author SHA1 Message Date
CI Bot a5f34b9a47 test: 修复 generation_cover 测试 mock 路径
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 38s
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m23s
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m25s
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m30s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m45s
AI Code Review / AI Code Review (pull_request) Successful in 2m21s
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 3m1s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m26s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 3m36s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 4m16s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 3m37s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m48s
CI/CD Pipeline / CI Gate (pull_request) Successful in 13s
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 54s
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 57s
- run_generate_cover 需要 patch packages.shared.ai_service 而非 route 模块
  (因为代码使用函数内 inline import)
- 补充 test_step25_skips 和 test_step25_exception 缺失的 run_generate_cover mock
2026-08-15 10:01:51 +08:00
CI Bot 8840672c16 style: auto-format with black + isort + prettier [skip ci-format-check]
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 48s
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m20s
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m23s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m27s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m46s
CI/CD Pipeline / Unit Tests (pull_request) Failing after 1m48s
AI Code Review / AI Code Review (pull_request) Successful in 3m6s
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 3m12s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m58s
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 3m33s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 3m34s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m52s
CI/CD Pipeline / CI Gate (pull_request) Failing after 17s
2026-08-15 01:45:16 +00:00
CI Bot 74d536db15 fix: 删除封面生成多余logger调用+增加source_edit_plan_id查找兜底
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 56s
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m26s
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m26s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m29s
AI Code Review / AI Code Review (pull_request) Successful in 1m48s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m53s
CI/CD Pipeline / Unit Tests (pull_request) Failing after 1m38s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m53s
CI/CD Pipeline / Validate - Code Quality (pull_request) Has been cancelled
CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled
CI/CD Pipeline / PR Build API Image (pull_request) Has been cancelled
CI/CD Pipeline / PR Build Worker Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled
CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled
CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled
CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled
CI/CD Pipeline / CI Gate (pull_request) Has been cancelled
修复1: 删除步骤2中多余的 logger.info(plan_id, generation_task_id)
        无格式化字符串的调用会导致 TypeError 500
修复2: 步骤2和步骤3之间新增 source_edit_plan_id 查找逻辑
        通过 plan_id 精确匹配关联的已完成预览任务
修复3: list_by_source_edit_plan 已有 order_by(created_at.desc()) 无需修改

新增4个单元测试覆盖新逻辑
2026-08-15 09:40:51 +08:00
2 changed files with 261 additions and 4 deletions
+27 -4
View File
@@ -105,10 +105,6 @@ def generate_cover(
generation_task_id,
rendered_storage_key[:80],
)
logger.info(
plan_id,
generation_task_id,
)
except Exception:
logger.warning(
"封面生成: 通过 generation_task_id 查找视频失败: plan_id=%s",
@@ -116,6 +112,33 @@ def generate_cover(
exc_info=True,
)
# 第 2.5 步:通过 plan_id 作为 source_edit_plan_id 查找关联的已完成预览任务
if not rendered_storage_key:
try:
gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
logger.info("[封面生成] 步骤2.5: 通过 source_edit_plan_id 查找: plan_id=%s", plan_id)
preview_tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
for pt in preview_tasks:
if getattr(pt, "status", "") == "completed" and getattr(pt, "is_preview", False):
video_repo = get_generated_video_repository(db)
use_case = ListGeneratedVideosByTaskUseCase(video_repo)
videos = use_case.execute(pt.id)
if videos:
rendered_storage_key = getattr(videos[0], "file_url", "") or ""
logger.info(
"[封面生成] ✅ 步骤2.5找到视频: plan_id=%s task_id=%s url=%s",
plan_id,
pt.id,
rendered_storage_key[:80],
)
break
except Exception:
logger.warning(
"封面生成: 通过 source_edit_plan_id 查找预览任务失败: plan_id=%s",
plan_id,
exc_info=True,
)
# 第三步:按 user + template 查找最近的已完成预览任务(兜底)
if not rendered_storage_key:
try:
+234
View File
@@ -209,3 +209,237 @@ class TestUnifiedCoverPipelineEndpoint:
# 应该走 run_generate_cover 回退
mock_run.assert_called_once()
assert result.cover["image_url"] == "https://fallback.com/cover.jpg"
class TestSourceEditPlanFallback:
"""测试步骤 2.5:通过 source_edit_plan_id 查找预览视频兜底逻辑。"""
def test_step25_finds_video_by_source_edit_plan_id(self):
"""当步骤1和步骤2都找不到时,步骤2.5通过source_edit_plan_id找到预览视频。"""
from unittest.mock import MagicMock, call, patch
from app.api.routes.generation_cover import GenerateCoverRequest
# plan.config 没有 rendered_storage_key 和 generation_task_id
mock_plan = MagicMock()
mock_plan.config = {}
mock_plan_svc = MagicMock()
mock_plan_svc.get_plan_or_raise.return_value = mock_plan
mock_template_svc = MagicMock()
# Mock preview task found by source_edit_plan_id
mock_preview_task = MagicMock()
mock_preview_task.id = "preview-task-789"
mock_preview_task.status = "completed"
mock_preview_task.is_preview = True
# Mock generated video
mock_video = MagicMock()
mock_video.file_url = "rendered/plan-x/video.mp4"
mock_db = MagicMock()
body = GenerateCoverRequest(cover_type="ai_frame")
with (
patch("app.api.routes.generation_cover.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
patch("app.api.routes.generation_cover.get_generated_video_repository") as mock_video_repo,
patch("app.api.routes.generation_cover.ListGeneratedVideosByTaskUseCase") as mock_usecase_cls,
patch("app.api.routes.generation_cover.normalize_plan_config") as mock_normalize,
patch("packages.shared.ai_service.run_generate_cover") as mock_run,
patch("packages.shared.storage.get_shared_storage_service") as mock_storage_getter,
):
mock_repo = MagicMock()
# Step 2: no generation_task_id, so get() is not called
mock_repo.get.return_value = None
# Step 2.5: found by source_edit_plan_id
mock_repo.list_by_source_edit_plan.return_value = [mock_preview_task]
mock_repo_cls.return_value = mock_repo
mock_usecase = MagicMock()
mock_usecase.execute.return_value = [mock_video]
mock_usecase_cls.return_value = mock_usecase
mock_normalize.return_value = {"cover": {"type": "ai_frame", "image_url": ""}}
mock_storage_svc = MagicMock()
mock_storage_svc.get_url.return_value = "https://oss.example.com/rendered/plan-x/video.mp4"
mock_storage_getter.return_value = mock_storage_svc
# cover_type=ai_frame but no cover_url on task -> fallback to run_generate_cover
mock_run.return_value = {"type": "ai_frame", "image_url": "https://cover.com/final.jpg"}
from app.api.routes.generation_cover import generate_cover
result = generate_cover(
body=body,
template_id="template-1",
plan_id="plan-x",
services=(mock_template_svc, mock_plan_svc),
db=mock_db,
current_user=MagicMock(),
)
# Verify step 2.5 was called
mock_repo.list_by_source_edit_plan.assert_called_once_with("plan-x")
# Step 3 should NOT be called since step 2.5 found the video
mock_repo.list_latest_completed_preview.assert_not_called()
def test_step25_skips_non_completed_or_non_preview_tasks(self):
"""步骤2.5跳过非completed或非is_preview的任务,继续到步骤3。"""
from unittest.mock import MagicMock, patch
from app.api.routes.generation_cover import GenerateCoverRequest
mock_plan = MagicMock()
mock_plan.config = {}
mock_plan_svc = MagicMock()
mock_plan_svc.get_plan_or_raise.return_value = mock_plan
mock_template_svc = MagicMock()
# Task that is not completed
mock_task_failed = MagicMock()
mock_task_failed.id = "task-failed"
mock_task_failed.status = "failed"
mock_task_failed.is_preview = True
# Task that is not preview
mock_task_full = MagicMock()
mock_task_full.id = "task-full"
mock_task_full.status = "completed"
mock_task_full.is_preview = False
mock_db = MagicMock()
# Step 3 fallback finds a valid preview task
mock_step3_task = MagicMock()
mock_step3_task.id = "step3-task"
mock_video = MagicMock()
mock_video.file_url = "rendered/step3/video.mp4"
body = GenerateCoverRequest(cover_type="ai_frame")
with (
patch("app.api.routes.generation_cover.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
patch("app.api.routes.generation_cover.get_generated_video_repository") as mock_video_repo,
patch("app.api.routes.generation_cover.ListGeneratedVideosByTaskUseCase") as mock_usecase_cls,
patch("app.api.routes.generation_cover.normalize_plan_config") as mock_normalize,
patch("packages.shared.storage.get_shared_storage_service") as mock_storage_getter,
patch("packages.shared.ai_service.run_generate_cover") as mock_run,
):
mock_run.return_value = {"type": "ai_frame", "image_url": "https://cover.com/step3.jpg"}
mock_repo = MagicMock()
mock_repo.get.return_value = None
mock_repo.list_by_source_edit_plan.return_value = [mock_task_failed, mock_task_full]
# Step 3 returns a valid task
mock_repo.list_latest_completed_preview.return_value = [mock_step3_task]
mock_repo_cls.return_value = mock_repo
mock_usecase = MagicMock()
mock_usecase.execute.return_value = [mock_video]
mock_usecase_cls.return_value = mock_usecase
mock_normalize.return_value = {"cover": {"type": "ai_frame", "image_url": ""}}
mock_storage_svc = MagicMock()
mock_storage_svc.get_url.return_value = "https://oss.example.com/rendered/step3/video.mp4"
mock_storage_getter.return_value = mock_storage_svc
from app.api.routes.generation_cover import generate_cover
result = generate_cover(
body=body,
template_id="template-1",
plan_id="plan-y",
services=(mock_template_svc, mock_plan_svc),
db=mock_db,
current_user=MagicMock(),
)
# Step 2.5 found tasks but none matched -> step 3 should be called
mock_repo.list_by_source_edit_plan.assert_called_once()
mock_repo.list_latest_completed_preview.assert_called_once()
def test_step25_exception_does_not_block_step3(self):
"""步骤2.5异常时不影响步骤3兜底。"""
from unittest.mock import MagicMock, patch
from app.api.routes.generation_cover import GenerateCoverRequest
mock_plan = MagicMock()
mock_plan.config = {}
mock_plan_svc = MagicMock()
mock_plan_svc.get_plan_or_raise.return_value = mock_plan
mock_template_svc = MagicMock()
mock_step3_task = MagicMock()
mock_step3_task.id = "step3-task"
mock_video = MagicMock()
mock_video.file_url = "rendered/step3/video.mp4"
mock_db = MagicMock()
body = GenerateCoverRequest(cover_type="ai_frame")
with (
patch("app.api.routes.generation_cover.SQLAlchemyGenerationTaskRepository") as mock_repo_cls,
patch("app.api.routes.generation_cover.get_generated_video_repository") as mock_video_repo,
patch("app.api.routes.generation_cover.ListGeneratedVideosByTaskUseCase") as mock_usecase_cls,
patch("app.api.routes.generation_cover.normalize_plan_config") as mock_normalize,
patch("packages.shared.storage.get_shared_storage_service") as mock_storage_getter,
patch("packages.shared.ai_service.run_generate_cover") as mock_run,
):
mock_run.return_value = {"type": "ai_frame", "image_url": "https://cover.com/step3.jpg"}
mock_repo = MagicMock()
mock_repo.get.return_value = None
# Step 2.5 raises
mock_repo.list_by_source_edit_plan.side_effect = RuntimeError("db error")
# Step 3 succeeds
mock_repo.list_latest_completed_preview.return_value = [mock_step3_task]
mock_repo_cls.return_value = mock_repo
mock_usecase = MagicMock()
mock_usecase.execute.return_value = [mock_video]
mock_usecase_cls.return_value = mock_usecase
mock_normalize.return_value = {"cover": {"type": "ai_frame", "image_url": ""}}
mock_storage_svc = MagicMock()
mock_storage_svc.get_url.return_value = "https://oss.example.com/rendered/step3/video.mp4"
mock_storage_getter.return_value = mock_storage_svc
from app.api.routes.generation_cover import generate_cover
result = generate_cover(
body=body,
template_id="template-1",
plan_id="plan-z",
services=(mock_template_svc, mock_plan_svc),
db=mock_db,
current_user=MagicMock(),
)
# Step 3 was called after step 2.5 failed
mock_repo.list_latest_completed_preview.assert_called_once()
class TestStrayLoggerRemoved:
"""验证多余的 logger.info(plan_id, generation_task_id) 已被删除。"""
def test_no_stray_logger_call_in_source(self):
"""源码中不应存在 logger.info(plan_id, generation_task_id) 这样的调用。"""
import inspect
from app.api.routes import generation_cover
source = inspect.getsource(generation_cover)
# The stray call was logger.info(\n plan_id,\n generation_task_id,\n)
# with no format string — should not exist
assert (
"logger.info(\n plan_id," not in source
), "Stray logger.info(plan_id, generation_task_id) should be removed"