Merge pull request 'feat: 跨视频片段避让 — 生成前注入已用区间 #1670' (#1671) from feat/cross-video-avoidance-1670 into develop

2026-09-03 22:42:03 +08:00
parent 109d7afbc7 9d31818222
commit 159a62f9a5
4 changed files with 431 additions and 9 deletions
@@ -131,3 +131,65 @@ class SQLAlchemyEditPlanClipRepository:
            created_at=model.created_at,
            updated_at=model.updated_at,
        )
+
+    def list_used_segments_by_user(
+        self,
+        user_id: str,
+        *,
+        limit_recent: int = 50,
+    ) -> dict[str, list[tuple[float, float]]]:
+        """查询用户已有视频中已使用的素材区间（跨视频避让）.
+
+        JOIN edit_plans 表，按 created_by_user_id 过滤，只查 status='completed'
+        的 plan 下 status='rendered' 且 asset_id 非空的 clips。按 plan 的
+        created_at DESC 取最近 limit_recent 个 plan。
+
+        Returns:
+            {asset_id: [(start_time, start_time + duration), ...]}
+            空结果返回空 dict。
+        """
+        from packages.adapters.sqlalchemy_impl.models import EditPlanModel
+
+        if not user_id:
+            return {}
+
+        # 1. 查出最近 limit_recent 个已完成 plan 的 ID
+        recent_plan_ids = [
+            row[0]
+            for row in self.session.query(EditPlanModel.id)
+            .filter(
+                EditPlanModel.created_by_user_id == user_id,
+                EditPlanModel.status == "completed",
+            )
+            .order_by(EditPlanModel.created_at.desc())
+            .limit(limit_recent)
+            .all()
+        ]
+
+        if not recent_plan_ids:
+            return {}
+
+        # 2. 查这些 plan 下已渲染、有素材的 clips
+        clips = (
+            self.session.query(
+                EditPlanClipModel.asset_id,
+                EditPlanClipModel.start_time,
+                EditPlanClipModel.duration,
+            )
+            .filter(
+                EditPlanClipModel.plan_id.in_(recent_plan_ids),
+                EditPlanClipModel.status == "rendered",
+                EditPlanClipModel.asset_id != "",
+                EditPlanClipModel.asset_id.isnot(None),
+            )
+            .all()
+        )
+
+        # 3. 聚合为 {asset_id: [(start, start+duration), ...]}
+        result: dict[str, list[tuple[float, float]]] = {}
+        for asset_id, start_time, duration in clips:
+            if asset_id not in result:
+                result[asset_id] = []
+            result[asset_id].append((start_time or 0.0, (start_time or 0.0) + (duration or 0.0)))
+
+        return result