auto-save 2026-05-13 16:17 (~3)

api/main.py

@@ -64,13 +64,21 @@ class GeneratedImage(BaseModel):
 
 
 class StoryboardScene(BaseModel):
-    """分镜头编排：每个 selected 分镜对应一个 scene 描述"""
-    subject: str = ""        # 主体（如：戴头带的骨架人）
-    product: str = ""        # 产品（如：Goli 营养软糖）
-    scene: str = ""          # 场景（如：药店柜台）
-    action: str = ""         # 在干什么（如：递给顾客一瓶软糖）
-    duration: float = 0      # 视频片段时长（秒）
-    reference_ids: list[str] = []  # 参考图：选用该分镜里已提取的 element ids 作 reference
+    """分镜头编排：每个 selected 分镜对应一个 scene 描述
+    v2: 4 图槽 + 时长（复制粘贴模式）— 主体 / 场景 / 产品 / 动作 各一张图
+    v1 字段保留兼容（subject/product/scene/action/reference_ids）"""
+    duration: float = 0
+    # 4 图槽：dict 含 {kind, frame_idx, element_id?, cutout_id?, label}
+    subject_image: dict | None = None
+    scene_image: dict | None = None
+    product_image: dict | None = None
+    action_image: dict | None = None
+    # v1 兼容
+    subject: str = ""
+    product: str = ""
+    scene: str = ""
+    action: str = ""
+    reference_ids: list[str] = []
 
 
 class StoryboardImage(BaseModel):
@@ -1413,11 +1421,16 @@ def delete_cutout(job_id: str, idx: int, element_id: str, cutout_id: str) -> Job
 
 
 class UpdateStoryboardReq(BaseModel):
+    duration: float = 0
+    subject_image: dict | None = None
+    scene_image: dict | None = None
+    product_image: dict | None = None
+    action_image: dict | None = None
+    # v1 字段（前端可不传）
     subject: str = ""
     product: str = ""
     scene: str = ""
     action: str = ""
-    duration: float = 0
     reference_ids: list[str] = []
 
 
@@ -1434,11 +1447,15 @@ def update_storyboard(job_id: str, idx: int, req: UpdateStoryboardReq) -> Job:
     for f in job.frames:
         if f.index == idx:
             f.storyboard = StoryboardScene(
+                duration=max(0.0, float(req.duration)),
+                subject_image=req.subject_image,
+                scene_image=req.scene_image,
+                product_image=req.product_image,
+                action_image=req.action_image,
                 subject=req.subject.strip(),
                 product=req.product.strip(),
                 scene=req.scene.strip(),
                 action=req.action.strip(),
-                duration=max(0.0, float(req.duration)),
                 reference_ids=list(req.reference_ids),
             )
         new_frames.append(f)