xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 11 Pull Requests 2 Actions Packages Projects Releases 7 Wiki Activity

feat(edit-plan): add smart edit plan generator #24

Closed
xiaoxia wants to merge 379 commits from feature/smart-edit-plan into develop
pull from: feature/smart-edit-plan
merge into: xiaoxia:develop
Conversation 0 Commits 379 Files Changed 436
+56183 -1613
xiaoxia commented 2026-06-26 20:21:03 +08:00
Owner
Copy Link
Copy Source

功能说明

实现剪辑计划智能编排功能，支持多种剪辑模式：

新增功能

  1. SmartEditPlanGenerator 类 (apps/worker/worker_app/tasks/edit_plan_generator.py)

    • 支持 4 种剪辑模式：
      • one-take: 按分类分组，组内按质量排序，顺序拼接
      • pip: 第一个高质量素材为主画面，其余为画中画
      • voiceover: person 类素材为主播口播，其余穿插为 B-roll
      • voice_pip: 结合 voiceover 和 pip

  2. 新增 API 端点

    • POST /projects/{project_id}/edit-plans/auto-generate
    • 参数：editing_mode, target_duration, asset_library_id

  3. 数据模型更新

    • EditPlanModel 新增 editing_mode 字段
    • EditPlanClipModel 新增 layer 字段 (main/pip/broll)

Schema 更新

  • 新增 AutoGenerateEditPlanRequest
  • EditPlanClipResponse 新增 layer 字段
  • EditPlanResponse 新增 editing_mode 字段
## 功能说明 实现剪辑计划智能编排功能，支持多种剪辑模式： ### 新增功能 1. **SmartEditPlanGenerator 类** (`apps/worker/worker_app/tasks/edit_plan_generator.py`) - 支持 4 种剪辑模式： - `one-take`: 按分类分组，组内按质量排序，顺序拼接 - `pip`: 第一个高质量素材为主画面，其余为画中画 - `voiceover`: person 类素材为主播口播，其余穿插为 B-roll - `voice_pip`: 结合 voiceover 和 pip 2. **新增 API 端点** - `POST /projects/{project_id}/edit-plans/auto-generate` - 参数：`editing_mode`, `target_duration`, `asset_library_id` 3. **数据模型更新** - EditPlanModel 新增 `editing_mode` 字段 - EditPlanClipModel 新增 `layer` 字段 (main/pip/broll) ### Schema 更新 - 新增 `AutoGenerateEditPlanRequest` - EditPlanClipResponse 新增 `layer` 字段 - EditPlanResponse 新增 `editing_mode` 字段
xiaoxia added 85 commits 2026-06-26 20:21:03 +08:00
merge: release V21 UI and core E2E hardening
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 26s
Details
Tests / test (push) Successful in 18s
Details
Tests / lint (push) Successful in 10s
Details
Deploy / Deploy Staging (push) Has been skipped
Details
Deploy / Build Production Runtime Images (push) Successful in 9m52s
Details
Deploy / Deploy Production (push) Successful in 24s
Details
Deploy / Production Browser E2E (push) Failing after 58s
Details
31c0f23297 
Merge develop into main through protected Gitea PR flow.
fix(ci): pass production API base to E2E
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 23s
Details
Tests / test (push) Successful in 17s
Details
Tests / lint (push) Successful in 10s
Details
Deploy / Deploy Staging (push) Has been skipped
Details
Deploy / Build Production Runtime Images (push) Successful in 9m40s
Details
Deploy / Deploy Production (push) Successful in 23s
Details
Deploy / Production Browser E2E (push) Failing after 32s
Details
b914f55b7d 
Merge production E2E API base hotfix.
test(web): scope generation approval assertion
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 26s
Details
Tests / test (push) Successful in 16s
Details
Tests / lint (push) Successful in 11s
Details
Deploy / Deploy Staging (push) Has been skipped
Details
Deploy / Build Production Runtime Images (push) Successful in 9m43s
Details
Deploy / Deploy Production (push) Successful in 23s
Details
Deploy / Production Browser E2E (push) Failing after 36s
Details
2f9a1a42f5 
Merge production E2E assertion hotfix.
test(web): target generation approval pill
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 26s
Details
Tests / test (push) Successful in 17s
Details
Tests / lint (push) Successful in 10s
Details
Deploy / Deploy Staging (push) Has been skipped
Details
Deploy / Build Production Runtime Images (push) Successful in 10m16s
Details
Deploy / Deploy Production (push) Successful in 23s
Details
Deploy / Production Browser E2E (push) Successful in 36s
Details
06857d0a0d 
Merge generation approval pill hotfix.
Merge pull request 'feat(web): complete V21 UI redesign' (#6) from develop into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 24s
Details
Tests / test (push) Successful in 15s
Details
Tests / lint (push) Successful in 8s
Details
Deploy / Deploy Staging (push) Has been skipped
Details
Deploy / Build Production Runtime Images (push) Failing after 29s
Details
Deploy / Deploy Production (push) Has been skipped
Details
Deploy / Production Browser E2E (push) Has been skipped
Details
a31145950f
fix(security): P0 - JWT密钥强制环境变量，拒绝默认值 7a4bbbe512
fix(security): P0 - JWTConfig强制注入密钥，禁止无参数实例化 a12d5d7b12
fix(security): P0 - 日志过滤敏感参数(token/password/secret等)
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 1m0s
Details
Tests / test (pull_request) Failing after 1m0s
Details
Tests / lint (pull_request) Failing after 1m0s
Details
e58293a51f
feat(ui): V21 design system overhaul
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 1m0s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 1m0s
Details
Tests / test (pull_request) Failing after 1m0s
Details
Tests / lint (pull_request) Failing after 1m0s
Details
cae16d547e
fix: resolve CI check failures - format code and add nosec comment
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 1m0s
Details
Tests / lint (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 1m0s
Details
950f63bb69
fix: resolve CI check failures - format code and add nosec comment
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
071f0e990e
fix: resolve CI check failures - format code and fix line length issues
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
3d29dc0c83
fix: resolve CI check failures - format code and fix line length issues
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 1m0s
Details
a4f721528e
ci: enable auto-deploy for feature branches
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
a0f8540a09
Merge pull request 'ci: enable auto-deploy for feature branches' (#10) from ci/enable-feature-deploy into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
Tests / test (push) Has been cancelled
Details
Tests / lint (push) Has been cancelled
Details
a717dd17c8
Merge pull request 'fix(security): P0 - JWT密钥强制环境变量 + 日志敏感信息过滤' (#8) from fix/security-p0-jwt-logging into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
Tests / test (push) Has been cancelled
Details
Tests / lint (push) Has been cancelled
Details
f34f654a84
Merge pull request 'feat(ui): V21 design system overhaul' (#9) from feature/v21-design-system into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
Tests / test (push) Has been cancelled
Details
Tests / lint (push) Has been cancelled
Details
53055afa43
fix(p1): resolve 4 P1 technical debt issues
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
7fa327aa27 
- P1-1: CORS configuration security - use DEBUG mode to differentiate
  production vs development CORS settings
- P1-2: Implement token refresh logic in RefreshTokenUseCase
  - Add get_session_by_refresh_token to SessionStore
  - Verify session validity and expiry
  - Generate new access token on refresh
- P1-3: Fix database connection leak in worker ingest task
  - Add proper try-except-finally block
  - Ensure db.close() is always called
- P1-4: Implement real media metadata extraction
  - Use ffprobe for video metadata
  - Use Pillow for image metadata
  - Return empty dict on failure (no mock data)
Merge pull request 'fix(p1): 修复 4 个 P1 技术债务问题' (#11) from fix/p1-technical-debt into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 0s
Details
Tests / test (push) Failing after 0s
Details
Tests / lint (push) Failing after 0s
Details
13113f50c5
chore: remove temporary script 6e73d37857
chore: remove temporary script 4c86944c7a
chore: remove temporary script d79561d266
chore: remove temporary script 0e86857e0d
chore: remove temporary script e1ba142cb5
chore: remove temporary script 6bea2f38ff
chore: remove temporary script 08c73b00ef
chore: remove temporary script f6b261e194
chore: remove temporary script 42d5ce34b9
chore: remove temporary script 6d9677087e
chore: remove temporary script 5da250de14
chore: remove temporary script 4803273419
chore: remove temporary script 766a06ede6
chore: remove temporary script 96b75b8db5
chore: remove temporary script ae2c5500be
chore: remove temporary script aa700fb5e8
chore: remove temporary script 638ad99a4d
chore: remove temporary script 72936c944d
chore: remove obsolete phase progress reports 23471034c7
chore: remove obsolete phase progress reports bafe88a750
chore: remove obsolete phase progress reports 15882bd019
chore: remove obsolete phase progress reports 701f5ebc23
chore: remove obsolete phase progress reports fda807086d
chore: remove obsolete phase progress reports 94bec9a860
chore: remove obsolete phase progress reports dc4ce4006a
chore: remove obsolete phase progress reports 581c643684
chore: remove obsolete phase progress reports 0305509764
chore: remove obsolete phase progress reports 3204848bb5
chore: remove obsolete files bf9da32595
chore: remove obsolete files 46b0d4beea
chore: remove obsolete audit and project docs 2c53e644bc
chore: remove obsolete audit and project docs 47871d79dc
chore: remove obsolete audit and project docs 372c3861c9
chore: remove obsolete audit and project docs 0e9c771915
chore: remove obsolete audit and project docs 353868904a
chore: remove obsolete audit and project docs e66ac2bd6c
chore: remove obsolete audit and project docs a87b1ae3a1
chore: remove obsolete audit and project docs 1bb2a83214
chore: remove obsolete audit and project docs aaf0096ac6
chore: remove obsolete audit and project docs fc72ff4a47
chore: remove obsolete audit and project docs 9255a3af05
chore: remove obsolete audit and project docs 12bbecc9fe
chore: remove obsolete audit and project docs fcd518d4a6
chore: remove obsolete audit and project docs 0d1f7ca8d5
chore: remove obsolete audit and project docs d0f43530e7
chore: remove obsolete audit and project docs 2748408ac0
chore: update .gitignore for temp files
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
55d2b25f08
Merge pull request 'chore: 清理仓库 - 删除过时文件和已合并分支' (#13) from chore/repo-cleanup into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 0s
Details
Tests / lint (push) Failing after 0s
Details
Tests / test (push) Failing after 1m0s
Details
3c54dcbef4
P2-1: 移除 projects.py 中重复的 _require_workspace_member 函数，使用 permissions.py 中的共享函数 d5bc23d488
P2-1 & P2-5: 移除 upload.py 中重复的 _require_workspace_member，添加服务端 MIME type 验证 33a0ed13fe
P2-2: 创建 packages/application/auth/jwt_handler.py 委托层，隔离 Domain 层对 jwt 库的依赖 cc51da0bd7
P2-2: 创建 packages/application/auth/password_handler.py 委托层，隔离 Domain 层对 bcrypt 库的依赖 4015929e3f
P2-2: 更新 packages/application/auth/__init__.py 导出 JWT 和 Password 委托处理器 129a0235ad
P2-3: workspace_member_repository.py find_by_workspace 方法添加 JOIN 预加载用户数据 a85790f24a
P2-4: dependencies.py 添加返回类型注解 c913e7cd89
P2-6: processor.py 使用 NamedTemporaryFile + try-finally 确保临时文件清理 36ffd9004a
P3-1: database.py 统一使用 config.py 中的 Settings，消除配置重复定义 5a05b804f2
P3-3: infra/docker/api.Dockerfile 转换为多阶段构建 8b248cf035
P3-4: .gitea/workflows/ci-cd.yml 添加 frontend-lint job 443588eebd
P3-5: 添加 tests/integration/test_auth.py 认证集成测试
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Failing after 30s
Details
b300f66630
fix(ci): remove container field to run on host directly
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
8575ee772f
Merge pull request 'fix: 移除 CI container 配置，直接在 host 运行' (#16) from fix/ci-remove-container into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 0s
Details
Tests / lint (push) Failing after 0s
Details
Tests / test (push) Failing after 1m0s
Details
c393c38d89
Merge pull request 'chore: 修复 P2/P3 技术债务' (#15) from fix/p2p3-tech-debt-v2 into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 0s
Details
CI/CD Pipeline / Frontend Lint (push) Failing after 0s
Details
Tests / test (push) Failing after 0s
Details
Tests / lint (push) Failing after 1m0s
Details
f2fe27eda6
fix(deploy): use ubuntu-latest runner label
CI/CD Pipeline / Frontend Lint (pull_request) Failing after 0s
Details
Tests / test (pull_request) Failing after 0s
Details
Tests / lint (pull_request) Failing after 0s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 16m40s
Details
1ba3543fa0
Merge pull request 'fix: 部署workflow使用ubuntu-latest runner label' (#17) from fix/deploy-runner-label into main
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 0s
Details
CI/CD Pipeline / Frontend Lint (push) Failing after 0s
Details
Tests / test (push) Failing after 0s
Details
Tests / lint (push) Failing after 0s
Details
42c543917e
chore: trigger CI/Deploy pipeline test
Tests / test (push) Failing after 1s
Details
Tests / lint (push) Failing after 1s
Details
CI/CD Pipeline / Frontend Lint (push) Failing after 0s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 1m30s
Details
dbf2092e89
xiaoxia force-pushed feature/smart-edit-plan from e635906947 to f5bc1b8947 2026-06-26 21:22:12 +08:00 Compare
xiaoxia closed this pull request 2026-06-27 00:41:37 +08:00
Some checks are pending
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Waiting to run
Details
Tests / test (pull_request) Waiting to run
Details
Tests / lint (pull_request) Waiting to run
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
Deploy / Deploy Staging (push) Has been cancelled
Details
Deploy / Build Production Runtime Images (push) Has been cancelled
Details
Deploy / Deploy Production (push) Has been cancelled
Details
Deploy / Production Browser E2E (push) Has been cancelled
Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#24
Delete Branch "feature/smart-edit-plan"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?