素材云批量删除API

video-gen-api/app/services/shot_replicate_flow_service.py

@@ -12,7 +12,6 @@ from sqlalchemy.orm.attributes import flag_modified
 
 from app.config import settings
 from app.enums.common import ModuleEventTypeEnum, ModuleProjectStatusEnum, ModulePromptTypeEnum, ModuleStepStatusEnum
-from app.enums.generation_task import ChatGenerationPipelineStage, ChatGenerationTaskStatus
 from app.enums.shot_replicate import ShotReplicateGenerationModeEnum, ShotReplicateStepCodeEnum, ModuleCodeEnum
 from app.models.chat_generation_task import ChatGenerationTask
 from app.models.module_generation_project import ModuleGenerationProject
@@ -55,6 +54,7 @@ from app.services.module_generation_log_service import log_module_error, log_mod
 from app.services.llm import optimize_prompt
 from app.services.resource_accounting_service import soft_delete_chat_task_resources
 from app.services.module_generation_flow_base_service import (
+    assert_project_has_no_active_chat_tasks as _base_assert_project_has_no_active_chat_tasks,
     chat_tasks_by_id as _base_chat_tasks_by_id,
     create_module_step as _base_create_step,
     get_current_step_by_code as _base_get_current_step_by_code,
@@ -336,7 +336,7 @@ async def _soft_delete_steps_from_index(
     project: ModuleGenerationProject,
     start_index: int,
     deleted_at: datetime | None = None,
-    refund_unfinished: bool = True,
+    refund_unfinished: bool = False,
     release_stats: dict[str, int] | None = None,
 ) -> None:
     await _base_soft_delete_steps_from_index(
@@ -1412,57 +1412,18 @@ async def handle_chat_generation_task_failed(db: AsyncSession, task: ChatGenerat
 
 
 
-_ACTIVE_DELETE_BLOCK_STATUSES = {
-    ChatGenerationTaskStatus.PENDING.value,
-    ChatGenerationTaskStatus.GENERATING.value,
-}
-_ACTIVE_DELETE_BLOCK_STAGES = {
-    ChatGenerationPipelineStage.QUEUED.value,
-    ChatGenerationPipelineStage.PREPARING.value,
-    ChatGenerationPipelineStage.CREATING_PROVIDER_TASK.value,
-    ChatGenerationPipelineStage.WAITING_REMOTE.value,
-    ChatGenerationPipelineStage.POLLING.value,
-    ChatGenerationPipelineStage.RESULT_READY.value,
-    ChatGenerationPipelineStage.DOWNLOAD_QUEUED.value,
-    ChatGenerationPipelineStage.DOWNLOADING.value,
-    ChatGenerationPipelineStage.RETRY_WAITING.value,
-}
-
-
 async def _assert_project_has_no_active_chat_tasks_for_delete(
     db: AsyncSession,
     *,
     project: ModuleGenerationProject,
 ) -> None:
     """用户主动删除项目/切片时不退款；如仍有异步生成任务进行中，直接拦截。"""
-    step_result = await db.execute(
-        select(ModuleGenerationStep.chat_task_id)
-        .where(
-            ModuleGenerationStep.project_id == project.id,
-            ModuleGenerationStep.module == MODULE,
-            ModuleGenerationStep.deleted_at.is_(None),
-            ModuleGenerationStep.chat_task_id.is_not(None),
-        )
+    await _base_assert_project_has_no_active_chat_tasks(
+        db,
+        project=project,
+        config=FLOW_CONFIG,
+        detail_message="当前拆镜复刻项目仍有生成中任务，暂不能删除",
     )
-    chat_task_ids = [task_id for task_id in step_result.scalars().all() if task_id]
-    if not chat_task_ids:
-        return
-
-    task_result = await db.execute(
-        select(ChatGenerationTask)
-        .where(
-            ChatGenerationTask.id.in_(chat_task_ids),
-            ChatGenerationTask.deleted_at.is_(None),
-        )
-        .with_for_update()
-    )
-    active_tasks = []
-    for task in task_result.scalars().all():
-        if task.status in _ACTIVE_DELETE_BLOCK_STATUSES or (task.pipeline_stage in _ACTIVE_DELETE_BLOCK_STAGES):
-            active_tasks.append(task.id)
-
-    if active_tasks:
-        raise HTTPException(status_code=400, detail="当前拆镜复刻项目仍有生成中任务，暂不能删除")
 
 
 async def mark_shot_replicate_step_dispatch_failed(