fix(viral-video): 预设音色ID与后端对齐（longxiaochun_v3等v3后缀）+ 取消模糊匹配兜底 (#2130)

之前 revision id 36 字符超过 alembic_version.version_num VARCHAR(32)，
迁移事务回滚导致列加不上、版本号也没更新。现在用短名 089_viral_video_cols（21 字符），
同时把 alembic_version.version_num 扩成 VARCHAR(256) 一劳永逸防未来再踩坑。

alembic/versions/089_viral_video_cols.py

@@ -0,0 +1,62 @@
+"""viral video add storyboard + generated_copy_text (complement 088)
+
+Revision ID: 089_viral_video_cols
+Revises: 088_viral_video_copy_result
+Create Date: 2026-10-01
+
+#2129 兜底迁移：补齐 _VIRAL_VIDEO_BACKFILL_COLS 中所有列，覆盖
+# watchtower 自动部署未跑历史 migration、且 AUTO_CREATE_SCHEMA=false 时
+# _ensure_viral_video_columns 未执行的场景。
+# 幂等 ADD COLUMN IF NOT EXISTS，已存在则跳过。
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "089_viral_video_cols"
+down_revision = "088_viral_video_copy_result"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 扩展 alembic_version.version_num 字段长度（原来 VARCHAR(32) 装不下长 revision id）
+    conn = op.get_bind()
+    try:
+        conn.execute(sa.text("ALTER TABLE alembic_version ALTER COLUMN version_num TYPE VARCHAR(256)"))
+    except Exception:
+        pass
+    cols = [
+        ("storyboard", "JSON"),
+        ("generated_copy_text", "TEXT NOT NULL DEFAULT ''"),
+        ("voice_id", "VARCHAR(200) NOT NULL DEFAULT ''"),
+        ("voice_source", "VARCHAR(20) NOT NULL DEFAULT ''"),
+        ("video_ratio", "VARCHAR(10) NOT NULL DEFAULT '9:16'"),
+        ("video_model", "VARCHAR(100) NOT NULL DEFAULT ''"),
+        ("copy_result", "JSON"),
+    ]
+    for name, ddl in cols:
+        try:
+            conn.execute(sa.text(f"ALTER TABLE viral_video_jobs ADD COLUMN IF NOT EXISTS {name} {ddl}"))
+        except Exception:
+            try:
+                conn.execute(sa.text(f"ALTER TABLE viral_video_jobs ADD COLUMN {name} {ddl}"))
+            except Exception:
+                pass
+
+
+def downgrade() -> None:
+    for name in (
+        "copy_result",
+        "video_model",
+        "video_ratio",
+        "voice_source",
+        "voice_id",
+        "generated_copy_text",
+        "storyboard",
+    ):
+        try:
+            op.drop_column("viral_video_jobs", name)
+        except Exception:
+            pass

apps/api/app/api/routes/health.py

@@ -9,6 +9,11 @@ from fastapi.responses import JSONResponse
 router = APIRouter(tags=["Health"])
 
 
+
+def _pg_url(url: str) -> str:
+    """Convert SQLAlchemy URL (postgresql+psycopg://...) to libpq connection string."""
+    return url.replace("postgresql+psycopg://", "postgresql://", 1).replace("postgresql+psycopg2://", "postgresql://", 1)
+
 @router.get("/health", status_code=status.HTTP_200_OK)
 async def health_check():
     return {
@@ -49,7 +54,7 @@ async def _check_database() -> dict:
             "message": "Using in-memory database",
         }
     try:
-        conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
+        conn = psycopg.connect(_pg_url(settings.DATABASE_URL), connect_timeout=3)
         with conn.cursor() as cur:
             cur.execute("SELECT 1")
             cur.fetchone()
@@ -124,7 +129,7 @@ async def _check_migrations() -> dict:
             "message": "Using in-memory database, no migrations needed",
         }
     try:
-        conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
+        conn = psycopg.connect(_pg_url(settings.DATABASE_URL), connect_timeout=3)
         with conn.cursor() as cur:
             cur.execute("""
                 SELECT COUNT(*) FROM information_schema.tables
@@ -137,3 +142,5 @@ async def _check_migrations() -> dict:
         return {"status": "unhealthy", "message": f"Missing tables, found {count}/5"}
     except Exception as error:
         return {"status": "unhealthy", "message": f"Migration check failed: {error}"}
+
+

apps/web/src/pages/viral-video/components/PresetVoicePickerModal.tsx

@@ -34,83 +34,63 @@ interface Props {
 
 /** 兜底 mock 音色（后端 /api/v1/tts/presets 返回字段不够时使用） */
 const MOCK_VOICES: PresetVoice[] = [
+  // ⚠️ 兜底 mock，仅在 /voices/presets 接口不可达时使用；ID 必须与后端
+  // packages/domain/preset_voices.py PRESET_VOICES 的 voice_id 对齐（v3后缀）
   {
-    id: "long-xiaochun",
+    id: "longxiaochun_v3",
     name: "龙小淳",
     gender: "female",
     category: "女声",
     desc: "知性积极女声，适合语音助手",
   },
   {
-    id: "long-xiaoxia",
+    id: "longxiaoxia_v3",
     name: "龙小夏",
     gender: "female",
     category: "女声",
     desc: "沉稳权威女声，适合新闻播报",
   },
   {
-    id: "long-xiaoyan",
-    name: "龙小颜",
-    gender: "female",
-    category: "女声",
-    desc: "温柔甜美女声，适合情感口播",
-  },
-  {
-    id: "long-xiaotong",
-    name: "龙小彤",
-    gender: "female",
-    category: "女声",
-    desc: "活力少女音，适合短视频带货",
-  },
-  {
-    id: "long-sanshu",
+    id: "longsanshu_v3",
     name: "龙三叔",
     gender: "male",
     category: "男声",
     desc: "沉稳质感男声，适合有声书",
   },
   {
-    id: "long-xiaogang",
-    name: "龙小刚",
-    gender: "male",
-    category: "男声",
-    desc: "阳光活力男声，适合解说",
-  },
-  {
-    id: "long-xiaocheng",
-    name: "龙小诚",
-    gender: "male",
-    category: "男声",
-    desc: "磁性商务男声，适合品牌宣传",
-  },
-  {
-    id: "long-xiaozhi",
-    name: "龙小智",
-    gender: "child",
-    category: "童声",
-    desc: "可爱童声，适合亲子内容",
-  },
-  {
-    id: "long-yue",
+    id: "longyue_v3",
     name: "龙悦",
     gender: "female",
-    category: "情绪",
-    desc: "温柔治愈女声，适合睡前/助眠",
+    category: "女声",
+    desc: "温暖磁性女声，适合广告配音",
   },
   {
-    id: "long-xiaodong",
-    name: "龙晓东",
+    id: "longshu_v3",
+    name: "龙书",
     gender: "male",
-    category: "方言",
-    desc: "东北方言男声，接地气",
+    category: "男声",
+    desc: "沉稳青年男声，适合教育讲解",
   },
-  { id: "long-xiaoling", name: "龙小玲", gender: "female", category: "方言", desc: "粤语女声" },
   {
-    id: "long-xiaoxiao-neural",
-    name: "晓晓",
+    id: "longyingjing_v3",
+    name: "龙应静",
     gender: "female",
     category: "女声",
-    desc: "温柔女声",
+    desc: "低调冷静女声，适合纪录片解说",
+  },
+  {
+    id: "longshuo_v3",
+    name: "龙硕",
+    gender: "male",
+    category: "男声",
+    desc: "博才干练男声，适合科技类内容",
+  },
+  {
+    id: "longtian_v3",
+    name: "龙甜",
+    gender: "female",
+    category: "女声",
+    desc: "活泼女声，适合短视频配音",
   },
 ]
 
@@ -178,23 +158,22 @@ const PresetVoicePickerModal: React.FC<Props> = ({
 
   // 合并真实数据和 mock：如果真实数据 gender/category 缺失，用 mock 兜底
   const allVoices: PresetVoice[] = useMemo(() => {
+    // 真实 API 返回的 voice_id 以 API 为准（如 longxiaochun_v3），前端不做硬编码覆盖
     const realList: PresetVoice[] = (voices || []).map((v) => {
-      // 按 name 模糊匹配 mock 获取补充信息
-      const mockMatch = MOCK_VOICES.find(
-        (m) => v.name?.includes(m.name.slice(1)) || m.name.includes(v.name?.slice(0, 2) || "___"),
-      )
+      // 按 id 精确匹配 mock 获取补充元信息（id 即 voice_id，唯一稳定键）
+      const mockMatch = MOCK_VOICES.find((m) => m.id === v.id)
       return {
         ...v,
         gender: v.gender || mockMatch?.gender,
         category:
           v.category ||
           mockMatch?.category ||
-          (v.gender === "female" ? "女声" : v.gender === "male" ? "男声" : undefined),
+          (v.gender === "female" ? "女声" : v.gender === "male" ? "男声" : "其他"),
         desc: v.desc || mockMatch?.desc,
         sample_audio_url: v.sample_audio_url,
       }
     })
-    // 如果没有真实数据，使用 mock
+    // 如果没有真实数据，使用兜底 mock（接口失败时）
     return realList.length > 0 ? realList : MOCK_VOICES
   }, [voices])
 

infra/docker/api.Dockerfile

@@ -30,6 +30,10 @@ COPY deploy/configs/douyin_cookies.txt /app/configs/douyin_cookies.txt
 # 强制升级 yt-dlp 到最新（抖音反爬经常变更，旧版 cookies 支持失效；#1968/#1963）
 RUN pip install --no-cache-dir -i https://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com --upgrade "yt-dlp>=2026.8.19"
 
+# API 启动入口（幂等迁移 + uvicorn）—— #2129: watchtower 自动部署兜底
+COPY infra/docker/entrypoint-api.sh /usr/local/bin/entrypoint-api.sh
+RUN chmod +x /usr/local/bin/entrypoint-api.sh
+
 # 设置环境变量
 ENV PATH="/opt/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 ENV PYTHONPATH=/app:/app/apps/api
@@ -41,4 +45,4 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)"
 
 # API 入口点
-CMD ["uvicorn", "apps.api.main:app", "--host", "0.0.0.0", "--port", "8000"]
+ENTRYPOINT ["/usr/local/bin/entrypoint-api.sh"]

infra/docker/entrypoint-api.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# API 启动入口：先幂等执行数据库迁移，再启动传入的 CMD（默认 uvicorn）
+# 解决 watchtower 自动拉取新镜像后容器重启、未跑 alembic upgrade head 导致新列缺失 500 的问题（#2129）
+set -e
+
+cd /app
+
+echo "[entrypoint-api] Running alembic upgrade head..."
+if alembic upgrade head; then
+  echo "[entrypoint-api] Migrations ok."
+else
+  echo "[entrypoint-api] WARNING: alembic upgrade failed, continuing (existing columns should be fine)..." >&2
+fi
+
+# 若有显式 CMD（CI 部署时 docker compose run --rm api sh -c '...' 传入），直接 exec 它
+if [ "$#" -gt 0 ]; then
+  echo "[entrypoint-api] Exec custom command: $*"
+  exec "$@"
+fi
+
+echo "[entrypoint-api] Starting uvicorn..."
+exec uvicorn apps.api.main:app --host 0.0.0.0 --port 8000

infra/docker/entrypoint-worker.sh

@@ -18,6 +18,17 @@
 
 set -e
 
+# #2129: 幂等执行数据库迁移（watchtower 自动部署兜底）
+# worker 容器独立启动，不能依赖 API 容器先跑迁移
+cd /app
+echo "[entrypoint-worker] Running alembic upgrade head..."
+if alembic upgrade head; then
+  echo "[entrypoint-worker] Migrations ok."
+else
+  echo "[entrypoint-worker] WARNING: alembic upgrade failed, continuing to start workers..." >&2
+fi
+cd - >/dev/null
+
 MAX_TASKS="${WORKER_MAX_TASKS_PER_CHILD:-100}"
 
 # ── 并发计算：显式 env 优先；否则从 WORKER_CONCURRENCY 按比例推导 ──

infra/docker/worker.Dockerfile

@@ -34,6 +34,7 @@ ENV APP_VERSION=$APP_VERSION
 
 # 复制文件（按变化频率从低到高排序，最大化层缓存命中）
 COPY alembic.ini /app/alembic.ini
+COPY alembic/ /app/alembic/
 COPY migrations/ /app/migrations/
 COPY packages/ /app/packages/
 # PR #1844 起，worker 还需要加载 apps.api.app.tasks.lipsync_tts，