xiaoxia/xiaoxia-saas

fix: 确认生成兜底增强 — project_id 为空时通过 user_id 查找素材 #1338

Merged

xiaoxia merged 4 commits from fix/generate-fallback-user-assets into develop

2026-08-10 21:32:15 +08:00

Author	SHA1	Message	Date
CI	8d260f16f2	style: black + isort 格式化修复 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 36s 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 / Validate - Migration (alembic) (pull_request) Successful in 1m6s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m6s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m28s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m44s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m24s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m50s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 2m50s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m32s Details AI Code Review / AI Code Review (pull_request) Successful in 4m42s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 5m9s 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 1m55s Details CI/CD Pipeline / CI Gate (pull_request) Successful in 6s Details ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 47s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m0s Details	2026-08-10 21:24:19 +08:00
CI Bot	fabb880ceb	style: auto-format with black + isort + prettier [skip ci-format-check] CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging API 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 / Validate - Migration (alembic) (pull_request) Successful in 1m31s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m37s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m51s 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 / PR Build API Image (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build Worker Image (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 AI Code Review / AI Code Review (pull_request) Has been cancelled Details PR Automation / Auto Approve on CI Green (pull_request) Has been cancelled Details Preview Deploy / Deploy Preview Environment (pull_request) Has been cancelled Details	2026-08-10 13:22:23 +00:00
CI	c528bc50d3	test: 补充 PR #1338 兜底增强单测 (find_ready_videos_by_user + user_id 策略2) 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 22s 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 Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m20s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m46s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m49s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m58s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m28s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 2m27s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m59s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m42s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Failing after 4m45s Details AI Code Review / AI Code Review (pull_request) Has been cancelled 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 CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details	2026-08-10 21:17:31 +08:00
CI Bot	e09fdda74c	fix: 确认生成兜底增强 — project_id 为空时通过 user_id 查找素材 CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details 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 / 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 / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 21s 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 Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m27s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m51s Details CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m53s Details CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m59s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m15s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 2m17s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m24s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 3m29s Details CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 6m8s 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 AI Code Review / AI Code Review (pull_request) Successful in 6m43s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m31s Details CI/CD Pipeline / CI Gate (pull_request) Failing after 8s Details 根因：模板编辑器直接创建的草稿 plan 没有 project_id 和 config.asset_ids，导致 _auto_fallback_auto_material_mode 跳过素材分配， can_generate 报 "没有可渲染的就绪片段"。修复： - asset_repository 新增 find_ready_videos_by_user 方法 - _auto_fallback_auto_material_mode 增加策略2：project_id 为空时通过 uploaded_by_user_id 查找用户上传的就绪视频 - generation.py 传递 current_user.user.id 给兜底函数	2026-08-10 20:19:12 +08:00