xiaoxia/xiaoxia-saas

refactor(worker): generate_video直接读取edit_plan_clips渲染，删除内存重建逻辑 #1468

Merged

xiaoxia merged 5 commits from refactor/worker-use-edit-plan-clips into develop

2026-08-23 16:03:31 +08:00

Author	SHA1	Message	Date
CI Bot	6f222db4c7	fix(editor): 移除asset_id min_length限制+order默认None (#1468 ) CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 45s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 44s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m49s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m52s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m53s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m23s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m44s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m35s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m9s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 5m54s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details AI Code Review / AI Code Review (pull_request) Successful in 6m51s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m15s Details CI/CD Pipeline / CI Gate (pull_request) Successful in 6s Details ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 39s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 57s Details AI Code Review 第三轮修复： 1. EditorClipBatchItem.asset_id 移除 min_length=1，允许空字符串（占位片段场景） 2. EditorClipBatchItem.order 默认值改为 None（非0），仅在显式传入时加入 dict 3. 服务层 order 逻辑：dict 无 order key 时回退到索引 i 4. 测试更新：9 passed	2026-08-23 15:54:34 +08:00
CI Bot	ee561b0d64	fix(editor): B017 lint修复 pytest.raises(Exception)→ValidationError CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 32s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m20s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m40s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m39s Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m43s Details AI Code Review / AI Code Review (pull_request) Failing after 2m9s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 31s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m42s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m41s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m30s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 5m17s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details	2026-08-23 15:39:08 +08:00
CI Bot	0386a1f08f	fix(editor): 批量更新clips加事务保护+asset_id校验 (#1468 ) CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 31s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 40s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m43s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m42s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m53s Details AI Code Review / AI Code Review (pull_request) Failing after 2m13s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m33s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m4s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Failing after 3m14s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m33s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m31s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m46s Details CI/CD Pipeline / CI Gate (pull_request) Failing after 8s Details AI Code Review 修复： 1. batch_update_clips 改用 replace_all_clips_transactional：清空→创建→标记ready 在同一事务内完成，失败自动 rollback 2. EditorClipBatchItem.asset_id 加 min_length=1 校验，禁止空字符串避免脏数据新增 8 个测试（5 endpoint + 3 service），全量相关 92 passed。	2026-08-23 15:32:12 +08:00
CI Bot	dd7513a512	style: auto-format with black + isort + prettier [skip ci-format-check] CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 49s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m32s Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details AI Code Review / AI Code Review (pull_request) Failing after 1m50s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m52s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 2m1s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 31s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m25s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m41s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m44s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m9s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 5m2s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m43s Details CI/CD Pipeline / CI Gate (pull_request) Successful in 7s Details	2026-08-23 07:17:14 +00:00
CI Bot	0cb67afd61	refactor(worker): generate_video直接读取edit_plan_clips渲染，删除内存重建逻辑 CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 40s Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m34s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m46s Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m54s Details AI Code Review / AI Code Review (pull_request) Failing after 2m10s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m16s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 31s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m46s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details PR Automation / Auto Approve on CI Green (pull_request) Has been cancelled Details 核心改造： - 有source_edit_plan_id时，Worker直接调用RenderAdapter.render_plan(plan_id) 从数据库加载edit_plan+clips渲染，不再_download_all_assets+_build_plan_and_clips - 新增_sync_task_config_to_plan：将title_config/bgm_config/分辨率同步到plan.config，配音下载后通过voiceover_audio_path传给RenderAdapter - 无source_edit_plan_id时保留旧路径（标记DEPRECATED） - RenderAdapter.render_plan新增voiceover_audio_path参数透传给_do_render 新增API： - PUT /templates/{id}/editor/clips 批量替换clips（delete_all+create+mark_ready） - EditorClipBatchItem/EditorClipBatchUpdateRequest/EditorClipBatchUpdateResponse schema 删除死代码： - worker_app/tasks/edit_plan_generation.py（worker.render_edit_plan，452行） - worker_app/tasks/compose_video.py（worker.compose_video，198行） - celery_app.py imports清理、tasks/__init__.py清理 - test_edit_plan_worker_failure.py、test_cover_url_finalize.py（测试已删除模块） - templates_editor/generation.py的send_task改为worker.generate_video 新增3个单测，全量13790 passed	2026-08-23 15:14:01 +08:00