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

fix(api): create_plan接口增加asset_ids参数，修复一键生成片段无素材问题 #477

Merged
auto-approve-bot merged 4 commits from fix/create-plan-asset-ids into develop 2026-07-17 16:04:15 +08:00
Conversation 2 Commits 4 Files Changed 7
+303 -187
xiaoxia commented 2026-07-17 15:53:59 +08:00
Owner
Copy Link
Copy Source

问题

一键生成剪辑计划时，生成的 clips.asset_id 全为空，导致渲染时报"没有可渲染的就绪片段"。

根因

create_plan 接口调用 PlanGeneratorService.generate_from_template() 时，asset_ids 硬编码为 []，用户传入的素材ID没有传递进去。
PlanGeneratorService 本身有完整的按 editing_mode 分配素材的逻辑（ONE_TAKE/PIP/VOICE_OVER/VOICE_PIP），但传空数组就全跳过了。

修复

  1. EditPlanCreateRequest 增加 asset_ids 字段
  2. create_plan 调用生成器时传递 body.asset_ids
  3. 创建后将 asset_ids 写入 plan.config，供生成时兜底分配使用
  4. 新增 test_create_with_asset_ids 测试验证参数传递

影响范围

  • 创建剪辑计划API：新增可选参数，向后兼容
  • 不影响已有接口调用方式（不传asset_ids行为与之前一致）
## 问题 一键生成剪辑计划时，生成的 clips.asset_id 全为空，导致渲染时报"没有可渲染的就绪片段"。 ## 根因 `create_plan` 接口调用 `PlanGeneratorService.generate_from_template()` 时，`asset_ids` 硬编码为 `[]`，用户传入的素材ID没有传递进去。 PlanGeneratorService 本身有完整的按 editing_mode 分配素材的逻辑（ONE_TAKE/PIP/VOICE_OVER/VOICE_PIP），但传空数组就全跳过了。 ## 修复 1. `EditPlanCreateRequest` 增加 `asset_ids` 字段 2. `create_plan` 调用生成器时传递 `body.asset_ids` 3. 创建后将 `asset_ids` 写入 `plan.config`，供生成时兜底分配使用 4. 新增 `test_create_with_asset_ids` 测试验证参数传递 ## 影响范围 - 创建剪辑计划API：新增可选参数，向后兼容 - 不影响已有接口调用方式（不传asset_ids行为与之前一致）
xiaoxia added 4 commits 2026-07-17 15:53:59 +08:00
fix(worker): 统一OSS配置读取为SharedSettings，解决oss_helpers读不到.env配置的问题
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 18s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 55s
Details
AI Code Review / AI Code Review (pull_request) Successful in 1m0s
Details
CI/CD Pipeline / Unit Tests (pull_request) Failing after 2m52s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 3m17s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m57s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 3m20s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m46s
Details
cd1f6f6b34
fix(worker): render_adapter素材下载先查assets表拿file_url而非直接用asset_id当key
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
AI Code Review / AI Code Review (pull_request) Successful in 35s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 13s
Details
CI/CD Pipeline / Unit Tests (pull_request) Failing after 2m35s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 4m22s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 3m3s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 3m7s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 41s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m32s
Details
3b96e0c6f6 
- _download_assets() 从 staticmethod 改为实例方法，通过 self._db 查询 assets 表
- 批量查询 AssetModel 获取 file_url（OSS 存储路径），再用 file_url 下载
- asset_id 是 UUID 主键，不能直接当作 OSS 存储 key 使用
- 保留原始文件扩展名，不再硬编码 .mp4
- 配套更新单元测试，新增无 file_url 场景测试
fix(tests): 修复oss_helpers测试 — 改用patch oss_settings替代patch os.environ + black格式化
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 19s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 48s
Details
AI Code Review / AI Code Review (pull_request) Successful in 59s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m2s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m43s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 3m15s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m27s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 4m5s
Details
cefd97966a
fix(api): create_plan接口增加asset_ids参数并传递给PlanGeneratorService
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
AI Code Review / AI Code Review (pull_request) Successful in 44s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 5s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 41s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m45s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m18s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 9m4s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m21s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 10m16s
Details
53c6e66eaa 
- EditPlanCreateRequest增加asset_ids字段
- create_plan调用generate_from_template时传递body.asset_ids而非硬编码空数组
- asset_ids同时写入plan.config，供generate时兜底分配
- 新增test_create_with_asset_ids测试验证参数传递
auto-approve-bot approved these changes 2026-07-17 16:03:03 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-07-17 16:03:04 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot merged commit ede6f53428 into develop 2026-07-17 16:04:15 +08:00
auto-approve-bot deleted branch fix/create-plan-asset-ids 2026-07-17 16:04:15 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
auto-approve-bot
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
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#477
Delete Branch "fix/create-plan-asset-ids"

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?