48f6f49f7b
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m22s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m32s
AI Code Review / AI Code Review (pull_request) Successful in 6m51s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 10m53s
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 0s
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s
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 / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped 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 / PR Build API Image (pull_request) Successful in 30s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 29s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m46s
CI/CD Pipeline / Validate - Style (pull_request) Successful in 4m59s
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 5m33s
CI/CD Pipeline / Validate - Security (pull_request) Successful in 10m57s
CI/CD Pipeline / Unit Tests (pull_request) Failing after 11m4s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / CI Gate (pull_request) Failing after 1s
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
Two-phase pipeline: worker renders and precomputes dedup metadata, but does
not create GeneratedVideo until user confirms cover in Step 5.
Domain
- Add GenerationTaskStatus.AWAITING_COVER (non-terminal)
- Add mark_awaiting_cover(): progress=100, clears error, leaves completed_at unset
- Transitions: running → {awaiting_cover, completed, failed, cancelled};
awaiting_cover → {completed, failed, cancelled}
- _missing_ aliases: waiting_cover/video_ready/rendered/pending_cover
- Keep running→completed for backward compat / legacy paths
Worker (apps/worker/worker_app/tasks/generation.py)
- Replace _record_video_and_dedup with _precompute_render_metadata:
calls compute_render_fingerprint_and_dedup, returns dict without DB writes
- Remove runtime batch-rerender decision (should_rerender_for_batch_dedup path);
dedup now happens at finalize time against all finished records
- Persist precomputed metadata into task.extra_meta['rendered_output']
- Final status: mark_awaiting_cover instead of mark_completed
Dedup helpers (apps/worker/video_processing/dedup_helpers.py)
- New compute_render_fingerprint_and_dedup(video_path,...): local fingerprint
+ historical dedup + batch dedup, returns fully serializable dict
(fingerprint_dict, fingerprint_chunks list, is_duplicate, duplicate_of, etc.)
- create_video_record_and_dedup() retained for compat/tests; now supports
pre_dedup_result to reuse worker-precomputed data without re-reading video
- VideoFingerprint.from_dict() added to reconstruct from serialized form
Application layer (packages/application/generated_video_finalize.py)
- RenderedOutput dataclass + from_dict() for deserializing worker output
- finalize_generated_video(): creates GeneratedVideo, bulk-inserts
VideoFingerprintChunk rows, commits; API-layer free
API service (apps/api/app/services/generation_finalize_service.py)
- GenerationFinalizeService.finalize_task(task_id, user_id, cover_url):
* permission / existence check
* idempotent: if GeneratedVideo already exists for this task, just ensure
task is marked completed and return (safe for double-click)
* status gate: only awaiting_cover (or legacy completed) accepted
* cover resolution: explicit cover_url arg > task.cover_url
* delegates to finalize_generated_video, marks task completed,
clears extra_meta['rendered_output']
API endpoint (apps/api/app/api/routes/generation_tasks.py)
- POST /api/v1/generation/tasks/{task_id}/finalize
- Body: { cover_url?: string }; returns video_id/cover_url/file_url/is_duplicate
- Adjust confirm_generation fast path: mark_confirmed keeps task in
awaiting_cover (don't auto-complete); historical 'completed' previews
migrated back to awaiting_cover
- Preview-reuse accepts awaiting_cover tasks
Preview / task center
- GET /preview/{task_id} constructs lightweight _PreviewVideo from
extra_meta.rendered_output when task is awaiting_cover
- Task center step map: awaiting_cover → 等待确认封面; status filter includes it
Tests
- tests/unit/test_finalize_generation.py: 13 new tests covering status
transitions, mark_awaiting_cover, RenderedOutput parsing, finalize use case
(success / missing metadata / cover fallback)
- test_generation_task.py updated for 6th status value
- Full suite: 15978 passed, 28 skipped (matches #2023 baseline, no regressions)
- black/isort/ruff clean
Out of scope (intentionally untouched)
- AI avatar pipeline uses separate AiAvatarRenderJob; finalize_job and
/{job_id}/finalize are unchanged
- PR #2023 subtitle font scaling files (ass_subtitle_builder,
video_filter_builder, subtitle_generator) not modified
- No DB migration: GenerationTaskModel.status is String(20) without CHECK
- Temp file cleanup: leave to existing periodic job
210 lines
7.4 KiB
Python
210 lines
7.4 KiB
Python
"""generation_task 单测.
|
||
|
||
domain 层生成任务实体纯逻辑模块,0 外部依赖。
|
||
覆盖:枚举、create工厂/校验、列表拷贝。
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
from packages.domain.generation_task import GenerationTask, GenerationTaskStatus
|
||
|
||
|
||
class TestGenerationTaskStatus:
|
||
"""GenerationTaskStatus 枚举测试."""
|
||
|
||
def test_five_statuses(self):
|
||
"""六种状态(#2024 新增 awaiting_cover)."""
|
||
assert len(GenerationTaskStatus) == 6
|
||
assert GenerationTaskStatus.AWAITING_COVER == "awaiting_cover"
|
||
|
||
def test_pending(self):
|
||
assert GenerationTaskStatus.PENDING == "pending"
|
||
|
||
def test_running(self):
|
||
assert GenerationTaskStatus.RUNNING == "running"
|
||
|
||
def test_completed(self):
|
||
assert GenerationTaskStatus.COMPLETED == "completed"
|
||
|
||
def test_failed(self):
|
||
assert GenerationTaskStatus.FAILED == "failed"
|
||
|
||
def test_cancelled(self):
|
||
assert GenerationTaskStatus.CANCELLED == "cancelled"
|
||
|
||
|
||
class TestGenerationTaskCreate:
|
||
"""GenerationTask.create 工厂测试."""
|
||
|
||
def test_create_minimal(self):
|
||
"""最简创建(project_id + asset_library_id)."""
|
||
task = GenerationTask.create(project_id="proj1", asset_library_id="lib1")
|
||
assert task.project_id == "proj1"
|
||
assert task.asset_library_id == "lib1"
|
||
assert task.status == GenerationTaskStatus.PENDING
|
||
assert task.progress == 0.0
|
||
assert task.result_count == 0
|
||
assert task.error_message == ""
|
||
assert task.asset_ids == []
|
||
assert task.title_ids == []
|
||
assert task.voice_ids == []
|
||
assert isinstance(task.id, str)
|
||
assert len(task.id) > 0
|
||
|
||
def test_create_with_all_fields(self):
|
||
"""带全部字段创建."""
|
||
task = GenerationTask.create(
|
||
project_id=" proj1 ",
|
||
asset_library_id=" lib1 ",
|
||
strategy_id=" strat1 ",
|
||
voice_library_id=" vlib1 ",
|
||
template_id=" tpl1 ",
|
||
asset_ids=["a1", "a2", "a3"],
|
||
title_ids=["t1", "t2"],
|
||
voice_ids=["v1"],
|
||
created_by_user_id=" user1 ",
|
||
source_edit_plan_id=" plan1 ",
|
||
asset_select_mode="smart",
|
||
batch_id="batch1",
|
||
)
|
||
assert task.project_id == "proj1"
|
||
assert task.asset_library_id == "lib1"
|
||
assert task.strategy_id == "strat1"
|
||
assert task.voice_library_id == "vlib1"
|
||
assert task.template_id == "tpl1"
|
||
assert task.asset_ids == ["a1", "a2", "a3"]
|
||
assert task.title_ids == ["t1", "t2"]
|
||
assert task.voice_ids == ["v1"]
|
||
assert task.created_by_user_id == "user1"
|
||
assert task.source_edit_plan_id == "plan1"
|
||
assert task.asset_select_mode == "smart"
|
||
assert task.batch_id == "batch1"
|
||
|
||
def test_create_with_template_instead_of_project(self):
|
||
"""有 template_id 但 project_id 为空也可以."""
|
||
task = GenerationTask.create(
|
||
project_id="",
|
||
asset_library_id="lib1",
|
||
template_id="tpl1",
|
||
)
|
||
assert task.template_id == "tpl1"
|
||
assert task.project_id == ""
|
||
|
||
def test_create_neither_project_nor_template(self):
|
||
"""project_id 和 template_id 都为空,抛错."""
|
||
try:
|
||
GenerationTask.create(project_id="", asset_library_id="lib1")
|
||
assert False
|
||
except ValueError as e:
|
||
assert "project_id" in str(e) and "template_id" in str(e)
|
||
|
||
def test_create_whitespace_project_and_template(self):
|
||
"""都是空白也抛错."""
|
||
try:
|
||
GenerationTask.create(project_id=" ", asset_library_id="lib1", template_id=" ")
|
||
assert False
|
||
except ValueError as e:
|
||
assert "project_id" in str(e) and "template_id" in str(e)
|
||
|
||
def test_create_no_asset_library_and_no_ids(self):
|
||
"""asset_library_id 为空且没有素材列表,抛错."""
|
||
try:
|
||
GenerationTask.create(project_id="p1", asset_library_id="")
|
||
assert False
|
||
except ValueError as e:
|
||
assert "asset_library_id" in str(e)
|
||
|
||
def test_create_whitespace_asset_library_and_no_ids(self):
|
||
"""空白 asset_library 且无素材列表,抛错."""
|
||
try:
|
||
GenerationTask.create(project_id="p1", asset_library_id=" ")
|
||
assert False
|
||
except ValueError as e:
|
||
assert "asset_library_id" in str(e)
|
||
|
||
def test_create_with_asset_ids_instead_of_library(self):
|
||
"""用 asset_ids 替代 asset_library_id."""
|
||
task = GenerationTask.create(
|
||
project_id="p1",
|
||
asset_library_id="",
|
||
asset_ids=["a1", "a2"],
|
||
)
|
||
assert task.asset_library_id == ""
|
||
assert task.asset_ids == ["a1", "a2"]
|
||
|
||
def test_create_with_title_ids_instead_of_library(self):
|
||
"""用 title_ids 替代 asset_library_id."""
|
||
task = GenerationTask.create(
|
||
project_id="p1",
|
||
asset_library_id="",
|
||
title_ids=["t1"],
|
||
)
|
||
assert task.title_ids == ["t1"]
|
||
|
||
def test_create_with_voice_ids_instead_of_library(self):
|
||
"""用 voice_ids 替代 asset_library_id."""
|
||
task = GenerationTask.create(
|
||
project_id="p1",
|
||
asset_library_id="",
|
||
voice_ids=["v1"],
|
||
)
|
||
assert task.voice_ids == ["v1"]
|
||
|
||
def test_create_asset_ids_copied(self):
|
||
"""asset_ids 是拷贝不是引用."""
|
||
original = ["a1", "a2"]
|
||
task = GenerationTask.create(project_id="p1", asset_library_id="lib1", asset_ids=original)
|
||
original.append("a3")
|
||
assert task.asset_ids == ["a1", "a2"]
|
||
|
||
def test_create_title_ids_copied(self):
|
||
"""title_ids 是拷贝不是引用."""
|
||
original = ["t1"]
|
||
task = GenerationTask.create(project_id="p1", asset_library_id="lib1", title_ids=original)
|
||
original.append("t2")
|
||
assert task.title_ids == ["t1"]
|
||
|
||
def test_create_voice_ids_copied(self):
|
||
"""voice_ids 是拷贝不是引用."""
|
||
original = ["v1"]
|
||
task = GenerationTask.create(project_id="p1", asset_library_id="lib1", voice_ids=original)
|
||
original.append("v2")
|
||
assert task.voice_ids == ["v1"]
|
||
|
||
def test_create_none_lists_default_empty(self):
|
||
"""None 列表默认为空."""
|
||
task = GenerationTask.create(
|
||
project_id="p1",
|
||
asset_library_id="lib1",
|
||
asset_ids=None,
|
||
title_ids=None,
|
||
voice_ids=None,
|
||
)
|
||
assert task.asset_ids == []
|
||
assert task.title_ids == []
|
||
assert task.voice_ids == []
|
||
|
||
def test_create_unique_id(self):
|
||
"""不同任务 id 不同."""
|
||
t1 = GenerationTask.create("p", "l")
|
||
t2 = GenerationTask.create("p", "l")
|
||
assert t1.id != t2.id
|
||
|
||
def test_create_has_created_at(self):
|
||
"""有创建时间."""
|
||
task = GenerationTask.create("p", "l")
|
||
assert task.created_at is not None
|
||
|
||
def test_create_defaults_started_completed_none(self):
|
||
"""started_at 和 completed_at 默认 None."""
|
||
task = GenerationTask.create("p", "l")
|
||
assert task.started_at is None
|
||
assert task.completed_at is None
|
||
|
||
def test_empty_lists_independent(self):
|
||
"""不同任务的空列表互不影响."""
|
||
t1 = GenerationTask.create("p", "l")
|
||
t2 = GenerationTask.create("p", "l")
|
||
t1.asset_ids.append("x")
|
||
assert t2.asset_ids == []
|