fix(#1743): 批量变体独立选片——完整重跑单视频选片+批次20%重叠避让+查重超阈重渲+封面独立 #1745
Merged
auto-approve-bot
merged 2 commits from 2026-09-06 18:07:25 +08:00
fix/batch-variant-independent-plans-1743 into develop
2 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 saas-backend-agent
|
c83febed61 |
test(#1743): 集成测试适配批量无plan守卫——无plan 400中断+有源plan独立变体plan成功链路
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 2s
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 29s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 28s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m38s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m48s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 1m57s
CI/CD Pipeline / Validate - Style (pull_request) Successful in 2m12s
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 2m37s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m17s
CI/CD Pipeline / Validate - Security (pull_request) Successful in 4m52s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / CI Gate (pull_request) Successful in 1s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 2m16s
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 6s
AI Code Review / AI Code Review (pull_request) Successful in 6m37s
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m25s
|
||
|
saas-backend-agent
|
21d7a6f45a |
fix(#1743): 批量变体独立选片——完整重跑单视频选片流程+批次20%重叠避让+查重超阈重渲+封面独立
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 3s
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1m31s
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
CI/CD Pipeline / Validate - Style (pull_request) Successful in 1m49s
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 33s
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 2m8s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m32s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m32s
AI Code Review / AI Code Review (pull_request) Failing after 3m15s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m12s
CI/CD Pipeline / Integration Tests (pull_request) Failing after 2m57s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 4m37s
CI/CD Pipeline / Validate - Security (pull_request) Successful in 6m32s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / CI Gate (pull_request) Failing after 3s
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m57s
根因：批量生成的变体 1..N 走 clone_plan_for_variant 只重算起点，
素材/顺序/速度与源 plan 完全相同，导致 N 条成片片段同源（批次查重率 60.1%/33.3%）。
修复（多视频 = 单视频逻辑 × N）：
- 新增 packages/domain/variant_plan_selector.py 纯核心：
素材池 shuffle + main 片段顺序洗牌 + _resolve_start_time 起点重选
（镜头洗牌/随机起点/历史区间避让，与单视频同一入口）+ 批次内同素材
区间重叠 >20% 自动重选起点（最多 6 次）
- EditPlanService.reselect_plan_for_variant：源 plan 骨架（clip_type/order/
duration/文案/转场/速度）保留，素材池=源素材∪批次素材，新片段区间
record_used_segments 写回（跨变体/跨任务避让），replace 事务落库
- 正式生成（generation_tasks）：创建任务前预生成 N-1 个独立 plan，
变体0保留用户预览 plan；count>1 无源 plan 直接 400（严禁 N 任务兜底
共用同一 plan）；任务循环兜底块加批量守卫（缺 plan 500 中断）
- 批量预览（generation_preview）：count>1 变体0用源 plan、变体1..N-1
reselect 真实选片（所见即所得）；count==1 保持 clone 零回归
- worker 渲染：上传 OSS 与落库查重拆分（_upload_rendered_video/
_record_video_and_dedup）；批次任务 batch_similarity>20% 重选 plan
重渲一次（最多1次，重选失败保留首版，首版_v1后缀不覆盖）；
封面按 task_id md5 稳定哈希分散选候选帧（非批次仍取首帧）
- dedup_helpers.create_video_record_and_dedup 返回 dict：
{video_count,is_duplicate,batch_similarity,duplicate_of}
测试：新增 24 个单测（纯核心选片差异化/重叠避让/骨架保留、服务层
reselect、重渲阈值判定、封面哈希、批次查重 dict 契约），适配 6 个旧测试，
全量 14469 passed；diff coverage 63%。
|