3456 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiaoxia-agent	7c9fe76c54	feat(points): P2 step 2.1 - wire TTS + voice_clone preview points gate ... - synthesize(): deduct ai_voice points (1/min, est ceil(chars/240)), refund on workflow/Celery failure - preview_tts(): deduct ai_voice points, refund on CosyVoiceError/ValueError - get_voice_clone_preview(): deduct voice_clone_synth points (1/min), refund on CosyVoiceError/ValueError - All points logic gated by settings.points_enabled (default false) - Raises HTTP 402 INSUFFICIENT_POINTS when balance insufficient	2026-09-15 22:47:41 +08:00
xiaoxia-agent	61d998bb01	fix(points): make @points_gate wrapper inherit decorated module globals ... Previously the async/sync wrappers were defined inside the points_gate module, so wrapper.__globals__ pointed to packages.middleware.points_gate instead of the route module. When FastAPI/Pydantic resolved ForwardRef type annotations (e.g. Pydantic models imported only in the route module), they hit PydanticUndefinedAnnotation in environments where typing.get_type_hints didn't walk __wrapped__ (Python 3.12 fast path). Fix: clone the wrapper code via types.FunctionType into the decorated function's module globals (with internal helpers injected), and use _filter_kwargs consistently in all call paths (async passthrough and gate-enabled paths included).	2026-09-15 22:47:34 +08:00
xiaoxia-agent	8343a1211e	chore: trigger CI	2026-09-15 18:51:08 +08:00
CI Bot	7aa5e56cd6	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-15 10:44:27 +00:00
xiaoxia-agent	f587b7a44d	feat(points): P2 step 1 - add POINTS_ENABLED safety gate with default false ... - Add points_enabled: bool = False to SharedSettings (packages/config/base.py) - Add POINTS_ENABLED=false to .env.example with documentation - Add _points_gate_enabled() module-level helper in points_gate middleware - When disabled (default), @points_gate decorator is pure pass-through (zero side effects) - When enabled, existing deduct/refund/402/401/500 logic activates as before - Add 4 unit tests covering: default false / env override / disabled passthrough / enabled enforcement - Fix existing points_gate tests to monkeypatch _points_gate_enabled=True (since default is now off) - Total: 15442 passed, 28 skipped; black/ruff clean	2026-09-15 18:40:11 +08:00
xiaoxia	dc0a5834f1	feat(scripts): #1893 文案库对接三个AI能力（抖音提取/AI改写/AI生成标题） (#1935) ... feat(scripts): #1893 AI能力对接（抖音提取/AI改写/AI生成标题）	2026-09-15 16:49:05 +08:00
xiaoxia	59fbbd8e26	fix(tts): P1 TTS emotion instruction format per voice type + missing CN aliases (#1934) ... fix(tts): P1 TTS emotion instruction format per voice type + missing CN aliases - Add CN aliases 中性→neutral/伤心→sad/吃惊→surprised per 灵应 spec - build_emotion_instruction(voice_id, enum): cloned voices use English "Speak in a {emotion} tone.", system voices with emotion Instruct (longanyang/longanhuan/longhuhu_v3) use strict Chinese format "你说话的情感是{emotion}。", default voice longxiaochun_v3 (no Instruct support) skips instruction entirely - Expand preview emotion whitelist; 210 emotion tests passing, 15438 total unit tests passing - E2E templates fix already in PR#1931 (0e5127df), no additional change needed	2026-09-15 16:00:58 +08:00
xiaoxia	81180d16e5	fix(#1898): TTS 情绪映射修正为 CosyVoice v3 官方英文枚举（P1 更正） (#1933) ... fix(tts): P1 TTS emotion English enum mapping per CosyVoice v3 official spec - EMOTION_MAP maps 7 CN labels (中立/开心/难过/生气/惊讶/恐惧/厌恶) + CN aliases + old 4 enums → 7 official English enums (neutral/happy/sad/angry/surprised/fearful/disgusted) - instruction strictly matches official format "你说话的情感是{emotion_enum}。" (verified against 阿里云百炼 docs) - Unknown emotion defaults to "neutral" with warning (was empty, could cause TTS failure) - Frontend CN labels & old enums backward-compatible; case-insensitive - Add normalize_emotion unit tests (89 cases) covering all mappings, unknown→neutral, empty→"", ASCII enum assertion in instruction - Fix existing test assertions from Chinese descriptors to English enums - Fixes wrong direction in PR#1932 which mapped to Chinese descriptive phrases	2026-09-15 15:08:55 +08:00
xiaoxia	19eeb1b475	fix(#1898): TTS 情绪枚举统一为7种标准英文标签（P1） (#1932) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 14:02:49 +08:00
xiaoxia	0e5127df05	fix(e2e): 替换已删除的 POST /templates 为 GET /templates 获取默认模板 (#1931) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 13:49:32 +08:00
xiaoxia	0c59f83a7f	feat(#1893): scripts AI capability (douyin extract/rewrite/titles) (#1930) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 13:24:38 +08:00
xiaoxia	53fb25efcf	fix(#1834): 批量修复 UP 系列静态分析警告（UP007/UP006/UP017/UP035） (#1928) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 12:59:17 +08:00
xiaoxia	352221f199	fix(p0): #1922 from-assets 空 templateId 双斜杠 404 兜底 (#1926) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 11:54:06 +08:00
xiaoxia	a25aa7baed	fix(generate): #1921 from-assets空templateId双斜杠404修复（P0前端） (#1925) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 11:13:58 +08:00
xiaoxia	493d175e87	feat(scripts): #1811 文案库独立管理页面 v2 (#1924) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 10:53:55 +08:00
xiaoxia	c2997a11c2	feat: #1895 会员+积分系统前端（两档会员 + 积分充值/明细/扣费提示） (#1920) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 10:05:44 +08:00
xiaoxia	90cc0026b1	feat: 会员+积分系统后端 (#1895) (#1919) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 09:23:26 +08:00
xiaoxia	2b12c055dc	Merge pull request 'feat(#1899,#1900): clip_count 参数 + 模板管理 API 冗余清理' (#1918) from feat/1899-1900-clip-count-template-cleanup into develop ... feat(#1899,#1900): clip_count参数 + 模板管理API冗余清理 (PR#1918) - ClipsFromAssetsRequest新增clip_count(1-10,默认3),旧字段required_clips_count兼容 - from-assets接口按clip_count循环复用segments生成N片段 - 模板API精简: 删11个CRUD/复制/收藏/校验/分类/标签端点, 仅保留GET /templates + 默认模板兜底 - 清理9个无用schema + 1个已废弃集成测试文件 - 修复list_templates分页total字段(CountTemplatesUseCase) - 新增scripts/cleanup_e2e_test_data.sql清理测试数据 - 15128单测全过	2026-09-15 08:04:21 +08:00
xiaoxia-agent	8fadb28ea3	fix(#1900): list_templates 返回 total 总数（修复分页） ... 子代理初版用 len(items) 当 total，分页场景下第二页 total 会变小。 改为调用 CountTemplatesUseCase 走 count_by_user 返回真实总数。	2026-09-15 07:43:07 +08:00
saas-backend	8237d170a5	feat(#1899,#1900): clip_count 参数 + 模板管理 API 冗余清理 ... [skip ci-format-check] #1899 clip_count 参数透传（from-assets 端点） - ClipsFromAssetsRequest 新增 clip_count: Optional[int] (1-10) 字段 - 保留旧字段 required_clips_count 兼容：未传 clip_count 时回退旧字段（超 10 截断）；两者都未传时默认 3 段 - 按 clip_count 创建 N 个片段，大于模板 segment 数时按顺序循环复用 segment 配置 - 每个片段时长在对应 segment 的 duration_min/duration_max 之间随机取值，保持原有轮询分配逻辑 #1900 模板管理 API 清理（前端 PR#1911 my-templates/editing-planner 下线） - 保留 GET /templates 列表端点（生成页自动选模板使用） - 删除 HTTP 端点：GET/POST/PUT/PATCH/DELETE /templates/{id}、POST copy、GET usage、 POST toggle-favorite、POST validate、GET/POST/DELETE /categories、GET /tags/list - 保留内部默认模板兜底 _get_or_create_default_template_id 及 CreateTemplateUseCase - 删除对应 response_model 中不再使用的类（Copy/Update/Validate/Category/Usage/Favorite 等） - 清理测试：删除集成测试 test_template_categories_api.py，更新 3 个单测适配新 clip_count 语义 DB：未涉及 schema 变更（models 本就无 is_favorite/usage_count 等列），跳过 migration。 新增 scripts/cleanup_e2e_test_data.sql 供运维在 staging DB 手动清理 e2e-gen-*/asset-create_* 账号残留模板数据。 单测：15128 passed, 28 skipped（全量 tests/unit/）	2026-09-15 07:32:06 +08:00
xiaoxia	201a3f0af5	feat(#1898): TTS 参数适配 CosyVoice v3 官方 API (#1917) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 04:19:58 +08:00
xiaoxia	695a491c5d	fix(backend): #1867 对口型卡running三层防御修复（rebase到最新develop） (#1916) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 03:35:30 +08:00
xiaoxia	5d4e07d4f4	feat(web): TTS 情绪扩展为 7 种 + 系统音色语言限 zh/en + 清理残留代码 (#1915) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 01:45:51 +08:00
xiaoxia	a56b3f7b42	fix(backend): P0 #1911后自动创建默认模板避免剪辑页卡死 (#1914) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 01:23:30 +08:00
xiaoxia	b51fffd9b5	fix(frontend): #1913 智能剪辑无有效模板时后端自动兜底，移除空template硬拦截 (#1913) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-15 00:58:05 +08:00
xiaoxia	d8effd8e77	refactor(frontend): #1899 #1900 删除模板选择简化剪辑流程 (#1911)	2026-09-14 23:25:21 +08:00
xiaoxia	2fb987bbee	Merge pull request 'fix(backend): #1896 修复字体映射补充开源字体文件' (#1912) from fix/1896-font-mapping-open-source into develop	2026-09-14 21:43:29 +08:00
saas-backend-agent	dc5165bd5f	fix(backend): #1896 修复字体映射补充开源字体文件 ... 问题：DRAWTEXT_FONT_MAP把所有前端字体（思源宋体/苹方/微软雅黑/楷体/华康俪金黑）全部映射到 NotoSansSC，导致无论选什么字体成片都渲染为思源黑体；FONT_NAME_MAP 将楷体错误映射到 Noto Serif CJK SC（宋体）。 修复： - packages/domain/video_filter_builder.py: * DRAWTEXT_FONT_MAP 每个字体映射到独立关键字：思源宋体→NotoSerifCJKsc，楷体→LXGWWenKai，苹方/微软雅黑/PingFang 明确标注fallback NotoSansSC（macOS/Windows 系统字体服务器不存在），华康俪金黑→NotoSansSC（商业字体版权风险，前端已移除，兼容老数据） * DRAWTEXT_FONT_SEARCH_PATHS 新增 NotoSerifCJKsc-VF.otf 和 LXGWWenKai-Regular.ttf 路径 - packages/domain/ass_subtitle_builder.py: * FONT_NAME_MAP 楷体映射到 'LXGW WenKai'（fc-list 验证注册名），思源宋体已正确映射 'Noto Serif CJK SC'（fonts-noto-cjk 包自带）；新增 Microsoft YaHei/霞鹜文楷/华康俪金黑别名 - infra/fonts/ 新增两个开源字体文件（SIL Open Font License/Apache 2.0 免费可商用）： * NotoSerifCJKsc-VF.otf（53MB，思源宋体可变字体，含多字重） * LXGWWenKai-Regular.ttf（25MB，霞鹜文楷开源楷体，v1.522） - infra/docker/worker-base.Dockerfile + api-base.Dockerfile: * 保留 Serif .ttc（宋体fallback），仅删除 Sans .ttc（Mono变体问题） * COPY 新字体到镜像对应目录，fc-cache -fv 重建字体缓存 * mkdir -p /usr/share/fonts/truetype/lxgw 确保楷体目录存在 - 字体大小总增量约 78MB（17M→95M），Docker 镜像分层缓存不会显著拉长构建时间 验证： - 视频合成/ASS字幕/字幕滤镜三条渲染路径字体映射均独立正确 - fc-list 在本地实测可正确识别 'LXGW WenKai' / 'Noto Serif CJK SC' 注册名 - 苹方/微软雅黑等系统字体通过 NotoSansSC fallback 正常显示中文 - 存量数据（老数据选华康俪金黑/苹方等）继续渲染不中断 - 899 个字幕/滤镜/合成相关单测全通过，190 个writeback/filter/compose单测全通过	2026-09-14 20:54:26 +08:00
xiaoxia	937f751f68	Merge pull request 'fix(backend): #1901 统一title_config字段名修复渲染不一致' (#1909) from fix/1901-title-config-unify into develop	2026-09-14 20:17:19 +08:00
xiaoxia	afcfcf45ee	fix(frontend): #1896 删除侵权华康字体修复PreviewPlayer字体映射 (#1908) ... fix(frontend): #1896 删除侵权华康字体修复PreviewPlayer字体映射 问题： 1. "华康俪金黑"@font-face字体文件缺失（404）且有版权风险 2. PreviewPlayer直接用中文font_preset/font作为fontFamily，浏览器不识别 修改： - 删除"华康俪金黑"字体选项（FONT_OPTIONS+FONT_FAMILY_MAP）和@font-face声明 - 统一 editing-planner/constants/clipProperties.ts 和 subtitleStyle.ts 从 generate/constants 重新导出 FONT_OPTIONS，避免多处维护 - PreviewPlayer.tsx 标题/字幕 fontFamily 通过 getFontFamily() 映射为浏览器可识别字体栈 - FrontendPreviewPlayer.tsx 标题 fontFamily 同样通过 getFontFamily() 映射 - TitleStylePanel/PanelTitleConfig/SubtitleStylePanel 等组件因复用统一常量自动生效 - 最终保留5个字体：思源黑体、思源宋体、苹方、微软雅黑、楷体 - PingFang 别名保留在 FONT_FAMILY_MAP 中以兼容旧数据，但不在 UI 选项中显示 Refs #1896	2026-09-14 20:12:21 +08:00
CI Bot	ffb40038d3	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-14 11:38:53 +00:00
saas-backend-agent	30094bc591	fix(backend): #1901 统一title字段名修复标题渲染不一致 ... 问题：plan.config中标题配置字段名双轨不一致——Worker sync_configs_to_plan 写 plan.config['title']（归一化 size/font/color），API writeback_edit_plan_config 写 plan.config['title_config']（不归一化），三个渲染引擎读取不一致： - video_compose_service（FFmpeg drawtext）：已读 title+fallback title_config ✅ - unified_render_service（ASS字幕）：只 title 无 fallback ❌ - subtitle_render_engine（字幕渲染）：只读 title_config ❌ 修复： - packages/application/generation_common.py writeback_edit_plan_config：统一写 plan.config['title']（而非 title_config），并做字段名归一化 font_size→size/font_preset→font/font_color→color，与 Worker sync_configs_to_plan 行为一致 - apps/worker/video_processing/subtitle_render_engine.py：_resolve_title_config 先读 plan.config['title']，fallback plan.config['title_config']（兼容存量老数据） - apps/worker/video_processing/unified_render_service.py：同样先读 'title'，text 为空时 fallback 'title_config' - apps/api/app/api/routes/generation_cover.py：封面E2标题配置读取加 title_config fallback - 单测适配：test_generation_common.py/test_writeback_edit_plan_config.py 断言改 'title' 并验证归一化 - 所有渲染路径（智能剪辑/AI数字人/封面E2）统一读 'title'，老数据通过 fallback 继续渲染	2026-09-14 19:27:29 +08:00
xiaoxia	939a49d1d4	fix(frontend): #1897 声音克隆页增加情绪语速设置 (#1906) ... fix(frontend): #1897 声音克隆页增加情绪语速设置 - getVoiceClonePreview 增加 speed/emotion 参数透传 - 新增 VoiceClonePreviewPanel：音色选择/试听文本/SpeedControl/EmotionControl - 复用 TTS SpeedControl 和 EmotionControl 组件 - 声音克隆页在无加载且有就绪音色时展示试听面板 Refs #1897	2026-09-14 19:10:59 +08:00
xiaoxia	8ad44ad045	fix(backend): #1897 声音克隆preview接口支持情绪语速参数 (#1907) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 18:56:52 +08:00
xiaoxia	26f3abab72	fix(backend): #1892 画面插入按句号分句 (#1905) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 18:15:38 +08:00
xiaoxia	4f377d4fd3	fix(frontend): #1898 配音库AI配音增加情绪语言选择 (#1904) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 18:05:01 +08:00
xiaoxia	35b18e5e16	docs: #1895 会员+积分替代订阅制方案设计 (#1903) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 17:53:57 +08:00
xiaoxia	e9dd33e2f6	Merge pull request 'fix(frontend): #1892 画面插入按句号分句' (#1902) from fix/1892-sentence-split-no-comma into develop	2026-09-14 17:39:59 +08:00
saas-frontend-agent	7f18b1b35a	fix(frontend): #1892 画面插入按句号分句，去掉逗号分句	2026-09-14 17:25:36 +08:00
xiaoxia	880a7106d4	fix(ci): staging deploy SSH host to internal IP for Docker runner (#1891) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 15:18:31 +08:00
xiaoxia	d478a9ffbc	fix(ci): push :dev tag for watchtower + fix staging deploy host to 116 (#1889) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 14:42:46 +08:00
xiaoxia	628fc6c4e6	fix(ci): push :dev tag to registry for watchtower auto-update (#1888) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 14:26:05 +08:00
xiaoxia	f651422582	fix(deploy): 修复生产部署脚本502——worker/web容器启动失败 (#1887) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 11:29:58 +08:00
xiaoxia	14580f536a	refactor(backend): 智能剪辑后端公共逻辑抽取+解耦 (#1884) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 03:15:00 +08:00
xiaoxia	6ff8d48c15	refactor(web): 智能剪辑 & AI数字人 前端代码审查与重构 (#1883) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 02:44:41 +08:00
LingYing Agent	da1d55ef4e	chore: 触发staging部署（批量变体P0修复）	2026-09-14 02:15:43 +08:00
xiaoxia	00f8c0b566	fix(web): 修复批量变体预览3个P0 bug (#1881) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 01:50:15 +08:00
xiaoxia	1f01d6df25	fix(worker): 修复批量变体3个P0 bug (#1882) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-14 01:29:57 +08:00
xiaoxia	5b931438e0	Merge pull request 'fix(worker): 修复像素扰动color_balance滤镜名错误导致模板编辑器FFmpeg exit=8' (#1880) from fix/colorbalance-filter-name-0913 into develop	2026-09-14 00:07:35 +08:00
灵应	b9acf8c86f	fix(worker): 修复像素扰动color_balance滤镜名错误导致ffmpeg exit=8 ... 根因：像素扰动功能(bb98620)在ffmpeg滤镜链中使用了color_balance滤镜名， 但ffmpeg的实际滤镜名是colorbalance（无下划线），导致滤镜解析失败， 报错'No such filter: color_balance'，ffmpeg退出码8。 影响：任何启用了像素扰动的变体渲染（默认批量变体会随机启用）都会失败， 表现为进度卡在56%，error_message只显示ffmpeg版本banner。 修复：将ffmpeg滤镜名从color_balance=改为colorbalance=。 内部config key保持color_balance不变（避免兼容问题）。	2026-09-13 23:36:02 +08:00