2611 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
CI Bot	486fa7b20d	style: auto-format with black + isort + prettier [skip ci-format-check]	2026-08-15 05:53:33 +00:00
xiaoxia	17761124c2	fix: ASR字幕路径叠加标题，修复封面没有标题的问题 ... 根因： 1. _maybe_generate_ass 的 ASR 路径直接 return，跳过了 generate_ass_subtitles() （负责标题叠加），导致 ASR 字幕生成的 ASS 文件中没有标题 2. generation.py 设置 auto_generated=True 但未设置 enabled=True， 导致模板 subtitle.enabled=false 时 ASR 路径从未被触发 修复： - unified_render_service.py: - ASR 路径生成 ASS 后，调用 _overlay_title_on_ass() 追加标题事件 - ASR 无结果/失败时，如有标题仍降级生成标题 ASS - 新增 _overlay_title_on_ass() 辅助函数：复用 build_ass_content 生成 TitleStyle + Dialogue，插入到 ASR 生成的 ASS 文件中 - generation.py: - voice_ids 注入时同步设置 subtitle_cfg['enabled'] = True 新增 6 个测试，全量 13651 passed	2026-08-15 13:49:16 +08:00
xiaoxia	59faf37fc9	fix: 统一封面管道增加cover_url多步fallback查找，修复500错误 (#1373) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-15 11:41:00 +08:00
xiaoxia	206d517a91	fix: 删除封面生成多余logger调用+增加source_edit_plan_id查找兜底 (#1372)	2026-08-15 10:09:16 +08:00
xiaoxia	0301370dd8	refactor: 统一封面生成管道 — 从渲染后视频抽帧作为封面 (#1371) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-14 22:16:00 +08:00
xiaoxia	85bfe58f39	Merge pull request 'fix: 修复封面标题叠加根因 - custom_title 未传入渲染流程' (#1368) from fix/custom-title-render into develop	2026-08-14 15:05:23 +08:00
xiaoxia	2ff2798c97	fix: 修复封面标题叠加根因 - custom_title 未传入渲染流程 ... - _render_video 函数签名新增 custom_title 参数 - 函数体内注入 custom_title 到 plan_config 覆盖模板标题 - 调用处传入 task_info.get('custom_title', '')	2026-08-14 14:54:37 +08:00
xiaoxia	00348a2154	fix(e2e): align confirm generation response assertion with BatchGenerationTaskResponse (#1366) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-14 13:41:00 +08:00
xiaoxia	c00c56a742	fix: overlay title text on auto-generated cover frames (#1365) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-14 12:11:00 +08:00
xiaoxia	8e4a8a8184	fix: videoRatio aspect ratio parsed as resolution causing scale=9:1920 (#1364)	2026-08-14 00:56:54 +08:00
xiaoxia	6a4085452d	fix: cover_templates config double-encoded JSON causing 500 (#1363)	2026-08-13 23:55:40 +08:00
xiaoxia	0896f3e161	fix: add ffmpeg to API runtime image for cover fallback (#1362) ... fix: add ffmpeg to API runtime image for cover fallback (#1362)	2026-08-13 21:40:22 +08:00
xiaoxia	21e84c71c4	perf: render-time cover frame pre-extraction + FFmpeg fallback, remove MediaKit (#1360) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-13 20:51:02 +08:00
xiaoxia	17174e2cf5	refactor(cover): 封面生成API从templates_editor解耦到generation路由 (#1359) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-13 18:56:00 +08:00
xiaoxia	0a00870ab6	fix(cover): 修复预览视频存储路径错误导致封面生成 500 (#1358) ... fix(cover): 修复预览视频存储路径错误导致封面生成500 (#1358)	2026-08-13 18:17:09 +08:00
xiaoxia	68fa7fd163	fix(cover): 修复 OSS 路径双斜杠导致 MediaKit 404 (#1357) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-13 17:51:00 +08:00
xiaoxia	7ba46cb9c0	fix(cover): 封面生成前校验视频URL可达性，避免MediaKit超时120秒 (#1356) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-13 15:36:00 +08:00
xiaoxia	0529c61347	fix(test): 修复 test_confirm_generation.py 中 confirm API 路径 (#1355) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-13 15:31:00 +08:00
xiaoxia	915e551ecc	Merge pull request 'fix: 修复封面类型解耦后的5个TypeScript import路径错误 ... PR #1352解耦CoverConfig后，遗漏了5处import路径更新，导致staging web镜像构建失败（tsc编译错误）。 修复内容： - api/editing-planner/types.ts 和 api/template-editor/types.ts：CoverConfig改为从 @/page…' (#1354) from fix/cover-types-import-paths into develop fix: 修复封面类型解耦后的TypeScript import路径错误 修复了PR #1352解耦CoverConfig后遗漏的5处import路径更新: - api/editing-planner/types.ts 和 api/template-editor/types.ts: CoverConfig改从 @/pages/generate/types/cover 导入 - useGenerateFormState/index.ts, usePlanConfigLoader.ts, useTitleCoverSync.ts: 相对路径修正 - EditorDrawers.tsx: Prettier格式修复	2026-08-13 11:48:55 +08:00
xiaoxia	b0812b14f9	style: fix Prettier formatting in EditorDrawers.tsx ... Remove trailing empty line to pass prettier --check.	2026-08-13 11:35:00 +08:00
xiaoxia	c062ff3912	fix: correct types/cover import path in useTitleCoverSync.ts	2026-08-13 11:29:48 +08:00
xiaoxia	8e4834c927	fix: correct types/cover import path in usePlanConfigLoader.ts	2026-08-13 11:29:48 +08:00
xiaoxia	e1076f7e88	fix: correct types/cover import path in useGenerateFormState/index.ts	2026-08-13 11:29:47 +08:00
xiaoxia	5b95bdef6f	fix: update CoverConfig import path in api/template-editor/types.ts	2026-08-13 11:29:47 +08:00
xiaoxia	61c75ad809	fix: update CoverConfig import path in api/editing-planner/types.ts ... CoverConfig was moved from editing-planner/types to generate/types/cover (PR #1352) but this import was not updated, causing TS2305 build failure.	2026-08-13 11:29:25 +08:00
xiaoxia	52eb37472d	refactor(#1341): 删除 EditingPlanner 遗留封面生成器 + 清理 compose_video 封面代码 (#1353) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-13 01:16:00 +08:00
灵应	d67d6eb2cd	refactor(#1341): 解耦封面类型定义，独立于 editing-planner + 修复 confirm 路径和 AI 超时 (#1352)	2026-08-13 01:01:23 +08:00
xiaoxia	cd6fde790a	perf(#1341): 封面生成改用 TimeInterval 策略（避免 OOM，提高稳定性） (#1351) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-08-13 00:36:00 +08:00
CI Bot	9c6af4dd45	fix: 删除孤立测试文件 test_cover_service.py（cover_service.py 已在 PR #1347 squash merge 中删除）	2026-08-12 22:51:20 +08:00
xiaoxia	7b9e803603	fix(#1341): 增强封面生成错误日志和前端提示 + ESLint 修复 + prettier 格式化 (#1347)	2026-08-12 22:28:38 +08:00
xiaoxia	12d7b9ac2f	fix(#1341): 移除 useStep6Cover 未使用的 useRef 导入，修复 Docker 构建 TS6133 (#1346)	2026-08-12 17:11:53 +08:00
xiaoxia	887e66b0f9	refactor(#1341): 删除 EditingPlanner 废弃的封面代码	2026-08-12 17:01:04 +08:00
xiaoxia	9520507f38	fix(#1341): 修复智能剪辑封面生成的 3 个问题 (#1345) ... A. generatingRef 卡死 → 改用 useState + 300秒超时保护 B. Step6 缺少进度弹窗 → 添加 Modal + Spin 进度提示 C. 预览视频 URL 没回写 → 预览完成后保存到 plan.config.rendered_storage_key	2026-08-12 16:56:00 +08:00
xiaoxia	0d99a28fc2	fix(#1341): 修复 EditorDrawers totalDuration 重复定义 (#1344)	2026-08-12 16:11:26 +08:00
xiaoxia	d995617375	feat: 封面功能接入 UI + AI 生成按钮 + 进度弹窗 (#1343) ... - useEditorDrawers: 添加 coverDrawerOpen 开关状态 - EditorDrawers: 渲染 CoverSelector Drawer - EditingPlanner: 传递 cover 相关 props 到 EditorDrawers 和 RightPanel - clipProperties.ts: 添加 onOpenCoverDrawer 属性 - ClipPropertiesPanel: 添加封面设置入口按钮 - RightPanel: 透传 onOpenCoverDrawer 到 ClipPropertiesPanel - cover-selector/index.tsx: 添加 templateId prop、AI 生成封面按钮、 进度弹窗 Modal + Spin - EditingPlanner.css: 添加生成按钮样式 Close #1343	2026-08-12 15:14:07 +08:00
CI Bot	947b3ed86e	fix(#1341): MediaKit 视频理解从 API 路由移到 Worker 任务 ... P0 Bug: analyze_videos() 在 HTTP 请求中同步调用耗时 30-60s， 前端 10s 超时。 修复： - 从 generation_preview.py 移除 MediaKit 同步调用 - 在 Worker generate_video 任务中、渲染之前调用 - 分析结果保存到 task.extra_meta['asset_analyses']	2026-08-12 12:36:13 +08:00
CI Bot	75f19ae9d9	fix(#1341): E2E 全局超时从 180s 提升到 360s ... 预览生成步骤最多需要 300s（MediaKit 视频理解），全局 180s 不够用。	2026-08-12 12:25:10 +08:00
CI Bot	880237ff5f	fix(#1341): E2E 预览生成超时从 120s 提升到 300s ... MediaKit 视频理解修复后实际生效，火山方舟 API 轮询耗时 30-60s， 加上渲染总时间超过 120s。	2026-08-12 10:09:41 +08:00
CI Bot	8ac6d1e6bc	fix(#1341): analyze_videos 添加缺失的 prompt 参数 ... generation_preview.py 调用 mk_client.analyze_videos() 缺少必传 prompt 参数， 导致 TypeError 被 try/except 吞掉，MediaKit 视频理解从未生效。	2026-08-12 09:48:16 +08:00
CI Bot	7d6c0cc67e	fix: cover.py step3 改用 user+template 查找预览任务；删除 generation.py 冗余 rendered_url ... P0 修复：预览任务创建时 plan_id 尚未存在，source_edit_plan_id 始终为空， 导致封面生成第三步查找永远匹配不到。改为按 user_id + template_id + is_preview + status=completed 查找最近预览任务。 技术债：generation.py 复用预览产物分支删除冗余 rendered_url 写入， 统一只写 rendered_storage_key。 新增 repository 方法：list_latest_completed_preview(user_id, template_id)	2026-08-12 00:07:06 +08:00
CI Bot	cb1ba46d30	style: auto-format with black + isort + prettier [skip ci-format-check]	2026-08-11 14:42:39 +00:00
CI Bot	b174a792b2	fix: remove duplicate pytest imports for ruff F811	2026-08-11 22:36:19 +08:00
CI Bot	43fa4a5575	test: fix test_ai_tasks + format cover.py for #1341	2026-08-11 22:02:08 +08:00
CI Bot	cbf1f228bd	style: auto-format with black + isort + prettier [skip ci-format-check]	2026-08-11 13:41:38 +00:00
CI Bot	0ec7a13562	test: fix unit tests for #1341 — remove _sign_video_url tests, update stub fallback to expect RuntimeError	2026-08-11 21:34:37 +08:00
CI Bot	308fbf2130	fix: #1341 cover generation full-chain fix + MediaKit integration	2026-08-11 21:01:35 +08:00
CI Bot	6c14170b94	style: auto-format with black + isort + prettier [skip ci-format-check]	2026-08-11 10:26:49 +00:00
CI Bot	3d5438a3af	fix: cover generation full-chain fix — bare URL, remove stub fallback, clean dead code ... - cover.py: use get_url() (bare URL) instead of get_download_url() (signed URL) to avoid OSS sign_url encoding / as %2F causing 403 - ai_service.py: remove SVG stub fallback in _call_ai_cover_service(), raise RuntimeError with clear error message instead - cover.py: wrap run_generate_cover() in try/except RuntimeError → HTTPException - schemas.py: remove unused CoverGenerateResponse class - Note: rendered/* OSS public read must be configured for bare URL to work	2026-08-11 18:22:23 +08:00
CI Bot	441d61127d	refactor(cover): use rendered preview video for cover generation, remove dead endpoints ... BREAKING CHANGE: cover/extract and cover/smart endpoints removed (unused by frontend) Changes: - cover.py: editor_generate_cover() now reads rendered_storage_key from plan config instead of querying assets table via SessionLocal - Removed 4 dead endpoints: GET/PUT /cover, POST /cover/extract, POST /cover/smart - Removed 4 unused schemas: CoverConfigResponse, CoverUpdateRequest, CoverExtractRequest, CoverSmartRequest - Deleted stale fix_confirm.py and test-results artifact - rendered/* videos use signed URL (1h) since path is not publicly readable - Flow is now strictly serial: preview render -> cover extraction from preview	2026-08-11 17:45:04 +08:00
CI Bot	d23db7654e	fix(cover): use bare public URL for video since OSS uploads/* public read is enabled ... - Changed get_download_url(expires_seconds=3600) to get_url() in cover.py - OSS Bucket Policy now allows anonymous reads on uploads/* - Bare URL verified: HEAD returns 200 for video files - Eliminates signed URL encoding issues that caused MediaKit 403	2026-08-11 17:21:59 +08:00