3505 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiaoxia	d855fc30ba	fix(scripts): #1894/#1968 抖音 yt-dlp cookies 支持 + 旧档位归一化补测 + CI 覆盖率修复 ... - scripts_ai.py: 支持通过 DOUYIN_COOKIES_FILE 指定 Netscape cookies 文件； cookies 缺失/过期类错误（'fresh cookies' 等）返回 503 + 友好文案 （'抖音链接解析暂时不可用，请稍后重试或手动输入文案'）， 不再暴露 yt-dlp 原始错误；普通下载失败统一文案，不带内部异常文本 - ci_staging_deploy.sh: API 容器挂载 /var/lib/xiaoxia-saas-staging/configs/douyin_cookies.txt 到 /app/configs/douyin_cookies.txt；自动 mkdir + 空占位兜底 - infra/docker/compose.yml: API 服务挂载 ../../deploy/configs:/app/configs:ro - deploy/configs/.env.{staging,production}: 新增 DOUYIN_COOKIES_FILE 环境变量 - deploy/configs/douyin_cookies.txt: Netscape 格式占位文件（真实 cookies 部署时替换） - 新增 test_helpers_get_user_plan.py 覆盖 _helpers.get_user_plan 旧档位归一化分支 - 新增 test_subscription_routes_legacy.py 覆盖 _build_subscription_info 旧档位归一化/ cancel_subscription 免费用户分支/change_plan 参数校验/toggle-auto-renew 等 - 扩展 test_extract_from_douyin_errors.py: 新增 5 个 cookies 场景测试（503 友好文案/ cookiefile 注入/错误信息脱敏等） - 增量覆盖率从 59% 提升到 60%+，解决 CI Gate 阻塞	2026-09-16 18:28:23 +08:00
CI Bot	02c7bba247	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-16 09:58:10 +00:00
xiaoxia-agent	83616ae4a3	feat(#1894): 清理文案库多余字段 + 废弃标题库 API + 清理旧定价档位 ... P0: 删除 scripts 表 title_text/title_category/title_config 三列 - migration 078_drop_script_title_fields 批量删列 - schemas/script.py: ScriptResponse/Create/Update 精简到 title/content/segments/tags - services/script_service.py: 移除 get_title_config_for_script 和三字段参数 - routes/scripts.py: _to_response 不再映射三字段，create/update 不传三字段 - models.py: ScriptModel 移除三列；保留 TemplateModel/GenerationTaskModel/AiAvatarRenderJob 的 title_config（渲染层配置） P1: 废弃 /api/v1/titles/* - 所有子路径统一返回 HTTP 410 Gone + Deprecation/Sunset header - 前端应直接调 GET /api/v1/scripts 取文案列表，用 title 作为标题 P1: 清理旧定价档位 - 新会员体系统一为 free/monthly/quarterly/yearly（#1951/#1955） - schemas/subscription.py: MembershipType 替代旧 PlanType，BillingCycle 新增 QUARTERLY - routes/subscription.py: _PLAN_NAMES 新映射；payment-callback 接受 quarterly（90天）；旧档位 plan 值拒绝 - routes/_helpers.py: get_user_plan() 归一化 standard/basic→monthly、pro/premium/enterprise→quarterly - packages/domain/quota.py: QUOTA_TIERS 改为 free/monthly/quarterly/yearly；保留 basic/standard/premium/pro/enterprise 别名兼容历史数据 - 单元测试 15527 passed	2026-09-16 17:52:38 +08:00
xiaoxia-agent	2d7f1c3a71	chore: rebuild API image with updated base (includes yt-dlp dependency)	2026-09-16 16:54:21 +08:00
xiaoxia	8637ed1576	fix(ux): #1894 删除标题库入口 + 文案名称改标题 + AI改写UX + 清理旧定价硬编码 (#1965) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 16:04:08 +08:00
xiaoxia-agent	6bcd255e85	fix(ci): 修复 ci-pipeline.yml 触发器被误改为 'true:' 导致 push 事件不触发 CI ... YAML 1.1 把未加引号的 on 解析为布尔 true，之前用 PyYAML dump/字符串替换时 意外把顶层 'on:' 写成了 'true:'，导致 push 到 develop 后 CI 完全不触发， staging 一直停留在旧版本 410487fe。恢复原始的 on: 结构和 tags/schedule 格式（参照 410487fe 最后可用版本）。	2026-09-16 15:21:19 +08:00
xiaoxia	17c6b0e3bd	Merge pull request 'chore: CHANGELOG for #1963 (douyin extract error handling)' (#1964) from chore/trigger-ci-after-1963 into develop ... chore: CHANGELOG for #1963 (#1964)	2026-09-16 14:48:57 +08:00
xiaoxia-agent	78cab46578	chore: update CHANGELOG for #1963 (douyin extract error handling)	2026-09-16 14:21:02 +08:00
xiaoxia-agent	9e87781a85	chore: trigger CI deploy to staging after #1963	2026-09-16 13:43:23 +08:00
xiaoxia	57545ab694	Merge pull request 'fix(scripts): extract-from-douyin 异常路径全部返回业务码，杜绝 500 INTERNAL_ERROR' (#1963) from fix/extract-douyin-error-handling into develop ... fix(scripts): extract-from-douyin 异常路径全部返回业务码，杜绝 500 (#1963)	2026-09-16 13:36:47 +08:00
xiaoxia	51694cbd0c	test(e2e): 放宽生成完成等待超时至7分钟（DOUBAO 真生成偶发超3分钟） (#1962) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 13:18:15 +08:00
xiaoxia-agent	fca943428b	fix(scripts): extract-from-douyin 异常路径全部返回业务码，杜绝 500 INTERNAL_ERROR ... 问题：POST /api/v1/scripts/extract-from-douyin 在抖音短链无效/网络异常/ASR 兜底异常等 场景下冒泡未捕获 Exception，被全局 general_exception_handler 吞成 500 INTERNAL_ERROR， 前端无法区分业务错误。 修复（apps/api/app/api/routes/scripts_ai.py）： 1. yt-dlp 导入失败（缺依赖）→ 503（提示功能不可用） 2. yt_dlp.utils.DownloadError 单独捕获： - 含 404/not found/unable to download/unsupported url → 400「无法解析该抖音链接」 - 其它网络/上游异常 → 502「视频下载失败」 3. 下载 info 成功但文件未落地（isfile False / size 0）→ 502「未获取到有效文件」 4. duration 非数字（TypeError/ValueError）→ 安全降级为 0 5. ASR 转写兜底 catch Exception → 502「语音识别失败」（原只 catch 两个自定义异常） 6. 最外层兜底 catch Exception → 500 但带具体 detail（不再是通用 INTERNAL_ERROR） 7. text/duration 提前初始化，避免异常路径 UnboundLocalError 测试： - 新增 tests/unit/test_extract_from_douyin_errors.py，覆盖 8 个失败场景 - 更新 tests/unit/test_scripts_ai.py 三个成功/ASR 路径测试，mock os.path.isfile/getsize - 全量单测 15531 passed	2026-09-16 13:16:45 +08:00
xiaoxia	3eb2fcf3ec	Merge pull request 'fix(ci): 生产环境部署也通过 CI 渲染 .env（避免 DOUBAO 等密钥丢失导致 AI 502）' (#1961) from fix/production-doubao-env-pipeline into develop	2026-09-16 12:50:28 +08:00
xiaoxia-agent	50b413a6fa	fix(ci): 生产环境部署也通过 CI 渲染 + 上传 .env（与 staging 对齐，避免 DOUBAO 等密钥丢失） ... - deploy-production 新增 Render .env from template 步骤（复用 render_env.sh production） - Deploy production over SSH 在拉镜像前加 SCP 上传渲染后的 .env + config diff 检查 - ci_production_deploy.sh: .env 不存在时给出清晰错误提示（对齐 staging） 本次主因修复：#1958 只补了 staging 的 DOUBAO 注入路径，但生产环境 deploy-production 直接读取服务器上手写的 .env，下次 release 到 main 时 AI 端点同样会因缺 DOUBAO_API_KEY 返回 502。本次同步补齐，确保生产也走 CI 统一渲染管线。	2026-09-16 12:36:19 +08:00
xiaoxia	410487fef5	test(e2e): #1954 用稳定的「下载」按钮断言代替易消失toast+封面选择器收紧 (#1960) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 12:33:17 +08:00
xiaoxia	fc99b5a080	Merge pull request 'fix(staging): 补 DOUBAO_API_KEY 环境变量配置（修复 AI 服务 502）' (#1958) from fix/staging-doubao-key into develop	2026-09-16 12:20:52 +08:00
xiaoxia-agent	300f4b2abd	fix(staging): add DOUBAO_API_KEY to CI env render (fix 502 AI unavailable) ... Root cause: Doubao (ARK) AI client configuration was missing from staging .env template and CI render pipeline. The DOUBAO_API_KEY/MODEL/BASE_URL variables were added to packages/config/api_settings.py but never wired through deploy/configs/.env.staging, render_env.sh shared secrets, or ci-pipeline.yml. After recent PRs that added AI endpoints (ai-rewrite, extract-from-douyin, lipsync/digital-human) calling get_doubao_client(), is_available returned False because settings.doubao_api_key was empty → all AI routes returned 502. Fix: 1. deploy/configs/.env.staging: add DOUBAO_API_KEY/MODEL/BASE_URL/TIMEOUT/MAX_RETRIES 2. deploy/configs/.env.production: same (for prod parity) 3. scripts/render_env.sh: add DOUBAO_API_KEY/MODEL/BASE_URL to SHARED_SECRETS 4. .gitea/workflows/ci-pipeline.yml: pass DOUBAO secrets to deploy-staging env 5. Gitea Actions secrets: DOUBAO_API_KEY/MODEL/BASE_URL added (already set) Verified render_env.sh produces correct .env.rendered with all 19 vars substituted. Full unit test suite: 15523 passed.	2026-09-16 11:54:44 +08:00
xiaoxia	bb47e89a47	fix(wizard): #1954 生成完成后底部按钮显示「下一步：选择封面」+ E2E封面步骤断言 (#1957) ... fix(wizard): #1954 生成完成后底部按钮正确显示「下一步：选择封面」+ E2E封面步骤断言 - GenerateStepActions.tsx: currentStep===4 且 generated&&!generating&&!generateError 时返回「下一步：选择封面」按钮；移除 dead 的 currentStep===5 分支；更新注释反映 5 步结构 - e2e/core-generation.spec.ts: 视频生成完成后断言「下一步：选择封面」可见并点击，进入步骤5后断言 h3「🖼️ 选择封面」可见 + 主按钮消失 Closes #1954	2026-09-16 11:33:55 +08:00
xiaoxia	6155b4d21e	feat(points): 对齐后端积分/订阅 API 最终契约（types + API 层改造） (#1956) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 10:53:58 +08:00
xiaoxia	41cd9cdc56	fix(#1895): /subscription/plans 路由挂载位置修复（解决 404） (#1955) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 09:59:30 +08:00
xiaoxia	799a7f7367	fix(e2e): v4 核心生成向导冒烟测试终点改为「视频生成完成」 (#1953) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 09:24:39 +08:00
xiaoxia	13c302c037	fix(#1895): points API 字段对齐（P0 修复 + P1 补全） (#1951) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 09:17:33 +08:00
xiaoxia	1e8ab91984	fix(e2e): v3 对齐实际步骤编号（标题页点下一步后才出现确认生成按钮） (#1952) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 09:05:22 +08:00
xiaoxia	3f27d199f5	fix(e2e): 加固核心生成向导冒烟测试（v2：按钮定位/等待/进度页断言） (#1950) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 08:43:36 +08:00
xiaoxia	67b270bce2	Merge pull request 'fix(e2e): 补齐选素材后数量弹窗交互，修复核心生成向导冒烟测试' (#1949) from fix/e2e-count-modal into develop	2026-09-16 07:52:06 +08:00
xiaoxia	0432629aef	fix(e2e): 补齐选素材后数量弹窗交互，修复核心生成向导冒烟测试失败 ... #1677 批量生成改造后，Step1 点「下一步」会弹出「要生成几个视频？」数量弹窗， 默认 1，需要点击「生成 1 个视频」才会进入 Step2 配音选择。原 e2e 测试未处理该弹窗， 导致停留在 Step1 等待「选择配音」heading 超时 15s。 - 在 Step1 下一步后增加对数量弹窗 h3「要生成几个视频？」的断言 - 点击「生成 1 个视频」确认（单视频冒烟路径） - 更新注释说明 5 步向导前的数量弹窗	2026-09-16 07:30:40 +08:00
frontend-dev	3ad48335f6	fix(e2e): 适配5步向导流程，删除已移除的模板选择和数量弹窗步骤 (#1948) ... Co-authored-by: frontend-dev <frontend-dev@xiaoxiajianji.com> Co-committed-by: frontend-dev <frontend-dev@xiaoxiajianji.com>	2026-09-16 07:00:28 +08:00
xiaoxia	1bf0e73fd2	Merge pull request 'fix(ci): trap EXIT 回收集成测试 PG/Redis 容器，杜绝取消/失败泄漏' (#1946) from fix/ci-service-container-cleanup-trap into develop	2026-09-16 06:52:20 +08:00
xiaoxia	7d2fbfa49f	fix(test): Header.test.tsx antd/icons mock 透传缺失导出（修复 Typography 未定义） (#1947) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 06:46:48 +08:00
xiaoxia	7564b50f7e	feat(#1894): 废弃标题库整合到文案库 - scripts 模型新增标题字段 (#1927) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 05:35:20 +08:00
CI Bot	7bf135789e	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-15 21:17:11 +00:00
xiaoxia-agent	f8c8d4320e	test(points): add @points_gate __globals__ regression tests + endpoint coverage (#1895)	2026-09-16 05:08:21 +08:00
xiaoxia	b73cd1f22d	feat(points): P2 step 2.2 - lipsync 口型同步 points gate (#1939) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 04:49:10 +08:00
xiaoxia	0918d347cf	feat(points): P2 step 2.1 - TTS + voice_clones preview points gate (#1938) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 04:19:26 +08:00
xiaoxia	ba7e056232	feat(points): P2 step 3 - 注册送50积分 (#1945) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 03:52:15 +08:00
xiaoxia	c455e33110	feat(points): P2 step 2.3 - scripts_ai (抖音提取/AI改写/AI标题) points gate (#1940) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 03:45:16 +08:00
xiaoxia	d706a76205	feat(points): P2 step 2.7 - generation_cover AI封面 points gate (#1944) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 02:50:23 +08:00
xiaoxia	8b69a6e18b	feat(points): P2 step 2.6 - ai_avatar_render 数字人渲染 points gate (#1943) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 02:47:03 +08:00
xiaoxia	3c41115b31	feat(#1894): merge title_library into scripts (#1927)	2026-09-16 01:36:50 +08:00
CI Bot	7715b789a8	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-15 17:18:08 +00:00
xiaoxia-agent	29cdd32203	fix(points): use sys.modules proxy in @points_gate wrapper for Py3.12/PEP563 compat ... Fixes PydanticUndefinedAnnotation on CI (Python 3.12): the wrapper's __globals__ previously pointed at packages.middleware.points_gate, so ForwardRefs for request models (e.g. ExtractFromDouyinRequest) could not resolve. Rebind the wrapper code object to the decorated route's globals via types.FunctionType, and route internal helpers through thin sys.modules proxies so tests can monkeypatch them.	2026-09-16 00:34:45 +08:00
xiaoxia	00045131f6	feat(points): P2 step 1 - POINTS_ENABLED safety gate (default false) (#1936) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-16 00:26:27 +08:00
xiaoxia	de56a67457	fix(ci): run_staging_tests.sh 同样加 trap EXIT 回收 staging 测试容器	2026-09-16 00:19:06 +08:00
xiaoxia	371be8034d	fix(ci): trap EXIT 回收集成测试 PG/Redis 容器，杜绝取消/失败时泄漏 ... 问题：run_integration_tests.sh 用 docker run -d 起 ci-pg-/ci-redis- 服务容器， 仅在脚本正常走到结尾时 rm；job 失败(set -e)或被 Gitea 取消(SIGTERM)时容器 永久残留。2026-09-15 堆积 20 个泄漏容器把构建机 load 顶到 25.9，CI 大面积排队。 修复：参照 validate_migration.sh 既有做法，新增幂等 cleanup_containers 并注册 trap EXIT/INT/TERM，在启动服务容器前生效，保证任何退出路径都回收临时容器； 共享 PG 模式的 drop-db 逻辑保持不变。主机侧另有 ci_service_reaper.py 每5分钟兜底。	2026-09-16 00:17:58 +08:00
CI Bot	d0af26116c	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-15 16:01:26 +00:00
xiaoxia	ab90a5ec9f	fix: #1800 批量生成进度卡片布局 + #1893 文案库 AI 入口 UX 细节 (#1937) ... fix: #1800 批量生成进度卡片布局 + #1893 文案库 AI 入口 UX 细节 - #1800: 卡片标题加 ellipsis 防溢出，grid 列宽 minmax(320px,1fr) max380px，card-head flex 布局 - #1893: AI 生成标题/改写按钮 disabled 时用 Tooltip 包裹 span，改写弹窗 loading 时禁关禁点	2026-09-15 23:31:26 +08:00
xiaoxia	d0125a1da2	fix(#1894): shorten alembic revision ID to fit varchar(32) ... alembic_version.version_num is varchar(32); previous ID '076_merge_title_library_into_scripts' was 36 chars and caused StringDataRightTruncation on PostgreSQL. Renamed to '076_merge_title_libs' (20 chars).	2026-09-15 23:07:35 +08:00
xiaoxia	f30fe14ff8	fix(#1894): fix alembic revision chain — rename 077→076 (no 076 existed), set down_revision to 075_add_sentence_timings, add postgresql dialect guard ... KeyError: '076_membership_points' broke alembic upgrade on CI (Postgres). No membership_points migration ever existed (PR #1919 added points without a new alembic revision). Our migration should chain from 075_add_sentence_timings, the actual head on develop.	2026-09-15 22:14:36 +08:00
xiaoxia	509b8db3a3	fix(#1894): add alembic 077 migration; fix test imports (from main import app) + URL prefix + dependency_overrides; ASCII Warning header	2026-09-15 20:09:04 +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