feat: 素材选取评分注入随机噪声,降低成片查重率 #1620

Merged
auto-approve-bot merged 4 commits from feat/asset-selection-random-noise into develop 2026-09-02 01:40:35 +08:00
Owner

背景

smart_match 评分排序是确定性的:同一批素材每次生成,选出来的素材组合完全相同(13 条素材永远选评分最高的 4 条),导致成片素材组合层面重复率高。

改动

两条素材选取路径的排序键注入 0~20 分随机噪声:

  1. from-assets 路径clips.py):sorted_candidates 排序键 -score 改为 -(score + random.uniform(0, 20))
  2. 一键生成路径plan_generator_service.py):_sort_assets_by_smart_score 排序加噪声
  3. 新增常量 SCORE_RANDOM_NOISE_MAX = 20.0smart_match.py,评分满分 100,噪声 20 分 ≈ 20%)

行为

  • 分差 > 20 的素材排名稳定:质量差距显著的素材保持优先级,不会选到明显差的素材
  • 分差 ≤ 20 的素材排名随机浮动:每次生成选出的素材组合不同,低分素材也有机会入选
  • use_count(使用次数)作为第二排序键不受影响,贪心均衡分配机制保留

测试

  • 新增 3 个噪声有效性测试:等分素材多次排序排名浮动覆盖两者;质量差 40 分时 50 次排序高质量素材始终第一
  • 确定性断言测试通过 zero-noise patch 消除随机性(均衡分配、非法 ID 过滤)
  • 全量 14034 测试通过(5 个 TTS 失败为 develop 基线预存的 h2/httpcore 环境依赖问题,与本 PR 无关)
## 背景 smart_match 评分排序是确定性的:同一批素材每次生成,选出来的素材组合完全相同(13 条素材永远选评分最高的 4 条),导致成片素材组合层面重复率高。 ## 改动 两条素材选取路径的排序键注入 0~20 分随机噪声: 1. **from-assets 路径**(`clips.py`):`sorted_candidates` 排序键 `-score` 改为 `-(score + random.uniform(0, 20))` 2. **一键生成路径**(`plan_generator_service.py`):`_sort_assets_by_smart_score` 排序加噪声 3. 新增常量 `SCORE_RANDOM_NOISE_MAX = 20.0`(`smart_match.py`,评分满分 100,噪声 20 分 ≈ 20%) ## 行为 - 分差 > 20 的素材排名稳定:质量差距显著的素材保持优先级,不会选到明显差的素材 - 分差 ≤ 20 的素材排名随机浮动:每次生成选出的素材组合不同,低分素材也有机会入选 - use_count(使用次数)作为第二排序键不受影响,贪心均衡分配机制保留 ## 测试 - 新增 3 个噪声有效性测试:等分素材多次排序排名浮动覆盖两者;质量差 40 分时 50 次排序高质量素材始终第一 - 确定性断言测试通过 zero-noise patch 消除随机性(均衡分配、非法 ID 过滤) - 全量 14034 测试通过(5 个 TTS 失败为 develop 基线预存的 h2/httpcore 环境依赖问题,与本 PR 无关)

🚀 预览环境已部署

项目 详情
PR号 #1620
预览链接 https://pr-1620.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据,请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后,预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #1620 | | 预览链接 | [https://pr-1620.preview.xiaoxiajianji.com](https://pr-1620.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据,请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后,预览环境会自动清理。
xiaoxia added 2 commits 2026-09-02 00:37:58 +08:00
from-assets(clips.py)与一键生成(plan_generator_service.py)两条
素材选取路径中,smart_match 评分排序注入 0~20 分随机噪声:

- 分差 > 20 的素材排名稳定,质量差距显著的素材保持优先级
- 得分接近的素材排名每次浮动,13 条素材选出的 4 条组合不再固定,
  排名靠后的低分素材也有机会入选,从素材组合层面降低成片重复率
- 新增 SCORE_RANDOM_NOISE_MAX 常量(smart_match.py)统一定义
- 确定性测试通过 zero-noise patch 消除随机性,新增 3 个噪声有效性测试
  (等分素材排名浮动 / 大分差不翻转),全量 14034 测试通过
fix(test): 补齐噪声/转场补偿导致的 flaky 断言
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
CI/CD Pipeline / Build Staging API Image (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 / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
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 / PR Build API Image (pull_request) Successful in 1m31s
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 4m11s
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
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 4m38s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 4m39s
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
AI Code Review / AI Code Review (pull_request) Successful in 4m55s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m7s
CI/CD Pipeline / Unit Tests (pull_request) Failing after 5m23s
CI/CD Pipeline / Validate - Style (pull_request) Successful in 5m30s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 5m3s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 6m10s
CI/CD Pipeline / Validate - Security (pull_request) Successful in 8m55s
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 / CI Gate (pull_request) Failing after 0s
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
90b5951a81
- test_mediakit_smart_clips.test_assets_balanced_assignment:
  评分噪声下贪心均衡断言改为 zero-noise patch 内确定性验证
  (CI 失败:assert 1 == 2,与 test_editor_clips_random_start 同类)
- test_duration_within_segment_range:断言上界未计入 PR #1614
  转场补偿(2片段每clip +0.25s),uniform 接近上限时偶发 5.2>5.0;
  按补偿公式与舍入余量修正断言范围
xiaoxia force-pushed feat/asset-selection-random-noise from a37e44a6aa to 90b5951a81 2026-09-02 00:37:58 +08:00 Compare
auto-approve-bot approved these changes 2026-09-02 00:50:04 +08:00
auto-approve-bot left a comment
Collaborator

CI全绿,自动审批通过。

CI全绿,自动审批通过。
auto-approve-bot approved these changes 2026-09-02 00:50:04 +08:00
auto-approve-bot left a comment
Collaborator

CI全绿,自动审批通过。

CI全绿,自动审批通过。
xiaoxia added 1 commit 2026-09-02 01:11:41 +08:00
fix(test): 均衡分配断言补 zero-noise patch
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 0s
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
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 API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web 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 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 / PR Build Worker Image (pull_request) Successful in 3m17s
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 5m8s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 6m4s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 6m19s
AI Code Review / AI Code Review (pull_request) Successful in 6m27s
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 6m30s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 7m11s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 8m14s
CI/CD Pipeline / Validate - Security (pull_request) Successful in 9m6s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 9m51s
CI/CD Pipeline / Validate - Style (pull_request) Has been cancelled
CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled
CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled
CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled
CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled
CI/CD Pipeline / CI Gate (pull_request) Has been cancelled
74c991abfe
test_assets_balanced_assignment 断言 2 素材分 4 片段各用 2 次,
评分噪声注入后排序浮动会打破均衡(CI: assert 3==2)。
均衡性由 use_count 贪心保证,测试需在零噪声下确定性断言。
auto-approve-bot added 1 commit 2026-09-02 01:27:15 +08:00
style: auto-format with black + isort + prettier [skip ci-format-check]
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 4s
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 5s
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 / Build Staging Worker Image (pull_request) Has been skipped
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 / PR Build API Image (pull_request) Successful in 3m23s
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 / PR Build Worker Image (pull_request) Successful in 2m40s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 5m11s
AI Code Review / AI Code Review (pull_request) Successful in 5m32s
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
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 6m2s
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
PR Automation / Auto Approve on CI Green (pull_request) Successful in 6m21s
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 6m19s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 6m12s
CI/CD Pipeline / Validate - Style (pull_request) Successful in 6m33s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 6m16s
CI/CD Pipeline / Validate - Security (pull_request) Successful in 9m38s
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 / CI Gate (pull_request) Successful in 1s
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 4m1s
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 4m29s
8ce2e866a7
Collaborator

代码审查结果 - PR #1620

⚠️ 问题(0个需要修改)

💡 建议(1个可选)

  1. apps/api/app/api/routes/templates_editor/clips.py 第752行sorted 函数的 key 中保留了原有的 random.random() 作为第三排序键。由于第一排序键中已注入了 random.uniform 噪声,理论上已经保证了随机性,第三层的 random.random() 显得冗余。虽然这不会导致功能错误,但移除它可以略微减少计算开销。不过,保留它能作为极端情况下的最终“决胜局”,也不算错误,可视作代码风格选择,不强求修改。

格式检查通过 | 逻辑审查通过 | 性能无明显问题


🤖 由 AI 代码审查机器人自动生成 | 2026-09-01 17:32:46 | 模型:

## 代码审查结果 - PR #1620 ### ⚠️ 问题(0个需要修改) 无 ### 💡 建议(1个可选) 1. **apps/api/app/api/routes/templates_editor/clips.py 第752行**:`sorted` 函数的 `key` 中保留了原有的 `random.random()` 作为第三排序键。由于第一排序键中已注入了 `random.uniform` 噪声,理论上已经保证了随机性,第三层的 `random.random()` 显得冗余。虽然这不会导致功能错误,但移除它可以略微减少计算开销。不过,保留它能作为极端情况下的最终“决胜局”,也不算错误,可视作代码风格选择,不强求修改。 --- ✅ 格式检查通过 | ✅ 逻辑审查通过 | ✅ 性能无明显问题 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-09-01 17:32:46 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
auto-approve-bot merged commit 2c5600cfc9 into develop 2026-09-02 01:40:35 +08:00
auto-approve-bot deleted branch feat/asset-selection-random-noise 2026-09-02 01:40:35 +08:00

🗑️ 预览环境已清理

PR #1620 已关闭或合并,对应的预览环境已被清理。

如有需要,可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #1620 已关闭或合并,对应的预览环境已被清理。 > 如有需要,可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.