3705 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
saas-backend-agent	dfc5e5a5b6	fix(worker): align gpu-direct title defaults (size/margin/bold) with CPU vfb path ... PR #2095 fixed title baseline positioning and width-scaling but didn't fully align default constants with the CPU video_filter_builder path, causing GPU rendered titles to appear slightly smaller / higher / bolder-differently than the CPU/ASS preview the template was authored against. This shows up in both single and batch GPU renders since every variant shares the same gpu_direct pipeline. Root causes in PR #2095 defaults: - Default title size 36@720p vs config_schemas DEFAULT 48 / vfb default 48 - Top/bottom margin 40@720p (PAD16+margin24) vs vfb _scale_title_len(50) - Subtitle bottom margin 60@720p vs vfb 50 - Faux bold used same-color 1px border (white-on-white invisible for default white text; red-on-red for colored) vs vfb black 2px (intentional choice per #2001 to avoid double-print/halo artifact) - margin_top was treated as absolute y offset, now correctly added on top of base margin (matches vfb additive semantics) - subtitle stroke/bold block referenced uninitialized s_borderw (ruff F821) — added proper init + stroke parsing consistent with title block Changes: - TITLE_DEFAULT_MARGIN_TOP/BOTTOM = 50 (was 24+PAD=40) - SUBTITLE_DEFAULT_MARGIN_BOTTOM = 50 (was 60) - TITLE_FAUX_BOLD_WIDTH = 2, border color = #000000 (was 1, same as text) - default title size 48@720p (was 36) - margin_top from cfg added on top of base 50 (additive, same as vfb) - subtitle: init s_borderw/s_border_color, parse stroke dict before bold check - bottom position: y = h - th - margin_bottom (correct baseline; previously used margin_top variable which was misleading but numerically equivalent before margin split; now uses explicit margin_bottom) Tests updated to new expected scaled values (1280x720 scale=1.778: fontsize 85, y=89, bold borderw=4 black; 1080x1920 vertical: fontsize 72, y=75; margin_top=100 user offset => y=267). Added test_title_bold_false_disables_faux_bold. Batch investigation notes (separate findings, not bugs in this PR): - per-variant plan config is correctly deep-copied via clone_plan_for_variant (config=dict(source.config or {})); title text per-variant via titles[] override; voice per-variant independent download with #1749 strict guards; bgm merged via merge_bgm_config — batch passthrough chain is correct. - Worker generation concurrency = 2 (compose.yml default); USER_PENDING_LIMIT=3, 6 tasks will enqueue in two waves (first 3 → then next 3 as workers free up); GLOBAL_PENDING_LIMIT allows it. This is expected behavior, not a bug. - Legacy key mismatch: subtitle_render_engine.py reads plan_config['subtitle_config'] (snake_case) but normalize_plan_config writes 'subtitle' short key. This file is not imported by unified_render_service (which uses render_subtitles.py with explicit subtitle_config= parameter), so no runtime impact; left for separate cleanup. - Frontend usePlanConfigLoader.ts reads config.title_config snake_case while backend writes 'title' short key — frontend-only issue for subsequent edit sessions, out of backend scope.	2026-09-29 18:08:18 +08:00
xiaoxia	3be06c5763	fix(worker): align gpu-direct title position/size with frontend preview (#2095) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-29 17:04:37 +08:00
xiaoxia	02199d80ee	Merge pull request 'chore(worker): BGM preset diagnostics + upload helper' (#2094) from chore/preset-bgm-audio-upload-helper into develop	2026-09-29 16:03:29 +08:00
Coze Agent	ca6803e1a5	chore(worker): move bgm upload readme under docs/ to avoid ruff parsing md	2026-09-29 15:35:34 +08:00
CI Bot	d449496f90	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-29 07:33:22 +00:00
Coze Agent	a04e363d1b	chore(worker): improve BGM preset download diagnostics + add upload helper script ... - _prepare_bgm preset branch now differentiates: preset not found / preset exists but audio_url empty (未部署) / download failure, with a clear hint to ops to upload audio and fill preset_bgm.py - final warning now surfaces enabled/audio_url/asset_id/preset_id state so triage is immediate - add scripts/upload_preset_bgm.py: one-shot uploader that uploads mp3s from ./bgm_assets/{preset_id}.mp3 to OSS preset/bgm/, sets public-read ACL, and rewrites packages/domain/preset_bgm.py with the public URL. Dry-run supported. - add bgm_assets/README.md with the 10-preset file naming table	2026-09-29 15:28:36 +08:00
xiaoxia	da59a6c9a6	fix(gpu-direct): passthrough template title/subtitle/BGM config (#2093) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-29 14:54:32 +08:00
Coze Agent	11c554e43a	fix(gpu-direct): passthrough template title/subtitle/BGM config ... Problem: GPU direct render MVP hardcoded title/subtitle/BGM styles and ignored template config fields: - P0 static subtitle text (subtitle.text) was never rendered - P0 title styles (font/size/color/position/stroke/shadow/bold) all hardcoded - P1 BGM volume hardcoded at 0.35, no fade/offset/adjust-db - P1 ASR subtitle styles (color/size/position/font) ignored - P2 extra_audio_tracks (TTS/voiceover) volume hardcoded at 1.0 Changes: 1. build_direct_render() now accepts title_config/subtitle_config/ bgm_config dicts + static_subtitle_text. 2. Added helpers _hex_to_drawtext_color (#RGB/#RRGGBB/#RRGGBBAA/named), _position_to_drawtext_xy (top/center/bottom), _build_drawtext_filters (shadow layer + main layer, stroke via borderw/bordercolor, bold simulated via same-color borderw). 3. Title parses font/size/color/position/stroke/shadow/bold with safe defaults; legacy title_text still used as fallback. 4. Static subtitle_text renders as full-span (0→total_duration) segment; when ASR segments are present they take priority. 5. BGM reads volume (default 0.3), volume_adjust_db (linear gain), fade_in/fade_out (afade), audio_offset (adelay ms|ms), and honors enabled=false even if path supplied. Volume clamped to [0,1.5]. 6. _try_gpu_direct() now passes cfg['title']/['subtitle']/['bgm'] whole dicts through, computes static_subtitle_text for non-auto subs, and sources extra_audio_tracks volume from audio_tracks_config (voiceover tracks) instead of hardcoding 1.0. 7. DirectRenderPlan exposes filter_complex for testing. 8. Added 24 unit tests covering: default backward-compat, color hex/BGR conversion (short/long/alpha/invalid), position (top/center/bottom), stroke, shadow (two drawtext layers), font override, enabled flag, static subtitle full-span, ASR style passthrough, BGM volume/fade/offset/adjust-db/enabled=false, extra audio volume, bold simulation, ASR vs static priority, volume clamping. Fixes template-style rendering not taking effect in GPU pipeline.	2026-09-29 14:44:11 +08:00
xiaoxia	f9f3e6bfb9	fix(worker+api): P1 封面评分时序bug + direct/complete吞ingest占位bug (#2092) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-29 04:24:48 +08:00
xiaoxia	3904a8f3b5	perf(worker): 封面抽帧三优化 — blackdetect黑屏规避+单次ffmpeg批量抽帧+并发上传+CJK字体兜底 (#2091) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 22:32:56 +08:00
xiaoxia	ba3e97c986	fix(worker): GPU直连支持配音素材库音轨+无声片段anullsrc+per-clip音量 (#2090) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 21:09:10 +08:00
xiaoxia	3106496c12	fix(worker): GPU直连管线音频bug修复+边缘裁剪入GPU省5s (#2089) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 20:17:54 +08:00
xiaoxia	f79f75b863	fix(frontend): 轮询识别awaiting_cover状态，visibilitychange恢复轮询，自动跳封面页 (#2088) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 19:39:17 +08:00
xiaoxia	b7a439d319	feat(cover): 默认本地ffmpeg抽帧+cv2打分，砍掉MediaKit封面86s瓶颈 (#2087) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 18:44:41 +08:00
Agent	4d7c80ae07	fix: OSS签名URL校验HEAD→GET+Range，修复403误报 ... OSS sign_url()将路径中/编码为%2F，HEAD请求返回403但GET正常。 改用GET+Range:bytes=0-0仅下载1字节验证，同时接受206状态码。 根因修复，消除URL校验失败后的object_exists兜底路径。	2026-09-28 18:01:12 +08:00
Agent	26c0140d79	chore: 持久化 staging 宿主机 nginx 配置，包含 GPU relay 路由修复 ... - 新增 deploy/configs/host-nginx-cms-staging.conf: 宿主机 CMS nginx 完整配置备份 - 更新 infra/nginx/gpu-relay-staging.conf: 改为文档说明，指向实际配置 - 确保重建服务器时可从仓库恢复 GPU relay 路由配置	2026-09-28 17:44:13 +08:00
Agent	c507f76c14	fix: update GPU relay nginx config - integrate into CMS 8092 vhost ... Root cause: port 8092 was occupied by CMS nginx vhost, which proxied /api/ to CMS backend (port 8091) instead of staging API (port 8000). P4000 PUT requests to relay endpoint returned 404. Fix: Added /api/v1/internal/gpu-relay/ location block to CMS 8092 server block, proxying to staging API on port 8000. Nginx longest prefix match ensures relay routes take priority over generic /api/.	2026-09-28 17:25:36 +08:00
灵应	8a5cfe831e	fix: 修复 gpu_direct_pipeline.py 中 concat 构建的变量名错误 ... build_direct_render 方法中列表推导式使用 _lbl 作为循环变量， 但 f-string 中误用了未定义的 l，导致 NameError。 修复: f"[{l}]" -> f"[{_lbl}]" (line 195)	2026-09-28 16:22:01 +08:00
灵应	d7d3f3184b	fix: 修复 GPU 直连管线中 l.role 变量名拼写错误 ... _can_use_gpu_direct 和 _try_gpu_direct 方法中 3 处列表推导式 误用未定义变量 l 代替循环变量 _lyr，导致 NameError 使 gpu-direct eligibility check 始终失败并 fallback 到 CPU 路径。 修复: l.role -> _lyr.role (line 2220, 2275, 2280)	2026-09-28 15:31:46 +08:00
业务服务器运维	ec9240b52a	fix: 修复 _storage_key 无法写入 EditPlanClip（slots=True） ... EditPlanClip 使用 @dataclass(slots=True)，不允许 setattr 动态添加属性。 将 _storage_key 改为存储在 clip.config 字典中，所有读取处同步修改。 - render_adapter.py: c._storage_key = sk → c.config['_storage_key'] = sk - unified_render_service.py: getattr → config.get('_storage_key') - gpu_direct_pipeline.py: getattr → config.get('_storage_key')	2026-09-28 14:46:44 +08:00
xiaoxia	d0e5ef1753	Merge pull request 'feat(worker): 全GPU直连渲染，取消mezzanine CPU中间编码' (#2086) from feature/gpu-direct-pipeline into develop	2026-09-28 14:20:48 +08:00
saas-backend-agent	6e8199581d	fix(gpu-direct): 修复单测+style E741，默认字体改为Noto Sans CJK SC ... - DEFAULT_DRAWTEXT_FONT 从 sans 改为 'Noto Sans CJK SC'（P4000已装中文字体） - _download_assets 返回 4-tuple 导致老单测解包失败，更新 test_render_adapter - 修复 E741 模糊变量名 l → _lbl/_lyr - ruff format 统一格式	2026-09-28 14:02:57 +08:00
CI Bot	1e23a3f094	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-28 05:38:30 +00:00
业务服务器运维	b04a803655	feat(worker): 全GPU直连渲染，取消mezzanine CPU中间编码 ... - gpu_encoder 新增 render_inputs_to_output：多输入+filter_complex 直接交 P4000 一次出片 - 新增 gpu_direct_pipeline：原始素材/BGM 签名URL、TTS 上传、drawtext 标题/字幕、 filter_complex 完成 trim/scale/pad/concat/边缘crop/amix，末端 h264_nvenc 仅编码一次 - unified_render_service：render() 步骤4.8 接入直连，命中即出片； 不满足条件或 GPU 失败自动回退现有 mezzanine/CPU 链路；config gpu_direct_enabled 可灰度关闭 - render_adapter：_download_assets 额外返回 asset_storage_map， _do_render 给 clip 注入 _storage_key 供直连签名 消除 mezzanine 85s + 边缘裁剪 26s + 合成 2s + 中转 1s ≈ 114s CPU 开销	2026-09-28 13:30:31 +08:00
xiaoxia	e496f127a3	feat(p1): OSS 双endpoint分离 — 上传/下载走VPC内网，签名URL走公网 (#2085) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 11:35:13 +08:00
xiaoxia	423be1446f	Merge pull request 'fix(p0): GPU mezzanine传输切回OSS绕开Tailscale反向卡顿' (#2084) from fix/p0-gpu-mezzanine-oss into develop ... fix(p0): GPU mezzanine传输切回OSS绕开Tailscale反向卡顿 Tailscale 反向链路（P4000 从 116 relay 下载 mezzanine）间歇性 TCP stall， 导致 GPU 编码首字节 20s 超时 fallback 到 CPU 软编，渲染变慢到 ~3 分钟。 改 GPU_ENCODE_MEZZANINE_TRANSPORT=relay → oss：P4000 直接从阿里云 OSS 公网下载 mezzanine，绕开不稳定的 Tailscale 反向链路；编码结果回传仍走 relay（116→P4000 正向 POST 正常）。仅改 .env.staging，部署后 watchtower 自动拉起容器生效。	2026-09-28 08:51:37 +08:00
xiaoxia	6d9d2e8179	fix(p0): GPU mezzanine传输切回OSS绕开Tailscale反向卡顿 ... Tailscale 反向链路（P4000 从 116 relay 下载 mezzanine）间歇性 TCP stall， 导致 GPU 编码 20s 首字节超时 fallback 到 CPU 软编，渲染变慢到 ~3 分钟。 改 transport=oss：P4000 直接从阿里云 OSS 公网下载 mezzanine，绕开不稳定的 Tailscale 反向链路；编码结果回传仍走 relay（116→P4000 正向链路正常）。	2026-09-28 08:31:20 +08:00
xiaoxia	b233529eee	Merge pull request 'fix(ci): #2081 follow-up——CI 部署脚本修复（compose.yml 由 CI scp + --env-file）' (#2082) from fix/ci-worker-compose-followup into develop ... fix(ci): worker 部署收敛到 compose——CI scp compose.yml + --env-file，消除并发/HC 配置漂移 修复 #2081 首次部署失败的两个问题： - 去掉 curl 私有仓库（无 token 404），改由 CI workflow 在运行脚本前 scp infra/docker/compose.yml 到服务器 - docker compose 加 --env-file 显式指向 .env，确保 GENERATED_FILES_HOST_DIR 等变量加载 - 封装 compose() 函数统一调用；回滚走同样路径，compose 失败才 fallback docker run	2026-09-28 02:41:32 +08:00
xiaoxia	6de6971e7b	fix(ci): scp compose.yml to staging host before running deploy script	2026-09-28 02:23:49 +08:00
xiaoxia	548be6aced	fix(ci): worker compose deploy - remove curl fetch, add --env-file, use existing compose.yml	2026-09-28 02:23:45 +08:00
xiaoxia	588a4b7320	fix(ci): #2079 收敛 worker 部署到 compose——消除并发/HC 配置漂移 (#2081) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 02:12:08 +08:00
xiaoxia	1a93a9c00e	fix(quality): classification_status 赋枚举值而非裸字符串 + 仓储层防御 (#2079) (#2080) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 01:37:20 +08:00
xiaoxia	01991f14d7	fix(queue): #2073 Worker 队列分流——任务路由补全 + beat 独立 + transcode 并发独立 (#2079) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 01:09:29 +08:00
xiaoxia	8abdeb9551	fix(P0): gpu-encoder 冷启动防护 — pre-warm + 首字节短超时兜底 (#2072) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 00:08:49 +08:00
xiaoxia	97ad0ae2e5	fix(p0): 固化 GPU_ENCODE 到 .env.staging + MediaKit 抽帧 403 修复 (#2069) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 21:42:18 +08:00
xiaoxia	59c05148ab	fix(p0): finalize 400（extra_meta漏传）+ 查重失效（fingerprint_chunks漏存） (#2068) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 20:47:12 +08:00
xiaoxia	a00031e100	refactor(shared): 抽取标题模板为公共组件，智能剪辑/AI数字人复用 (#2067) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 20:29:49 +08:00
xiaoxia	87ec400a1b	fix(generate): 标题模板恢复内联大卡片网格 (#2066) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 19:08:11 +08:00
xiaoxia	2d3cb13707	ci: 修正 staging 默认部署目标为 116.62.226.203:22（staging业务机） (#2065) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 17:42:17 +08:00
xiaoxia	28cbe2a207	ci: 修正 staging SSH 部署目标为 47.98.113.167:22222 (#2064) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 15:32:16 +08:00
xiaoxia	e4723bfb1b	perf(gpu): mezzanine relay直传跳过公网OSS(-18s), preset veryfast(-38%), 修复CI staging IP (#2063) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 14:48:54 +08:00
xiaoxia	9c0535da19	fix(generate): Step6 本地上传封面走 OSS + 标题样式恢复 Modal 弹窗模式 (#2061) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 11:19:04 +08:00
xiaoxia	c7288cd46b	fix(generate): Step6封面完成按钮在awaiting_cover阶段可用 (#2060) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 10:34:38 +08:00
xiaoxia	447aad166b	fix(title): 爆款预设缩略图色块/缺字回归bug (#2059) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 10:19:58 +08:00
xiaoxia	1463cf0834	fix(version): /health 返回真实 commit SHA，不再是 unknown (#2058) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 01:13:33 +08:00
xiaoxia	3a8d5e50d0	fix(ci): staging SSH 默认目标改为业务机 47.98.113.167:22222 (#2057) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 00:59:28 +08:00
xiaoxia	6778f4be32	test(title): 补标题工具函数单测，前端覆盖率从49.99%提升到50.15% (#2056) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-27 00:45:23 +08:00
xiaoxia	778b17a723	Merge pull request 'feat(gpu): 接入 P4000 NVENC 硬件编码加速' (#2055) from feature/gpu-nvenc-encode into develop	2026-09-26 21:46:42 +08:00
CI Bot	706fed9c08	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-26 13:03:47 +00:00
saas-backend-agent	7b0db03875	test(gpu-encoder): 补充分支覆盖率测试（encode全流程/错误路径/singleton/relay路由）+ 持久化宿主机 nginx :8092 vhost 配置 ... - test_gpu_encoder.py: 扩展至 ~45 个用例，覆盖 encode_mezzanine_to_output happy path (audio/no-audio/bitrate/extra_video_args)、post_sync 错误分支(URLError/timeout/bad JSON/uploaded=false)、 _download_to_file 非200/网络错误清理、_relay_delete 异常吞掉、 OSS helper(import失败/bucket=None/upload失败/delete异常吞掉)、 _build_client_from_settings 所有分支(import失败/disabled/缺endpoint/缺relay/正常配置)、 get_gpu_encoder singleton+init异常、constructor 默认值。 - test_gpu_relay.py: 新增 30+ 个用例，覆盖 _relay_dir/_secret/_safe_key/_check_token、 build_relay_put_url/get_url/generate_key，以及 PUT/GET/HEAD/DELETE 四个 handler (写入/404/401/400/写入错误清理/unlink错误)。 - infra/nginx/gpu-relay-staging.conf: 宿主机 nginx :8092 纯 HTTP vhost， 给 P4000 通过 Tailscale 回传编码结果使用。部署命令见文件注释。	2026-09-26 20:43:21 +08:00