diff --git a/apps/worker/worker_app/tasks/edit_plan_generation.py b/apps/worker/worker_app/tasks/edit_plan_generation.py index 3eb54cc93..19ce9d826 100755 --- a/apps/worker/worker_app/tasks/edit_plan_generation.py +++ b/apps/worker/worker_app/tasks/edit_plan_generation.py @@ -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,