优化脚本

core/backend/apps/projects/services/pipeline.py

@@ -5,14 +5,23 @@ from django.utils import timezone
 from apps.projects.models import Project, ProjectStage, ScriptVersion, VideoSegment
 
 
+# 故事板已从流程中去掉:脚本 → 基础资产 → 视频 → 导出。
+# ProjectStage.Stage.STORYBOARD 枚举保留(老项目的历史行还引用它),但不再出现在流水线里。
 STAGE_ORDER = [
     ProjectStage.Stage.SCRIPT,
     ProjectStage.Stage.BASE_ASSETS,
-    ProjectStage.Stage.STORYBOARD,
     ProjectStage.Stage.VIDEO,
     ProjectStage.Stage.EXPORT,
 ]
 
+# 老项目可能正停在已下线的 storyboard 阶段;按「基础资产之后」对待,让它们能正常进视频。
+LEGACY_STAGE_FALLBACK = {ProjectStage.Stage.STORYBOARD: ProjectStage.Stage.BASE_ASSETS}
+
+
+def normalize_stage(stage: str) -> str:
+    """把已下线的阶段名归一到现役阶段,供索引/比较使用。"""
+    return LEGACY_STAGE_FALLBACK.get(stage, stage)
+
 
 @dataclass(frozen=True)
 class StageTransition:
@@ -22,24 +31,22 @@ class StageTransition:
     reason: str = ""
 
 
-def can_enter_stage(current_stage: str, target_stage: str, allow_skip_storyboard: bool = True) -> StageTransition:
+def can_enter_stage(current_stage: str, target_stage: str) -> StageTransition:
     if target_stage not in STAGE_ORDER:
         return StageTransition(current_stage, target_stage, False, "unknown target stage")
 
-    current_index = STAGE_ORDER.index(current_stage) if current_stage in STAGE_ORDER else -1
+    current = normalize_stage(current_stage)
+    current_index = STAGE_ORDER.index(current) if current in STAGE_ORDER else -1
     target_index = STAGE_ORDER.index(target_stage)
 
     if target_index <= current_index + 1:
         return StageTransition(current_stage, target_stage, True)
 
-    if allow_skip_storyboard and current_stage == ProjectStage.Stage.BASE_ASSETS and target_stage == ProjectStage.Stage.VIDEO:
-        return StageTransition(current_stage, target_stage, True)
-
     return StageTransition(current_stage, target_stage, False, "stage prerequisite is not satisfied")
 
 
 def initialize_project_pipeline(project: Project, *, placeholder_segments: int = 4) -> None:
-    """建立专业创作和极速成片共用的阶段、视频占位数据。幂等，可安全重试。"""
+    """建立专业创作和一键成片共用的阶段、视频占位数据。幂等，可安全重试。"""
     for stage_name in STAGE_ORDER:
         ProjectStage.objects.get_or_create(project=project, stage=stage_name)
     for index in range(placeholder_segments):
@@ -94,7 +101,7 @@ def sync_video_segments_to_script(project: Project, script: ScriptVersion) -> No
 
 
 def adopt_script_version(project: Project, script: ScriptVersion) -> None:
-    """采用脚本并推进到资产阶段，供专业创作按钮和极速编排共同调用。"""
+    """采用脚本并推进到资产阶段，供专业创作按钮和一键成片编排共同调用。"""
     ScriptVersion.objects.filter(project=project).exclude(id=script.id).update(is_adopted=False)
     if not script.is_adopted:
         script.is_adopted = True
@@ -111,9 +118,9 @@ def adopt_script_version(project: Project, script: ScriptVersion) -> None:
     project.save(update_fields=["current_stage", "status", "failure_reason", "updated_at"])
 
 
-def finish_storyboard_stage(project: Project) -> None:
-    """故事板全部成功后推进到视频阶段，并再次校准片段数量。"""
-    stage, _ = ProjectStage.objects.get_or_create(project=project, stage=ProjectStage.Stage.STORYBOARD)
+def finish_base_assets_stage(project: Project) -> None:
+    """基础资产齐备后直接推进到视频阶段（故事板已下线），并再次校准片段数量。"""
+    stage, _ = ProjectStage.objects.get_or_create(project=project, stage=ProjectStage.Stage.BASE_ASSETS)
     stage.status = ProjectStage.Status.SUCCEEDED
     stage.completed_at = timezone.now()
     stage.error_message = ""
@@ -127,7 +134,7 @@ def finish_storyboard_stage(project: Project) -> None:
 
 
 def finish_video_stage(project: Project) -> bool:
-    """全部片段成功即完成专业创作的视频阶段。"""
+    """全部片段成功即完成视频阶段。"""
     segments = list(project.video_segments.values_list("status", "adopted_version_id"))
     if not segments or not all(status == VideoSegment.Status.SUCCEEDED and adopted for status, adopted in segments):
         return False