feat: worker渲染任务取消检查点 - 素材下载后检测cancelled状态
CI Build & Deploy Pipeline / Build Staging API Image (push) Has been skipped
CI Build & Deploy Pipeline / Build Staging Web Image (push) Has been skipped
CI Build & Deploy Pipeline / Build Staging Worker Image (push) Has been skipped
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Has been skipped
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI Build & Deploy Pipeline / Staging E2E Tests (push) Has been skipped
CI Build & Deploy Pipeline / Staging API Integration Tests (push) Has been skipped
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 50s
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 32s
CI/CD Pipeline / Frontend Lint (push) Successful in 1m18s
CI Build & Deploy Pipeline / Build Production API Image (push) Has been skipped
CI Build & Deploy Pipeline / Build Production Web Image (push) Has been skipped
CI Build & Deploy Pipeline / Build Production Worker Image (push) Has been skipped
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI Build & Deploy Pipeline / Deploy Production (push) Has been skipped
CI Build & Deploy Pipeline / Production Browser E2E (push) Has been skipped
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 54s
CI/CD Pipeline / Unit Tests (push) Successful in 3m35s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m26s
CI/CD Pipeline / Integration Tests (push) Successful in 2m37s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m20s

在渲染主流程中增加取消检查点:
- 素材下载完成后、启动FFmpeg前,检查generation_task状态
- 如果已被取消(cancelled),立即中止,不启动渲染
- 计划状态从 rendering 切回 editing,用户可继续编辑
- 与 API 层的取消接口配套

不修改 FFmpeg 运行时取消(后续迭代),覆盖排队/下载期间取消的场景
This commit is contained in:
CI Bot
2026-07-16 10:06:02 +08:00
parent 11c00811eb
commit a08eea1630
@@ -491,6 +491,23 @@ def render_edit_plan(self, plan_id: str) -> dict:
gen_task_repo.update(gen_task)
# 4. 根据引擎选择渲染方式
# 取消检查:素材下载完后,确认任务没有被用户取消
if generation_task_id:
current_task = gen_task_repo.get(generation_task_id)
if current_task:
task_status = current_task.status.value if hasattr(current_task.status, "value") else str(current_task.status)
if task_status == "cancelled":
logger.info("任务已被取消,中止渲染: plan_id=%s task_id=%s", plan_id, generation_task_id)
# 计划回到 editing 状态,用户可以继续编辑
from packages.domain.edit_plan import EditPlanStatus
if plan.status.value == "rendering":
try:
plan.resume_editing()
plan_repo.update(plan)
except ValueError:
pass
return {"status": "cancelled", "plan_id": plan_id, "message": "任务已取消"}
if engine == "unified":
result = _render_with_unified(
plan=plan,