Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 xiaoxia
|
ea65033b01 |
@@ -1 +0,0 @@
|
|||||||
CI re-trigger after runner add-host/DNS fix. This file is harmless and not referenced.
|
|
||||||
+1
-2
@@ -1,2 +1 @@
|
|||||||
CI trigger file - safe to delete
|
trigger: 1784009947
|
||||||
updated!
|
|
||||||
|
|||||||
+27
-165
@@ -1,198 +1,60 @@
|
|||||||
# ============================================================
|
# 小虾 SaaS 环境变量配置
|
||||||
# 小虾 SaaS 环境变量完整配置
|
|
||||||
# ============================================================
|
|
||||||
# 本文件列出所有可配置的环境变量及默认值。
|
|
||||||
# 复制为 .env 后按需修改；生产环境务必覆盖所有密钥类配置。
|
|
||||||
#
|
|
||||||
# 配置读取规则（pydantic-settings，大小写不敏感）：
|
|
||||||
# 1. 系统环境变量（最高优先级）
|
|
||||||
# 2. .env.{APP_ENV} 文件（如 .env.staging）
|
|
||||||
# 3. .env 文件
|
|
||||||
# 4. 代码中的默认值（最低优先级）
|
|
||||||
# ============================================================
|
|
||||||
|
|
||||||
|
# ==================== 应用配置 ====================
|
||||||
# ==================== 应用基本配置 ====================
|
APP_NAME=小虾 SaaS
|
||||||
|
APP_BASE_URL=http://localhost:3000
|
||||||
# 应用名称
|
|
||||||
APP_NAME=xiaoxia-saas
|
|
||||||
|
|
||||||
# 应用版本号（展示用，代码中已内置默认）
|
|
||||||
APP_VERSION=0.1.61
|
|
||||||
|
|
||||||
# 环境标识：development / staging / production
|
|
||||||
# 决定读取 .env.{APP_ENV} 还是 .env，也影响部分配置的严格校验
|
|
||||||
APP_ENV=development
|
APP_ENV=development
|
||||||
|
|
||||||
# 是否开启 Debug 模式（开发环境 true，生产环境 false）
|
|
||||||
DEBUG=true
|
|
||||||
|
|
||||||
# 应用基础 URL，用于生成认证邮件、回调链接等
|
|
||||||
APP_BASE_URL=http://localhost:3000
|
|
||||||
|
|
||||||
# API 服务监听地址（容器内绑定，外部暴露由 Docker/Nginx 控制）
|
|
||||||
API_HOST=0.0.0.0
|
|
||||||
|
|
||||||
# API 服务监听端口
|
|
||||||
API_PORT=8000
|
|
||||||
|
|
||||||
# 是否自动创建数据库表结构（开发环境可开启，生产环境用 alembic migration）
|
|
||||||
AUTO_CREATE_SCHEMA=false
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== 数据库配置 ====================
|
# ==================== 数据库配置 ====================
|
||||||
|
DATABASE_URL=postgresql://xiaoxia_user:your_password@localhost:5432/xiaoxia_saas
|
||||||
|
|
||||||
# 数据库连接串（格式：postgresql+psycopg://user:password@host:port/dbname）
|
# 开发环境：使用内存数据库（不需要 PostgreSQL）
|
||||||
DATABASE_URL=postgresql+psycopg://postgres:postgres@localhost:5432/xiaoxia_saas
|
USE_IN_MEMORY_DB=true
|
||||||
|
|
||||||
# 连接池大小（常驻连接数）
|
|
||||||
DATABASE_POOL_SIZE=20
|
|
||||||
|
|
||||||
# 连接池最大溢出连接数（pool_size + max_overflow = 最大并发连接数）
|
|
||||||
DATABASE_MAX_OVERFLOW=10
|
|
||||||
|
|
||||||
# 获取连接超时时间（秒）
|
|
||||||
DATABASE_POOL_TIMEOUT=30
|
|
||||||
|
|
||||||
# 连接回收时间（秒），防止数据库端主动断开导致的死连接
|
|
||||||
DATABASE_POOL_RECYCLE=3600
|
|
||||||
|
|
||||||
# 是否使用内存数据库（SQLite，仅开发/测试可用；生产务必 false）
|
|
||||||
USE_IN_MEMORY_DB=false
|
|
||||||
|
|
||||||
|
# 生产环境：使用 PostgreSQL
|
||||||
|
# USE_IN_MEMORY_DB=false
|
||||||
|
|
||||||
# ==================== Redis 配置 ====================
|
# ==================== Redis 配置 ====================
|
||||||
|
|
||||||
# Redis 连接 URL（格式：redis://[:password@]host:port/db）
|
|
||||||
REDIS_URL=redis://localhost:6379/0
|
REDIS_URL=redis://localhost:6379/0
|
||||||
|
|
||||||
# 是否使用 Redis 存储 Session（多实例部署时必须开启；开发可用内存存储）
|
# ==================== JWT 配置 ====================
|
||||||
ENABLE_REDIS_SESSIONS=false
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== Celery 任务队列 ====================
|
|
||||||
|
|
||||||
# Celery Broker（任务分发），默认用 Redis db0
|
|
||||||
CELERY_BROKER_URL=redis://localhost:6379/0
|
|
||||||
|
|
||||||
# Celery Result Backend（任务结果存储），默认用 Redis db1
|
|
||||||
CELERY_RESULT_BACKEND=redis://localhost:6379/1
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== Worker 配置 ====================
|
|
||||||
|
|
||||||
# Worker 进程名称
|
|
||||||
WORKER_NAME=xiaoxia-saas-worker
|
|
||||||
|
|
||||||
# Worker 并发数（同时执行的任务数）
|
|
||||||
WORKER_CONCURRENCY=4
|
|
||||||
|
|
||||||
# 每个子进程最多处理多少任务后重启（防止内存泄漏）
|
|
||||||
WORKER_MAX_TASKS_PER_CHILD=1000
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== JWT 认证配置 ====================
|
|
||||||
|
|
||||||
# JWT 签名密钥 — 生产环境必须设置为强随机字符串（至少32字符）
|
|
||||||
# 内置不安全值会被拒绝：secret / changeme / password / your-secret-key 等
|
|
||||||
JWT_SECRET_KEY=your-super-secret-key-change-this-in-production-min-32-chars
|
JWT_SECRET_KEY=your-super-secret-key-change-this-in-production-min-32-chars
|
||||||
|
|
||||||
# JWT 签名算法
|
|
||||||
JWT_ALGORITHM=HS256
|
JWT_ALGORITHM=HS256
|
||||||
|
|
||||||
# Access Token 过期时间（分钟）
|
|
||||||
JWT_ACCESS_TOKEN_EXPIRE_MINUTES=30
|
JWT_ACCESS_TOKEN_EXPIRE_MINUTES=30
|
||||||
|
|
||||||
# Refresh Token 过期时间（天）
|
|
||||||
JWT_REFRESH_TOKEN_EXPIRE_DAYS=30
|
JWT_REFRESH_TOKEN_EXPIRE_DAYS=30
|
||||||
|
|
||||||
|
|
||||||
# ==================== 邮件配置 ====================
|
# ==================== 邮件配置 ====================
|
||||||
|
|
||||||
# 是否启用邮件投递（关闭时邮件内容打印到日志，开发调试用）
|
|
||||||
ENABLE_EMAIL_DELIVERY=false
|
|
||||||
|
|
||||||
# SMTP 服务器地址
|
|
||||||
SMTP_HOST=smtp.gmail.com
|
SMTP_HOST=smtp.gmail.com
|
||||||
|
|
||||||
# SMTP 端口
|
|
||||||
SMTP_PORT=587
|
SMTP_PORT=587
|
||||||
|
|
||||||
# SMTP 用户名
|
|
||||||
SMTP_USER=your-email@gmail.com
|
SMTP_USER=your-email@gmail.com
|
||||||
|
|
||||||
# SMTP 密码 / 应用专用密码
|
|
||||||
SMTP_PASSWORD=your-app-specific-password
|
SMTP_PASSWORD=your-app-specific-password
|
||||||
|
|
||||||
# 发件人邮箱
|
|
||||||
SMTP_FROM_EMAIL=noreply@xiaoxia-saas.com
|
SMTP_FROM_EMAIL=noreply@xiaoxia-saas.com
|
||||||
|
|
||||||
# 发件人显示名称
|
|
||||||
SMTP_FROM_NAME=小虾 SaaS
|
SMTP_FROM_NAME=小虾 SaaS
|
||||||
|
|
||||||
# 是否启用 TLS
|
# ==================== 环境配置 ====================
|
||||||
SMTP_USE_TLS=true
|
ENVIRONMENT=development
|
||||||
|
DEBUG=true
|
||||||
|
|
||||||
# ==================== 阿里云 OSS 配置 ====================
|
|
||||||
|
|
||||||
# OSS 区域 endpoint
|
|
||||||
OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
|
|
||||||
|
|
||||||
# OSS Access Key ID — 非开发环境必须设置
|
|
||||||
OSS_ACCESS_KEY_ID=your-access-key-id
|
|
||||||
|
|
||||||
# OSS Access Key Secret — 非开发环境必须设置
|
|
||||||
OSS_ACCESS_KEY_SECRET=your-access-key-secret
|
|
||||||
|
|
||||||
# OSS Bucket 名称
|
|
||||||
OSS_BUCKET_NAME=xiaoxia-autocut
|
|
||||||
|
|
||||||
# 直传最大文件大小（MB）
|
|
||||||
OSS_DIRECT_UPLOAD_MAX_MB=2000
|
|
||||||
|
|
||||||
# 直传签名有效期（秒）
|
|
||||||
OSS_DIRECT_UPLOAD_EXPIRE_SECONDS=900
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== CORS 配置 ====================
|
# ==================== CORS 配置 ====================
|
||||||
|
# 逗号分隔的域名列表（Settings 读取 CORS_ORIGINS_RAW）
|
||||||
|
CORS_ORIGINS_RAW=http://localhost:3000,http://localhost:5173
|
||||||
|
|
||||||
# 允许跨域的前端域名列表，逗号分隔
|
# ==================== 阿里云 OSS 配置 ====================
|
||||||
CORS_ORIGINS_RAW=http://localhost:3000,http://localhost:5173,http://localhost:8000
|
OSS_ENDPOINT=oss-cn-hangzhou.aliyuncs.com
|
||||||
|
OSS_ACCESS_KEY_ID=your-access-key-id
|
||||||
|
OSS_ACCESS_KEY_SECRET=your-access-key-secret
|
||||||
# ==================== 渲染引擎配置 ====================
|
OSS_BUCKET_NAME=xiaoxia-autocut
|
||||||
|
|
||||||
# 渲染引擎选择：
|
|
||||||
# legacy — 旧 VideoComposeService（稳定，功能完整）
|
|
||||||
# unified — 新 UnifiedRenderService（新架构，部分场景仍在验证）
|
|
||||||
RENDER_ENGINE=legacy
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== CosyVoice 语音合成 ====================
|
|
||||||
# 阿里云百灵语音合成服务
|
|
||||||
# 模型选择：
|
|
||||||
# cosyvoice-v3-flash — 推荐，系统音色多，性价比高
|
|
||||||
# cosyvoice-v3-plus — 高质量，系统音色少
|
|
||||||
# cosyvoice-v3.5-flash / cosyvoice-v3.5-plus — 仅支持克隆/设计音色，无系统音色
|
|
||||||
# 音色：v3 系列系统音色带 _v3 后缀，如 longxiaochun_v3 / longxiaoxia_v3 / longanyang
|
|
||||||
|
|
||||||
|
# ==================== CosyVoice 语音合成配置 ====================
|
||||||
|
# 注意：base_url 只需写到 /api/v1，具体路径由代码拼接
|
||||||
|
# 模型: cosyvoice-v3-flash (推荐，支持系统音色，性价比高)
|
||||||
|
# cosyvoice-v3-plus (高质量，系统音色少)
|
||||||
|
# cosyvoice-v3.5-flash / cosyvoice-v3.5-plus (仅支持克隆/设计音色，无系统音色)
|
||||||
|
# 音色: v3系列系统音色带 _v3 后缀，如 longxiaochun_v3, longxiaoxia_v3, longanyang (无后缀)
|
||||||
|
# 注意：COSYVOICE_* 变量由 packages/shared/config.py 的 SharedSettings 读取
|
||||||
COSYVOICE_API_KEY=your-cosyvoice-api-key
|
COSYVOICE_API_KEY=your-cosyvoice-api-key
|
||||||
COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
|
COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1
|
||||||
COSYVOICE_MODEL=cosyvoice-v3-flash
|
COSYVOICE_MODEL=cosyvoice-v3-flash
|
||||||
COSYVOICE_VOICE=longxiaochun_v3
|
COSYVOICE_VOICE=longxiaochun_v3
|
||||||
COSYVOICE_SAMPLE_RATE=22050
|
COSYVOICE_SAMPLE_RATE=22050
|
||||||
COSYVOICE_FORMAT=mp3
|
COSYVOICE_FORMAT=mp3
|
||||||
|
|
||||||
# 音色克隆模型名（固定为 voice-enrollment，通常不需修改）
|
|
||||||
COSYVOICE_CLONE_MODEL=voice-enrollment
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== 豆包大模型（火山引擎方舟） ====================
|
|
||||||
# 用于 AI 文案生成、智能剪辑等需要大模型能力的场景
|
|
||||||
|
|
||||||
DOUBAO_API_KEY=your-doubao-api-key
|
|
||||||
DOUBAO_MODEL=doubao-seed-1-6-250615
|
|
||||||
DOUBAO_BASE_URL=https://ark.cn-beijing.volces.com/api/v3
|
|
||||||
DOUBAO_TIMEOUT=30
|
|
||||||
DOUBAO_MAX_RETRIES=2
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
[flake8]
|
||||||
|
max-line-length = 120
|
||||||
|
exclude =
|
||||||
|
.git,
|
||||||
|
.cache,
|
||||||
|
__pycache__,
|
||||||
|
.venv,
|
||||||
|
venv,
|
||||||
|
node_modules,
|
||||||
|
alembic
|
||||||
|
|
||||||
|
per-file-ignores =
|
||||||
|
tests/integration/*:F821
|
||||||
|
tests/unit/*:F821
|
||||||
@@ -1,161 +0,0 @@
|
|||||||
name: ACR Cleanup
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '0 19 * * *' # UTC 19:00 = 北京时间凌晨3:00
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
pr_sha:
|
|
||||||
description: "PR commit SHA（仅清理指定PR镜像，留空则全量清理）"
|
|
||||||
required: false
|
|
||||||
default: ""
|
|
||||||
dry_run:
|
|
||||||
description: "预览模式（dry-run），不实际删除"
|
|
||||||
required: false
|
|
||||||
default: "true"
|
|
||||||
pull_request_target:
|
|
||||||
types: [closed]
|
|
||||||
branches: [develop, main]
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: acr-cleanup-${{ gitea.ref }}
|
|
||||||
cancel-in-progress: false
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
cleanup:
|
|
||||||
name: ACR Image Cleanup
|
|
||||||
runs-on: ci-l2
|
|
||||||
timeout-minutes: 20
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
env:
|
|
||||||
ACR_REGISTRY: xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com
|
|
||||||
ACR_NAMESPACE: xiaoxiakeji
|
|
||||||
ACR_SERVICE: registry.aliyuncs.com:cn-hangzhou:china:cri-fvec8o9q4mmxrkaa
|
|
||||||
GITEA_URL: https://git.xiaoxiajianji.com
|
|
||||||
GITEA_REPO: xiaoxia/xiaoxia-saas
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" | bash
|
|
||||||
|
|
||||||
# ====== Cron模式：获取staging运行中镜像作为白名单 ======
|
|
||||||
- name: Get staging running images (whitelist)
|
|
||||||
id: protected_images
|
|
||||||
if: gitea.event_name != 'pull_request_target' && !gitea.event.inputs.pr_sha
|
|
||||||
env:
|
|
||||||
STAGING_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
echo "获取staging服务器运行中镜像作为白名单..."
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
echo "$STAGING_SSH_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
|
|
||||||
staging_host="${STAGING_SSH_HOST:-47.98.113.167}"
|
|
||||||
staging_port="${STAGING_SSH_PORT:-22222}"
|
|
||||||
|
|
||||||
ssh-keyscan -p "$staging_port" -H "$staging_host" >> ~/.ssh/known_hosts 2>/dev/null
|
|
||||||
|
|
||||||
# 获取所有运行容器的镜像，提取tag部分
|
|
||||||
IMAGES=$(ssh -p "$staging_port" -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no \
|
|
||||||
"root@$staging_host" "docker ps --format '{{.Image}}' 2>/dev/null" 2>/dev/null | grep -v "^$" | sort -u)
|
|
||||||
|
|
||||||
PROTECTED_TAGS=""
|
|
||||||
if [ -n "$IMAGES" ]; then
|
|
||||||
while IFS= read -r img; do
|
|
||||||
# 从完整镜像名中提取tag（最后一个冒号后）
|
|
||||||
tag=$(echo "$img" | rev | cut -d: -f1 | rev)
|
|
||||||
if [ -n "$tag" ] && [ "$tag" != "latest" ] && [ ${#tag} -gt 5 ]; then
|
|
||||||
if [ -z "$PROTECTED_TAGS" ]; then
|
|
||||||
PROTECTED_TAGS="$tag"
|
|
||||||
else
|
|
||||||
PROTECTED_TAGS="$PROTECTED_TAGS,$tag"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done <<< "$IMAGES"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "staging运行中镜像tag: ${PROTECTED_TAGS:-（无）}"
|
|
||||||
echo "protected_tags=$PROTECTED_TAGS" >> $GITEA_OUTPUT
|
|
||||||
|
|
||||||
# ====== Docker登录 ======
|
|
||||||
- name: Docker login to ACR
|
|
||||||
env:
|
|
||||||
ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
|
|
||||||
ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
|
|
||||||
run: |
|
|
||||||
printf '%s' "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" -u "$ACR_USERNAME" --password-stdin
|
|
||||||
|
|
||||||
# ====== 模式1：PR关闭时清理 ======
|
|
||||||
- name: Cleanup PR images (PR closed)
|
|
||||||
if: gitea.event_name == 'pull_request_target'
|
|
||||||
env:
|
|
||||||
ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
|
|
||||||
ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
|
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
|
||||||
PR_SHA: ${{ gitea.event.pull_request.head.sha }}
|
|
||||||
PR_NUMBER: ${{ gitea.event.pull_request.number }}
|
|
||||||
run: |
|
|
||||||
echo "============================================"
|
|
||||||
echo " PR #$PR_NUMBER 已关闭，清理对应镜像"
|
|
||||||
echo " Head SHA: ${PR_SHA::12}"
|
|
||||||
echo "============================================"
|
|
||||||
echo ""
|
|
||||||
python3 scripts/ci/acr_cleanup.py \
|
|
||||||
--pr-sha "$PR_SHA" \
|
|
||||||
--execute
|
|
||||||
|
|
||||||
# ====== 模式2：Cron全量清理 ======
|
|
||||||
- name: Full cleanup (cron / manual)
|
|
||||||
if: gitea.event_name != 'pull_request_target' && !gitea.event.inputs.pr_sha
|
|
||||||
env:
|
|
||||||
ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
|
|
||||||
ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
|
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
|
||||||
PROTECTED_TAGS: ${{ steps.protected_images.outputs.protected_tags }}
|
|
||||||
DRY_RUN_INPUT: ${{ gitea.event.inputs.dry_run }}
|
|
||||||
run: |
|
|
||||||
echo "============================================"
|
|
||||||
echo " ACR 全量清理（${{ gitea.event_name }}）"
|
|
||||||
echo "============================================"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# 决定是否dry-run
|
|
||||||
DRY_RUN_FLAG=""
|
|
||||||
if [ "$DRY_RUN_INPUT" = "true" ]; then
|
|
||||||
DRY_RUN_FLAG="--dry-run"
|
|
||||||
echo "模式: 预览模式 (dry-run)"
|
|
||||||
else
|
|
||||||
echo "模式: 执行模式"
|
|
||||||
fi
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
python3 scripts/ci/acr_cleanup.py \
|
|
||||||
--keep 20 \
|
|
||||||
--protected-tags "$PROTECTED_TAGS" \
|
|
||||||
$DRY_RUN_FLAG
|
|
||||||
|
|
||||||
# ====== 模式3：手动指定PR SHA清理 ======
|
|
||||||
- name: Cleanup specific PR image (manual)
|
|
||||||
if: gitea.event_name == 'workflow_dispatch' && gitea.event.inputs.pr_sha
|
|
||||||
env:
|
|
||||||
ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
|
|
||||||
ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
|
|
||||||
PR_SHA: ${{ gitea.event.inputs.pr_sha }}
|
|
||||||
DRY_RUN_INPUT: ${{ gitea.event.inputs.dry_run }}
|
|
||||||
run: |
|
|
||||||
echo "手动清理PR镜像: ${PR_SHA::12}"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
DRY_RUN_FLAG=""
|
|
||||||
if [ "$DRY_RUN_INPUT" = "true" ]; then
|
|
||||||
DRY_RUN_FLAG="--dry-run"
|
|
||||||
fi
|
|
||||||
|
|
||||||
python3 scripts/ci/acr_cleanup.py \
|
|
||||||
--pr-sha "$PR_SHA" \
|
|
||||||
$DRY_RUN_FLAG
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
name: API Base Image Build
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- main
|
|
||||||
paths:
|
|
||||||
- 'requirements-base.txt'
|
|
||||||
- 'requirements.txt'
|
|
||||||
- 'infra/docker/api-base.Dockerfile'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-api-base:
|
|
||||||
name: Build API Base Image
|
|
||||||
runs-on: runtime-builder
|
|
||||||
timeout-minutes: 45
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
|
|
||||||
| bash
|
|
||||||
|
|
||||||
- name: Docker login to Registry
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
|
|
||||||
ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
|
|
||||||
GITEA_REGISTRY_USER: xiaoxia
|
|
||||||
GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
for i in 1 2 3; do
|
|
||||||
echo "=== Docker login 尝试 $i/3 ==="
|
|
||||||
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
|
|
||||||
&& docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
|
|
||||||
echo "✅ Docker login successful"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "❌ Docker login 失败（尝试 $i/3），5s 后重试..."
|
|
||||||
sleep 5
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Build and push API base image
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
|
|
||||||
GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/saas-api-base:latest"
|
|
||||||
|
|
||||||
echo "=== Building API base image ==="
|
|
||||||
|
|
||||||
# 使用普通 docker build（单平台不需要 buildx）
|
|
||||||
docker build \
|
|
||||||
-f infra/docker/api-base.Dockerfile \
|
|
||||||
-t "${ACR_IMAGE}" \
|
|
||||||
.
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "✅ Image built successfully"
|
|
||||||
|
|
||||||
# 推送到 ACR
|
|
||||||
echo "=== Pushing to ACR ==="
|
|
||||||
docker push "${ACR_IMAGE}"
|
|
||||||
echo "✅ Pushed to ACR"
|
|
||||||
|
|
||||||
# 打标签并推送到 Gitea Packages 作为备份
|
|
||||||
echo "=== Pushing to Gitea Packages ==="
|
|
||||||
docker tag "${ACR_IMAGE}" "${GITEA_IMAGE}"
|
|
||||||
docker push "${GITEA_IMAGE}" || echo "⚠️ Gitea Packages push failed (non-fatal)"
|
|
||||||
echo "✅ Gitea backup push completed"
|
|
||||||
|
|
||||||
- name: Cleanup
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
|
|
||||||
docker rmi "${ACR_IMAGE}" 2>/dev/null || true
|
|
||||||
echo "Cleanup done"
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
name: CI Base Image Build
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- main
|
|
||||||
paths:
|
|
||||||
- 'requirements-base.txt'
|
|
||||||
- 'requirements-dev.txt'
|
|
||||||
- 'infra/docker/ci.Dockerfile'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
reason:
|
|
||||||
description: "触发原因"
|
|
||||||
required: false
|
|
||||||
default: "手动触发 - ci-base 镜像重建"
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ci-base-image-build
|
|
||||||
cancel-in-progress: false
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-ci-base:
|
|
||||||
name: Build CI Base Image
|
|
||||||
runs-on: runtime-builder
|
|
||||||
timeout-minutes: 60
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
|
|
||||||
| bash
|
|
||||||
|
|
||||||
- name: Docker login to Gitea Registry
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITEA_REGISTRY_USER: xiaoxia
|
|
||||||
GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
for i in 1 2 3; do
|
|
||||||
echo "=== Docker login 尝试 $i/3 ==="
|
|
||||||
if docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
|
|
||||||
echo "✅ Docker login successful"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "❌ Docker login 失败（尝试 $i/3），5s 后重试..."
|
|
||||||
sleep 5
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Build and push CI base image
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
IMAGE="git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas/ci-base"
|
|
||||||
VERSION_TAG="deps-$(date +%Y%m%d-%H%M)-${GITHUB_SHA::8}"
|
|
||||||
|
|
||||||
echo "=== Building CI base image (tags: latest, ${VERSION_TAG}) ==="
|
|
||||||
docker build --progress=plain \
|
|
||||||
-f infra/docker/ci.Dockerfile \
|
|
||||||
-t "${IMAGE}:latest" \
|
|
||||||
-t "${IMAGE}:${VERSION_TAG}" \
|
|
||||||
.
|
|
||||||
echo "✅ Image built successfully"
|
|
||||||
|
|
||||||
echo "=== Pushing ${VERSION_TAG} ==="
|
|
||||||
docker push "${IMAGE}:${VERSION_TAG}"
|
|
||||||
echo "=== Pushing latest ==="
|
|
||||||
docker push "${IMAGE}:latest"
|
|
||||||
echo "✅ Pushed to Gitea Registry"
|
|
||||||
|
|
||||||
- name: Verify image
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
IMAGE="git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas/ci-base:latest"
|
|
||||||
echo "=== Verifying pinned deps in fresh image ==="
|
|
||||||
docker run --rm "${IMAGE}" /opt/xiaoxia-ci-venv/bin/python -c \
|
|
||||||
"import httpcore, h2, numpy, httpx; print('VERSIONS:', httpcore.__version__, h2.__version__, numpy.__version__, httpx.__version__)"
|
|
||||||
|
|
||||||
- name: Notify result
|
|
||||||
if: always()
|
|
||||||
continue-on-error: true
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
if [ "${{ job.status }}" = "success" ]; then
|
|
||||||
NOTIFY_MODE=success JOB_NAME="CI Base Image Build" python3 scripts/ci_notify.py
|
|
||||||
else
|
|
||||||
NOTIFY_MODE=failure JOB_NAME="CI Base Image Build" python3 scripts/ci_notify.py
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Cleanup
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
IMAGE="git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas/ci-base"
|
|
||||||
docker rmi "${IMAGE}:latest" 2>/dev/null || true
|
|
||||||
echo "Cleanup done"
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
name: CI Canary Check
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '*/30 * * * *'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
canary:
|
|
||||||
runs-on: ci-l2
|
|
||||||
timeout-minutes: 10
|
|
||||||
steps:
|
|
||||||
- name: Canary (runner -> docker -> network -> gitea)
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
echo "== runner/container basic =="
|
|
||||||
date; hostname; whoami
|
|
||||||
echo "== gitea api reachability =="
|
|
||||||
code=$(curl -s -o /tmp/v.json -w '%{http_code}' -m 15 "$GITHUB_API_URL/version")
|
|
||||||
echo "gitea api http_code=$code"
|
|
||||||
[ "$code" = "200" ] || { echo "::error::Gitea API unreachable, http_code=$code"; exit 1; }
|
|
||||||
cat /tmp/v.json; echo
|
|
||||||
echo "== external egress =="
|
|
||||||
ext=$(curl -s -o /dev/null -w '%{http_code}' -m 15 https://www.baidu.com || echo 000)
|
|
||||||
echo "external http_code=$ext"
|
|
||||||
echo "== gitea domain resolves NOT to loopback =="
|
|
||||||
set -o pipefail
|
|
||||||
ip=$(getent hosts git.xiaoxiajianji.com | awk '{print $1}' | head -1)
|
|
||||||
echo "git.xiaoxiajianji.com -> $ip"
|
|
||||||
if [ -z "$ip" ]; then
|
|
||||||
echo "::error::DNS resolution failed, git.xiaoxiajianji.com unresolvable"; exit 1
|
|
||||||
fi
|
|
||||||
if [ "$ip" = "127.0.0.1" ] || [ "$ip" = "::1" ]; then
|
|
||||||
echo "::error::Gitea domain resolves to loopback inside job container (hosts/DNS leak)"; exit 1
|
|
||||||
fi
|
|
||||||
echo "CANARY OK"
|
|
||||||
- name: Notify failure
|
|
||||||
if: failure()
|
|
||||||
env:
|
|
||||||
CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
if [ -n "$CI_NOTIFY_WEBHOOK" ]; then
|
|
||||||
MSG="🚨 CI 金丝雀失败：runner->docker->网络->Gitea 链路异常，时间 $(date '+%Y-%m-%d %H:%M:%S')，请立即检查构建服务器"
|
|
||||||
python3 - "$CI_NOTIFY_WEBHOOK" "$MSG" <<'PY'
|
|
||||||
import json,sys,urllib.request
|
|
||||||
hook,msg=sys.argv[1],sys.argv[2]
|
|
||||||
data=json.dumps({"msg_type":"text","content":{"text":msg}}).encode()
|
|
||||||
urllib.request.urlopen(urllib.request.Request(hook,data=data,headers={"Content-Type":"application/json"}),timeout=10)
|
|
||||||
PY
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,78 +0,0 @@
|
|||||||
name: CI Failure Monitor
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '0 */6 * * *' # 每6小时检查一次
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
days:
|
|
||||||
description: '统计最近N天的失败'
|
|
||||||
required: false
|
|
||||||
default: '7'
|
|
||||||
fail_threshold:
|
|
||||||
description: '失败次数阈值'
|
|
||||||
required: false
|
|
||||||
default: '3'
|
|
||||||
fail_rate_threshold:
|
|
||||||
description: '失败率阈值(%)'
|
|
||||||
required: false
|
|
||||||
default: '30'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
monitor:
|
|
||||||
name: CI重复失败检测
|
|
||||||
runs-on: ci-l2
|
|
||||||
timeout-minutes: 10
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
|
|
||||||
| bash
|
|
||||||
|
|
||||||
- name: Record job start time
|
|
||||||
shell: sh
|
|
||||||
run: bash scripts/ci/step_timer_start.sh
|
|
||||||
|
|
||||||
- name: Run failure detection
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITEA_API_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
|
|
||||||
GITEA_URL: https://git.xiaoxiajianji.com
|
|
||||||
GITEA_REPO: xiaoxia/xiaoxia-saas
|
|
||||||
CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
|
|
||||||
FAIL_CHECK_DAYS: ${{ inputs.days || 7 }}
|
|
||||||
FAIL_THRESHOLD: ${{ inputs.fail_threshold || 3 }}
|
|
||||||
FAIL_RATE_THRESHOLD: ${{ inputs.fail_rate_threshold || 30 }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
python3 scripts/ci/ci_repeated_failure_detector.py
|
|
||||||
EXIT_CODE=$?
|
|
||||||
echo "检测完成，退出码: $EXIT_CODE"
|
|
||||||
# 0=无异常, 1=有警告, 2=有严重问题
|
|
||||||
# 监控脚本永远不fail，避免告警风暴
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
- name: Job duration summary
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
run: bash scripts/ci/step_timer_end.sh
|
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
name: CI Health Daily Report
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '0 1 * * *' # UTC 01:00 = 北京时间 09:00
|
|
||||||
workflow_dispatch:
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
jobs:
|
|
||||||
ci-health-report:
|
|
||||||
name: CI健康度每日巡检
|
|
||||||
runs-on: ci-l2
|
|
||||||
timeout-minutes: 15
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
python3 - <<'PY'
|
|
||||||
import io, os, tarfile, time, urllib.request, urllib.error
|
|
||||||
url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
|
|
||||||
request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
|
|
||||||
last_err = None
|
|
||||||
for attempt in range(5):
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(request, timeout=120) as response:
|
|
||||||
archive = response.read()
|
|
||||||
break
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
last_err = e
|
|
||||||
if e.code >= 500 and attempt < 4:
|
|
||||||
wait = 2 ** attempt
|
|
||||||
print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
|
||||||
time.sleep(wait)
|
|
||||||
continue
|
|
||||||
raise
|
|
||||||
except Exception as e:
|
|
||||||
last_err = e
|
|
||||||
if attempt < 4:
|
|
||||||
wait = 2 ** attempt
|
|
||||||
print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
|
||||||
time.sleep(wait)
|
|
||||||
continue
|
|
||||||
raise
|
|
||||||
else:
|
|
||||||
raise last_err
|
|
||||||
with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
|
|
||||||
root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
|
|
||||||
for member in tar.getmembers():
|
|
||||||
name = member.name
|
|
||||||
if name == root_prefix[:-1]:
|
|
||||||
continue
|
|
||||||
if name.startswith(root_prefix):
|
|
||||||
member.name = name[len(root_prefix):]
|
|
||||||
if member.name:
|
|
||||||
tar.extract(member, '.')
|
|
||||||
PY
|
|
||||||
|
|
||||||
- name: Generate CI Dashboard HTML
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
echo "=== 生成 CI 健康度 HTML 看板 ==="
|
|
||||||
echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
|
|
||||||
echo ""
|
|
||||||
python3 scripts/ci/ci_dashboard.py --days 7 --html --html-output ci_dashboard.html
|
|
||||||
EXIT_CODE=$?
|
|
||||||
if [ $EXIT_CODE -eq 0 ] && [ -f ci_dashboard.html ]; then
|
|
||||||
HTML_SIZE=$(wc -c < ci_dashboard.html)
|
|
||||||
echo ""
|
|
||||||
echo "✅ HTML 看板生成成功 (${HTML_SIZE} bytes)"
|
|
||||||
echo "路径: $(pwd)/ci_dashboard.html"
|
|
||||||
# 输出文件内容前几行，方便在 Actions 日志中确认
|
|
||||||
echo ""
|
|
||||||
echo "--- 看板预览 (前 5 行) ---"
|
|
||||||
head -5 ci_dashboard.html
|
|
||||||
echo "...（完整内容见产物文件）"
|
|
||||||
else
|
|
||||||
echo "❌ HTML 看板生成失败 (exit code: $EXIT_CODE)"
|
|
||||||
fi
|
|
||||||
echo ""
|
|
||||||
# 永远成功，看板生成失败不影响主流程
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
- name: Run CI health check and report
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ github.token }}
|
|
||||||
CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
echo "=== CI健康度每日巡检 ==="
|
|
||||||
echo "时间: $(date '+%Y-%m-%d %H:%M:%S')"
|
|
||||||
echo ""
|
|
||||||
python3 scripts/ci/ci_health_report.py --limit 30
|
|
||||||
EXIT_CODE=$?
|
|
||||||
echo ""
|
|
||||||
echo "巡检完成 (exit code: $EXIT_CODE)"
|
|
||||||
# 永远成功，不影响CI状态（通知失败不应该标红）
|
|
||||||
exit 0
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,52 +0,0 @@
|
|||||||
name: CI Trigger Monitor
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '*/10 * * * *' # 每10分钟检查一次（与pr-auto-scan同步降频）
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
stale_threshold:
|
|
||||||
description: 'CI未触发告警阈值（分钟）'
|
|
||||||
required: false
|
|
||||||
default: '10'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
monitor:
|
|
||||||
name: Monitor CI Trigger Reliability
|
|
||||||
runs-on: ci-l2
|
|
||||||
timeout-minutes: 5
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" | bash
|
|
||||||
|
|
||||||
- name: Check CI trigger status for all open PRs
|
|
||||||
env:
|
|
||||||
GITEA_API_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
|
|
||||||
GITEA_URL: https://git.xiaoxiajianji.com
|
|
||||||
GITEA_REPO: xiaoxia/xiaoxia-saas
|
|
||||||
CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
|
|
||||||
STALE_THRESHOLD_MIN: ${{ inputs.stale_threshold || 5 }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
python3 scripts/ci_trigger_monitor.py
|
|
||||||
# 监控脚本永远不fail，避免告警风暴
|
|
||||||
exit 0
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
name: AI Code Review
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
types:
|
|
||||||
- opened
|
|
||||||
- synchronize
|
|
||||||
- reopened
|
|
||||||
|
|
||||||
# 同一个 PR 只跑一个 review，新的取消旧的
|
|
||||||
concurrency:
|
|
||||||
group: code-review-${{ gitea.repository }}-${{ gitea.event.pull_request.number }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
code-review:
|
|
||||||
name: AI Code Review
|
|
||||||
runs-on: ci-l2
|
|
||||||
# 跳过草稿 PR
|
|
||||||
if: ${{ !gitea.event.pull_request.draft }}
|
|
||||||
|
|
||||||
steps:
|
|
||||||
# actions/checkout 由 runner 在宿主机层面处理，不受容器网络影响
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" | bash
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
# 确保 python3-pip 可用（兼容不同基础镜像）
|
|
||||||
if ! python3 -m pip --version >/dev/null 2>&1; then
|
|
||||||
apt-get update -qq && apt-get install -y -qq python3-pip python3-venv >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
# 部分镜像 ensurepip 方式兜底
|
|
||||||
if ! python3 -m pip --version >/dev/null 2>&1; then
|
|
||||||
python3 -m ensurepip --upgrade 2>/dev/null || curl -sS https://bootstrap.pypa.io/get-pip.py | python3
|
|
||||||
fi
|
|
||||||
python3 -m pip install --upgrade pip
|
|
||||||
python3 -m pip install requests
|
|
||||||
|
|
||||||
- name: Run AI Code Review
|
|
||||||
env:
|
|
||||||
# Gitea 配置（自动从运行环境获取）
|
|
||||||
GITEA_API_URL: ${{ gitea.server_url }}
|
|
||||||
GITEA_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
|
|
||||||
REPO_NAME: ${{ gitea.repository }}
|
|
||||||
PR_NUMBER: ${{ gitea.event.pull_request.number }}
|
|
||||||
PR_HEAD_SHA: ${{ gitea.event.pull_request.head.sha }}
|
|
||||||
# LLM 提供商: coze (扣子原生Bot) / openai (OpenAI兼容)
|
|
||||||
LLM_PROVIDER: "coze"
|
|
||||||
# 扣子模式配置（默认国内站 api.coze.cn）
|
|
||||||
LLM_BASE_URL: ${{ secrets.LLM_BASE_URL }}
|
|
||||||
LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
|
|
||||||
COZE_BOT_ID: ${{ secrets.COZE_BOT_ID }}
|
|
||||||
LLM_MODEL: ${{ secrets.LLM_MODEL }}
|
|
||||||
# 可选参数
|
|
||||||
MAX_DIFF_CHARS: "30000"
|
|
||||||
LLM_TIMEOUT: "120"
|
|
||||||
run: |
|
|
||||||
python3 scripts/ci_code_review.py
|
|
||||||
# 注意：脚本退出码决定job状态
|
|
||||||
# - 有阻塞级问题 → exit 1 → job失败 → 门禁拦截
|
|
||||||
# - 无阻塞级问题/LLM异常 → exit 0 → 通过（fail-open）
|
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
name: Daily Health Check
|
name: Daily Health Check
|
||||||
# 注意：使用 curl step_checkout.sh 方式以兼容 docker runner
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
@@ -13,7 +12,7 @@ jobs:
|
|||||||
# ── 1. 生产环境冒烟测试 ─────────────────────────────────────────────
|
# ── 1. 生产环境冒烟测试 ─────────────────────────────────────────────
|
||||||
production-smoke:
|
production-smoke:
|
||||||
name: Production Smoke Test
|
name: Production Smoke Test
|
||||||
runs-on: ci-l2
|
runs-on: saas
|
||||||
timeout-minutes: 8
|
timeout-minutes: 8
|
||||||
outputs:
|
outputs:
|
||||||
report: ${{ steps.smoke.outputs.report }}
|
report: ${{ steps.smoke.outputs.report }}
|
||||||
@@ -24,9 +23,47 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" \
|
set -eu
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
|
python3 - <<'PY'
|
||||||
| bash
|
import io, os, tarfile, time, urllib.request, urllib.error
|
||||||
|
url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
|
||||||
|
request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
|
||||||
|
last_err = None
|
||||||
|
for attempt in range(5):
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(request, timeout=120) as response:
|
||||||
|
archive = response.read()
|
||||||
|
break
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
last_err = e
|
||||||
|
if e.code >= 500 and attempt < 4:
|
||||||
|
wait = 2 ** attempt
|
||||||
|
print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
||||||
|
time.sleep(wait)
|
||||||
|
continue
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
last_err = e
|
||||||
|
if attempt < 4:
|
||||||
|
wait = 2 ** attempt
|
||||||
|
print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
||||||
|
time.sleep(wait)
|
||||||
|
continue
|
||||||
|
raise
|
||||||
|
else:
|
||||||
|
raise last_err
|
||||||
|
with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
|
||||||
|
root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
|
||||||
|
for member in tar.getmembers():
|
||||||
|
name = member.name
|
||||||
|
if name == root_prefix[:-1]:
|
||||||
|
continue
|
||||||
|
if name.startswith(root_prefix):
|
||||||
|
member.name = name[len(root_prefix):]
|
||||||
|
if member.name:
|
||||||
|
tar.extract(member, '.')
|
||||||
|
PY
|
||||||
|
|
||||||
- name: Production health check & smoke test
|
- name: Production health check & smoke test
|
||||||
id: smoke
|
id: smoke
|
||||||
shell: sh
|
shell: sh
|
||||||
@@ -69,25 +106,13 @@ jobs:
|
|||||||
echo "======================================"
|
echo "======================================"
|
||||||
exit $SMOKE_EXIT
|
exit $SMOKE_EXIT
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
# ── 2. Staging API 集成测试 ─────────────────────────────────────────
|
# ── 2. Staging API 集成测试 ─────────────────────────────────────────
|
||||||
staging-api-tests:
|
staging-api-tests:
|
||||||
name: Staging API Integration Tests
|
name: Staging API Integration Tests
|
||||||
runs-on: ci-l2
|
runs-on: saas
|
||||||
timeout-minutes: 10
|
timeout-minutes: 10
|
||||||
outputs:
|
outputs:
|
||||||
report: ${{ steps.report.outputs.report }}
|
report: ${{ steps.smoke.outputs.report }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
@@ -95,15 +120,50 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" \
|
set -eu
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
|
python3 - <<'PY'
|
||||||
| bash
|
import io, os, tarfile, time, urllib.request, urllib.error
|
||||||
|
url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
|
||||||
|
request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
|
||||||
|
last_err = None
|
||||||
|
for attempt in range(5):
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(request, timeout=120) as response:
|
||||||
|
archive = response.read()
|
||||||
|
break
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
last_err = e
|
||||||
|
if e.code >= 500 and attempt < 4:
|
||||||
|
wait = 2 ** attempt
|
||||||
|
print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
||||||
|
time.sleep(wait)
|
||||||
|
continue
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
last_err = e
|
||||||
|
if attempt < 4:
|
||||||
|
wait = 2 ** attempt
|
||||||
|
print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
||||||
|
time.sleep(wait)
|
||||||
|
continue
|
||||||
|
raise
|
||||||
|
else:
|
||||||
|
raise last_err
|
||||||
|
with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
|
||||||
|
root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
|
||||||
|
for member in tar.getmembers():
|
||||||
|
name = member.name
|
||||||
|
if name == root_prefix[:-1]:
|
||||||
|
continue
|
||||||
|
if name.startswith(root_prefix):
|
||||||
|
member.name = name[len(root_prefix):]
|
||||||
|
if member.name:
|
||||||
|
tar.extract(member, '.')
|
||||||
|
PY
|
||||||
|
|
||||||
- name: Run API smoke test on staging
|
- name: Run API smoke test on staging
|
||||||
id: smoke
|
id: smoke
|
||||||
shell: sh
|
shell: sh
|
||||||
env:
|
|
||||||
STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
|
|
||||||
STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
|
|
||||||
run: |
|
run: |
|
||||||
set +e
|
set +e
|
||||||
START_TIME=$(date +%s)
|
START_TIME=$(date +%s)
|
||||||
@@ -111,8 +171,8 @@ jobs:
|
|||||||
docker run --rm \
|
docker run --rm \
|
||||||
-e BASE_URL=https://staging-api.xiaoxiajianji.com \
|
-e BASE_URL=https://staging-api.xiaoxiajianji.com \
|
||||||
-e WEB_URL=https://staging.xiaoxiajianji.com \
|
-e WEB_URL=https://staging.xiaoxiajianji.com \
|
||||||
-e TEST_USER="$STAGING_TEST_USER" \
|
-e TEST_USER=18314979086@163.com \
|
||||||
-e TEST_PASSWORD="$STAGING_TEST_PASSWORD" \
|
-e TEST_PASSWORD=Ying1234 \
|
||||||
-e CLEANUP_ENABLED=1 \
|
-e CLEANUP_ENABLED=1 \
|
||||||
-e PERF_CHECK_ENABLED=1 \
|
-e PERF_CHECK_ENABLED=1 \
|
||||||
-e PERF_WARN_THRESHOLD_MS=500 \
|
-e PERF_WARN_THRESHOLD_MS=500 \
|
||||||
@@ -183,25 +243,13 @@ jobs:
|
|||||||
echo "report=FAIL" >> "${GITHUB_OUTPUT}"
|
echo "report=FAIL" >> "${GITHUB_OUTPUT}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
# ── 3. Staging 浏览器 E2E ──────────────────────────────────────────
|
# ── 3. Staging 浏览器 E2E ──────────────────────────────────────────
|
||||||
staging-e2e:
|
staging-e2e:
|
||||||
name: Staging Browser E2E
|
name: Staging Browser E2E
|
||||||
runs-on: ci-l2
|
runs-on: saas
|
||||||
timeout-minutes: 15
|
timeout-minutes: 15
|
||||||
outputs:
|
outputs:
|
||||||
report: ${{ steps.e2e.outputs.report }}
|
report: ${{ steps.smoke.outputs.report }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
@@ -209,9 +257,47 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" \
|
set -eu
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
|
python3 - <<'PY'
|
||||||
| bash
|
import io, os, tarfile, time, urllib.request, urllib.error
|
||||||
|
url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
|
||||||
|
request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
|
||||||
|
last_err = None
|
||||||
|
for attempt in range(5):
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(request, timeout=120) as response:
|
||||||
|
archive = response.read()
|
||||||
|
break
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
last_err = e
|
||||||
|
if e.code >= 500 and attempt < 4:
|
||||||
|
wait = 2 ** attempt
|
||||||
|
print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
||||||
|
time.sleep(wait)
|
||||||
|
continue
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
last_err = e
|
||||||
|
if attempt < 4:
|
||||||
|
wait = 2 ** attempt
|
||||||
|
print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
||||||
|
time.sleep(wait)
|
||||||
|
continue
|
||||||
|
raise
|
||||||
|
else:
|
||||||
|
raise last_err
|
||||||
|
with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
|
||||||
|
root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
|
||||||
|
for member in tar.getmembers():
|
||||||
|
name = member.name
|
||||||
|
if name == root_prefix[:-1]:
|
||||||
|
continue
|
||||||
|
if name.startswith(root_prefix):
|
||||||
|
member.name = name[len(root_prefix):]
|
||||||
|
if member.name:
|
||||||
|
tar.extract(member, '.')
|
||||||
|
PY
|
||||||
|
|
||||||
- name: Run Playwright E2E on staging
|
- name: Run Playwright E2E on staging
|
||||||
id: e2e
|
id: e2e
|
||||||
shell: sh
|
shell: sh
|
||||||
@@ -246,22 +332,10 @@ jobs:
|
|||||||
echo "=========================================="
|
echo "=========================================="
|
||||||
exit $EXIT_CODE
|
exit $EXIT_CODE
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
# ── 4. 性能基线巡检 ────────────────────────────────────────────────
|
# ── 4. 性能基线巡检 ────────────────────────────────────────────────
|
||||||
performance-check:
|
performance-check:
|
||||||
name: Performance Baseline Check
|
name: Performance Baseline Check
|
||||||
runs-on: ci-l2
|
runs-on: saas
|
||||||
timeout-minutes: 8
|
timeout-minutes: 8
|
||||||
outputs:
|
outputs:
|
||||||
report: ${{ steps.report.outputs.report }}
|
report: ${{ steps.report.outputs.report }}
|
||||||
@@ -270,9 +344,6 @@ jobs:
|
|||||||
- name: Run performance baseline checks
|
- name: Run performance baseline checks
|
||||||
id: perf
|
id: perf
|
||||||
shell: sh
|
shell: sh
|
||||||
env:
|
|
||||||
STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
|
|
||||||
STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
|
|
||||||
run: |
|
run: |
|
||||||
set +e
|
set +e
|
||||||
START_TIME=$(date +%s)
|
START_TIME=$(date +%s)
|
||||||
@@ -308,10 +379,9 @@ jobs:
|
|||||||
|
|
||||||
# 先登录获取 token
|
# 先登录获取 token
|
||||||
echo "--- 准备: 获取测试 Token ---"
|
echo "--- 准备: 获取测试 Token ---"
|
||||||
LOGIN_BODY="{\"email\":\"$STAGING_TEST_USER\",\"password\":\"$STAGING_TEST_PASSWORD\"}"
|
|
||||||
AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
|
AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "$LOGIN_BODY" \
|
-d '{"email":"18314979086@163.com","password":"Ying1234"}' \
|
||||||
"https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
|
"https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
|
||||||
--max-time 10 2>&1)
|
--max-time 10 2>&1)
|
||||||
AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
|
AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
|
||||||
@@ -341,7 +411,7 @@ jobs:
|
|||||||
# 构建 curl 命令
|
# 构建 curl 命令
|
||||||
CURL_ARGS="-s -o /dev/null -w '%{http_code} %{time_total}' --max-time 30"
|
CURL_ARGS="-s -o /dev/null -w '%{http_code} %{time_total}' --max-time 30"
|
||||||
if [ "$method" = "POST" ]; then
|
if [ "$method" = "POST" ]; then
|
||||||
CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d \"$LOGIN_BODY\""
|
CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d '{\"email\":\"18314979086@163.com\",\"password\":\"Ying1234\"}'"
|
||||||
fi
|
fi
|
||||||
if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
|
if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
|
||||||
CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
|
CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
|
||||||
@@ -389,9 +459,6 @@ jobs:
|
|||||||
- name: Generate performance report
|
- name: Generate performance report
|
||||||
id: report
|
id: report
|
||||||
shell: sh
|
shell: sh
|
||||||
env:
|
|
||||||
STAGING_TEST_USER: ${{ secrets.STAGING_TEST_USER }}
|
|
||||||
STAGING_TEST_PASSWORD: ${{ secrets.STAGING_TEST_PASSWORD }}
|
|
||||||
run: |
|
run: |
|
||||||
set +e
|
set +e
|
||||||
echo ""
|
echo ""
|
||||||
@@ -406,11 +473,10 @@ jobs:
|
|||||||
RESULTS=""
|
RESULTS=""
|
||||||
START_TIME=$(date +%s)
|
START_TIME=$(date +%s)
|
||||||
|
|
||||||
LOGIN_BODY="{\"email\":\"$STAGING_TEST_USER\",\"password\":\"$STAGING_TEST_PASSWORD\"}"
|
|
||||||
# 先登录获取 token
|
# 先登录获取 token
|
||||||
AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
|
AUTH_RESP=$(curl -s -w "\n%{http_code}" -X POST \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "$LOGIN_BODY" \
|
-d '{"email":"18314979086@163.com","password":"Ying1234"}' \
|
||||||
"https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
|
"https://staging-api.xiaoxiajianji.com/api/v1/auth/login" \
|
||||||
--max-time 10 2>&1)
|
--max-time 10 2>&1)
|
||||||
AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
|
AUTH_CODE=$(echo "$AUTH_RESP" | tail -1)
|
||||||
@@ -426,7 +492,7 @@ jobs:
|
|||||||
|
|
||||||
local CURL_ARGS="-s -o /dev/null -w '%{http_code} %{time_total}' --max-time 30"
|
local CURL_ARGS="-s -o /dev/null -w '%{http_code} %{time_total}' --max-time 30"
|
||||||
if [ "$method" = "POST" ]; then
|
if [ "$method" = "POST" ]; then
|
||||||
CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d \"$LOGIN_BODY\""
|
CURL_ARGS="$CURL_ARGS -X POST -H 'Content-Type: application/json' -d '{\"email\":\"18314979086@163.com\",\"password\":\"Ying1234\"}'"
|
||||||
fi
|
fi
|
||||||
if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
|
if [ -n "$TOKEN" ] && [ "$name" != "健康检查" ]; then
|
||||||
CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
|
CURL_ARGS="$CURL_ARGS -H 'Authorization: Bearer $TOKEN'"
|
||||||
@@ -514,22 +580,10 @@ jobs:
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
# ── 5. 每日巡检汇总报告 ────────────────────────────────────────────
|
# ── 5. 每日巡检汇总报告 ────────────────────────────────────────────
|
||||||
daily-report:
|
daily-report:
|
||||||
name: Daily Check Report
|
name: Daily Check Report
|
||||||
runs-on: ci-l2
|
runs-on: saas
|
||||||
timeout-minutes: 2
|
timeout-minutes: 2
|
||||||
if: always()
|
if: always()
|
||||||
needs:
|
needs:
|
||||||
@@ -602,15 +656,3 @@ jobs:
|
|||||||
# 不 exit 1，因为我们用了 always()，保持 report job 成功，
|
# 不 exit 1，因为我们用了 always()，保持 report job 成功，
|
||||||
# 但其他失败的 job 已经让整体流水线标记为失败
|
# 但其他失败的 job 已经让整体流水线标记为失败
|
||||||
fi
|
fi
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
name: Playwright Base Image Build
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
reason:
|
|
||||||
description: "触发原因"
|
|
||||||
required: false
|
|
||||||
default: "构建 playwright 基础镜像"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-playwright:
|
|
||||||
name: Build Playwright Base Image
|
|
||||||
runs-on: runtime-builder
|
|
||||||
timeout-minutes: 30
|
|
||||||
steps:
|
|
||||||
- name: Docker login to Gitea Registry
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITEA_REGISTRY_USER: xiaoxia
|
|
||||||
GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
for i in 1 2 3; do
|
|
||||||
echo "=== Docker login attempt $i/3 ==="
|
|
||||||
if printf '%s' "${GITEA_REGISTRY_TOKEN}" | docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" --password-stdin; then
|
|
||||||
echo "Docker login successful"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "Docker login failed (attempt $i/3), retrying in 5s..."
|
|
||||||
sleep 5
|
|
||||||
[ $i -eq 3 ] && exit 1
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Pull, retag and push Playwright image
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
OFFICIAL_IMAGE="mcr.microsoft.com/playwright:v1.45.0-jammy"
|
|
||||||
GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy"
|
|
||||||
|
|
||||||
echo "=== Pulling official Playwright image ==="
|
|
||||||
docker pull "${OFFICIAL_IMAGE}"
|
|
||||||
|
|
||||||
echo "=== Tagging ==="
|
|
||||||
docker tag "${OFFICIAL_IMAGE}" "${GITEA_IMAGE}"
|
|
||||||
|
|
||||||
echo "=== Pushing to Gitea Registry ==="
|
|
||||||
docker push "${GITEA_IMAGE}"
|
|
||||||
|
|
||||||
echo "Done: ${GITEA_IMAGE}"
|
|
||||||
|
|
||||||
- name: Cleanup
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
docker rmi "mcr.microsoft.com/playwright:v1.45.0-jammy" 2>/dev/null || true
|
|
||||||
docker rmi "git.xiaoxiajianji.com/xiaoxia/base/playwright:v1.45.0-jammy" 2>/dev/null || true
|
|
||||||
echo "Cleanup done"
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
name: PR Auto Scan
|
|
||||||
# 定时扫描所有open PR，对CI全绿的触发审批/合并
|
|
||||||
# 作为短作业模式的兜底，防止事件驱动遗漏
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
# - cron: "*/15 * * * *" # DISABLED: temporarily to stop failure spam (2026-09-02) # 每10分钟扫描一次（脚本自带240s墙钟上限，降频减负）
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
auto-scan:
|
|
||||||
name: Auto Scan Open PRs
|
|
||||||
runs-on: ci-check
|
|
||||||
timeout-minutes: 5
|
|
||||||
if: github.repository == 'xiaoxia/xiaoxia-saas'
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/pr_auto_scan.py?ref=develop" -o /tmp/pr_auto_scan.py
|
|
||||||
python3 /tmp/pr_auto_scan.py --help > /dev/null 2>&1 || {
|
|
||||||
# fallback: checkout
|
|
||||||
echo "使用checkout方式"
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=develop" | bash
|
|
||||||
}
|
|
||||||
|
|
||||||
- name: Scan and auto process PRs
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
REVIEW_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
|
|
||||||
MERGE_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
echo "=== 扫描所有open PR并自动处理 ==="
|
|
||||||
echo "时间: $(date)"
|
|
||||||
echo
|
|
||||||
|
|
||||||
python3 /tmp/pr_auto_scan.py --token "$REVIEW_TOKEN" --repo "$GITHUB_REPOSITORY" --base develop --approve --merge --dry-run false
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "✅ 扫描完成"
|
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "" || true
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
name: PR Automation
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
types: [synchronize, opened, ready_for_review, review_requested]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: pr-automation-${{ gitea.event.pull_request.number }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
auto-approve:
|
|
||||||
name: Auto Approve on CI Green
|
|
||||||
runs-on: ci-check
|
|
||||||
if: github.event_name == 'pull_request' && !github.event.pull_request.draft
|
|
||||||
timeout-minutes: 10 # 等待CI全绿+审批，需要充足时间
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" | bash
|
|
||||||
|
|
||||||
- name: "🔍 脚本语法自检"
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
ERROR=0
|
|
||||||
for f in scripts/ci/*.sh; do [ -f "$f" ] && bash -n "$f" 2>&1 || ERROR=$((ERROR+1)); done
|
|
||||||
for f in scripts/ci/*.py; do [ -f "$f" ] && python3 -m py_compile "$f" 2>&1 || ERROR=$((ERROR+1)); done
|
|
||||||
if [ "$ERROR" -ne 0 ]; then echo "❌ 语法自检失败 ($ERROR个)"; exit 1; fi
|
|
||||||
echo "✅ 脚本语法自检通过"
|
|
||||||
|
|
||||||
- name: Auto approve when CI passes
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
REVIEW_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
|
|
||||||
PR_NUMBER: ${{ github.event.pull_request.number }}
|
|
||||||
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
|
||||||
run: |
|
|
||||||
bash scripts/ci/auto_approve.sh
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
auto-merge:
|
|
||||||
name: Auto Merge on CI Green + Approved
|
|
||||||
runs-on: ci-check
|
|
||||||
if: github.event_name == 'pull_request' && !github.event.pull_request.draft && github.event.pull_request.base.ref == 'develop'
|
|
||||||
needs: [auto-approve] # 修复竞态：必须等审批完成后再尝试合并
|
|
||||||
timeout-minutes: 15 # 等待审批+CI就绪+合并，需要充足时间
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" | bash
|
|
||||||
|
|
||||||
- name: "🔍 脚本语法自检（防止脚本bug导致所有PR挂掉）"
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "=== CI脚本语法自检 ==="
|
|
||||||
ERROR=0
|
|
||||||
for f in scripts/ci/*.sh; do
|
|
||||||
[ -f "$f" ] || continue
|
|
||||||
if ! bash -n "$f" 2>&1; then
|
|
||||||
echo "FAIL: $f"
|
|
||||||
ERROR=1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
for f in scripts/ci/*.py; do
|
|
||||||
[ -f "$f" ] || continue
|
|
||||||
if ! python3 -m py_compile "$f" 2>&1; then
|
|
||||||
echo "FAIL: $f"
|
|
||||||
ERROR=1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ "$ERROR" -ne 0 ]; then
|
|
||||||
echo "❌ 脚本语法自检失败"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "✅ 所有CI脚本语法自检通过"
|
|
||||||
|
|
||||||
- name: Auto merge when CI passes and approved
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
MERGE_TOKEN: ${{ secrets.REVIEW_GITEA_TOKEN }}
|
|
||||||
PR_NUMBER: ${{ github.event.pull_request.number }}
|
|
||||||
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
|
|
||||||
BASE_REF: ${{ github.event.pull_request.base.ref }}
|
|
||||||
run: |
|
|
||||||
bash scripts/ci/auto_merge.sh
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
name: Preview Cleanup
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
types:
|
|
||||||
- closed
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- develop
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
pull-requests: write
|
|
||||||
jobs:
|
|
||||||
cleanup-preview:
|
|
||||||
name: Cleanup Preview Environment
|
|
||||||
runs-on: runtime-builder
|
|
||||||
timeout-minutes: 10
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
python3 - <<'PY'
|
|
||||||
import io, os, tarfile, time, urllib.request, urllib.error
|
|
||||||
url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
|
|
||||||
request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
|
|
||||||
last_err = None
|
|
||||||
for attempt in range(5):
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(request, timeout=120) as response:
|
|
||||||
archive = response.read()
|
|
||||||
break
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
last_err = e
|
|
||||||
if e.code >= 500 and attempt < 4:
|
|
||||||
wait = 2 ** attempt
|
|
||||||
print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
|
||||||
time.sleep(wait)
|
|
||||||
continue
|
|
||||||
raise
|
|
||||||
except Exception as e:
|
|
||||||
last_err = e
|
|
||||||
if attempt < 4:
|
|
||||||
wait = 2 ** attempt
|
|
||||||
print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
|
||||||
time.sleep(wait)
|
|
||||||
continue
|
|
||||||
raise
|
|
||||||
else:
|
|
||||||
raise last_err
|
|
||||||
with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
|
|
||||||
root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
|
|
||||||
for member in tar.getmembers():
|
|
||||||
name = member.name
|
|
||||||
if name == root_prefix[:-1]:
|
|
||||||
continue
|
|
||||||
if name.startswith(root_prefix):
|
|
||||||
member.name = name[len(root_prefix):]
|
|
||||||
if member.name:
|
|
||||||
tar.extract(member, '.')
|
|
||||||
PY
|
|
||||||
|
|
||||||
- name: Extract PR number
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
# 优先从event payload中读取（兼容所有PR事件类型）
|
|
||||||
if [ -n "${GITHUB_EVENT_PATH:-}" ] && [ -f "$GITHUB_EVENT_PATH" ]; then
|
|
||||||
PR_NUMBER=$(python3 -c "import json,sys; print(json.load(sys.stdin).get('number',''))" < "$GITHUB_EVENT_PATH")
|
|
||||||
fi
|
|
||||||
# fallback: 从GITHUB_REF中提取
|
|
||||||
if [ -z "${PR_NUMBER:-}" ]; then
|
|
||||||
PR_NUMBER=$(echo "$GITHUB_REF" | sed -n 's|refs/pull/\([0-9]*\)/.*|\1|p')
|
|
||||||
fi
|
|
||||||
# 再fallback: 兼容纯数字ref
|
|
||||||
if [ -z "${PR_NUMBER:-}" ] || ! echo "$PR_NUMBER" | grep -qE '^[0-9]+$'; then
|
|
||||||
echo "WARNING: Could not extract PR number cleanly, using raw ref suffix"
|
|
||||||
PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
|
|
||||||
fi
|
|
||||||
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
|
|
||||||
echo "PR number: $PR_NUMBER"
|
|
||||||
echo "Preview dir: /var/www/preview/pr-${PR_NUMBER}"
|
|
||||||
|
|
||||||
- name: Install SSH client
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
# 先检查是否已存在ssh
|
|
||||||
if command -v ssh >/dev/null 2>&1 && command -v ssh-keyscan >/dev/null 2>&1; then
|
|
||||||
echo "SSH client already available: $(ssh -V 2>&1)"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
# 尝试多种包管理器安装
|
|
||||||
if command -v apk >/dev/null 2>&1; then
|
|
||||||
apk add --no-cache openssh-client >/dev/null 2>&1
|
|
||||||
echo "openssh-client installed via apk"
|
|
||||||
elif command -v apt-get >/dev/null 2>&1; then
|
|
||||||
apt-get update -qq && apt-get install -y -qq openssh-client >/dev/null 2>&1
|
|
||||||
echo "openssh-client installed via apt-get"
|
|
||||||
elif command -v yum >/dev/null 2>&1; then
|
|
||||||
yum install -y openssh-clients >/dev/null 2>&1
|
|
||||||
echo "openssh-client installed via yum"
|
|
||||||
elif command -v dnf >/dev/null 2>&1; then
|
|
||||||
dnf install -y openssh-clients >/dev/null 2>&1
|
|
||||||
echo "openssh-client installed via dnf"
|
|
||||||
else
|
|
||||||
echo "ERROR: No package manager found and ssh not pre-installed"
|
|
||||||
which ssh 2>/dev/null || echo " ssh: not found"
|
|
||||||
which ssh-keyscan 2>/dev/null || echo " ssh-keyscan: not found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Remove preview directory from server
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
PREVIEW_SSH_HOST: ${{ secrets.PREVIEW_SSH_HOST }}
|
|
||||||
PREVIEW_SSH_USER: ${{ secrets.PREVIEW_SSH_USER }}
|
|
||||||
PREVIEW_SSH_PORT: ${{ secrets.PREVIEW_SSH_PORT }}
|
|
||||||
PREVIEW_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
|
|
||||||
run: |
|
|
||||||
set -eux
|
|
||||||
preview_host="${PREVIEW_SSH_HOST:-47.98.113.167}"
|
|
||||||
preview_user="${PREVIEW_SSH_USER:-deploy}"
|
|
||||||
preview_port="${PREVIEW_SSH_PORT:-22222}"
|
|
||||||
preview_dir="/var/www/preview/pr-${PR_NUMBER}"
|
|
||||||
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
|
|
||||||
# 查找可用的SSH密钥（优先用 secret 里专门为 preview 配置的 key）
|
|
||||||
key_path=""
|
|
||||||
if [ -n "${PREVIEW_SSH_KEY:-}" ]; then
|
|
||||||
key_path="$HOME/.ssh/id_ed25519"
|
|
||||||
printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path"
|
|
||||||
chmod 600 "$key_path"
|
|
||||||
echo "Using key from PREVIEW_SSH_KEY secret"
|
|
||||||
elif [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
|
|
||||||
key_path="/root/.ssh/xiaoxia_runtime_builder"
|
|
||||||
echo "Using key: $key_path (builder key)"
|
|
||||||
elif [ -f "$HOME/.ssh/xiaoxia_runtime_builder" ]; then
|
|
||||||
key_path="$HOME/.ssh/xiaoxia_runtime_builder"
|
|
||||||
echo "Using key: $key_path (home key)"
|
|
||||||
else
|
|
||||||
echo "ERROR: No SSH key available"
|
|
||||||
ls -la ~/.ssh/ 2>/dev/null || true
|
|
||||||
ls -la /root/.ssh/ 2>/dev/null || true
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
ssh-keyscan -p "$preview_port" -H "$preview_host" >> ~/.ssh/known_hosts 2>/dev/null
|
|
||||||
echo "SSH keyscan done"
|
|
||||||
|
|
||||||
# 测试SSH连接
|
|
||||||
ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" "echo SSH_CONNECTION_OK && hostname"
|
|
||||||
echo "SSH connection verified"
|
|
||||||
|
|
||||||
# 检查目录是否存在
|
|
||||||
DIR_EXISTS=$(ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" \
|
|
||||||
"if [ -d '${preview_dir}' ]; then echo 'yes'; else echo 'no'; fi")
|
|
||||||
|
|
||||||
if [ "$DIR_EXISTS" = "yes" ]; then
|
|
||||||
echo "Removing preview directory: ${preview_dir}"
|
|
||||||
ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" \
|
|
||||||
"rm -rf ${preview_dir} && echo 'Preview directory removed successfully'"
|
|
||||||
echo "Cleanup completed: ${preview_dir}"
|
|
||||||
else
|
|
||||||
echo "Preview directory does not exist: ${preview_dir}, nothing to clean up"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Comment cleanup notice on PR
|
|
||||||
if: success()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
# 从event payload读取PR号（最可靠）
|
|
||||||
if [ -n "${GITHUB_EVENT_PATH:-}" ] && [ -f "$GITHUB_EVENT_PATH" ]; then
|
|
||||||
PR_NUMBER=$(python3 -c "import json,sys; print(json.load(sys.stdin).get('number',''))" < "$GITHUB_EVENT_PATH")
|
|
||||||
else
|
|
||||||
PR_NUMBER=$(echo "$GITHUB_REF" | sed -n 's|refs/pull/\([0-9]*\)/.*|\1|p')
|
|
||||||
fi
|
|
||||||
export PR_NUMBER
|
|
||||||
|
|
||||||
COMMENT_BODY=$(python3 scripts/ci/preview_comment.py cleanup)
|
|
||||||
|
|
||||||
API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"
|
|
||||||
curl -s -X POST \
|
|
||||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$COMMENT_BODY" \
|
|
||||||
"$API_URL" \
|
|
||||||
> /dev/null
|
|
||||||
echo "Cleanup comment posted"
|
|
||||||
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
@@ -1,280 +0,0 @@
|
|||||||
name: Preview Deploy
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
types:
|
|
||||||
- opened
|
|
||||||
- synchronize
|
|
||||||
- reopened
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- develop
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
reason:
|
|
||||||
description: "触发原因"
|
|
||||||
required: false
|
|
||||||
default: "手动触发 - 预览环境补跑"
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
pull-requests: write
|
|
||||||
concurrency:
|
|
||||||
group: preview-deploy-${{ gitea.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
jobs:
|
|
||||||
deploy-preview:
|
|
||||||
name: Deploy Preview Environment
|
|
||||||
runs-on: runtime-builder
|
|
||||||
timeout-minutes: 20
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
python3 - <<'PY'
|
|
||||||
import io, os, tarfile, time, urllib.request, urllib.error
|
|
||||||
url = f"{os.environ['GITHUB_API_URL']}/repos/{os.environ['GITHUB_REPOSITORY']}/archive/{os.environ['GITHUB_SHA']}.tar.gz"
|
|
||||||
request = urllib.request.Request(url, headers={"Authorization": f"token {os.environ['GITHUB_TOKEN']}"})
|
|
||||||
last_err = None
|
|
||||||
for attempt in range(5):
|
|
||||||
try:
|
|
||||||
with urllib.request.urlopen(request, timeout=120) as response:
|
|
||||||
archive = response.read()
|
|
||||||
break
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
last_err = e
|
|
||||||
if e.code >= 500 and attempt < 4:
|
|
||||||
wait = 2 ** attempt
|
|
||||||
print(f"Checkout HTTP {e.code}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
|
||||||
time.sleep(wait)
|
|
||||||
continue
|
|
||||||
raise
|
|
||||||
except Exception as e:
|
|
||||||
last_err = e
|
|
||||||
if attempt < 4:
|
|
||||||
wait = 2 ** attempt
|
|
||||||
print(f"Checkout error: {e}, retrying in {wait}s (attempt {attempt+1}/5)...")
|
|
||||||
time.sleep(wait)
|
|
||||||
continue
|
|
||||||
raise
|
|
||||||
else:
|
|
||||||
raise last_err
|
|
||||||
with tarfile.open(fileobj=io.BytesIO(archive), mode='r:gz') as tar:
|
|
||||||
root_prefix = tar.getmembers()[0].name.split('/', 1)[0] + '/'
|
|
||||||
for member in tar.getmembers():
|
|
||||||
name = member.name
|
|
||||||
if name == root_prefix[:-1]:
|
|
||||||
continue
|
|
||||||
if name.startswith(root_prefix):
|
|
||||||
member.name = name[len(root_prefix):]
|
|
||||||
if member.name:
|
|
||||||
tar.extract(member, '.')
|
|
||||||
PY
|
|
||||||
|
|
||||||
- name: Record job start time
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
echo "JOB_START_TIME=$(date +%s)" >> $GITHUB_ENV
|
|
||||||
echo "Job started at $(date)"
|
|
||||||
|
|
||||||
- name: Extract PR number
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
|
|
||||||
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
|
|
||||||
echo "PR number: $PR_NUMBER"
|
|
||||||
echo "PREVIEW_URL=https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com" >> $GITHUB_ENV
|
|
||||||
echo "Preview URL: https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com"
|
|
||||||
|
|
||||||
- name: Build frontend
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
cd apps/web
|
|
||||||
|
|
||||||
# Install dependencies with retry
|
|
||||||
for i in 1 2 3; do
|
|
||||||
npm ci --registry=https://registry.npmmirror.com --no-audit --no-fund && break
|
|
||||||
echo "npm install failed, retry $i/3..."
|
|
||||||
[ $i -eq 3 ] && exit 1
|
|
||||||
rm -rf node_modules
|
|
||||||
sleep 5
|
|
||||||
done
|
|
||||||
|
|
||||||
# TypeScript check
|
|
||||||
echo "=== TypeScript check ==="
|
|
||||||
./node_modules/.bin/tsc --noEmit
|
|
||||||
|
|
||||||
# Vite build
|
|
||||||
echo "=== Vite build ==="
|
|
||||||
export VITE_API_URL=https://staging-api.xiaoxiajianji.com
|
|
||||||
./node_modules/.bin/vite build
|
|
||||||
|
|
||||||
echo "=== Build completed ==="
|
|
||||||
ls -la dist/
|
|
||||||
|
|
||||||
- name: Install SSH client and rsync
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
if command -v apk >/dev/null 2>&1; then
|
|
||||||
apk add --no-cache openssh-client rsync >/dev/null 2>&1
|
|
||||||
elif command -v apt-get >/dev/null 2>&1; then
|
|
||||||
apt-get update -qq && apt-get install -y -qq openssh-client rsync >/dev/null 2>&1
|
|
||||||
elif command -v yum >/dev/null 2>&1; then
|
|
||||||
yum install -y openssh-clients rsync >/dev/null 2>&1
|
|
||||||
else
|
|
||||||
echo "ERROR: No package manager found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "openssh-client and rsync installed"
|
|
||||||
|
|
||||||
- name: Deploy preview to server
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
PREVIEW_SSH_HOST: ${{ secrets.PREVIEW_SSH_HOST }}
|
|
||||||
PREVIEW_SSH_USER: ${{ secrets.PREVIEW_SSH_USER }}
|
|
||||||
PREVIEW_SSH_PORT: ${{ secrets.PREVIEW_SSH_PORT }}
|
|
||||||
PREVIEW_SSH_KEY: ${{ secrets.PREVIEW_SSH_KEY }}
|
|
||||||
run: |
|
|
||||||
set -eux
|
|
||||||
preview_host="${PREVIEW_SSH_HOST:-47.98.113.167}"
|
|
||||||
preview_user="${PREVIEW_SSH_USER:-root}"
|
|
||||||
preview_port="${PREVIEW_SSH_PORT:-22222}"
|
|
||||||
preview_dir="/var/www/preview/pr-${PR_NUMBER}"
|
|
||||||
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
|
|
||||||
# 查找可用的SSH密钥（优先用 secret 里专门为 preview 配置的 key）
|
|
||||||
key_path=""
|
|
||||||
if [ -n "${PREVIEW_SSH_KEY:-}" ]; then
|
|
||||||
key_path="$HOME/.ssh/id_ed25519"
|
|
||||||
printf '%s\n' "$PREVIEW_SSH_KEY" > "$key_path"
|
|
||||||
chmod 600 "$key_path"
|
|
||||||
echo "Using key from PREVIEW_SSH_KEY secret"
|
|
||||||
elif [ -f /root/.ssh/xiaoxia_runtime_builder ]; then
|
|
||||||
key_path="/root/.ssh/xiaoxia_runtime_builder"
|
|
||||||
echo "Using key: $key_path (builder key)"
|
|
||||||
elif [ -f "$HOME/.ssh/xiaoxia_runtime_builder" ]; then
|
|
||||||
key_path="$HOME/.ssh/xiaoxia_runtime_builder"
|
|
||||||
echo "Using key: $key_path (home key)"
|
|
||||||
else
|
|
||||||
echo "ERROR: No SSH key available"
|
|
||||||
ls -la ~/.ssh/ 2>/dev/null || true
|
|
||||||
ls -la /root/.ssh/ 2>/dev/null || true
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# SSH密钥完整性自检
|
|
||||||
if ! ssh-keygen -y -f "$key_path" > /dev/null 2>&1; then
|
|
||||||
echo "ERROR: SSH密钥损坏（private key contents do not match public）"
|
|
||||||
echo "请检查 PREVIEW_SSH_KEY secret 中的私钥是否完整正确"
|
|
||||||
echo "私钥文件大小: $(wc -c < "$key_path") 字节"
|
|
||||||
head -2 "$key_path"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "SSH key integrity check passed"
|
|
||||||
|
|
||||||
ssh-keyscan -p "$preview_port" -H "$preview_host" >> ~/.ssh/known_hosts 2>/dev/null
|
|
||||||
echo "SSH keyscan done"
|
|
||||||
|
|
||||||
# 测试SSH连接
|
|
||||||
ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" "echo SSH_CONNECTION_OK && hostname"
|
|
||||||
echo "SSH connection verified"
|
|
||||||
|
|
||||||
# 创建预览目录并上传文件
|
|
||||||
ssh -p "$preview_port" -i "$key_path" -o StrictHostKeyChecking=no "${preview_user}@${preview_host}" \
|
|
||||||
"mkdir -p ${preview_dir} && echo 'Preview directory created: ${preview_dir}'"
|
|
||||||
|
|
||||||
# 使用rsync上传dist目录内容
|
|
||||||
rsync -avz --delete -e "ssh -p ${preview_port} -i ${key_path} -o StrictHostKeyChecking=no" \
|
|
||||||
apps/web/dist/ \
|
|
||||||
"${preview_user}@${preview_host}:${preview_dir}/"
|
|
||||||
|
|
||||||
echo "Preview deployed to: ${preview_dir}"
|
|
||||||
echo "Preview URL: https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com"
|
|
||||||
|
|
||||||
- name: Comment preview link on PR
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
|
|
||||||
PREVIEW_URL="https://pr-${PR_NUMBER}.preview.xiaoxiajianji.com"
|
|
||||||
export PR_NUMBER PREVIEW_URL
|
|
||||||
|
|
||||||
COMMENT_BODY=$(python3 scripts/ci/preview_comment.py deploy)
|
|
||||||
|
|
||||||
API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"
|
|
||||||
|
|
||||||
EXISTING_COMMENT_ID=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" "$API_URL" | python3 -c "
|
|
||||||
import sys, json
|
|
||||||
try:
|
|
||||||
for c in json.load(sys.stdin):
|
|
||||||
if '预览环境已部署' in c.get('body', ''):
|
|
||||||
print(c['id'])
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
")
|
|
||||||
|
|
||||||
if [ -n "$EXISTING_COMMENT_ID" ]; then
|
|
||||||
curl -s -X PATCH \
|
|
||||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$COMMENT_BODY" \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/issues/comments/${EXISTING_COMMENT_ID}" \
|
|
||||||
> /dev/null
|
|
||||||
echo "Comment updated"
|
|
||||||
else
|
|
||||||
curl -s -X POST \
|
|
||||||
-H "Authorization: token ${GITHUB_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$COMMENT_BODY" \
|
|
||||||
"$API_URL" \
|
|
||||||
> /dev/null
|
|
||||||
echo "Comment posted"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Job duration summary
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set +eu
|
|
||||||
if [ -n "$JOB_START_TIME" ]; then
|
|
||||||
END_TIME=$(date +%s)
|
|
||||||
DURATION=$((END_TIME - JOB_START_TIME))
|
|
||||||
MINS=$((DURATION / 60))
|
|
||||||
SECS=$((DURATION % 60))
|
|
||||||
echo "JOB_DURATION_SECONDS=$DURATION" >> $GITHUB_ENV
|
|
||||||
echo "=== Job Duration: ${MINS}m${SECS}s ==="
|
|
||||||
else
|
|
||||||
echo "JOB_DURATION_SECONDS=0" >> $GITHUB_ENV
|
|
||||||
echo "=== Job Duration: unknown ==="
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Notify on failure
|
|
||||||
continue-on-error: true
|
|
||||||
if: failure()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
CI_NOTIFY_WEBHOOK: ${{ secrets.CI_NOTIFY_WEBHOOK }}
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
NOTIFY_MODE=failure JOB_NAME="Deploy Preview Environment" python3 scripts/ci_notify.py
|
|
||||||
- name: Report CI trace
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
AGENTLOOP_LICENSE_KEY: ${{ secrets.AGENTLOOP_LICENSE_KEY }}
|
|
||||||
run: |
|
|
||||||
STATUS="ok"
|
|
||||||
[ ${{ job.status }} = "success" ] || STATUS="error"
|
|
||||||
START_TIME=""
|
|
||||||
[ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time)
|
|
||||||
python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true
|
|
||||||
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
name: Worker Base Image Build
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
- main
|
|
||||||
paths:
|
|
||||||
- 'requirements-base.txt'
|
|
||||||
- 'requirements.txt'
|
|
||||||
- 'requirements-worker.txt'
|
|
||||||
- 'infra/docker/worker-base.Dockerfile'
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-worker-base:
|
|
||||||
name: Build Worker Base Image
|
|
||||||
runs-on: runtime-builder
|
|
||||||
timeout-minutes: 45
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
|
||||||
run: |
|
|
||||||
curl -sH "Authorization: token $GITHUB_TOKEN" \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/raw/scripts/ci/step_checkout.sh?ref=${GITHUB_SHA}" \
|
|
||||||
| bash
|
|
||||||
|
|
||||||
- name: Docker login to Registry
|
|
||||||
shell: sh
|
|
||||||
env:
|
|
||||||
ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
|
|
||||||
ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
|
|
||||||
GITEA_REGISTRY_USER: xiaoxia
|
|
||||||
GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
for i in 1 2 3; do
|
|
||||||
echo "=== Docker login 尝试 $i/3 ==="
|
|
||||||
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
|
|
||||||
&& docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
|
|
||||||
echo "✅ Docker login successful"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "❌ Docker login 失败（尝试 $i/3），5s 后重试..."
|
|
||||||
sleep 5
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Build and push Worker base image
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
set -eu
|
|
||||||
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
|
|
||||||
GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/saas-worker-base:latest"
|
|
||||||
|
|
||||||
echo "=== Building Worker base image ==="
|
|
||||||
|
|
||||||
# 使用普通 docker build（单平台不需要 buildx）
|
|
||||||
docker build \
|
|
||||||
-f infra/docker/worker-base.Dockerfile \
|
|
||||||
-t "${ACR_IMAGE}" \
|
|
||||||
.
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "✅ Image built successfully"
|
|
||||||
|
|
||||||
# 推送到 ACR
|
|
||||||
echo "=== Pushing to ACR ==="
|
|
||||||
docker push "${ACR_IMAGE}"
|
|
||||||
echo "✅ Pushed to ACR"
|
|
||||||
|
|
||||||
# 打标签并推送到 Gitea Packages 作为备份
|
|
||||||
echo "=== Pushing to Gitea Packages ==="
|
|
||||||
docker tag "${ACR_IMAGE}" "${GITEA_IMAGE}"
|
|
||||||
docker push "${GITEA_IMAGE}" || echo "⚠️ Gitea Packages push failed (non-fatal)"
|
|
||||||
echo "✅ Gitea backup push completed"
|
|
||||||
|
|
||||||
- name: Cleanup
|
|
||||||
if: always()
|
|
||||||
shell: sh
|
|
||||||
run: |
|
|
||||||
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
|
|
||||||
docker rmi "${ACR_IMAGE}" 2>/dev/null || true
|
|
||||||
docker image prune -f 2>/dev/null || true
|
|
||||||
echo "Cleanup done"
|
|
||||||
-11
@@ -24,11 +24,6 @@ ruff_cache/
|
|||||||
.env.production
|
.env.production
|
||||||
.env.staging
|
.env.staging
|
||||||
!.env.example
|
!.env.example
|
||||||
# 配置模板不受忽略规则限制
|
|
||||||
!deploy/configs/.env.staging
|
|
||||||
!deploy/configs/.env.production
|
|
||||||
# 渲染后的 env 文件包含真实密钥，绝不能提交
|
|
||||||
.env.rendered
|
|
||||||
|
|
||||||
# OS / editor
|
# OS / editor
|
||||||
.DS_Store
|
.DS_Store
|
||||||
@@ -54,9 +49,3 @@ build/
|
|||||||
tracker_tasks.json
|
tracker_tasks.json
|
||||||
|
|
||||||
frontend-v21-ui-prototype-final.html
|
frontend-v21-ui-prototype-final.html
|
||||||
|
|
||||||
!.vscode/
|
|
||||||
!.vscode/settings.json
|
|
||||||
.vscode/extensions.json
|
|
||||||
.coverage
|
|
||||||
.env.current
|
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
repos:
|
|
||||||
- repo: https://github.com/psf/black
|
|
||||||
rev: 26.5.1
|
|
||||||
hooks:
|
|
||||||
- id: black
|
|
||||||
language_version: python3.12
|
|
||||||
|
|
||||||
- repo: https://github.com/pycqa/isort
|
|
||||||
rev: 8.0.1
|
|
||||||
hooks:
|
|
||||||
- id: isort
|
|
||||||
args: ["--profile", "black"]
|
|
||||||
language_version: python3.12
|
|
||||||
|
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
|
||||||
rev: v0.14.0
|
|
||||||
hooks:
|
|
||||||
- id: ruff
|
|
||||||
args: [--fix]
|
|
||||||
language_version: python3.12
|
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
|
||||||
rev: v4.0.0-alpha.11
|
|
||||||
hooks:
|
|
||||||
- id: prettier
|
|
||||||
name: prettier (frontend)
|
|
||||||
files: ^apps/web/.*\.(ts|tsx|js|jsx|css|scss|less|json|html|md|yaml|yml)$
|
|
||||||
additional_dependencies:
|
|
||||||
- prettier@3.4.2
|
|
||||||
Vendored
-49
@@ -1,49 +0,0 @@
|
|||||||
{
|
|
||||||
"[python]": {
|
|
||||||
"editor.defaultFormatter": "ms-python.black-formatter",
|
|
||||||
"editor.formatOnSave": true,
|
|
||||||
"editor.codeActionsOnSave": {
|
|
||||||
"source.organizeImports": "explicit"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"[typescript]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[typescriptreact]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[javascript]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[javascriptreact]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[json]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[css]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[scss]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[html]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"[markdown]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"editor.formatOnSave": true
|
|
||||||
},
|
|
||||||
"prettier.requireConfig": true,
|
|
||||||
"isort.args": ["--profile", "black"],
|
|
||||||
"python.linting.ruffEnabled": true,
|
|
||||||
"python.analysis.typeCheckingMode": "basic"
|
|
||||||
}
|
|
||||||
@@ -1,222 +0,0 @@
|
|||||||
---
|
|
||||||
AIGC:
|
|
||||||
Label: "1"
|
|
||||||
ContentProducer: 001191110102MACQD9K64018705
|
|
||||||
ProduceID: 15868733686388_0/project_7655981463858544923-files/docs/1197_preview_generation_proposal.md
|
|
||||||
ReservedCode1: ""
|
|
||||||
ContentPropagator: 001191110102MACQD9K64028705
|
|
||||||
PropagateID: 15868733686388#1785468313901
|
|
||||||
ReservedCode2: ""
|
|
||||||
---
|
|
||||||
# #1197 预览生成接口方案评估
|
|
||||||
|
|
||||||
## 背景
|
|
||||||
|
|
||||||
智能剪辑「一键生成」流程中，第3步预览生成当前被跳过，直接进入下一步。需要实现真正的预览生成功能，让用户在正式生成前能看到效果预览。
|
|
||||||
|
|
||||||
## 现状分析
|
|
||||||
|
|
||||||
### 现有生成链路
|
|
||||||
|
|
||||||
```
|
|
||||||
API 触发生成 → GenerationTask入库 → Celery异步任务 → UnifiedRenderService渲染 → OSS上传 → 更新状态
|
|
||||||
```
|
|
||||||
|
|
||||||
**关键节点：**
|
|
||||||
1. **API层**：`POST /generation-tasks` 或 `POST /templates/{id}/generate` 触发生成
|
|
||||||
2. **任务调度**：Celery task `worker.generate_video`
|
|
||||||
3. **渲染引擎**：`UnifiedRenderService`（统一渲染引擎，已接入9个效果层）
|
|
||||||
4. **输出配置**：默认 720p (1280x720)，支持 `resolution` 字段自定义
|
|
||||||
5. **产物存储**：`GeneratedVideo` 表记录，OSS 存储视频文件
|
|
||||||
|
|
||||||
### 已有可复用能力
|
|
||||||
|
|
||||||
| 能力 | 位置 | 是否可复用 |
|
|
||||||
|------|------|-----------|
|
|
||||||
| 任务创建与状态管理 | `GenerationTask` + `CreateGenerationTaskUseCase` | ✅ 是 |
|
|
||||||
| 素材下载与预处理 | `_download_video_assets` / `_download_voice_asset` | ✅ 是 |
|
|
||||||
| 统一渲染引擎 | `UnifiedRenderService` | ✅ 是 |
|
|
||||||
| 分辨率配置 | `resolution` 字段已支持 | ✅ 是 |
|
|
||||||
| 混音与后处理 | `_render_video` 内流程 | ✅ 是 |
|
|
||||||
| OSS 上传与查重 | `_upload_and_dedup` | ✅ 是 |
|
|
||||||
| 进度追踪 | `append_log` / `progress` 字段 | ✅ 是 |
|
|
||||||
|
|
||||||
## 方案对比
|
|
||||||
|
|
||||||
### 方案A：复用现有生成链路 + is_preview 标记（推荐）
|
|
||||||
|
|
||||||
**思路**：在现有 GenerationTask 上加 `is_preview` 标记，预览生成走完整链路但参数降级。
|
|
||||||
|
|
||||||
**改动点：**
|
|
||||||
1. **数据模型**：`GenerationTask` 加 `is_preview: bool` 字段（默认 false）；`GeneratedVideo` 加 `is_preview: bool`
|
|
||||||
2. **API 层**：生成接口加 `is_preview` 参数，预览任务不计入配额
|
|
||||||
3. **渲染参数**：预览模式下自动调整
|
|
||||||
- 分辨率：480p (854x480)
|
|
||||||
- 时长：限制前 15 秒（或模板第一个片段）
|
|
||||||
- 码率：降低至 1.5Mbps（正式 4Mbps）
|
|
||||||
- 效果层：跳过高级转场/粒子特效等耗时效果
|
|
||||||
4. **任务调度**：预览任务走低优先级队列（或复用现有队列，标记优先级）
|
|
||||||
5. **前端对接**：预览生成结果带 `is_preview=true` 标记，前端展示"预览"标签
|
|
||||||
|
|
||||||
**优点：**
|
|
||||||
- 代码复用率 90%+，改动最小
|
|
||||||
- 与正式生成逻辑一致，预览效果真实可信
|
|
||||||
- 进度查询、结果展示等功能直接复用
|
|
||||||
- 后续可平滑升级：预览满意后一键转正式生成
|
|
||||||
|
|
||||||
**缺点：**
|
|
||||||
- 需要区分预览和正式任务，避免数据混淆
|
|
||||||
- 预览任务和正式任务竞争同一队列资源（可后续优化为独立队列）
|
|
||||||
|
|
||||||
**开发量估算**：2-3 天
|
|
||||||
- 数据模型 + 迁移：0.5 天
|
|
||||||
- API 层改造：0.5 天
|
|
||||||
- 渲染参数降级：1 天
|
|
||||||
- 测试 + 联调：1 天
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 方案B：新建独立预览接口 + 轻量渲染逻辑
|
|
||||||
|
|
||||||
**思路**：新建独立的预览生成接口，使用简化的渲染逻辑（如只拼接素材+基础配音，跳过大部分效果）。
|
|
||||||
|
|
||||||
**改动点：**
|
|
||||||
1. 新增 `PreviewTask` 数据模型
|
|
||||||
2. 新增 `POST /api/v1/preview/generate` 接口
|
|
||||||
3. 新增独立的 Celery task `worker.generate_preview`
|
|
||||||
4. 简化渲染流程：只做素材裁剪+拼接+配音，跳过转场/滤镜/字幕特效等
|
|
||||||
|
|
||||||
**优点：**
|
|
||||||
- 完全隔离，不影响正式生成链路
|
|
||||||
- 可以做极致优化，预览生成速度快
|
|
||||||
- 数据模型清晰，不会混淆
|
|
||||||
|
|
||||||
**缺点：**
|
|
||||||
- 代码重复率高，两套生成逻辑维护成本翻倍
|
|
||||||
- 预览效果与正式生成可能不一致（效果层差异）
|
|
||||||
- 前端需要对接两套接口
|
|
||||||
- 无法从预览升级为正式生成（需重新走完整流程）
|
|
||||||
|
|
||||||
**开发量估算**：4-5 天
|
|
||||||
- 数据模型 + 接口：1 天
|
|
||||||
- 简化渲染逻辑：2 天
|
|
||||||
- 测试 + 联调：1-2 天
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 方案C：图片预览（首帧/关键帧截图）
|
|
||||||
|
|
||||||
**思路**：不生成视频，只生成几张关键帧的预览图片。
|
|
||||||
|
|
||||||
**优点：**
|
|
||||||
- 生成速度极快（秒级）
|
|
||||||
- 资源消耗小
|
|
||||||
|
|
||||||
**缺点：**
|
|
||||||
- 预览效果差，用户无法感知动态效果
|
|
||||||
- 无法验证配音、转场、节奏等时间维度的效果
|
|
||||||
- 用户体验不佳，不如"真预览"有说服力
|
|
||||||
|
|
||||||
**开发量估算**：1-2 天
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 推荐方案：方案A（复用现有生成链路）
|
|
||||||
|
|
||||||
### 核心理由
|
|
||||||
|
|
||||||
1. **效果保真**：预览和正式生成用同一套渲染引擎，效果一致，用户信任度高
|
|
||||||
2. **开发效率**：90% 代码复用，2-3 天可上线
|
|
||||||
3. **可扩展性强**：后续可加「预览转正式」「低分辨率快速预览」等增强功能
|
|
||||||
4. **维护成本低**：一套生成逻辑，bug 修复和新功能同时生效
|
|
||||||
|
|
||||||
### 详细设计
|
|
||||||
|
|
||||||
#### 1. 数据模型变更
|
|
||||||
|
|
||||||
```python
|
|
||||||
# GenerationTask 新增字段
|
|
||||||
is_preview: bool = False
|
|
||||||
"""是否为预览生成"""
|
|
||||||
|
|
||||||
preview_of: str = ""
|
|
||||||
"""预览对应的正式任务 ID（或反向关联）"""
|
|
||||||
|
|
||||||
# GeneratedVideo 新增字段
|
|
||||||
is_preview: bool = False
|
|
||||||
"""是否为预览视频"""
|
|
||||||
```
|
|
||||||
|
|
||||||
**迁移**：alembic 新增 migration，两个表各加 1-2 个字段。
|
|
||||||
|
|
||||||
#### 2. API 层
|
|
||||||
|
|
||||||
```
|
|
||||||
POST /api/v1/generation-tasks
|
|
||||||
Body 增加 is_preview: bool = false
|
|
||||||
|
|
||||||
POST /api/v1/templates/{id}/generate
|
|
||||||
Query 增加 is_preview: bool = false
|
|
||||||
```
|
|
||||||
|
|
||||||
**配额处理**：预览生成不计入用户配额，不占用生成次数限制。
|
|
||||||
|
|
||||||
#### 3. 渲染参数降级
|
|
||||||
|
|
||||||
| 参数 | 正式生成 | 预览生成 |
|
|
||||||
|------|---------|---------|
|
|
||||||
| 分辨率 | 720p (1280x720) | 480p (854x480) |
|
|
||||||
| 码率 | 4 Mbps | 1.5 Mbps |
|
|
||||||
| 时长 | 完整时长 | 前 15 秒（或第一段） |
|
|
||||||
| 帧率 | 30 fps | 24 fps |
|
|
||||||
| 转场效果 | 完整转场 | 仅淡入淡出（或简单切） |
|
|
||||||
| 特效滤镜 | 全部启用 | 跳过粒子/光效等高级效果 |
|
|
||||||
| 字幕 | 完整渲染 | 正常渲染（字幕是核心信息） |
|
|
||||||
| 配音 | 完整混音 | 正常混音（配音是核心信息） |
|
|
||||||
|
|
||||||
**实现方式**：在 `_render_video` 或 UnifiedRenderService 入口处，根据 `is_preview` 标记调整渲染配置。
|
|
||||||
|
|
||||||
#### 4. 任务调度
|
|
||||||
|
|
||||||
- 初期复用现有队列，预览任务正常排队
|
|
||||||
- 后续如需优化，可拆分独立预览队列（低优先级）
|
|
||||||
- 预览任务可设置较短超时时间
|
|
||||||
|
|
||||||
#### 5. 前端对接
|
|
||||||
|
|
||||||
- 调用生成接口时传 `is_preview=true`
|
|
||||||
- 结果列表中预览视频带「预览」标签
|
|
||||||
- 预览满意后可一键「升级为正式生成」（重新触发全分辨率生成，可复用素材下载缓存）
|
|
||||||
|
|
||||||
### 实施步骤
|
|
||||||
|
|
||||||
**Phase 1（MVP，2天）：**
|
|
||||||
1. 数据模型 + 迁移
|
|
||||||
2. API 层支持 is_preview 参数
|
|
||||||
3. 渲染分辨率降级（480p）
|
|
||||||
4. 不计入配额
|
|
||||||
5. 基础测试
|
|
||||||
|
|
||||||
**Phase 2（优化，1-2天）：**
|
|
||||||
1. 时长限制（前15秒）
|
|
||||||
2. 效果层降级（跳高级效果）
|
|
||||||
3. 预览任务低优先级队列
|
|
||||||
4. 预览转正式生成功能
|
|
||||||
|
|
||||||
## 与前端对齐点
|
|
||||||
|
|
||||||
1. 预览生成的触发时机（第3步自动生成？用户点击才生成？）
|
|
||||||
2. 预览时长是固定15秒还是完整但低清？
|
|
||||||
3. 是否需要「预览转正式生成」功能
|
|
||||||
4. 预览视频的展示形态（和正式视频一样还是有特殊UI）
|
|
||||||
|
|
||||||
## 风险与注意事项
|
|
||||||
|
|
||||||
1. **数据混淆**：确保统计、计费、列表展示时正确区分预览和正式任务
|
|
||||||
2. **存储成本**：预览视频也占 OSS 空间，可设置自动清理（7天后自动删除）
|
|
||||||
3. **用户预期**：要明确告诉用户这是预览，效果和正式生成一致但清晰度低
|
|
||||||
4. **并发压力**：如果用户频繁生成预览，可能增加系统负载，需要限流
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
> 本内容由 Coze AI 生成，请遵循相关法律法规及《人工智能生成合成内容标识办法》使用与传播。
|
|
||||||
@@ -1,382 +0,0 @@
|
|||||||
# #1197 预览生成接口技术方案（v2）
|
|
||||||
|
|
||||||
> 更新说明：v2 新增「多版本预览生成」能力，支持一个模板生成多个不重复的预览视频，左侧列表展示，用户可挑选满意的版本转正式生成。
|
|
||||||
|
|
||||||
## 1. 背景与目标
|
|
||||||
|
|
||||||
**现状**：智能剪辑「一键生成」第3步预览生成被跳过，用户直接进入正式生成，缺少效果预览环节。
|
|
||||||
|
|
||||||
**目标**：
|
|
||||||
1. ✅ 实现真正的预览生成（低分辨率快速出片）
|
|
||||||
2. ✅ **支持生成 1~N 个不重复的预览版本**（默认 3 个），左侧列表展示
|
|
||||||
3. ✅ 预览满意后可一键转正式生成（复用素材下载缓存）
|
|
||||||
4. ✅ 不计入用户配额，不占用正式生成次数
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. 现有生成链路分析
|
|
||||||
|
|
||||||
### 2.1 链路总览
|
|
||||||
|
|
||||||
```
|
|
||||||
API 触发生成 → GenerationTask入库 → Celery异步任务
|
|
||||||
→ 下载素材 → 构建plan/clips → UnifiedRenderService渲染
|
|
||||||
→ 混音后处理 → OSS上传 + 查重 → 更新状态
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2.2 决定视频差异的变量
|
|
||||||
|
|
||||||
要做"多个不重复版本"，先分析哪些环节可以引入变化：
|
|
||||||
|
|
||||||
| 变量 | 当前行为 | 能否引入变化 | 影响程度 |
|
|
||||||
|------|---------|------------|---------|
|
|
||||||
| 素材选择 | 按 asset_ids 顺序全用 | ✅ 可随机选择子集/不同组合 | 大 |
|
|
||||||
| 素材排序 | 按 asset_ids 顺序 | ✅ 可 shuffle 重排 | 大 |
|
|
||||||
| 配音选择 | 固定 voice_library_id | ✅ 可选不同音色 | 中 |
|
|
||||||
| 标题选择 | 固定 title_ids 或随机选 | ✅ 可选不同标题 | 中 |
|
|
||||||
| BGM | 固定 bgm_config | ✅ 可选不同BGM | 小 |
|
|
||||||
| 转场效果 | 模板固定 | ✅ 可随机化转场类型 | 小 |
|
|
||||||
| 播放速度 | 模板固定 | ✅ 可微调速度 | 小 |
|
|
||||||
| 分辨率/码率 | 固定 | ✅ 预览可降级 | 不影响内容 |
|
|
||||||
|
|
||||||
### 2.3 可复用能力
|
|
||||||
|
|
||||||
- 任务创建与状态管理：`GenerationTask` + `CreateGenerationTaskUseCase`
|
|
||||||
- 素材下载与预处理：`_download_all_assets`
|
|
||||||
- 统一渲染引擎：`UnifiedRenderService`
|
|
||||||
- 分辨率配置：`resolution` 字段已支持
|
|
||||||
- 批量任务：`batch_id` 字段已存在（可用于预览组）
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. 总体方案：复用现有链路 + 多变体引擎
|
|
||||||
|
|
||||||
**核心思路**：沿用 v1 的"复用现有生成链路 + is_preview 标记"方案，在此基础上增加「多版本生成」能力。
|
|
||||||
|
|
||||||
**架构**：
|
|
||||||
```
|
|
||||||
预览生成请求（count=N）
|
|
||||||
↓
|
|
||||||
创建预览批次（preview_batch）
|
|
||||||
↓
|
|
||||||
变体引擎生成 N 个变体参数（variation seed + 参数组合）
|
|
||||||
↓
|
|
||||||
为每个变体创建 1 个 GenerationTask（is_preview=true）
|
|
||||||
↓
|
|
||||||
N 个 Celery 任务并行执行（走现有生成链路，参数降级）
|
|
||||||
↓
|
|
||||||
N 个结果汇聚，前端左侧列表展示
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. 详细设计
|
|
||||||
|
|
||||||
### 4.1 数据模型变更
|
|
||||||
|
|
||||||
#### 4.1.1 GenerationTask 新增字段
|
|
||||||
|
|
||||||
```python
|
|
||||||
# 现有字段保留，新增：
|
|
||||||
is_preview: bool = False
|
|
||||||
"""是否为预览生成"""
|
|
||||||
|
|
||||||
preview_batch_id: str = ""
|
|
||||||
"""预览批次 ID（同批次的 N 个预览共享一个 batch）"""
|
|
||||||
|
|
||||||
variant_seed: int = 0
|
|
||||||
"""变体种子，用于控制随机化行为（素材选择、排序、转场等）"""
|
|
||||||
|
|
||||||
variant_params: dict = field(default_factory=dict)
|
|
||||||
"""变体参数快照（记录本次使用了哪些素材、标题、配音等，可追溯）
|
|
||||||
{
|
|
||||||
"asset_ids": [...], # 实际选用的素材子集
|
|
||||||
"title_id": "", # 选用的标题
|
|
||||||
"voice_id": "", # 选用的配音
|
|
||||||
"transition_style": "", # 转场风格
|
|
||||||
"bgm_track": "", # BGM 音轨
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 4.1.2 GeneratedVideo 新增字段
|
|
||||||
|
|
||||||
```python
|
|
||||||
is_preview: bool = False
|
|
||||||
"""是否为预览视频"""
|
|
||||||
|
|
||||||
preview_batch_id: str = ""
|
|
||||||
"""所属预览批次"""
|
|
||||||
|
|
||||||
variant_index: int = 0
|
|
||||||
"""在批次中的序号（0, 1, 2...）"""
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 4.1.3 迁移方案
|
|
||||||
|
|
||||||
alembic 新增 migration，两个表各加 4 个字段，默认值为空/false，无数据回填成本。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4.2 变体引擎（Variant Engine）
|
|
||||||
|
|
||||||
**核心组件**：根据 count 和 seed，生成 N 组互不相同的生成参数。
|
|
||||||
|
|
||||||
#### 4.2.1 变纬度设计
|
|
||||||
|
|
||||||
| 维度 | 策略 | 说明 |
|
|
||||||
|------|------|------|
|
|
||||||
| **素材子集选择** | 从素材池中随机选 M 个（M=min(素材数, 模板clip数*2)） | 版本差异最大的来源 |
|
|
||||||
| **素材排序** | 随机打乱顺序 | 影响叙事节奏 |
|
|
||||||
| **标题选择** | 从 title_ids 中随机选 1 个 | 影响文案内容 |
|
|
||||||
| **配音选择** | 从 voice_ids 中随机选 1 个（如有多个） | 影响听觉体验 |
|
|
||||||
| **转场风格** | 从预设转场池中随机选 1 种 | 影响视觉过渡 |
|
|
||||||
| **BGM 选择** | 从 bgm 列表中随机选 1 首（如有配置） | 影响氛围 |
|
|
||||||
|
|
||||||
#### 4.2.2 去重机制
|
|
||||||
|
|
||||||
- 同一批次内，变体参数必须两两不同（至少素材组合或排序不同）
|
|
||||||
- 使用 `variant_seed` 保证可复现（相同 seed → 相同变体）
|
|
||||||
- 如果素材数量不足导致无法生成 N 个不同版本，按实际能生成的数量返回
|
|
||||||
|
|
||||||
#### 4.2.3 接口设计
|
|
||||||
|
|
||||||
```python
|
|
||||||
def generate_variants(
|
|
||||||
count: int,
|
|
||||||
seed: int,
|
|
||||||
asset_pool: list[str], # 可用素材 ID 列表
|
|
||||||
title_pool: list[str] = [], # 可用标题 ID 列表
|
|
||||||
voice_pool: list[str] = [], # 可用配音 ID 列表
|
|
||||||
template_id: str = "",
|
|
||||||
) -> list[dict]:
|
|
||||||
"""
|
|
||||||
生成 count 组变体参数。
|
|
||||||
|
|
||||||
每组参数包含：asset_ids（选用的素材+排序）、title_id、voice_id、
|
|
||||||
transition_style 等，确保两两不同。
|
|
||||||
"""
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4.3 API 层设计
|
|
||||||
|
|
||||||
#### 4.3.1 预览生成接口
|
|
||||||
|
|
||||||
```
|
|
||||||
POST /api/v1/templates/{template_id}/generate-preview
|
|
||||||
```
|
|
||||||
|
|
||||||
**请求体**：
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"asset_library_id": "lib_xxx",
|
|
||||||
"asset_ids": ["asset_1", "asset_2", ...],
|
|
||||||
"title_ids": ["title_1", "title_2"],
|
|
||||||
"voice_ids": ["voice_1", "voice_2"],
|
|
||||||
"bgm_config": {},
|
|
||||||
"count": 3,
|
|
||||||
"seed": 0
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
| 参数 | 类型 | 必填 | 默认 | 说明 |
|
|
||||||
|------|------|------|------|------|
|
|
||||||
| template_id | path | ✅ | - | 模板 ID |
|
|
||||||
| asset_library_id | body | ✅ | - | 素材库 ID |
|
|
||||||
| asset_ids | body | ✅ | - | 素材池（从中选子集/排序） |
|
|
||||||
| title_ids | body | - | [] | 标题池（可选，不传则不用标题） |
|
|
||||||
| voice_ids | body | - | [] | 配音池（可选） |
|
|
||||||
| bgm_config | body | - | {} | BGM 配置 |
|
|
||||||
| count | body | - | 3 | 生成几个预览版本（1~10） |
|
|
||||||
| seed | body | - | 0 | 随机种子，0 表示随机 |
|
|
||||||
|
|
||||||
**响应**：
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"preview_batch_id": "pb_xxx",
|
|
||||||
"count": 3,
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"task_id": "gen_xxx_0",
|
|
||||||
"variant_index": 0,
|
|
||||||
"status": "processing"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"task_id": "gen_xxx_1",
|
|
||||||
"variant_index": 1,
|
|
||||||
"status": "processing"
|
|
||||||
},
|
|
||||||
...
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 4.3.2 预览批次查询接口
|
|
||||||
|
|
||||||
```
|
|
||||||
GET /api/v1/preview-batches/{batch_id}
|
|
||||||
```
|
|
||||||
|
|
||||||
返回批次内所有预览任务的状态、结果（已完成的带 video_url）。
|
|
||||||
|
|
||||||
**响应**：
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"preview_batch_id": "pb_xxx",
|
|
||||||
"count": 3,
|
|
||||||
"completed_count": 2,
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"task_id": "gen_xxx_0",
|
|
||||||
"variant_index": 0,
|
|
||||||
"status": "completed",
|
|
||||||
"video_url": "https://oss.xxx/preview/xxx.mp4",
|
|
||||||
"duration": 15.5,
|
|
||||||
"thumbnail_url": "https://oss.xxx/preview/xxx.jpg"
|
|
||||||
},
|
|
||||||
...
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 4.3.3 预览转正式生成
|
|
||||||
|
|
||||||
```
|
|
||||||
POST /api/v1/preview-batches/{batch_id}/tasks/{task_id}/promote
|
|
||||||
```
|
|
||||||
|
|
||||||
将某个预览版本升级为正式生成（复用素材缓存，重新全分辨率渲染）。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4.4 渲染参数降级
|
|
||||||
|
|
||||||
预览模式下自动调整以下参数：
|
|
||||||
|
|
||||||
| 参数 | 正式生成 | 预览生成 |
|
|
||||||
|------|---------|---------|
|
|
||||||
| 分辨率 | 720p (1280x720) | 480p (854x480) |
|
|
||||||
| 码率 | 4 Mbps | 1.5 Mbps |
|
|
||||||
| 帧率 | 30 fps | 24 fps |
|
|
||||||
| 时长 | 完整时长 | 前 15 秒（或第一段完整clip） |
|
|
||||||
| 转场效果 | 完整转场 | 仅淡入淡出 |
|
|
||||||
| 高级特效 | 全部启用 | 跳过粒子/光效等 |
|
|
||||||
| 字幕 | 完整渲染 | 正常渲染 |
|
|
||||||
| 配音 | 完整混音 | 正常混音 |
|
|
||||||
| 输出质量 | high | medium |
|
|
||||||
|
|
||||||
**实现位置**：`_render_video` 函数入口处，根据 `is_preview` 标记调整渲染配置。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4.5 任务调度
|
|
||||||
|
|
||||||
- **并行执行**：N 个预览任务并行提交到 Celery，不排队等待
|
|
||||||
- **低优先级**：预览任务走独立队列（`preview_queue`），不抢占正式生成资源
|
|
||||||
- **超时控制**：预览任务超时时间 5 分钟（正式 30 分钟）
|
|
||||||
- **自动清理**：预览视频 7 天后自动从 OSS 删除，任务记录标记为 archived
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. 前端对接要点
|
|
||||||
|
|
||||||
### 5.1 交互流程
|
|
||||||
|
|
||||||
```
|
|
||||||
第2步选素材 → 第3步点击"生成预览"
|
|
||||||
→ 显示 loading + 进度
|
|
||||||
→ 预览陆续完成，左侧列表逐张出现
|
|
||||||
→ 用户点击左侧不同版本，右侧预览区切换
|
|
||||||
→ 用户选中满意版本 → 点击"正式生成"
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5.2 需要对齐的接口
|
|
||||||
|
|
||||||
1. **预览创建**：`POST /templates/{id}/generate-preview`
|
|
||||||
2. **批次状态轮询**：`GET /preview-batches/{id}`（建议 2s 轮询，或走 SSE）
|
|
||||||
3. **预览转正式**：`POST /preview-batches/{id}/tasks/{task_id}/promote`
|
|
||||||
|
|
||||||
### 5.3 数据格式对齐
|
|
||||||
|
|
||||||
预览视频条目结构：
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"id": "gen_xxx",
|
|
||||||
"variant_index": 0,
|
|
||||||
"status": "completed",
|
|
||||||
"video_url": "https://...",
|
|
||||||
"duration": 15.5,
|
|
||||||
"file_size": 2850000,
|
|
||||||
"thumbnail_url": "https://...",
|
|
||||||
"is_preview": true
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. 配额与计费
|
|
||||||
|
|
||||||
- 预览生成**不计入**用户配额
|
|
||||||
- 同一模板 + 同一素材池，每天最多生成 3 次多版本预览（防滥用）
|
|
||||||
- 单个预览批次最多 10 个版本
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. 实施步骤
|
|
||||||
|
|
||||||
### Phase 1：单版本预览（MVP，2 天）
|
|
||||||
1. 数据模型 + 迁移（is_preview 字段）
|
|
||||||
2. API 层支持 is_preview 参数
|
|
||||||
3. 渲染分辨率降级（480p）
|
|
||||||
4. 不计入配额
|
|
||||||
5. 基础测试
|
|
||||||
|
|
||||||
### Phase 2：多版本预览（3 天）
|
|
||||||
1. 变体引擎实现（素材随机选择 + 排序 + 去重）
|
|
||||||
2. preview_batch 批次管理
|
|
||||||
3. 批量创建 N 个预览任务
|
|
||||||
4. 批次查询接口
|
|
||||||
5. 前端联调
|
|
||||||
|
|
||||||
### Phase 3：预览转正式 + 优化（2 天）
|
|
||||||
1. 预览转正式生成接口（promote）
|
|
||||||
2. 素材下载缓存复用
|
|
||||||
3. 独立预览队列（低优先级）
|
|
||||||
4. 自动清理机制
|
|
||||||
5. 完整测试 + 压测
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8. 风险与注意事项
|
|
||||||
|
|
||||||
| 风险 | 影响 | 应对 |
|
|
||||||
|------|------|------|
|
|
||||||
| 并发预览任务过多打满 worker | 正式生成被阻塞 | 独立预览队列 + 限流 |
|
|
||||||
| 变体生成的视频差异不够大 | 用户觉得"都一样" | 优先素材子集+排序差异，保证视觉差异 |
|
|
||||||
| 预览视频占用 OSS 存储 | 存储成本上升 | 7 天自动清理 + 低码率 |
|
|
||||||
| N 个版本同时下载重复素材 | 带宽浪费 | 批次内共享一次下载（Phase 3 优化） |
|
|
||||||
| 用户预期管理 | 以为预览就是最终效果 | 明确标注"预览版"，说明分辨率差异 |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. 开发量估算
|
|
||||||
|
|
||||||
| 阶段 | 后端 | 前端 | 合计 |
|
|
||||||
|------|------|------|------|
|
|
||||||
| Phase 1 单版本预览 | 2 天 | 1 天 | 3 天 |
|
|
||||||
| Phase 2 多版本预览 | 3 天 | 2 天 | 5 天 |
|
|
||||||
| Phase 3 转正式+优化 | 2 天 | 1 天 | 3 天 |
|
|
||||||
| **总计** | **7 天** | **4 天** | **~7 天（并行）** |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 10. 与 v1 方案的差异总结
|
|
||||||
|
|
||||||
1. **新增多版本能力**：从"生成1个预览"升级为"生成N个不重复预览"
|
|
||||||
2. **新增变体引擎**：负责素材选择/排序/配音/标题的随机化
|
|
||||||
3. **新增批次概念**：preview_batch 管理一组预览任务
|
|
||||||
4. **新增 promote 接口**：预览转正式生成
|
|
||||||
5. **独立队列**：预览不抢占正式生成资源
|
|
||||||
6. **开发量**：从 2-3 天增加到约 7 天（后端）
|
|
||||||
Executable → Regular
+4
-7
@@ -1,3 +1,4 @@
|
|||||||
|
import os
|
||||||
from logging.config import fileConfig
|
from logging.config import fileConfig
|
||||||
|
|
||||||
from sqlalchemy import engine_from_config, pool
|
from sqlalchemy import engine_from_config, pool
|
||||||
@@ -7,17 +8,13 @@ from alembic import context
|
|||||||
# Import your models' Base here
|
# Import your models' Base here
|
||||||
from packages.adapters.sqlalchemy_impl.models import Base
|
from packages.adapters.sqlalchemy_impl.models import Base
|
||||||
|
|
||||||
# 使用统一配置入口获取 database_url，而非直接读环境变量
|
|
||||||
from packages.config import get_shared_settings
|
|
||||||
|
|
||||||
# this is the Alembic Config object, which provides
|
# this is the Alembic Config object, which provides
|
||||||
# access to the values within the .ini file in use.
|
# access to the values within the .ini file in use.
|
||||||
config = context.config
|
config = context.config
|
||||||
|
|
||||||
# 从统一配置系统获取 database_url，确保与应用使用同一配置源
|
database_url = os.getenv("DATABASE_URL")
|
||||||
settings = get_shared_settings()
|
if database_url:
|
||||||
if settings.database_url:
|
config.set_main_option("sqlalchemy.url", database_url)
|
||||||
config.set_main_option("sqlalchemy.url", settings.database_url)
|
|
||||||
|
|
||||||
# Interpret the config file for Python logging.
|
# Interpret the config file for Python logging.
|
||||||
# This line sets up loggers basically.
|
# This line sets up loggers basically.
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
"""add result_count to edit_plans
|
|
||||||
|
|
||||||
Revision ID: 041_result_count
|
|
||||||
Revises: 040_playback_speed
|
|
||||||
Create Date: 2026-07-15 14:05:00.000000
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = "041_result_count"
|
|
||||||
down_revision = "040_playback_speed"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"edit_plans",
|
|
||||||
sa.Column("result_count", sa.Integer(), nullable=False, server_default="0"),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("edit_plans", "result_count")
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
"""add storage_key to assets
|
|
||||||
|
|
||||||
Revision ID: 042_storage_key
|
|
||||||
Revises: 041_result_count
|
|
||||||
Create Date: 2026-07-17 18:10:00.000000
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = "042_storage_key"
|
|
||||||
down_revision = "041_result_count"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"assets",
|
|
||||||
sa.Column("storage_key", sa.String(500), nullable=False, server_default=""),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("assets", "storage_key")
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
"""add updated_at to generation_tasks
|
|
||||||
|
|
||||||
Revision ID: 043_updated_at_generation_tasks
|
|
||||||
Revises: 042_storage_key
|
|
||||||
Create Date: 2026-07-18 19:30:00.000000
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = "043_updated_at_generation_tasks"
|
|
||||||
down_revision = "042_storage_key"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column(
|
|
||||||
"updated_at",
|
|
||||||
sa.DateTime,
|
|
||||||
nullable=False,
|
|
||||||
server_default=sa.func.now(),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("generation_tasks", "updated_at")
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
"""add user_id to generated_videos
|
|
||||||
|
|
||||||
Revision ID: 044_user_id_generated_videos
|
|
||||||
Revises: 043_updated_at_generation_tasks
|
|
||||||
Create Date: 2026-07-19 08:00:00.000000
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = "044_user_id_generated_videos"
|
|
||||||
down_revision = "043_updated_at_generation_tasks"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"generated_videos",
|
|
||||||
sa.Column(
|
|
||||||
"user_id",
|
|
||||||
sa.String(36),
|
|
||||||
nullable=False,
|
|
||||||
server_default="",
|
|
||||||
index=True,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("generated_videos", "user_id")
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
"""backfill user_id for generated_videos from generation_tasks
|
|
||||||
|
|
||||||
Revision ID: 045_backfill_user_id_generated_videos
|
|
||||||
Revises: 044_user_id_generated_videos
|
|
||||||
Create Date: 2026-07-19 10:50:00.000000
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = "045_backfill_user_id"
|
|
||||||
down_revision = "044_user_id_generated_videos"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# 回填 generated_videos.user_id：通过 generation_task_id 关联 generation_tasks 表
|
|
||||||
# 取 generation_tasks.created_by_user_id 作为 user_id
|
|
||||||
# 回填不到的（无关联task的兜底记录）保持空字符串
|
|
||||||
op.execute("""
|
|
||||||
UPDATE generated_videos gv
|
|
||||||
SET user_id = gt.created_by_user_id
|
|
||||||
FROM generation_tasks gt
|
|
||||||
WHERE gv.generation_task_id = gt.id
|
|
||||||
AND gv.user_id = ''
|
|
||||||
AND gt.created_by_user_id != ''
|
|
||||||
""")
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# 降级不做处理（无法精确区分哪些是回填的）
|
|
||||||
pass
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
"""add video_title to generation_tasks
|
|
||||||
|
|
||||||
Revision ID: 046_add_video_title_to_generation_tasks
|
|
||||||
Revises: 045_backfill_user_id_generated_videos
|
|
||||||
Create Date: 2026-07-19 11:20:00.000000
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision = "046_task_title"
|
|
||||||
down_revision = "045_backfill_user_id"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column(
|
|
||||||
"video_title",
|
|
||||||
sa.String(255),
|
|
||||||
nullable=False,
|
|
||||||
server_default="",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("generation_tasks", "video_title")
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
"""Phase 2 - 模板发布版本化：version字段 + 发布历史表
|
|
||||||
|
|
||||||
Revision ID: 047
|
|
||||||
Revises: 046
|
|
||||||
Create Date: 2026-07-20
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. edit_templates 加 version 字段（INT，默认1，每次发布+1）
|
|
||||||
2. 新建 edit_template_versions 表存发布历史快照，支持回滚
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "047_template_versioning"
|
|
||||||
down_revision = "046_task_title"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
|
|
||||||
# 1. edit_templates 加 version 字段
|
|
||||||
op.add_column(
|
|
||||||
"edit_templates",
|
|
||||||
sa.Column("version", sa.Integer, nullable=False, server_default="1"),
|
|
||||||
)
|
|
||||||
|
|
||||||
# 2. 新建 edit_template_versions 发布历史表
|
|
||||||
conn.execute(sa.text("""
|
|
||||||
CREATE TABLE IF NOT EXISTS edit_template_versions (
|
|
||||||
id VARCHAR(36) PRIMARY KEY,
|
|
||||||
template_id VARCHAR(32) NOT NULL,
|
|
||||||
version INTEGER NOT NULL,
|
|
||||||
name VARCHAR(200) NOT NULL DEFAULT '',
|
|
||||||
editing_mode VARCHAR(30) NOT NULL DEFAULT 'one_take',
|
|
||||||
config JSONB NOT NULL DEFAULT '{}',
|
|
||||||
clip_configs JSONB NOT NULL DEFAULT '[]',
|
|
||||||
change_note VARCHAR(500) NOT NULL DEFAULT '',
|
|
||||||
published_by VARCHAR(36) NOT NULL DEFAULT '',
|
|
||||||
created_at TIMESTAMP NOT NULL DEFAULT NOW()
|
|
||||||
)
|
|
||||||
"""))
|
|
||||||
|
|
||||||
conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"CREATE INDEX IF NOT EXISTS ix_edit_template_versions_template_id " "ON edit_template_versions(template_id)"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"CREATE UNIQUE INDEX IF NOT EXISTS ix_edit_template_versions_template_version "
|
|
||||||
"ON edit_template_versions(template_id, version)"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
|
|
||||||
conn.execute(sa.text("DROP TABLE IF EXISTS edit_template_versions"))
|
|
||||||
op.drop_column("edit_templates", "version")
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
"""Phase 3 - 清理 EditPlan 表冗余字段
|
|
||||||
|
|
||||||
Revision ID: 048
|
|
||||||
Revises: 047
|
|
||||||
Create Date: 2026-07-21
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. 删除 edit_plans.result_count 字段（剪辑计划独立功能遗留，模板草稿不用，
|
|
||||||
生成结果数由 generation_tasks.result_count 承载）
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "048_cleanup_result_count"
|
|
||||||
down_revision = "047_template_versioning"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# 删除 result_count 字段（剪辑计划独立功能遗留字段）
|
|
||||||
op.drop_column("edit_plans", "result_count")
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# 回滚：恢复 result_count 字段，默认值 0
|
|
||||||
op.add_column(
|
|
||||||
"edit_plans",
|
|
||||||
sa.Column(
|
|
||||||
"result_count",
|
|
||||||
sa.Integer,
|
|
||||||
nullable=False,
|
|
||||||
server_default="0",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
"""#558 - 微信登录：手机号绑定字段 + 验证码表
|
|
||||||
|
|
||||||
Revision ID: 049
|
|
||||||
Revises: 048
|
|
||||||
Create Date: 2026-07-21
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. users 表新增 phone_verified / binding_completed_at 字段（phone 字段已在 029 中添加）
|
|
||||||
2. users 表 phone 字段添加唯一索引（幂等）
|
|
||||||
3. 新建 verification_codes 表（统一管理邮箱+手机验证码）
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import context, op
|
|
||||||
|
|
||||||
revision = "049_wechat_login_phone"
|
|
||||||
down_revision = "048_cleanup_result_count"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def _column_exists(table: str, column: str) -> bool:
|
|
||||||
"""检查列是否已存在。离线模式下返回 False。"""
|
|
||||||
if context.is_offline_mode():
|
|
||||||
return False
|
|
||||||
conn = op.get_bind()
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text("SELECT 1 FROM information_schema.columns " "WHERE table_name = :table AND column_name = :column"),
|
|
||||||
{"table": table, "column": column},
|
|
||||||
)
|
|
||||||
return result.first() is not None
|
|
||||||
|
|
||||||
|
|
||||||
def _index_exists(index_name: str) -> bool:
|
|
||||||
"""检查索引是否已存在。离线模式下返回 False。"""
|
|
||||||
if context.is_offline_mode():
|
|
||||||
return False
|
|
||||||
conn = op.get_bind()
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text("SELECT 1 FROM pg_indexes WHERE indexname = :index_name"),
|
|
||||||
{"index_name": index_name},
|
|
||||||
)
|
|
||||||
return result.first() is not None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# 1. users 表新增手机号验证状态字段（幂等）
|
|
||||||
if not _column_exists("users", "phone_verified"):
|
|
||||||
op.add_column(
|
|
||||||
"users",
|
|
||||||
sa.Column(
|
|
||||||
"phone_verified",
|
|
||||||
sa.Boolean,
|
|
||||||
nullable=False,
|
|
||||||
server_default=sa.text("false"),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
if not _column_exists("users", "binding_completed_at"):
|
|
||||||
op.add_column(
|
|
||||||
"users",
|
|
||||||
sa.Column("binding_completed_at", sa.DateTime, nullable=True),
|
|
||||||
)
|
|
||||||
|
|
||||||
# 2. phone 字段唯一索引（幂等 - 029 加了字段但没加索引）
|
|
||||||
if not _index_exists("ix_users_phone"):
|
|
||||||
op.create_index("ix_users_phone", "users", ["phone"], unique=True)
|
|
||||||
|
|
||||||
# 3. verification_codes 表
|
|
||||||
op.create_table(
|
|
||||||
"verification_codes",
|
|
||||||
sa.Column("id", sa.String(36), primary_key=True),
|
|
||||||
sa.Column("recipient", sa.String(255), nullable=False, index=True),
|
|
||||||
sa.Column("code", sa.String(10), nullable=False),
|
|
||||||
sa.Column("code_type", sa.String(32), nullable=False, index=True),
|
|
||||||
sa.Column("expires_at", sa.DateTime, nullable=False),
|
|
||||||
sa.Column("used_at", sa.DateTime, nullable=True),
|
|
||||||
sa.Column("attempts", sa.Integer, nullable=False, server_default="0"),
|
|
||||||
sa.Column("created_at", sa.DateTime, nullable=False),
|
|
||||||
sa.Index(
|
|
||||||
"ix_verification_recipient_type",
|
|
||||||
"recipient",
|
|
||||||
"code_type",
|
|
||||||
"created_at",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_table("verification_codes")
|
|
||||||
if _index_exists("ix_users_phone"):
|
|
||||||
op.drop_index("ix_users_phone", table_name="users")
|
|
||||||
if _column_exists("users", "binding_completed_at"):
|
|
||||||
op.drop_column("users", "binding_completed_at")
|
|
||||||
if _column_exists("users", "phone_verified"):
|
|
||||||
op.drop_column("users", "phone_verified")
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
"""#P3-2 - 视频分享表 video_shares
|
|
||||||
|
|
||||||
Revision ID: 050
|
|
||||||
Revises: 049
|
|
||||||
Create Date: 2026-07-22
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. 新建 video_shares 表，支持视频匿名分享链接
|
|
||||||
2. share_token 唯一索引，用于公开分享URL
|
|
||||||
3. 支持密码保护、有效期、浏览/下载计数
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import context, op
|
|
||||||
|
|
||||||
revision = "050_video_shares"
|
|
||||||
down_revision = "049_wechat_login_phone"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
# 检查表是否已存在（幂等）
|
|
||||||
result = conn.execute(sa.text("SELECT to_regclass('public.video_shares')"))
|
|
||||||
if result.scalar() is not None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.create_table(
|
|
||||||
"video_shares",
|
|
||||||
sa.Column("id", sa.String(32), primary_key=True),
|
|
||||||
sa.Column("video_id", sa.String(32), nullable=False, index=True),
|
|
||||||
sa.Column("user_id", sa.String(32), nullable=False, index=True),
|
|
||||||
sa.Column("share_token", sa.String(16), nullable=False, unique=True),
|
|
||||||
sa.Column("password_hash", sa.String(255), nullable=True),
|
|
||||||
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=True),
|
|
||||||
sa.Column("view_count", sa.Integer, nullable=False, server_default="0"),
|
|
||||||
sa.Column("download_count", sa.Integer, nullable=False, server_default="0"),
|
|
||||||
sa.Column("is_active", sa.Boolean, nullable=False, server_default=sa.true()),
|
|
||||||
sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
|
|
||||||
sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_table("video_shares")
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
"""#632 - 一键生成输出分辨率可配置
|
|
||||||
|
|
||||||
Revision ID: 051
|
|
||||||
Revises: 050
|
|
||||||
Create Date: 2026-07-23
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. generation_tasks 表新增 resolution 字段，存储用户指定的输出分辨率（如 "1280x720"）
|
|
||||||
2. 为空时使用默认值（1280x720）
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import context, op
|
|
||||||
|
|
||||||
revision = "051_generation_task_resolution"
|
|
||||||
down_revision = "050_video_shares"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
# 检查列是否已存在（幂等）
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"SELECT column_name FROM information_schema.columns "
|
|
||||||
"WHERE table_name = 'generation_tasks' AND column_name = 'resolution'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if result.scalar() is not None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("resolution", sa.String(20), nullable=False, server_default=""),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"SELECT column_name FROM information_schema.columns "
|
|
||||||
"WHERE table_name = 'generation_tasks' AND column_name = 'resolution'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if result.scalar() is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.drop_column("generation_tasks", "resolution")
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
"""#642 - 生成任务新增 bgm_config 字段
|
|
||||||
|
|
||||||
Revision ID: 052_generation_task_bgm_config
|
|
||||||
Revises: 051_generation_task_resolution
|
|
||||||
Create Date: 2026-07-25
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. generation_tasks 表新增 bgm_config 字段（JSON类型），存储用户自定义BGM配置
|
|
||||||
2. 为空时使用默认空字典
|
|
||||||
|
|
||||||
背景：
|
|
||||||
#642 一键生成支持自定义BGM 功能在 SQLAlchemy 模型中加了 bgm_config 字段，
|
|
||||||
但遗漏了 alembic migration，导致 staging 环境数据库没有该列，
|
|
||||||
创建生成任务时直接 500。
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import context, op
|
|
||||||
|
|
||||||
revision = "052_generation_task_bgm_config"
|
|
||||||
down_revision = "051_generation_task_resolution"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
# 检查列是否已存在（幂等）
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"SELECT column_name FROM information_schema.columns "
|
|
||||||
"WHERE table_name = 'generation_tasks' AND column_name = 'bgm_config'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if result.scalar() is not None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column(
|
|
||||||
"bgm_config",
|
|
||||||
sa.JSON,
|
|
||||||
nullable=False,
|
|
||||||
server_default=sa.text("'{}'::json"),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
# 检查列是否存在（幂等）
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"SELECT column_name FROM information_schema.columns "
|
|
||||||
"WHERE table_name = 'generation_tasks' AND column_name = 'bgm_config'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if result.scalar() is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.drop_column("generation_tasks", "bgm_config")
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
"""#1197 - 预览生成：generation_tasks 表新增 is_preview 字段
|
|
||||||
|
|
||||||
Revision ID: 053
|
|
||||||
Revises: 052
|
|
||||||
Create Date: 2026-08-15
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. generation_tasks 表新增 is_preview 字段，标记是否为预览生成任务（低清 480p）
|
|
||||||
2. 默认 False，与现有正式生成任务兼容
|
|
||||||
3. 加索引以支持按预览/正式任务筛选
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import context, op
|
|
||||||
|
|
||||||
revision = "053_generation_task_is_preview"
|
|
||||||
down_revision = "052_generation_task_bgm_config"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
# 检查列是否已存在（幂等）
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"SELECT column_name FROM information_schema.columns "
|
|
||||||
"WHERE table_name = 'generation_tasks' AND column_name = 'is_preview'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if result.scalar() is not None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("is_preview", sa.Boolean, nullable=False, server_default=sa.text("false")),
|
|
||||||
)
|
|
||||||
# 加索引
|
|
||||||
op.create_index(
|
|
||||||
"ix_generation_tasks_is_preview",
|
|
||||||
"generation_tasks",
|
|
||||||
["is_preview"],
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"SELECT column_name FROM information_schema.columns "
|
|
||||||
"WHERE table_name = 'generation_tasks' AND column_name = 'is_preview'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if result.scalar() is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.drop_index("ix_generation_tasks_is_preview", table_name="generation_tasks")
|
|
||||||
op.drop_column("generation_tasks", "is_preview")
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
"""确认生成 API 改造：为 generation_tasks 表添加 source_task_id、output_width、output_height、cover_url、custom_title 字段
|
|
||||||
|
|
||||||
Revision ID: 054_confirm_gen_fields
|
|
||||||
Revises: 053_generation_task_is_preview
|
|
||||||
Create Date: 2026-08-16
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. generation_tasks 表新增 source_task_id（来源预览任务 ID，带索引）
|
|
||||||
2. generation_tasks 表新增 output_width / output_height（动态输出分辨率）
|
|
||||||
3. generation_tasks 表新增 cover_url / custom_title（自定义封面和标题）
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "054_confirm_gen_fields"
|
|
||||||
down_revision = "053_generation_task_is_preview"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
is_pg = conn.dialect.name == "postgresql"
|
|
||||||
|
|
||||||
if is_pg:
|
|
||||||
# 幂等检查：source_task_id 列是否已存在
|
|
||||||
result = conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"SELECT column_name FROM information_schema.columns "
|
|
||||||
"WHERE table_name = 'generation_tasks' AND column_name = 'source_task_id'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if result.scalar() is not None:
|
|
||||||
return
|
|
||||||
|
|
||||||
# source_task_id
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("source_task_id", sa.String(32), nullable=False, server_default=""),
|
|
||||||
)
|
|
||||||
|
|
||||||
# output_width
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("output_width", sa.Integer, nullable=False, server_default=sa.text("1280")),
|
|
||||||
)
|
|
||||||
|
|
||||||
# output_height
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("output_height", sa.Integer, nullable=False, server_default=sa.text("720")),
|
|
||||||
)
|
|
||||||
|
|
||||||
# cover_url
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("cover_url", sa.String(1000), nullable=False, server_default=""),
|
|
||||||
)
|
|
||||||
|
|
||||||
# custom_title
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("custom_title", sa.String(500), nullable=False, server_default=""),
|
|
||||||
)
|
|
||||||
|
|
||||||
# 索引
|
|
||||||
op.create_index(
|
|
||||||
"ix_generation_tasks_source_task_id",
|
|
||||||
"generation_tasks",
|
|
||||||
["source_task_id"],
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index("ix_generation_tasks_source_task_id", table_name="generation_tasks")
|
|
||||||
op.drop_column("generation_tasks", "custom_title")
|
|
||||||
op.drop_column("generation_tasks", "cover_url")
|
|
||||||
op.drop_column("generation_tasks", "output_height")
|
|
||||||
op.drop_column("generation_tasks", "output_width")
|
|
||||||
op.drop_column("generation_tasks", "source_task_id")
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
"""封面模板表 cover_templates
|
|
||||||
|
|
||||||
Revision ID: 055_cover_templates
|
|
||||||
Revises: 054_confirm_gen_fields
|
|
||||||
Create Date: 2026-08-09
|
|
||||||
|
|
||||||
Changes:
|
|
||||||
1. 新建 cover_templates 表，支持系统预置和用户自定义封面模板
|
|
||||||
2. user_id 为 NULL 表示系统模板，is_system 标记区分
|
|
||||||
3. config 为 JSON 字段，存储封面配置信息
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import context, op
|
|
||||||
|
|
||||||
revision = "055_cover_templates"
|
|
||||||
down_revision = "054_confirm_gen_fields"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
SYSTEM_TEMPLATES = [
|
|
||||||
("a8b0120fd98e44788f5a6590f983d327", "默认模板", {}),
|
|
||||||
("6d8c501b11424432b3df3a45ae89b1a9", "大胆红", {"background_color": "#ef4444"}),
|
|
||||||
("04937fb57fea4bad95e7883e71a6b246", "优雅黑", {"background_color": "#111827"}),
|
|
||||||
("3ff9cc821174437ca53931073e7f536e", "渐变蓝", {"background_color": "#3b82f6"}),
|
|
||||||
("db51b3ea8f1a4f4caa94bf2d51f27d11", "渐变紫", {"background_color": "#8b5cf6"}),
|
|
||||||
("5027d113432a4f798a3b4ee1644d66af", "暖橙", {"background_color": "#f97316"}),
|
|
||||||
("0e10def2b5a148d686416494474726c2", "清新绿", {"background_color": "#22c55e"}),
|
|
||||||
("38ea98ac00c04bada064006d880546f0", "科技蓝", {"background_color": "#06b6d4"}),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
if context.get_context().dialect.name == "postgresql":
|
|
||||||
result = conn.execute(sa.text("SELECT to_regclass('public.cover_templates')"))
|
|
||||||
if result.scalar() is not None:
|
|
||||||
return
|
|
||||||
|
|
||||||
op.create_table(
|
|
||||||
"cover_templates",
|
|
||||||
sa.Column("id", sa.String(36), primary_key=True),
|
|
||||||
sa.Column("user_id", sa.String(36), nullable=True, index=True),
|
|
||||||
sa.Column("name", sa.String(200), nullable=False),
|
|
||||||
sa.Column("thumbnail_url", sa.String(1000), nullable=False, server_default=""),
|
|
||||||
sa.Column("is_system", sa.Boolean, nullable=False, server_default=sa.false(), index=True),
|
|
||||||
sa.Column("config", sa.JSON, nullable=False, server_default="{}"),
|
|
||||||
sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
|
|
||||||
sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
|
|
||||||
)
|
|
||||||
|
|
||||||
# 预置系统模板 seed 数据
|
|
||||||
cover_templates = sa.table(
|
|
||||||
"cover_templates",
|
|
||||||
sa.column("id", sa.String),
|
|
||||||
sa.column("user_id", sa.String),
|
|
||||||
sa.column("name", sa.String),
|
|
||||||
sa.column("thumbnail_url", sa.String),
|
|
||||||
sa.column("is_system", sa.Boolean),
|
|
||||||
sa.column("config", sa.JSON),
|
|
||||||
sa.column("created_at", sa.DateTime),
|
|
||||||
sa.column("updated_at", sa.DateTime),
|
|
||||||
)
|
|
||||||
|
|
||||||
for tid, name, config in SYSTEM_TEMPLATES:
|
|
||||||
conn.execute(
|
|
||||||
cover_templates.insert().values(
|
|
||||||
id=tid,
|
|
||||||
user_id=None,
|
|
||||||
name=name,
|
|
||||||
thumbnail_url="",
|
|
||||||
is_system=True,
|
|
||||||
config=config,
|
|
||||||
created_at=sa.func.now(),
|
|
||||||
updated_at=sa.func.now(),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_table("cover_templates")
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
"""修复 cover_templates.config 双重序列化
|
|
||||||
|
|
||||||
Revision ID: 056_fix_cover_templates_config
|
|
||||||
Revises: 055_cover_templates
|
|
||||||
Create Date: 2026-08-13
|
|
||||||
|
|
||||||
问题: 055 迁移 seed 数据时 json.dumps(config) 导致 config 被双重序列化为 JSON 字符串
|
|
||||||
例如 "{}"（字符串）而不是 {}（对象），导致 Pydantic CoverTemplateResponse 校验失败 500。
|
|
||||||
|
|
||||||
修复: 从 JSON 字符串中提取文本值，再 cast 回 json 对象类型。
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "056_fix_cover_templates_config"
|
|
||||||
down_revision = "055_cover_templates"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
|
|
||||||
# PostgreSQL: 从 JSON string scalar 中提取文本内容，cast 为 json object
|
|
||||||
# 例如: JSON string "{}" -> text "{}" -> JSON object {}
|
|
||||||
if conn.dialect.name == "postgresql":
|
|
||||||
conn.execute(
|
|
||||||
sa.text(
|
|
||||||
"UPDATE cover_templates SET config = (config#>>'{}')::json "
|
|
||||||
"WHERE jsonb_typeof(config::jsonb) = 'string'"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# No safe rollback — the original data was incorrect
|
|
||||||
pass
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
"""Add title_config to generation_tasks
|
|
||||||
|
|
||||||
Revision ID: 057_title_config
|
|
||||||
Revises: 056_fix_cover_templates_config
|
|
||||||
Create Date: 2026-08-23
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "057_title_config"
|
|
||||||
down_revision = "056_fix_cover_templates_config"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("title_config", sa.JSON(), nullable=False, server_default="{}"),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("generation_tasks", "title_config")
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
"""Add unique index on asset_libraries(project_id, kind)
|
|
||||||
|
|
||||||
Revision ID: 058_uq_asset_lib_project_kind
|
|
||||||
Revises: 057_title_config
|
|
||||||
Create Date: 2026-08-30
|
|
||||||
|
|
||||||
同一项目下同 kind 的素材库业务上唯一（前端 getOrCreate 语义、TTS 保存自动建库）。
|
|
||||||
加唯一索引兜底并发创建竞态，避免重复素材库。
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "058_uq_asset_lib_project_kind"
|
|
||||||
down_revision = "057_title_config"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# 建唯一索引前清洗历史重复：同 (project_id, kind) 只保留 created_at 最新的一条。
|
|
||||||
# project_id 为 NULL 的系统级行不参与去重（NULL 在唯一索引中互不冲突）。
|
|
||||||
op.execute("""
|
|
||||||
DELETE FROM asset_libraries
|
|
||||||
WHERE id IN (
|
|
||||||
SELECT id FROM (
|
|
||||||
SELECT id,
|
|
||||||
ROW_NUMBER() OVER (
|
|
||||||
PARTITION BY project_id, kind
|
|
||||||
ORDER BY created_at DESC, id DESC
|
|
||||||
) AS rn
|
|
||||||
FROM asset_libraries
|
|
||||||
WHERE project_id IS NOT NULL
|
|
||||||
) t
|
|
||||||
WHERE t.rn > 1
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
# 与 model 的 UniqueConstraint 定义保持一致（pg_constraint + pg_index 同时注册），
|
|
||||||
# 避免 Alembic autogenerate 检测到 schema drift
|
|
||||||
op.create_unique_constraint(
|
|
||||||
"uq_asset_libraries_project_kind",
|
|
||||||
"asset_libraries",
|
|
||||||
["project_id", "kind"],
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_constraint("uq_asset_libraries_project_kind", "asset_libraries", type_="unique")
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
"""add duplicate_rate to generated_videos
|
|
||||||
|
|
||||||
Revision ID: 059_duplicate_rate
|
|
||||||
Revises: 058_uq_asset_lib_project_kind
|
|
||||||
Create Date: 2026-08-31
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "059_duplicate_rate"
|
|
||||||
down_revision = "058_uq_asset_lib_project_kind"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column("generated_videos", sa.Column("duplicate_rate", sa.Float(), nullable=True))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("generated_videos", "duplicate_rate")
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
"""migrate template_segments data to template_clip_configs
|
|
||||||
|
|
||||||
Revision ID: 060_migrate_segments
|
|
||||||
Revises: 059_duplicate_rate
|
|
||||||
Create Date: 2026-08-31
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "060_migrate_segments"
|
|
||||||
down_revision = "059_duplicate_rate"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
dialect = op.get_bind().dialect.name
|
|
||||||
|
|
||||||
if dialect == "postgresql":
|
|
||||||
config_expr = (
|
|
||||||
"CASE WHEN s.material_type IS NOT NULL AND s.material_type != '' "
|
|
||||||
"THEN json_build_object('material_type', s.material_type)::jsonb "
|
|
||||||
"ELSE '{}'::jsonb END"
|
|
||||||
)
|
|
||||||
empty_json = "'{}'::jsonb"
|
|
||||||
else:
|
|
||||||
config_expr = (
|
|
||||||
"CASE WHEN s.material_type IS NOT NULL AND s.material_type != '' "
|
|
||||||
"THEN JSON_OBJECT('material_type', s.material_type) "
|
|
||||||
"ELSE '{}' END"
|
|
||||||
)
|
|
||||||
empty_json = "'{}'"
|
|
||||||
|
|
||||||
sql_str = (
|
|
||||||
"INSERT INTO template_clip_configs "
|
|
||||||
'(id, template_id, clip_type, "order", min_duration, max_duration, '
|
|
||||||
"text_template, material_requirements, transition_effect, config, "
|
|
||||||
"created_at, updated_at) "
|
|
||||||
"SELECT "
|
|
||||||
"s.id, s.template_id, 'main', s.segment_order, "
|
|
||||||
"s.duration_min, s.duration_max, "
|
|
||||||
"'', " + empty_json + ", "
|
|
||||||
"'cut', " + config_expr + ", "
|
|
||||||
"s.created_at, s.updated_at "
|
|
||||||
"FROM template_segments s "
|
|
||||||
"WHERE NOT EXISTS ("
|
|
||||||
" SELECT 1 FROM template_clip_configs c "
|
|
||||||
" WHERE c.template_id = s.template_id"
|
|
||||||
")"
|
|
||||||
)
|
|
||||||
op.execute(sa.text(sql_str))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
pass
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
"""add sort_order to template_categories
|
|
||||||
|
|
||||||
Revision ID: 061_sort_order
|
|
||||||
Revises: 060_migrate_segments
|
|
||||||
Create Date: 2026-09-02
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "061_sort_order"
|
|
||||||
down_revision = "060_migrate_segments"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"template_categories",
|
|
||||||
sa.Column("sort_order", sa.Integer, nullable=False, server_default="0"),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("template_categories", "sort_order")
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
"""re-add edit_plan_id to generation_tasks (align staging with production)
|
|
||||||
|
|
||||||
Revision ID: 062_edit_plan_id
|
|
||||||
Revises: 061_sort_order
|
|
||||||
Create Date: 2026-09-02
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "062_edit_plan_id"
|
|
||||||
down_revision = "061_sort_order"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("edit_plan_id", sa.String(36), nullable=True),
|
|
||||||
)
|
|
||||||
op.create_index("ix_generation_tasks_edit_plan_id_2", "generation_tasks", ["edit_plan_id"])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index("ix_generation_tasks_edit_plan_id_2", table_name="generation_tasks")
|
|
||||||
op.drop_column("generation_tasks", "edit_plan_id")
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
"""add video_fingerprint_chunks table for per-chunk fingerprint storage
|
|
||||||
|
|
||||||
Revision ID: 063_fingerprint_chunks
|
|
||||||
Revises: 062_edit_plan_id
|
|
||||||
Create Date: 2026-09-03
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "063_fingerprint_chunks"
|
|
||||||
down_revision = "062_edit_plan_id"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.create_table(
|
|
||||||
"video_fingerprint_chunks",
|
|
||||||
sa.Column("id", sa.String(36), primary_key=True),
|
|
||||||
sa.Column("video_id", sa.String(36), nullable=False),
|
|
||||||
sa.Column("project_id", sa.String(36), nullable=False),
|
|
||||||
sa.Column("user_id", sa.String(36), nullable=False, server_default=""),
|
|
||||||
sa.Column("start_time_ms", sa.Integer, nullable=False),
|
|
||||||
sa.Column("end_time_ms", sa.Integer, nullable=False),
|
|
||||||
sa.Column("phash_binary", sa.String(16), nullable=False),
|
|
||||||
sa.Column("color_histogram", sa.JSON, nullable=False),
|
|
||||||
sa.Column("frame_count", sa.Integer, nullable=False, server_default="1"),
|
|
||||||
sa.Column(
|
|
||||||
"created_at",
|
|
||||||
sa.DateTime,
|
|
||||||
nullable=False,
|
|
||||||
server_default=sa.func.now(),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
op.create_index("ix_vfc_video_id", "video_fingerprint_chunks", ["video_id"])
|
|
||||||
op.create_index("ix_vfc_project_id", "video_fingerprint_chunks", ["project_id"])
|
|
||||||
op.create_index("ix_vfc_user_id", "video_fingerprint_chunks", ["user_id"])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index("ix_vfc_user_id", table_name="video_fingerprint_chunks")
|
|
||||||
op.drop_index("ix_vfc_project_id", table_name="video_fingerprint_chunks")
|
|
||||||
op.drop_index("ix_vfc_video_id", table_name="video_fingerprint_chunks")
|
|
||||||
op.drop_table("video_fingerprint_chunks")
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
"""add match_count and visual_similarity to generated_videos
|
|
||||||
|
|
||||||
Revision ID: 064_match_count_visual_sim
|
|
||||||
Revises: 063_fingerprint_chunks
|
|
||||||
Create Date: 2026-09-03
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "064_match_count_visual_sim"
|
|
||||||
down_revision = "063_fingerprint_chunks"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column("generated_videos", sa.Column("match_count", sa.Integer(), nullable=True, server_default="0"))
|
|
||||||
op.add_column("generated_videos", sa.Column("visual_similarity", sa.Float(), nullable=True, server_default="0.0"))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("generated_videos", "visual_similarity")
|
|
||||||
op.drop_column("generated_videos", "match_count")
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
"""add visual_similarity and match_count to duplication_records
|
|
||||||
|
|
||||||
Revision ID: 065_dup_record_sim_match
|
|
||||||
Revises: 064_match_count_visual_sim
|
|
||||||
Create Date: 2026-09-04
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "065_dup_record_sim_match"
|
|
||||||
down_revision = "064_match_count_visual_sim"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column("duplication_records", sa.Column("visual_similarity", sa.Float(), nullable=True))
|
|
||||||
op.add_column("duplication_records", sa.Column("match_count", sa.Integer(), nullable=True))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("duplication_records", "match_count")
|
|
||||||
op.drop_column("duplication_records", "visual_similarity")
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
"""add client_upload_id to assets and asset_id to ingest_jobs
|
|
||||||
|
|
||||||
Issue #1714：上传 complete 幂等 + worker 转码回写关联。
|
|
||||||
- assets.client_upload_id：客户端幂等 token（complete 去重）
|
|
||||||
- ingest_jobs.asset_id：complete 阶段创建的占位 asset id（worker 回写关联，
|
|
||||||
防止 HEVC 转码改写 storage_key 后找不到占位而兜底新建 READY 记录）
|
|
||||||
|
|
||||||
Revision ID: 066_upload_idempotency
|
|
||||||
Revises: 065_dup_record_sim_match
|
|
||||||
Create Date: 2026-09-05
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "066_upload_idempotency"
|
|
||||||
down_revision = "065_dup_record_sim_match"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column("assets", sa.Column("client_upload_id", sa.String(64), nullable=True))
|
|
||||||
op.create_index("ix_assets_client_upload_id", "assets", ["client_upload_id"])
|
|
||||||
op.add_column("ingest_jobs", sa.Column("asset_id", sa.String(36), nullable=False, server_default=""))
|
|
||||||
op.create_index("ix_ingest_jobs_asset_id", "ingest_jobs", ["asset_id"])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index("ix_ingest_jobs_asset_id", table_name="ingest_jobs")
|
|
||||||
op.drop_column("ingest_jobs", "asset_id")
|
|
||||||
op.drop_index("ix_assets_client_upload_id", table_name="assets")
|
|
||||||
op.drop_column("assets", "client_upload_id")
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
"""add celery_task_id to generation_tasks and ingest_jobs
|
|
||||||
|
|
||||||
Issue #1714：孤儿恢复/超时清理撤销队列消息。
|
|
||||||
- generation_tasks.celery_task_id：入队时记录的 Celery 消息 ID，清理时 revoke
|
|
||||||
- ingest_jobs.celery_task_id：同上（素材转码任务）
|
|
||||||
|
|
||||||
Revision ID: 067_celery_task_id
|
|
||||||
Revises: 066_upload_idempotency
|
|
||||||
Create Date: 2026-09-05
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "067_celery_task_id"
|
|
||||||
down_revision = "066_upload_idempotency"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"generation_tasks",
|
|
||||||
sa.Column("celery_task_id", sa.String(64), nullable=False, server_default=""),
|
|
||||||
)
|
|
||||||
op.add_column(
|
|
||||||
"ingest_jobs",
|
|
||||||
sa.Column("celery_task_id", sa.String(64), nullable=False, server_default=""),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("ingest_jobs", "celery_task_id")
|
|
||||||
op.drop_column("generation_tasks", "celery_task_id")
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
"""add profile_completed to users
|
|
||||||
|
|
||||||
Issue #1718：微信新用户首次登录需设置昵称（PATCH /auth/me）。
|
|
||||||
- users.profile_completed：资料是否已完善；存量行默认 True（不触发引导），
|
|
||||||
微信新建用户在应用层置 False。
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "068_user_profile_completed"
|
|
||||||
down_revision = "067_celery_task_id"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.add_column(
|
|
||||||
"users",
|
|
||||||
sa.Column("profile_completed", sa.Boolean(), nullable=False, server_default=sa.text("true")),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column("users", "profile_completed")
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
"""Projects is_default + partial unique index for idempotent default project (Issue #1775)
|
|
||||||
|
|
||||||
Revision ID: 069_project_is_default
|
|
||||||
Revises: 068_user_profile_completed
|
|
||||||
Create Date: 2026-09-08
|
|
||||||
|
|
||||||
背景：
|
|
||||||
小程序端 getOrCreateDefaultProject 在重试/并发/前端重复调用下，
|
|
||||||
仅靠应用层"先查再插"不保证幂等，会给同一用户重复创建默认项目。
|
|
||||||
|
|
||||||
改动：
|
|
||||||
1. projects 表新增 is_default 布尔列（默认 false）
|
|
||||||
2. 部分唯一索引 uq_projects_owner_default：(owner_user_id) WHERE is_default = true
|
|
||||||
—— 保证每个用户至多一个默认项目
|
|
||||||
3. 存量数据回填：把名为"默认项目"的存量项目按创建时间最早者标记为 is_default=true
|
|
||||||
（只标记不删除；存量重复项目的清理另行确认后单独执行）
|
|
||||||
|
|
||||||
注意：部分唯一索引依赖 PostgreSQL，不支持 downgrade 到其他方言。
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "069_project_is_default"
|
|
||||||
down_revision = "068_user_profile_completed"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# 1. 新增 is_default 列
|
|
||||||
op.add_column(
|
|
||||||
"projects",
|
|
||||||
sa.Column(
|
|
||||||
"is_default",
|
|
||||||
sa.Boolean(),
|
|
||||||
nullable=False,
|
|
||||||
server_default=sa.text("false"),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
# 2. 存量回填：每个拥有"默认项目"的用户，只把最早创建的那一个标记为默认。
|
|
||||||
# 用 ROW_NUMBER() 取每组第一条；非"默认项目"命名的项目不标记（保守，不动用户自建项目）。
|
|
||||||
op.execute("""
|
|
||||||
UPDATE projects p
|
|
||||||
SET is_default = true
|
|
||||||
WHERE p.id IN (
|
|
||||||
SELECT id FROM (
|
|
||||||
SELECT id,
|
|
||||||
ROW_NUMBER() OVER (
|
|
||||||
PARTITION BY owner_user_id
|
|
||||||
ORDER BY created_at ASC, id ASC
|
|
||||||
) AS rn
|
|
||||||
FROM projects
|
|
||||||
WHERE name = '默认项目'
|
|
||||||
) t
|
|
||||||
WHERE t.rn = 1
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
|
|
||||||
# 3. 部分唯一索引：每用户至多一个默认项目（只约束 is_default = true 的行）
|
|
||||||
op.execute("""
|
|
||||||
CREATE UNIQUE INDEX uq_projects_owner_default
|
|
||||||
ON projects (owner_user_id)
|
|
||||||
WHERE is_default = true
|
|
||||||
""")
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.execute("DROP INDEX IF EXISTS uq_projects_owner_default")
|
|
||||||
op.drop_column("projects", "is_default")
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
"""Add scripts table for oral broadcast script library (Issue #1795)
|
|
||||||
|
|
||||||
Revision ID: 070_add_scripts
|
|
||||||
Revises: 069_project_is_default
|
|
||||||
Create Date: 2026-09-08
|
|
||||||
|
|
||||||
新建 scripts 表，支持口播文案 CRUD + 分段存储。
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "070_add_scripts"
|
|
||||||
down_revision = "069_project_is_default"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.create_table(
|
|
||||||
"scripts",
|
|
||||||
sa.Column("id", sa.String(36), nullable=False),
|
|
||||||
sa.Column("user_id", sa.String(36), nullable=False),
|
|
||||||
sa.Column("title", sa.String(255), nullable=False),
|
|
||||||
sa.Column("content", sa.Text(), nullable=False, server_default=""),
|
|
||||||
sa.Column("segments", sa.JSON(), nullable=False, server_default="[]"),
|
|
||||||
sa.Column("tags", sa.JSON(), nullable=False, server_default="[]"),
|
|
||||||
sa.Column(
|
|
||||||
"created_at",
|
|
||||||
sa.DateTime(timezone=True),
|
|
||||||
nullable=False,
|
|
||||||
server_default=sa.func.now(),
|
|
||||||
),
|
|
||||||
sa.Column(
|
|
||||||
"updated_at",
|
|
||||||
sa.DateTime(timezone=True),
|
|
||||||
nullable=False,
|
|
||||||
server_default=sa.func.now(),
|
|
||||||
),
|
|
||||||
sa.PrimaryKeyConstraint("id"),
|
|
||||||
)
|
|
||||||
op.create_index("ix_scripts_user_id", "scripts", ["user_id"])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index("ix_scripts_user_id", table_name="scripts")
|
|
||||||
op.drop_table("scripts")
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
"""add lipsync jobs table
|
|
||||||
|
|
||||||
Revision ID: 071_add_lipsync_jobs
|
|
||||||
Revises: 070_add_scripts
|
|
||||||
Create Date: 2026-09-08
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "071_add_lipsync_jobs"
|
|
||||||
down_revision = "070_add_scripts"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.create_table(
|
|
||||||
"lipsync_jobs",
|
|
||||||
sa.Column("id", sa.String(36), primary_key=True),
|
|
||||||
sa.Column("user_id", sa.String(36), nullable=False, index=True),
|
|
||||||
sa.Column("project_id", sa.String(36), nullable=False, server_default=""),
|
|
||||||
sa.Column("video_url", sa.Text(), nullable=False),
|
|
||||||
sa.Column("audio_url", sa.Text(), nullable=False),
|
|
||||||
sa.Column("enable_video_loop", sa.Boolean(), nullable=False, server_default=sa.text("false")),
|
|
||||||
sa.Column("mediakit_task_id", sa.String(200), nullable=False, server_default="", index=True),
|
|
||||||
sa.Column("status", sa.String(20), nullable=False, server_default="pending", index=True),
|
|
||||||
sa.Column("output_video_url", sa.Text(), nullable=False, server_default=""),
|
|
||||||
sa.Column("output_duration", sa.Float(), nullable=False, server_default=sa.text("0.0")),
|
|
||||||
sa.Column("error_message", sa.Text(), nullable=False, server_default=""),
|
|
||||||
sa.Column("error_code", sa.String(100), nullable=False, server_default=""),
|
|
||||||
sa.Column("submitted_at", sa.DateTime(), nullable=True),
|
|
||||||
sa.Column("completed_at", sa.DateTime(), nullable=True),
|
|
||||||
sa.Column("created_at", sa.DateTime(), nullable=False, server_default=sa.func.now()),
|
|
||||||
sa.Column("updated_at", sa.DateTime(), nullable=False, server_default=sa.func.now()),
|
|
||||||
)
|
|
||||||
# 复合索引：用户 + 状态（列表查询常用）
|
|
||||||
op.create_index("ix_lipsync_jobs_user_status", "lipsync_jobs", ["user_id", "status"])
|
|
||||||
# 项目 + 用户（项目维度查询）
|
|
||||||
op.create_index("ix_lipsync_jobs_project_user", "lipsync_jobs", ["project_id", "user_id"])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index("ix_lipsync_jobs_project_user", table_name="lipsync_jobs")
|
|
||||||
op.drop_index("ix_lipsync_jobs_user_status", table_name="lipsync_jobs")
|
|
||||||
op.drop_table("lipsync_jobs")
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
"""add ai avatar render jobs table
|
|
||||||
|
|
||||||
Revision ID: 072_add_ai_avatar_render
|
|
||||||
Revises: 071_add_lipsync_jobs
|
|
||||||
Create Date: 2026-09-09
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
|
|
||||||
revision = "072_add_ai_avatar_render"
|
|
||||||
down_revision = "071_add_lipsync_jobs"
|
|
||||||
branch_labels = None
|
|
||||||
depends_on = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
op.create_table(
|
|
||||||
"ai_avatar_render_jobs",
|
|
||||||
sa.Column("id", sa.String(36), primary_key=True),
|
|
||||||
sa.Column("user_id", sa.String(36), nullable=False, index=True),
|
|
||||||
sa.Column("project_id", sa.String(36), nullable=False, server_default=""),
|
|
||||||
sa.Column("lipsync_job_id", sa.String(36), nullable=False),
|
|
||||||
sa.Column("script_id", sa.String(36), nullable=False),
|
|
||||||
sa.Column("b_roll_segments", sa.JSON(), nullable=False, server_default="[]"),
|
|
||||||
sa.Column("title_config", sa.JSON(), nullable=False, server_default="{}"),
|
|
||||||
sa.Column("cover_config", sa.JSON(), nullable=False, server_default="{}"),
|
|
||||||
sa.Column("status", sa.String(20), nullable=False, server_default="pending", index=True),
|
|
||||||
sa.Column("progress", sa.Integer(), nullable=False, server_default=sa.text("0")),
|
|
||||||
sa.Column("output_video_url", sa.Text(), nullable=False, server_default=""),
|
|
||||||
sa.Column("output_cover_url", sa.Text(), nullable=False, server_default=""),
|
|
||||||
sa.Column("output_duration", sa.Float(), nullable=False, server_default=sa.text("0.0")),
|
|
||||||
sa.Column("error_message", sa.Text(), nullable=False, server_default=""),
|
|
||||||
sa.Column("submitted_at", sa.DateTime(), nullable=True),
|
|
||||||
sa.Column("started_at", sa.DateTime(), nullable=True),
|
|
||||||
sa.Column("completed_at", sa.DateTime(), nullable=True),
|
|
||||||
sa.Column("created_at", sa.DateTime(), nullable=False, server_default=sa.func.now()),
|
|
||||||
sa.Column("updated_at", sa.DateTime(), nullable=False, server_default=sa.func.now()),
|
|
||||||
)
|
|
||||||
op.create_index("ix_ai_avatar_render_user_status", "ai_avatar_render_jobs", ["user_id", "status"])
|
|
||||||
op.create_index("ix_ai_avatar_render_project_user", "ai_avatar_render_jobs", ["project_id", "user_id"])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_index("ix_ai_avatar_render_project_user", table_name="ai_avatar_render_jobs")
|
|
||||||
op.drop_index("ix_ai_avatar_render_user_status", table_name="ai_avatar_render_jobs")
|
|
||||||
op.drop_table("ai_avatar_render_jobs")
|
|
||||||
Binary file not shown.
@@ -1,30 +1,21 @@
|
|||||||
from app.api.routes.ai import router as ai_router
|
|
||||||
from app.api.routes.ai_avatar_render import router as ai_avatar_render_router
|
|
||||||
from app.api.routes.asset_diagnosis import router as asset_diagnosis_router
|
from app.api.routes.asset_diagnosis import router as asset_diagnosis_router
|
||||||
from app.api.routes.asset_libraries import router as asset_libraries_router
|
from app.api.routes.asset_libraries import router as asset_libraries_router
|
||||||
from app.api.routes.assets import router as assets_router
|
from app.api.routes.assets import router as assets_router
|
||||||
from app.api.routes.auth import router as auth_router
|
from app.api.routes.auth import router as auth_router
|
||||||
from app.api.routes.chunked_upload import router as chunked_upload_router
|
from app.api.routes.chunked_upload import router as chunked_upload_router
|
||||||
from app.api.routes.classification_jobs import router as classification_jobs_router
|
from app.api.routes.classification_jobs import router as classification_jobs_router
|
||||||
from app.api.routes.cover_templates import router as cover_templates_router
|
|
||||||
from app.api.routes.duplication import router as duplication_router
|
from app.api.routes.duplication import router as duplication_router
|
||||||
|
from app.api.routes.edit_plans import router as edit_plans_router
|
||||||
from app.api.routes.feature_flags import router as feature_flags_router
|
from app.api.routes.feature_flags import router as feature_flags_router
|
||||||
from app.api.routes.generation_cover import router as generation_cover_router
|
|
||||||
from app.api.routes.generation_preview import router as generation_preview_router
|
|
||||||
from app.api.routes.generation_tasks import router as generation_tasks_router
|
from app.api.routes.generation_tasks import router as generation_tasks_router
|
||||||
from app.api.routes.generation_variant_plans import router as generation_variant_plans_router
|
|
||||||
from app.api.routes.health import router as health_check_router
|
from app.api.routes.health import router as health_check_router
|
||||||
from app.api.routes.ingest_jobs import router as ingest_jobs_router
|
from app.api.routes.ingest_jobs import router as ingest_jobs_router
|
||||||
from app.api.routes.internal_render import router as internal_render_router
|
from app.api.routes.internal_render import router as internal_render_router
|
||||||
from app.api.routes.lipsync import router as lipsync_router
|
|
||||||
from app.api.routes.projects import router as projects_router
|
from app.api.routes.projects import router as projects_router
|
||||||
from app.api.routes.scripts import router as scripts_router
|
|
||||||
from app.api.routes.share import router as share_router
|
|
||||||
from app.api.routes.subscription import router as subscription_router
|
from app.api.routes.subscription import router as subscription_router
|
||||||
from app.api.routes.tags import router as tags_router
|
from app.api.routes.tags import router as tags_router
|
||||||
from app.api.routes.task_center import router as task_center_router
|
from app.api.routes.task_center import router as task_center_router
|
||||||
from app.api.routes.templates import router as templates_router
|
from app.api.routes.templates import router as templates_router
|
||||||
from app.api.routes.templates_editor import router as templates_editor_router
|
|
||||||
from app.api.routes.titles import router as titles_router
|
from app.api.routes.titles import router as titles_router
|
||||||
from app.api.routes.tts import router as tts_router
|
from app.api.routes.tts import router as tts_router
|
||||||
from app.api.routes.upload import router as upload_router
|
from app.api.routes.upload import router as upload_router
|
||||||
@@ -41,11 +32,6 @@ api_router.include_router(
|
|||||||
auth_router,
|
auth_router,
|
||||||
tags=["Auth"],
|
tags=["Auth"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
|
||||||
lipsync_router,
|
|
||||||
prefix="/lipsync",
|
|
||||||
tags=["Lipsync"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
api_router.include_router(
|
||||||
projects_router,
|
projects_router,
|
||||||
prefix="/projects",
|
prefix="/projects",
|
||||||
@@ -56,10 +42,6 @@ api_router.include_router(
|
|||||||
prefix="/tags",
|
prefix="/tags",
|
||||||
tags=["Tag"],
|
tags=["Tag"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
|
||||||
cover_templates_router,
|
|
||||||
tags=["CoverTemplate"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
api_router.include_router(
|
||||||
task_center_router,
|
task_center_router,
|
||||||
tags=["TaskCenter"],
|
tags=["TaskCenter"],
|
||||||
@@ -103,21 +85,6 @@ api_router.include_router(
|
|||||||
prefix="/generation",
|
prefix="/generation",
|
||||||
tags=["Generation"],
|
tags=["Generation"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
|
||||||
generation_preview_router,
|
|
||||||
prefix="/generation",
|
|
||||||
tags=["Generation"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
|
||||||
generation_variant_plans_router,
|
|
||||||
prefix="/generation",
|
|
||||||
tags=["Generation"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
|
||||||
generation_cover_router,
|
|
||||||
prefix="/generation",
|
|
||||||
tags=["Generation"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
api_router.include_router(
|
||||||
titles_router,
|
titles_router,
|
||||||
prefix="/titles",
|
prefix="/titles",
|
||||||
@@ -137,10 +104,6 @@ api_router.include_router(
|
|||||||
videos_router,
|
videos_router,
|
||||||
tags=["VideoCenter"],
|
tags=["VideoCenter"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
|
||||||
share_router,
|
|
||||||
tags=["Share"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
api_router.include_router(
|
||||||
duplication_router,
|
duplication_router,
|
||||||
prefix="/duplication",
|
prefix="/duplication",
|
||||||
@@ -157,20 +120,15 @@ api_router.include_router(
|
|||||||
tags=["Template"],
|
tags=["Template"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
api_router.include_router(
|
||||||
templates_editor_router,
|
edit_plans_router,
|
||||||
prefix="/templates/{template_id}/editor",
|
prefix="/edit-plans",
|
||||||
tags=["TemplateEditor"],
|
tags=["EditPlan"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
api_router.include_router(
|
||||||
tts_router,
|
tts_router,
|
||||||
prefix="/tts",
|
prefix="/tts",
|
||||||
tags=["TTS"],
|
tags=["TTS"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
|
||||||
ai_router,
|
|
||||||
prefix="/ai",
|
|
||||||
tags=["AI"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
api_router.include_router(
|
||||||
feature_flags_router,
|
feature_flags_router,
|
||||||
tags=["Internal"],
|
tags=["Internal"],
|
||||||
@@ -179,13 +137,3 @@ api_router.include_router(
|
|||||||
internal_render_router,
|
internal_render_router,
|
||||||
tags=["Internal"],
|
tags=["Internal"],
|
||||||
)
|
)
|
||||||
api_router.include_router(
|
|
||||||
scripts_router,
|
|
||||||
prefix="/scripts",
|
|
||||||
tags=["ScriptLibrary"],
|
|
||||||
)
|
|
||||||
api_router.include_router(
|
|
||||||
ai_avatar_render_router,
|
|
||||||
prefix="/ai-avatar/render",
|
|
||||||
tags=["AI Avatar Render"],
|
|
||||||
)
|
|
||||||
|
|||||||
Executable → Regular
-93
@@ -1,6 +1,5 @@
|
|||||||
"""路由层共享辅助函数 — 消除跨文件重复定义。"""
|
"""路由层共享辅助函数 — 消除跨文件重复定义。"""
|
||||||
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from fastapi import HTTPException, status
|
from fastapi import HTTPException, status
|
||||||
@@ -47,95 +46,3 @@ def require_project_and_library(
|
|||||||
libraries = asset_library_repository.find_by_project(project_id)
|
libraries = asset_library_repository.find_by_project(project_id)
|
||||||
if not any(item.id == library_id for item in libraries):
|
if not any(item.id == library_id for item in libraries):
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Asset library not found")
|
||||||
|
|
||||||
|
|
||||||
def auto_select_video_assets(
|
|
||||||
*,
|
|
||||||
project_id: str,
|
|
||||||
asset_library_repo: Any,
|
|
||||||
asset_repo: Any,
|
|
||||||
logger=None,
|
|
||||||
) -> list[str]:
|
|
||||||
"""从项目视频素材库自动选取 ready 状态的视频素材。
|
|
||||||
|
|
||||||
Args:
|
|
||||||
project_id: 项目 ID
|
|
||||||
asset_library_repo: 素材库仓储
|
|
||||||
asset_repo: 素材仓储
|
|
||||||
logger: 可选的 logger 实例，用于记录警告
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
选中的素材 ID 列表，无可用素材时返回空列表
|
|
||||||
"""
|
|
||||||
if not project_id:
|
|
||||||
return []
|
|
||||||
|
|
||||||
# 找到项目的视频素材库
|
|
||||||
libs = asset_library_repo.find_by_project(project_id)
|
|
||||||
video_lib = None
|
|
||||||
for lib in libs:
|
|
||||||
lib_kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
|
|
||||||
if lib_kind == "video":
|
|
||||||
video_lib = lib
|
|
||||||
break
|
|
||||||
|
|
||||||
if not video_lib:
|
|
||||||
if logger:
|
|
||||||
logger.warning("自动选素材: 项目 %s 无视频素材库", project_id)
|
|
||||||
return []
|
|
||||||
|
|
||||||
# 从素材库中选取 ready 状态的视频素材
|
|
||||||
assets = asset_repo.find_by_library(video_lib.id)
|
|
||||||
ready_videos = [
|
|
||||||
a
|
|
||||||
for a in assets
|
|
||||||
if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
|
|
||||||
and a.mime_type
|
|
||||||
and a.mime_type.startswith("video")
|
|
||||||
]
|
|
||||||
|
|
||||||
# 过滤横屏素材（只保留竖屏/正方形）
|
|
||||||
# 移动端短视频场景默认竖屏，横屏素材裁剪后画面不可用
|
|
||||||
# 注意：这只是选素材优化，渲染引擎本身支持任何分辨率的素材
|
|
||||||
filtered_videos = []
|
|
||||||
skipped_landscape = 0
|
|
||||||
for a in ready_videos:
|
|
||||||
width = a.width if hasattr(a, "width") and a.width else 0
|
|
||||||
height = a.height if hasattr(a, "height") and a.height else 0
|
|
||||||
if not width or not height:
|
|
||||||
# 从 metadata 兜底
|
|
||||||
if a.metadata and isinstance(a.metadata, dict):
|
|
||||||
width = int(a.metadata.get("width", 0) or 0)
|
|
||||||
height = int(a.metadata.get("height", 0) or 0)
|
|
||||||
if width and height and width > height:
|
|
||||||
skipped_landscape += 1
|
|
||||||
continue
|
|
||||||
filtered_videos.append(a)
|
|
||||||
|
|
||||||
if skipped_landscape and logger:
|
|
||||||
logger.warning("自动选素材: 跳过 %d 个横屏素材", skipped_landscape)
|
|
||||||
|
|
||||||
if not filtered_videos:
|
|
||||||
if logger:
|
|
||||||
logger.warning("自动选素材: 素材库 %s 无可用视频素材", video_lib.name)
|
|
||||||
return []
|
|
||||||
|
|
||||||
# 按创建时间降序（新素材在前）
|
|
||||||
filtered_videos.sort(key=lambda a: a.created_at, reverse=True)
|
|
||||||
return [a.id for a in filtered_videos]
|
|
||||||
|
|
||||||
|
|
||||||
def format_utc_datetime(dt: datetime | None) -> str:
|
|
||||||
"""将数据库读出的 UTC naive datetime 格式化为带时区的 ISO 8601 字符串。
|
|
||||||
|
|
||||||
数据库 DateTime 列不带时区信息，但存的是 UTC 时间。
|
|
||||||
直接 .isoformat() 输出无时区标识，前端会按本地时间解析，导致差 8 小时。
|
|
||||||
输出带 Z 后缀，前端 new Date() 自动转本地时间。
|
|
||||||
"""
|
|
||||||
if dt is None:
|
|
||||||
return ""
|
|
||||||
if isinstance(dt, str):
|
|
||||||
return dt
|
|
||||||
if dt.tzinfo is None:
|
|
||||||
return dt.isoformat() + "Z"
|
|
||||||
return dt.astimezone(timezone.utc).isoformat().replace("+00:00", "Z")
|
|
||||||
|
|||||||
@@ -1,136 +0,0 @@
|
|||||||
"""AI 相关接口 — 智能标题、智能素材匹配等.
|
|
||||||
|
|
||||||
基于豆包大模型的 AI 能力接口，未配置 API Key 时自动降级为本地模拟。
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from typing import List, Literal
|
|
||||||
|
|
||||||
from app.services.ai_service import TITLE_STYLES, generate_smart_titles, semantic_match_assets
|
|
||||||
from fastapi import APIRouter
|
|
||||||
from pydantic import BaseModel, Field
|
|
||||||
|
|
||||||
router = APIRouter()
|
|
||||||
|
|
||||||
|
|
||||||
# ── 请求/响应模型 ────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class GenerateTitlesRequest(BaseModel):
|
|
||||||
"""智能标题生成请求."""
|
|
||||||
|
|
||||||
description: str = Field(..., min_length=1, max_length=500, description="视频内容描述")
|
|
||||||
style: Literal["viral", "emotional", "informative"] = Field(
|
|
||||||
default="viral",
|
|
||||||
description="标题风格：viral爆款 / emotional情感 / informative信息",
|
|
||||||
)
|
|
||||||
count: int = Field(default=5, ge=3, le=10, description="生成数量，3-10个")
|
|
||||||
|
|
||||||
|
|
||||||
class GenerateTitlesResponse(BaseModel):
|
|
||||||
"""智能标题生成响应."""
|
|
||||||
|
|
||||||
titles: List[str] = Field(..., description="生成的标题列表")
|
|
||||||
style: str = Field(..., description="实际使用的风格")
|
|
||||||
source: str = Field(..., description="来源：doubao 或 fallback")
|
|
||||||
description: str = Field(..., description="原始描述")
|
|
||||||
|
|
||||||
|
|
||||||
class TitleStyleInfo(BaseModel):
|
|
||||||
"""标题风格信息."""
|
|
||||||
|
|
||||||
key: str
|
|
||||||
name: str
|
|
||||||
description: str
|
|
||||||
|
|
||||||
|
|
||||||
# ── 素材语义匹配 ────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class AssetMatchItem(BaseModel):
|
|
||||||
"""待匹配素材项."""
|
|
||||||
|
|
||||||
id: str = Field(..., description="素材ID")
|
|
||||||
name: str = Field(default="", description="素材名称")
|
|
||||||
tags: List[str] = Field(default_factory=list, description="标签列表")
|
|
||||||
description: str = Field(default="", description="素材描述")
|
|
||||||
|
|
||||||
|
|
||||||
class SemanticMatchRequest(BaseModel):
|
|
||||||
"""语义匹配请求."""
|
|
||||||
|
|
||||||
description: str = Field(..., min_length=1, max_length=500, description="目标视频内容描述")
|
|
||||||
assets: List[AssetMatchItem] = Field(..., min_length=1, max_length=100, description="待匹配素材列表")
|
|
||||||
top_k: int = Field(default=0, ge=0, le=100, description="返回前K个，0返回全部")
|
|
||||||
|
|
||||||
|
|
||||||
class SemanticMatchResultItem(AssetMatchItem):
|
|
||||||
"""匹配结果项."""
|
|
||||||
|
|
||||||
match_score: float = Field(..., description="匹配度评分 0-1")
|
|
||||||
match_reason: str = Field(..., description="匹配方式：doubao_semantic / fallback_keyword / fallback_default")
|
|
||||||
|
|
||||||
|
|
||||||
class SemanticMatchResponse(BaseModel):
|
|
||||||
"""语义匹配响应."""
|
|
||||||
|
|
||||||
matches: List[SemanticMatchResultItem] = Field(..., description="按匹配度降序排列的素材列表")
|
|
||||||
source: str = Field(..., description="来源：doubao / fallback")
|
|
||||||
description: str = Field(..., description="原始描述")
|
|
||||||
total: int = Field(..., description="输入素材总数")
|
|
||||||
|
|
||||||
|
|
||||||
# ── 路由 ────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/titles/generate", response_model=GenerateTitlesResponse)
|
|
||||||
def generate_titles(request: GenerateTitlesRequest):
|
|
||||||
"""生成智能标题.
|
|
||||||
|
|
||||||
根据视频描述生成指定风格的标题，支持爆款、情感、信息三种风格。
|
|
||||||
未配置豆包 API Key 时自动降级为本地规则生成。
|
|
||||||
"""
|
|
||||||
result = generate_smart_titles(
|
|
||||||
description=request.description,
|
|
||||||
style=request.style,
|
|
||||||
count=request.count,
|
|
||||||
)
|
|
||||||
return GenerateTitlesResponse(**result)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/titles/styles", response_model=List[TitleStyleInfo])
|
|
||||||
def list_title_styles():
|
|
||||||
"""获取支持的标题风格列表."""
|
|
||||||
return [
|
|
||||||
TitleStyleInfo(key=key, name=info["name"], description=info["description"])
|
|
||||||
for key, info in TITLE_STYLES.items()
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/assets/match", response_model=SemanticMatchResponse)
|
|
||||||
def match_assets(request: SemanticMatchRequest):
|
|
||||||
"""智能素材语义匹配.
|
|
||||||
|
|
||||||
根据用户描述，对素材列表做语义匹配并按匹配度排序。
|
|
||||||
未配置豆包 API Key 时自动降级为关键词匹配。
|
|
||||||
|
|
||||||
- 支持最多 100 个素材同时匹配
|
|
||||||
- 返回 match_score (0-1)，按降序排列
|
|
||||||
- top_k 可限制返回数量
|
|
||||||
"""
|
|
||||||
# 转为 dict 传给服务层
|
|
||||||
assets_dict = [asset.model_dump() for asset in request.assets]
|
|
||||||
|
|
||||||
result = semantic_match_assets(
|
|
||||||
description=request.description,
|
|
||||||
assets=assets_dict,
|
|
||||||
top_k=request.top_k,
|
|
||||||
)
|
|
||||||
|
|
||||||
return SemanticMatchResponse(
|
|
||||||
matches=[SemanticMatchResultItem(**m) for m in result["matches"]],
|
|
||||||
source=result["source"],
|
|
||||||
description=result["description"],
|
|
||||||
total=result["total"],
|
|
||||||
)
|
|
||||||
@@ -1,175 +0,0 @@
|
|||||||
"""AI数字人渲染合成 API 路由 — #1798.
|
|
||||||
|
|
||||||
接口：
|
|
||||||
POST /api/v1/ai-avatar/render 提交渲染任务
|
|
||||||
GET /api/v1/ai-avatar/render/jobs 任务列表
|
|
||||||
GET /api/v1/ai-avatar/render/{job_id} 任务详情
|
|
||||||
POST /api/v1/ai-avatar/render/{job_id}/cancel 取消任务
|
|
||||||
POST /api/v1/ai-avatar/render/{job_id}/retry 重试失败任务
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
from app.schemas.ai_avatar_render import (
|
|
||||||
AiAvatarRenderJobResponse,
|
|
||||||
CreateAiAvatarRenderRequest,
|
|
||||||
)
|
|
||||||
from app.services.ai_avatar_render_service import (
|
|
||||||
AiAvatarRenderError,
|
|
||||||
AiAvatarRenderService,
|
|
||||||
)
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter()
|
|
||||||
|
|
||||||
|
|
||||||
def _get_service(db: Session = Depends(get_db_session)) -> AiAvatarRenderService:
|
|
||||||
return AiAvatarRenderService(db)
|
|
||||||
|
|
||||||
|
|
||||||
# ── POST / — 提交渲染任务 ────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("", response_model=AiAvatarRenderJobResponse, status_code=201)
|
|
||||||
def create_render_job(
|
|
||||||
body: CreateAiAvatarRenderRequest,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: AiAvatarRenderService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""提交 AI 数字人渲染任务.
|
|
||||||
|
|
||||||
将对口型视频 + B-roll 素材 + 标题叠加 + 封面提取合成最终输出视频。
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
job = svc.create_render_job(
|
|
||||||
user_id=current_user.id,
|
|
||||||
lipsync_job_id=body.lipsync_job_id,
|
|
||||||
script_id=body.script_id,
|
|
||||||
b_roll_segments=[s.model_dump() for s in body.b_roll_segments],
|
|
||||||
title_config=body.title_config,
|
|
||||||
cover_config=body.cover_config,
|
|
||||||
project_id=body.project_id,
|
|
||||||
)
|
|
||||||
except AiAvatarRenderError as exc:
|
|
||||||
status_map = {
|
|
||||||
"LipsyncJobNotFound": 404,
|
|
||||||
"LipsyncJobNotCompleted": 400,
|
|
||||||
"LipsyncJobNoOutput": 400,
|
|
||||||
"ScriptNotFound": 404,
|
|
||||||
}
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status_map.get(exc.code, 400),
|
|
||||||
detail={"code": exc.code, "message": str(exc)},
|
|
||||||
) from exc
|
|
||||||
|
|
||||||
# 异步触发渲染
|
|
||||||
try:
|
|
||||||
from app.tasks.ai_avatar_render import execute_ai_avatar_render
|
|
||||||
|
|
||||||
execute_ai_avatar_render.delay(job.id)
|
|
||||||
except Exception:
|
|
||||||
logger.warning("Celery 任务提交失败，渲染任务已创建但未触发执行: %s", job.id)
|
|
||||||
|
|
||||||
return job
|
|
||||||
|
|
||||||
|
|
||||||
# ── GET /jobs — 任务列表 ─────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/jobs", response_model=dict)
|
|
||||||
def list_render_jobs(
|
|
||||||
project_id: str = Query("", description="项目 ID 过滤"),
|
|
||||||
status: str = Query("", description="状态过滤"),
|
|
||||||
offset: int = Query(0, ge=0),
|
|
||||||
limit: int = Query(20, ge=1, le=100),
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: AiAvatarRenderService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""获取 AI 数字人渲染任务列表."""
|
|
||||||
items, total = svc.list_render_jobs(
|
|
||||||
user_id=current_user.id,
|
|
||||||
project_id=project_id,
|
|
||||||
status=status,
|
|
||||||
offset=offset,
|
|
||||||
limit=limit,
|
|
||||||
)
|
|
||||||
return {
|
|
||||||
"items": [AiAvatarRenderJobResponse.model_validate(j) for j in items],
|
|
||||||
"total": total,
|
|
||||||
"offset": offset,
|
|
||||||
"limit": limit,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# ── GET /{job_id} — 任务详情 ─────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{job_id}", response_model=AiAvatarRenderJobResponse)
|
|
||||||
def get_render_job(
|
|
||||||
job_id: str,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: AiAvatarRenderService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""获取渲染任务详情."""
|
|
||||||
job = svc.get_render_job(job_id, current_user.id)
|
|
||||||
if job is None:
|
|
||||||
raise HTTPException(status_code=404, detail="渲染任务不存在")
|
|
||||||
return job
|
|
||||||
|
|
||||||
|
|
||||||
# ── POST /{job_id}/cancel — 取消任务 ─────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/{job_id}/cancel", response_model=AiAvatarRenderJobResponse)
|
|
||||||
def cancel_render_job(
|
|
||||||
job_id: str,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: AiAvatarRenderService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""取消渲染任务（仅 pending 状态可取消）."""
|
|
||||||
job = svc.cancel_render_job(job_id, current_user.id)
|
|
||||||
if job is None:
|
|
||||||
raise HTTPException(status_code=404, detail="渲染任务不存在")
|
|
||||||
if job.status != "cancelled":
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail=f"任务状态 {job.status} 不可取消，仅 pending 可取消",
|
|
||||||
)
|
|
||||||
return job
|
|
||||||
|
|
||||||
|
|
||||||
# ── POST /{job_id}/retry — 重试失败任务 ──────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/{job_id}/retry", response_model=AiAvatarRenderJobResponse)
|
|
||||||
def retry_render_job(
|
|
||||||
job_id: str,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: AiAvatarRenderService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""重试失败的渲染任务."""
|
|
||||||
job = svc.retry_render_job(job_id, current_user.id)
|
|
||||||
if job is None:
|
|
||||||
raise HTTPException(status_code=404, detail="渲染任务不存在")
|
|
||||||
if job.status != "pending":
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail=f"仅 failed 状态的任务可重试，当前状态: {job.status}",
|
|
||||||
)
|
|
||||||
|
|
||||||
# 重新触发渲染
|
|
||||||
try:
|
|
||||||
from app.tasks.ai_avatar_render import execute_ai_avatar_render
|
|
||||||
|
|
||||||
execute_ai_avatar_render.delay(job.id)
|
|
||||||
except Exception:
|
|
||||||
logger.warning("Celery 任务提交失败，重试任务已重置但未触发执行: %s", job.id)
|
|
||||||
|
|
||||||
return job
|
|
||||||
@@ -20,7 +20,7 @@ from packages.application import (
|
|||||||
GetProjectUseCase,
|
GetProjectUseCase,
|
||||||
ListAssetLibrariesUseCase,
|
ListAssetLibrariesUseCase,
|
||||||
)
|
)
|
||||||
from packages.domain import AssetLibraryKind
|
from packages.domain import AssetLibrary, AssetLibraryKind
|
||||||
|
|
||||||
from ._helpers import check_project_access
|
from ._helpers import check_project_access
|
||||||
|
|
||||||
@@ -120,11 +120,30 @@ def ensure_default_library(
|
|||||||
|
|
||||||
kind = AssetLibraryKind(request.kind)
|
kind = AssetLibraryKind(request.kind)
|
||||||
|
|
||||||
# Issue #1775: 幂等获取/创建——依赖唯一约束 uq_asset_libraries_project_kind，
|
# 查找该项目下同 kind 的素材库，返回第一个
|
||||||
# 并发创建冲突时回滚重查返回已有记录，不再依赖应用层"先查后插"，也不会 500。
|
existing = asset_library_repository.find_by_project(request.project_id)
|
||||||
|
for lib in existing:
|
||||||
|
if lib.kind == kind:
|
||||||
|
return _to_asset_library_response(lib)
|
||||||
|
|
||||||
|
# 不存在 → 自动创建
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
default_name = _DEFAULT_LIBRARY_NAMES.get(request.kind, f"{request.kind}素材库")
|
default_name = _DEFAULT_LIBRARY_NAMES.get(request.kind, f"{request.kind}素材库")
|
||||||
library = asset_library_repository.get_or_create_default_library(request.project_id, kind, name=default_name)
|
library = AssetLibrary(
|
||||||
return _to_asset_library_response(library)
|
id=str(uuid.uuid4()),
|
||||||
|
project_id=request.project_id,
|
||||||
|
name=default_name,
|
||||||
|
kind=kind,
|
||||||
|
asset_count=0,
|
||||||
|
total_size=0,
|
||||||
|
created_at=now,
|
||||||
|
updated_at=now,
|
||||||
|
)
|
||||||
|
created = asset_library_repository.create(library)
|
||||||
|
return _to_asset_library_response(created)
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
|
@router.delete("/{library_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import logging
|
import logging
|
||||||
from typing import Any, List, Optional
|
from typing import Any, Optional
|
||||||
|
|
||||||
from app.api.routes._helpers import check_project_access, format_utc_datetime
|
from app.api.routes._helpers import check_project_access
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
from app.core.storage import get_storage_service
|
from app.core.storage import get_storage_service
|
||||||
from app.dependencies import (
|
from app.dependencies import (
|
||||||
@@ -14,45 +14,28 @@ from app.schemas.asset import (
|
|||||||
AssetResponse,
|
AssetResponse,
|
||||||
BatchClassifyRequest,
|
BatchClassifyRequest,
|
||||||
BatchDeleteRequest,
|
BatchDeleteRequest,
|
||||||
BatchGetRequest,
|
|
||||||
BatchMarkRequest,
|
BatchMarkRequest,
|
||||||
BatchOperationResponse,
|
BatchOperationResponse,
|
||||||
BatchTagRequest,
|
BatchTagRequest,
|
||||||
|
CreateAssetRequest,
|
||||||
ListAssetsResponse,
|
ListAssetsResponse,
|
||||||
SmartMatchItem,
|
|
||||||
SmartMatchRequest,
|
|
||||||
SmartMatchResponse,
|
|
||||||
UpdateAssetRequest,
|
UpdateAssetRequest,
|
||||||
UpdateAssetReviewRequest,
|
UpdateAssetReviewRequest,
|
||||||
)
|
)
|
||||||
from app.schemas.tag import TagAssetsRequest
|
from app.schemas.tag import TagAssetsRequest
|
||||||
from app.services.asset_segment_tracker import compute_asset_availability, get_asset_recent_use_counts
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, Response
|
from fastapi import APIRouter, Depends, HTTPException, Query, Response
|
||||||
|
|
||||||
from packages.domain.smart_match import smart_select_assets
|
from packages.application import (
|
||||||
|
CreateAssetCommand,
|
||||||
|
CreateAssetUseCase,
|
||||||
|
)
|
||||||
|
from packages.domain import AssetStatus, ClassificationStatus
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
def _asset_availability_fields(item) -> dict:
|
|
||||||
"""视频素材返回余量四字段；非视频/无时长/异常时返回 None + usable=True（零影响）。"""
|
|
||||||
try:
|
|
||||||
info = compute_asset_availability(item)
|
|
||||||
except Exception:
|
|
||||||
logger.warning("计算素材余量失败，按可用处理: asset_id=%s", getattr(item, "id", "?"), exc_info=True)
|
|
||||||
info = None
|
|
||||||
if info is None:
|
|
||||||
return {
|
|
||||||
"used_duration": None,
|
|
||||||
"available_duration": None,
|
|
||||||
"used_ratio": None,
|
|
||||||
"usable": True,
|
|
||||||
}
|
|
||||||
return info
|
|
||||||
|
|
||||||
|
|
||||||
def _to_asset_response(item, storage_service=None) -> AssetResponse:
|
def _to_asset_response(item, storage_service=None) -> AssetResponse:
|
||||||
# 生成签名文件 URL（用于视频播放 / 文件下载）
|
# 生成签名文件 URL（用于视频播放 / 文件下载）
|
||||||
file_url = None
|
file_url = None
|
||||||
@@ -64,16 +47,10 @@ def _to_asset_response(item, storage_service=None) -> AssetResponse:
|
|||||||
logger.warning("生成签名URL失败: storage_key=%s", item.storage_key, exc_info=True)
|
logger.warning("生成签名URL失败: storage_key=%s", item.storage_key, exc_info=True)
|
||||||
file_url = None
|
file_url = None
|
||||||
|
|
||||||
# 缩略图：存储的是 storage_key，需要生成签名 URL 供前端使用
|
# 缩略图：优先用已有 thumbnail_url，否则对视频素材复用文件签名 URL
|
||||||
# 不再降级使用视频文件 URL（浏览器 <img> 无法渲染 .mp4，会显示黑屏）
|
thumbnail_url = item.thumbnail_url
|
||||||
thumbnail_url = None
|
if not thumbnail_url and item.mime_type and item.mime_type.startswith("video") and file_url:
|
||||||
if item.thumbnail_url:
|
thumbnail_url = file_url
|
||||||
try:
|
|
||||||
svc = storage_service or get_storage_service()
|
|
||||||
thumbnail_url = svc.get_download_url(item.thumbnail_url)
|
|
||||||
except Exception:
|
|
||||||
logger.warning("生成缩略图签名URL失败: key=%s", item.thumbnail_url, exc_info=True)
|
|
||||||
thumbnail_url = None
|
|
||||||
|
|
||||||
return AssetResponse(
|
return AssetResponse(
|
||||||
id=item.id,
|
id=item.id,
|
||||||
@@ -94,10 +71,8 @@ def _to_asset_response(item, storage_service=None) -> AssetResponse:
|
|||||||
status=item.status.value,
|
status=item.status.value,
|
||||||
classification_status=item.classification_status.value,
|
classification_status=item.classification_status.value,
|
||||||
quality_score=item.quality_score,
|
quality_score=item.quality_score,
|
||||||
created_at=format_utc_datetime(item.created_at),
|
|
||||||
uploaded_by_user_id=item.uploaded_by_user_id,
|
uploaded_by_user_id=item.uploaded_by_user_id,
|
||||||
tag_ids=getattr(item, "tag_ids", []),
|
tag_ids=getattr(item, "tag_ids", []),
|
||||||
**_asset_availability_fields(item),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -119,12 +94,6 @@ def list_assets(
|
|||||||
None,
|
None,
|
||||||
description="按内容分类筛选：scenic=风景、product=产品、person=人物、animal=动物、food=美食、tech=科技、sport=运动、music=音乐、other=其他",
|
description="按内容分类筛选：scenic=风景、product=产品、person=人物、animal=动物、food=美食、tech=科技、sport=运动、music=音乐、other=其他",
|
||||||
),
|
),
|
||||||
status: Optional[str] = Query(
|
|
||||||
"default",
|
|
||||||
description="按状态筛选，逗号分隔多值；默认返回除deleted外的所有状态；传deleted查看回收站；传all返回所有状态",
|
|
||||||
),
|
|
||||||
page: Optional[int] = Query(None, ge=1, description="页码，从1开始；与 page_size 配对使用，优先于 skip/limit"),
|
|
||||||
page_size: Optional[int] = Query(None, ge=1, le=500, description="每页数量；与 page 配对使用"),
|
|
||||||
skip: int = Query(0, ge=0),
|
skip: int = Query(0, ge=0),
|
||||||
limit: int = Query(100, ge=1, le=500),
|
limit: int = Query(100, ge=1, le=500),
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
@@ -134,26 +103,6 @@ def list_assets(
|
|||||||
) -> ListAssetsResponse:
|
) -> ListAssetsResponse:
|
||||||
user_id = authenticated_user.user.id
|
user_id = authenticated_user.user.id
|
||||||
|
|
||||||
# ── 分页：page/page_size 优先于 skip/limit
|
|
||||||
if page is not None and page_size is not None:
|
|
||||||
skip = (page - 1) * page_size
|
|
||||||
limit = page_size
|
|
||||||
|
|
||||||
# ── 解析 status 过滤
|
|
||||||
status_list: list[str] | None
|
|
||||||
if status and status.lower() == "all":
|
|
||||||
status_list = None # None = 不过滤，返回所有状态
|
|
||||||
elif status and status.lower() == "deleted":
|
|
||||||
status_list = ["deleted"] # 仅查回收站
|
|
||||||
elif status and status.lower() == "default":
|
|
||||||
status_list = ["ready", "uploading", "processing", "error"] # 默认排除deleted
|
|
||||||
elif status:
|
|
||||||
status_list = [s.strip() for s in status.split(",") if s.strip()]
|
|
||||||
if not status_list:
|
|
||||||
status_list = ["ready", "uploading", "processing", "error"]
|
|
||||||
else:
|
|
||||||
status_list = ["ready", "uploading", "processing", "error"]
|
|
||||||
|
|
||||||
# kind → file_type 映射（voice 对应 audio）
|
# kind → file_type 映射（voice 对应 audio）
|
||||||
kind_to_file_type = {"video": "video", "voice": "audio", "image": "image"}
|
kind_to_file_type = {"video": "video", "voice": "audio", "image": "image"}
|
||||||
|
|
||||||
@@ -222,13 +171,11 @@ def list_assets(
|
|||||||
raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
|
raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
|
||||||
check_project_access(library.project_id, user_id, project_repository)
|
check_project_access(library.project_id, user_id, project_repository)
|
||||||
if ft:
|
if ft:
|
||||||
items = asset_repository.find_by_library_and_file_type(
|
items = asset_repository.find_by_library_and_file_type(library_id, ft, skip=skip, limit=limit)
|
||||||
library_id, ft, skip=skip, limit=limit, status=status_list
|
total = asset_repository.count_by_project(library.project_id) if not kind else len(items)
|
||||||
)
|
|
||||||
total = asset_repository.count_by_library_and_file_type(library_id, ft, status=status_list)
|
|
||||||
else:
|
else:
|
||||||
items = asset_repository.find_by_library(library_id, skip=skip, limit=limit, status=status_list)
|
items = asset_repository.find_by_library(library_id, skip=skip, limit=limit)
|
||||||
total = asset_repository.count_by_project(library.project_id, status=status_list)
|
total = asset_repository.count_by_project(library.project_id)
|
||||||
return ListAssetsResponse(
|
return ListAssetsResponse(
|
||||||
items=[_to_asset_response(item) for item in items],
|
items=[_to_asset_response(item) for item in items],
|
||||||
total=total,
|
total=total,
|
||||||
@@ -240,14 +187,14 @@ def list_assets(
|
|||||||
if project_id:
|
if project_id:
|
||||||
check_project_access(project_id, user_id, project_repository)
|
check_project_access(project_id, user_id, project_repository)
|
||||||
if ft:
|
if ft:
|
||||||
items = asset_repository.find_by_project_and_file_type(
|
# 无直接方法，加载后按 file_type 过滤（仍比全量加载好）
|
||||||
project_id, ft, skip=skip, limit=limit, status=status_list
|
all_items = asset_repository.find_by_project(project_id)
|
||||||
)
|
items = [i for i in all_items if i.mime_type and i.mime_type.startswith(ft)]
|
||||||
total = asset_repository.count_by_project_and_file_type(project_id, ft, status=status_list)
|
total = len(items)
|
||||||
paged = items
|
paged = items[skip : skip + limit]
|
||||||
else:
|
else:
|
||||||
items = asset_repository.find_by_project(project_id, skip=skip, limit=limit, status=status_list)
|
items = asset_repository.find_by_project(project_id, skip=skip, limit=limit)
|
||||||
total = asset_repository.count_by_project(project_id, status=status_list)
|
total = asset_repository.count_by_project(project_id)
|
||||||
paged = items
|
paged = items
|
||||||
return ListAssetsResponse(
|
return ListAssetsResponse(
|
||||||
items=[_to_asset_response(item) for item in paged],
|
items=[_to_asset_response(item) for item in paged],
|
||||||
@@ -267,43 +214,22 @@ def list_assets(
|
|||||||
if not project_ids:
|
if not project_ids:
|
||||||
return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
|
return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
|
||||||
|
|
||||||
if ft:
|
total = asset_repository.count_by_project_ids(project_ids)
|
||||||
# 有 kind 过滤：逐项目查 file_type，凑够一页
|
# 跨项目分页：逐项目累积直到凑够一页
|
||||||
total = 0
|
paged_items: list = []
|
||||||
paged_items: list = []
|
offset = skip
|
||||||
offset = skip
|
remaining = limit
|
||||||
remaining = limit
|
for pid in project_ids:
|
||||||
for pid in project_ids:
|
proj_total = asset_repository.count_by_project(pid)
|
||||||
proj_total = asset_repository.count_by_project_and_file_type(pid, ft, status=status_list)
|
if offset >= proj_total:
|
||||||
total += proj_total
|
offset -= proj_total
|
||||||
if offset >= proj_total:
|
continue
|
||||||
offset -= proj_total
|
proj_items = asset_repository.find_by_project(pid, skip=offset, limit=remaining)
|
||||||
continue
|
paged_items.extend(proj_items)
|
||||||
proj_items = asset_repository.find_by_project_and_file_type(
|
remaining -= len(proj_items)
|
||||||
pid, ft, skip=offset, limit=remaining, status=status_list
|
offset = 0
|
||||||
)
|
if remaining <= 0:
|
||||||
paged_items.extend(proj_items)
|
break
|
||||||
remaining -= len(proj_items)
|
|
||||||
offset = 0
|
|
||||||
if remaining <= 0:
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
total = asset_repository.count_by_project_ids(project_ids, status=status_list)
|
|
||||||
# 跨项目分页：逐项目累积直到凑够一页
|
|
||||||
paged_items = []
|
|
||||||
offset = skip
|
|
||||||
remaining = limit
|
|
||||||
for pid in project_ids:
|
|
||||||
proj_total = asset_repository.count_by_project(pid, status=status_list)
|
|
||||||
if offset >= proj_total:
|
|
||||||
offset -= proj_total
|
|
||||||
continue
|
|
||||||
proj_items = asset_repository.find_by_project(pid, skip=offset, limit=remaining, status=status_list)
|
|
||||||
paged_items.extend(proj_items)
|
|
||||||
remaining -= len(proj_items)
|
|
||||||
offset = 0
|
|
||||||
if remaining <= 0:
|
|
||||||
break
|
|
||||||
|
|
||||||
return ListAssetsResponse(
|
return ListAssetsResponse(
|
||||||
items=[_to_asset_response(item) for item in paged_items],
|
items=[_to_asset_response(item) for item in paged_items],
|
||||||
@@ -319,21 +245,12 @@ def list_assets(
|
|||||||
raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
|
raise HTTPException(status_code=404, detail=f"AssetLibrary {library_id} not found")
|
||||||
check_project_access(library.project_id, user_id, project_repository)
|
check_project_access(library.project_id, user_id, project_repository)
|
||||||
if kind:
|
if kind:
|
||||||
all_items = asset_repository.find_by_library_and_file_type(
|
all_items = asset_repository.find_by_library_and_file_type(library_id, kind_to_file_type[kind])
|
||||||
library_id, kind_to_file_type[kind], status=status_list
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
all_items = asset_repository.find_by_library(library_id, status=status_list)
|
all_items = asset_repository.find_by_library(library_id)
|
||||||
elif project_id:
|
elif project_id:
|
||||||
check_project_access(project_id, user_id, project_repository)
|
check_project_access(project_id, user_id, project_repository)
|
||||||
if kind:
|
all_items = asset_repository.find_by_project(project_id)
|
||||||
ft = kind_to_file_type.get(kind)
|
|
||||||
if ft:
|
|
||||||
all_items = asset_repository.find_by_project_and_file_type(project_id, ft, status=status_list)
|
|
||||||
else:
|
|
||||||
all_items = asset_repository.find_by_project(project_id, status=status_list)
|
|
||||||
else:
|
|
||||||
all_items = asset_repository.find_by_project(project_id, status=status_list)
|
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
projects = project_repository.find_accessible_projects(user_id)
|
projects = project_repository.find_accessible_projects(user_id)
|
||||||
@@ -342,18 +259,12 @@ def list_assets(
|
|||||||
return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
|
return ListAssetsResponse(items=[], total=0, skip=skip, limit=limit)
|
||||||
all_items = []
|
all_items = []
|
||||||
for proj in projects:
|
for proj in projects:
|
||||||
if kind and kind_to_file_type.get(kind):
|
all_items.extend(asset_repository.find_by_project(proj.id))
|
||||||
all_items.extend(
|
|
||||||
asset_repository.find_by_project_and_file_type(proj.id, kind_to_file_type[kind], status=status_list)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
all_items.extend(asset_repository.find_by_project(proj.id, status=status_list))
|
|
||||||
|
|
||||||
# 应用 kind 过滤（如果有）+ keyword/gender/style
|
# 应用 kind 过滤（如果有）+ keyword/gender/style
|
||||||
if kind:
|
if kind:
|
||||||
ft = kind_to_file_type.get(kind)
|
ft = kind_to_file_type.get(kind)
|
||||||
if ft:
|
all_items = [i for i in all_items if i.mime_type and i.mime_type.startswith(ft or "")]
|
||||||
all_items = [i for i in all_items if i.file_type == ft]
|
|
||||||
filtered = _apply_memory_filters(all_items)
|
filtered = _apply_memory_filters(all_items)
|
||||||
total = len(filtered)
|
total = len(filtered)
|
||||||
paged = filtered[skip : skip + limit]
|
paged = filtered[skip : skip + limit]
|
||||||
@@ -390,18 +301,6 @@ def update_asset_review_status(
|
|||||||
return _to_asset_response(updated)
|
return _to_asset_response(updated)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/batch", response_model=List[AssetResponse])
|
|
||||||
def batch_get_assets(
|
|
||||||
request: BatchGetRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
asset_repository: Any = Depends(get_asset_repository),
|
|
||||||
) -> list[AssetResponse]:
|
|
||||||
"""批量获取素材详情（根据 ID 列表）。"""
|
|
||||||
items = asset_repository.find_by_ids(request.ids)
|
|
||||||
storage_service = get_storage_service()
|
|
||||||
return [_to_asset_response(item, storage_service) for item in items]
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/batch-delete", response_model=BatchOperationResponse)
|
@router.post("/batch-delete", response_model=BatchOperationResponse)
|
||||||
def batch_delete_assets(
|
def batch_delete_assets(
|
||||||
request: BatchDeleteRequest,
|
request: BatchDeleteRequest,
|
||||||
@@ -555,119 +454,6 @@ def batch_mark_assets(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/smart-match", response_model=SmartMatchResponse)
|
|
||||||
def smart_match_assets(
|
|
||||||
request: SmartMatchRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
asset_repository: Any = Depends(get_asset_repository),
|
|
||||||
asset_library_repository: Any = Depends(get_asset_library_repository),
|
|
||||||
project_repository: Any = Depends(get_project_repository),
|
|
||||||
) -> SmartMatchResponse:
|
|
||||||
"""智能选素材：根据素材库内容，按质量分+时长均衡+新鲜度+未使用偏好综合评分，返回 Top N 素材。"""
|
|
||||||
library = asset_library_repository.get(request.library_id)
|
|
||||||
if library is None:
|
|
||||||
raise HTTPException(status_code=404, detail=f"AssetLibrary {request.library_id} not found")
|
|
||||||
check_project_access(library.project_id, authenticated_user.user.id, project_repository)
|
|
||||||
|
|
||||||
# 获取素材库中所有 ready 素材（DB 层按 kind 过滤，避免加载不必要的数据到内存）
|
|
||||||
# kind → file_type 映射：schema 已校验只允许 video/image/audio，与 file_type 一致
|
|
||||||
if request.kind:
|
|
||||||
filtered_assets = asset_repository.find_by_library_and_file_type(
|
|
||||||
request.library_id, request.kind, status=["ready"], limit=10000
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
filtered_assets = asset_repository.find_by_library(request.library_id, status=["ready"], limit=10000)
|
|
||||||
total_candidates = len(filtered_assets)
|
|
||||||
|
|
||||||
# ── 过滤前置：余量 + 高频使用，过滤在评分/截取 limit 之前完成 ──────────
|
|
||||||
# 旧实现先 smart_select_assets(limit=N) 再对这 N 条做过滤，过滤后不回补，
|
|
||||||
# 当排名靠前的素材恰好都被排除时返回空 items（前端回退全选，smart-match 名存实亡）。
|
|
||||||
# 现在先过滤全量候选，每级过滤后为空/不足则回退上一级，最后才评分截取。
|
|
||||||
|
|
||||||
# 1) 余量过滤：usable=False（零重复可切区间耗尽且历史区间均达复用上限）的素材排除
|
|
||||||
usable_assets = []
|
|
||||||
exhausted_assets = []
|
|
||||||
for a in filtered_assets:
|
|
||||||
try:
|
|
||||||
avail = compute_asset_availability(a)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"smart-match 余量计算失败，按可用处理: asset_id=%s",
|
|
||||||
getattr(a, "id", "?"),
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
avail = None
|
|
||||||
if avail is not None and not avail["usable"]:
|
|
||||||
exhausted_assets.append(a)
|
|
||||||
else:
|
|
||||||
usable_assets.append(a)
|
|
||||||
|
|
||||||
if exhausted_assets:
|
|
||||||
logger.info(
|
|
||||||
"smart-match 余量过滤: 候选 %d，可切区间耗尽 %d",
|
|
||||||
len(filtered_assets), len(exhausted_assets),
|
|
||||||
)
|
|
||||||
|
|
||||||
# 回退策略：余量过滤后为空（全部耗尽）时，保留全部候选，不返回空结果。
|
|
||||||
# 宁可让用户在已耗尽素材上复用，也比 smart-match 空结果回退全选更可控
|
|
||||||
# （全选同样会选到这些素材，且不经过评分排序）。
|
|
||||||
pool = usable_assets if usable_assets else filtered_assets
|
|
||||||
|
|
||||||
# 2) 高频使用排除：同一素材在最近 5 个视频中出现超过 3 次则排除
|
|
||||||
MAX_RECENT_USE_COUNT = 3
|
|
||||||
high_freq_assets = set()
|
|
||||||
if pool:
|
|
||||||
asset_ids = [getattr(a, "id", "") for a in pool if getattr(a, "id", "")]
|
|
||||||
if asset_ids:
|
|
||||||
try:
|
|
||||||
use_counts = get_asset_recent_use_counts(
|
|
||||||
db=asset_repository.session,
|
|
||||||
asset_ids=asset_ids,
|
|
||||||
recent_video_count=5,
|
|
||||||
)
|
|
||||||
for a in pool:
|
|
||||||
aid = getattr(a, "id", "")
|
|
||||||
count = use_counts.get(aid, 0)
|
|
||||||
if count > MAX_RECENT_USE_COUNT:
|
|
||||||
high_freq_assets.add(aid)
|
|
||||||
logger.info(
|
|
||||||
"smart-match 排除高频使用素材: asset_id=%s use_count=%d limit=%d",
|
|
||||||
aid, count, MAX_RECENT_USE_COUNT,
|
|
||||||
)
|
|
||||||
# 回退策略：排除后剩余素材不足（为空或不够 limit）时，
|
|
||||||
# 不再全部排除，保留全部可用素材
|
|
||||||
if high_freq_assets:
|
|
||||||
remaining_count = len(pool) - len(high_freq_assets)
|
|
||||||
enough = request.limit is None or remaining_count >= request.limit
|
|
||||||
if remaining_count > 0 and enough:
|
|
||||||
pool = [a for a in pool if getattr(a, "id", "") not in high_freq_assets]
|
|
||||||
else:
|
|
||||||
logger.info(
|
|
||||||
"smart-match 高频排除后素材不足(%d<%s)，保留全部 %d 条",
|
|
||||||
remaining_count,
|
|
||||||
request.limit if request.limit is not None else "不限",
|
|
||||||
len(pool),
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning("smart-match 高频使用查询失败，跳过排除", exc_info=True)
|
|
||||||
|
|
||||||
# 3) 调用统一智能选素材算法（kind 已在 DB 层过滤，无需重复过滤）
|
|
||||||
results = smart_select_assets(pool, limit=request.limit, kind=None)
|
|
||||||
|
|
||||||
# 扁平结构：SmartMatchItem 继承 AssetResponse，素材字段直接在条目顶层，
|
|
||||||
# 前端无需解析 item.asset 包装层，item.id / item.usable / 余量字段直接可读
|
|
||||||
items = [
|
|
||||||
SmartMatchItem(
|
|
||||||
**_to_asset_response(r.asset).model_dump(),
|
|
||||||
score=r.score,
|
|
||||||
breakdown=r.breakdown,
|
|
||||||
)
|
|
||||||
for r in results
|
|
||||||
]
|
|
||||||
|
|
||||||
return SmartMatchResponse(items=items, total_candidates=total_candidates)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{asset_id}", response_model=AssetResponse)
|
@router.get("/{asset_id}", response_model=AssetResponse)
|
||||||
def get_asset(
|
def get_asset(
|
||||||
asset_id: str,
|
asset_id: str,
|
||||||
@@ -764,12 +550,43 @@ def untag_asset(
|
|||||||
|
|
||||||
|
|
||||||
@router.post("", response_model=AssetResponse)
|
@router.post("", response_model=AssetResponse)
|
||||||
def create_asset() -> None:
|
def create_asset(
|
||||||
"""
|
request: CreateAssetRequest,
|
||||||
已废弃接口。
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
所有素材上传统一走 uploadAssetDirect → completeDirectUpload → ingest-jobs 流程。
|
asset_repository: Any = Depends(get_asset_repository),
|
||||||
"""
|
asset_library_repository: Any = Depends(get_asset_library_repository),
|
||||||
raise HTTPException(
|
project_repository: Any = Depends(get_project_repository),
|
||||||
status_code=410,
|
) -> AssetResponse:
|
||||||
detail="此接口已废弃。请使用 uploadAssetDirect 接口上传素材，Worker 会自动处理（视频转码、图片/音频元数据提取）并创建 Asset 记录。",
|
project = project_repository.find_by_id(request.project_id)
|
||||||
|
if project is None:
|
||||||
|
raise HTTPException(status_code=404, detail=f"Project {request.project_id} not found")
|
||||||
|
if not project.can_access(authenticated_user.user.id):
|
||||||
|
raise HTTPException(status_code=403, detail="Access denied to project")
|
||||||
|
|
||||||
|
library = asset_library_repository.get(request.library_id)
|
||||||
|
if library is None or library.project_id != request.project_id:
|
||||||
|
raise HTTPException(status_code=404, detail=f"AssetLibrary {request.library_id} not found")
|
||||||
|
|
||||||
|
use_case = CreateAssetUseCase(asset_repository)
|
||||||
|
item = use_case.execute(
|
||||||
|
CreateAssetCommand(
|
||||||
|
project_id=request.project_id,
|
||||||
|
library_id=request.library_id,
|
||||||
|
name=request.name,
|
||||||
|
storage_key=request.storage_key,
|
||||||
|
mime_type=request.mime_type,
|
||||||
|
metadata=request.metadata,
|
||||||
|
file_size=request.file_size,
|
||||||
|
thumbnail_url=request.thumbnail_url,
|
||||||
|
duration=request.duration,
|
||||||
|
width=request.width,
|
||||||
|
height=request.height,
|
||||||
|
fps=request.fps,
|
||||||
|
codec=request.codec,
|
||||||
|
status=AssetStatus(request.status),
|
||||||
|
classification_status=ClassificationStatus(request.classification_status),
|
||||||
|
quality_score=request.quality_score,
|
||||||
|
uploaded_by_user_id=authenticated_user.user.id,
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
return _to_asset_response(item)
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
|
||||||
Canonical authentication API routes.
|
Canonical authentication API routes.
|
||||||
|
|
||||||
The route layer is intentionally thin: repository construction lives in
|
The route layer is intentionally thin: repository construction lives in
|
||||||
@@ -14,9 +13,9 @@ import jwt
|
|||||||
from app.auth import AuthenticatedUser, blacklist_token, get_current_user
|
from app.auth import AuthenticatedUser, blacklist_token, get_current_user
|
||||||
from app.config import settings
|
from app.config import settings
|
||||||
from app.dependencies import get_auth_email_service, get_auth_session_store, get_user_repository
|
from app.dependencies import get_auth_email_service, get_auth_session_store, get_user_repository
|
||||||
from fastapi import APIRouter, Depends, Header, HTTPException, Request, status
|
from fastapi import APIRouter, Depends, Header, HTTPException, status
|
||||||
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
||||||
from pydantic import BaseModel, EmailStr, field_validator
|
from pydantic import BaseModel, EmailStr
|
||||||
|
|
||||||
from packages.adapters.redis import NoopSessionStore
|
from packages.adapters.redis import NoopSessionStore
|
||||||
from packages.adapters.smtp import NoopEmailService
|
from packages.adapters.smtp import NoopEmailService
|
||||||
@@ -82,26 +81,6 @@ class CurrentUserResponse(BaseModel):
|
|||||||
username: str
|
username: str
|
||||||
display_name: str
|
display_name: str
|
||||||
email_verified: bool
|
email_verified: bool
|
||||||
phone: str = ""
|
|
||||||
phone_verified: bool = False
|
|
||||||
binding_complete: bool = False
|
|
||||||
wechat_bound: bool = False
|
|
||||||
profile_completed: bool = True
|
|
||||||
|
|
||||||
|
|
||||||
class UserProfileResponse(BaseModel):
|
|
||||||
"""用户资料负载（PATCH /me、绑定/解绑接口复用；字段与 GET /auth/me 一致，前端 normalizeUser 直接消费）"""
|
|
||||||
|
|
||||||
user_id: str
|
|
||||||
email: str
|
|
||||||
username: str
|
|
||||||
display_name: str
|
|
||||||
email_verified: bool
|
|
||||||
phone: str = ""
|
|
||||||
phone_verified: bool = False
|
|
||||||
binding_complete: bool = False
|
|
||||||
wechat_bound: bool = False
|
|
||||||
profile_completed: bool = True
|
|
||||||
|
|
||||||
|
|
||||||
class PasswordResetRequestModel(BaseModel):
|
class PasswordResetRequestModel(BaseModel):
|
||||||
@@ -280,62 +259,15 @@ async def get_current_user_info(
|
|||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
) -> CurrentUserResponse:
|
) -> CurrentUserResponse:
|
||||||
user = authenticated_user.user
|
user = authenticated_user.user
|
||||||
binding_complete = user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
|
|
||||||
return CurrentUserResponse(
|
return CurrentUserResponse(
|
||||||
user_id=user.id,
|
user_id=user.id,
|
||||||
email=user.email,
|
email=user.email,
|
||||||
username=user.username,
|
username=user.username,
|
||||||
display_name=user.display_name,
|
display_name=user.display_name,
|
||||||
email_verified=user.email_verified,
|
email_verified=user.email_verified,
|
||||||
phone=user.phone or "",
|
|
||||||
phone_verified=user.phone_verified,
|
|
||||||
binding_complete=binding_complete,
|
|
||||||
wechat_bound=bool(user.wechat_openid),
|
|
||||||
profile_completed=user.profile_completed,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class UpdateProfileRequest(BaseModel):
|
|
||||||
"""更新个人资料请求（当前仅支持昵称）"""
|
|
||||||
|
|
||||||
display_name: str
|
|
||||||
|
|
||||||
@field_validator("display_name")
|
|
||||||
@classmethod
|
|
||||||
def _validate_display_name(cls, v: str) -> str:
|
|
||||||
name = (v or "").strip()
|
|
||||||
if not name:
|
|
||||||
raise ValueError("昵称不能为空白")
|
|
||||||
if len(name) > 20:
|
|
||||||
raise ValueError("昵称长度需在 1-20 个字符之间")
|
|
||||||
return name
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateProfileResponse(BaseModel):
|
|
||||||
"""更新资料响应：前端 normalizeUser(response.user) 直接消费"""
|
|
||||||
|
|
||||||
user: UserProfileResponse
|
|
||||||
|
|
||||||
|
|
||||||
@router.patch("/me", response_model=UpdateProfileResponse)
|
|
||||||
async def update_current_user_profile(
|
|
||||||
request: UpdateProfileRequest,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
user_repository: UserRepository = Depends(get_user_repository),
|
|
||||||
) -> UpdateProfileResponse:
|
|
||||||
"""更新当前登录用户昵称（微信新用户首次设置昵称后置 profile_completed=True）。"""
|
|
||||||
user = current_user.user
|
|
||||||
user.display_name = request.display_name # 已 strip（validator）
|
|
||||||
if not user.profile_completed:
|
|
||||||
user.profile_completed = True
|
|
||||||
user_repository.save(user)
|
|
||||||
|
|
||||||
logger.info("[资料更新] 用户 %s 更新昵称，profile_completed=%s", user.id, user.profile_completed)
|
|
||||||
# 重新读取，确保返回的是持久化后的最新状态
|
|
||||||
fresh = user_repository.find_by_id(user.id) or user
|
|
||||||
return UpdateProfileResponse(user=_user_profile(fresh))
|
|
||||||
|
|
||||||
|
|
||||||
class _NoopSessionStore(NoopSessionStore):
|
class _NoopSessionStore(NoopSessionStore):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -448,325 +380,3 @@ async def wechat_sync(
|
|||||||
raise HTTPException(status_code=400, detail=error)
|
raise HTTPException(status_code=400, detail=error)
|
||||||
|
|
||||||
return WechatSyncResponse(**response.to_dict())
|
return WechatSyncResponse(**response.to_dict())
|
||||||
|
|
||||||
|
|
||||||
# ==================== 微信网页登录（OAuth） ====================
|
|
||||||
|
|
||||||
|
|
||||||
class WechatAuthUrlResponse(BaseModel):
|
|
||||||
auth_url: str
|
|
||||||
state: str
|
|
||||||
|
|
||||||
|
|
||||||
class WechatCallbackRequest(BaseModel):
|
|
||||||
code: str
|
|
||||||
state: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
class WechatLoginResponse(BaseModel):
|
|
||||||
access_token: str
|
|
||||||
refresh_token: str
|
|
||||||
user_id: str
|
|
||||||
display_name: str
|
|
||||||
avatar_url: str = ""
|
|
||||||
is_new_user: bool
|
|
||||||
binding_complete: bool
|
|
||||||
expires_in: int
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/wechat/url", response_model=WechatAuthUrlResponse)
|
|
||||||
async def get_wechat_auth_url() -> WechatAuthUrlResponse:
|
|
||||||
"""获取微信扫码登录授权链接"""
|
|
||||||
from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
|
|
||||||
|
|
||||||
oauth_service = get_wechat_oauth_service()
|
|
||||||
auth_url, state = oauth_service.generate_auth_url()
|
|
||||||
return WechatAuthUrlResponse(auth_url=auth_url, state=state)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/wechat/callback", response_model=WechatLoginResponse)
|
|
||||||
async def wechat_callback(
|
|
||||||
request: WechatCallbackRequest,
|
|
||||||
http_request: Request,
|
|
||||||
user_repository: UserRepository = Depends(get_user_repository),
|
|
||||||
) -> WechatLoginResponse:
|
|
||||||
"""微信登录回调处理"""
|
|
||||||
from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
|
|
||||||
from packages.application.auth.wechat_sync_use_case import WechatSyncRequest as SyncRequest
|
|
||||||
from packages.application.auth.wechat_sync_use_case import WechatSyncUseCase
|
|
||||||
|
|
||||||
# 回调可观测性：记录 UA（区分微信内置浏览器 MicroMessenger）与 state，
|
|
||||||
# 便于排查"停留 open.weixin.qq.com / 回调失败"类问题（#1718）
|
|
||||||
user_agent = http_request.headers.get("User-Agent", "")
|
|
||||||
is_wechat_browser = "MicroMessenger" in user_agent
|
|
||||||
logger.info(
|
|
||||||
"[微信回调] 收到回调: state=%s code_len=%d UA=%r 微信内置浏览器=%s",
|
|
||||||
(request.state or "")[:8],
|
|
||||||
len(request.code or ""),
|
|
||||||
user_agent[:200],
|
|
||||||
is_wechat_browser,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 1. 用 code 换微信用户信息
|
|
||||||
oauth_service = get_wechat_oauth_service()
|
|
||||||
wechat_user, err = oauth_service.handle_callback(request.code, request.state)
|
|
||||||
if err:
|
|
||||||
# state 校验失败 / 微信 errcode 等错误原文已在 service 内 log，这里带上 UA 上下文
|
|
||||||
logger.warning("[微信回调] 处理失败: err=%s 微信内置浏览器=%s", err, is_wechat_browser)
|
|
||||||
raise HTTPException(status_code=400, detail=err)
|
|
||||||
logger.info(
|
|
||||||
"[微信回调] state 校验通过，微信用户信息获取成功: openid=%s unionid=%s",
|
|
||||||
wechat_user.openid[:8] if wechat_user.openid else "",
|
|
||||||
bool(wechat_user.unionid),
|
|
||||||
)
|
|
||||||
|
|
||||||
# 2. 同步登录/注册（复用 wechat-sync 逻辑）
|
|
||||||
use_case = WechatSyncUseCase(user_repository=user_repository)
|
|
||||||
sync_request = SyncRequest(
|
|
||||||
openid=wechat_user.openid,
|
|
||||||
unionid=wechat_user.unionid,
|
|
||||||
nickname=wechat_user.nickname,
|
|
||||||
avatar_url=wechat_user.avatar_url,
|
|
||||||
source="web",
|
|
||||||
)
|
|
||||||
response, err = use_case.execute(sync_request)
|
|
||||||
if err:
|
|
||||||
raise HTTPException(status_code=400, detail=err)
|
|
||||||
|
|
||||||
# 3. 判断绑定状态
|
|
||||||
user = user_repository.find_by_id(response.user_id)
|
|
||||||
binding_complete = False
|
|
||||||
if user:
|
|
||||||
binding_complete = bool(
|
|
||||||
user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
|
|
||||||
)
|
|
||||||
|
|
||||||
return WechatLoginResponse(
|
|
||||||
access_token=response.access_token,
|
|
||||||
refresh_token=response.refresh_token,
|
|
||||||
user_id=response.user_id,
|
|
||||||
display_name=response.nickname,
|
|
||||||
avatar_url=response.avatar_url or wechat_user.avatar_url,
|
|
||||||
is_new_user=response.is_new_user,
|
|
||||||
binding_complete=binding_complete,
|
|
||||||
expires_in=response.expires_in,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== 微信账号绑定/解绑（已登录用户） ====================
|
|
||||||
|
|
||||||
|
|
||||||
class WechatBindUrlResponse(BaseModel):
|
|
||||||
auth_url: str
|
|
||||||
state: str
|
|
||||||
|
|
||||||
|
|
||||||
class WechatBindCompleteRequest(BaseModel):
|
|
||||||
code: str
|
|
||||||
state: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
class WechatBindCompleteResponse(BaseModel):
|
|
||||||
success: bool
|
|
||||||
user: UserProfileResponse
|
|
||||||
|
|
||||||
|
|
||||||
class WechatUnbindResponse(BaseModel):
|
|
||||||
success: bool
|
|
||||||
|
|
||||||
|
|
||||||
def _user_profile(user) -> UserProfileResponse:
|
|
||||||
binding_complete = bool(
|
|
||||||
user.phone_verified and user.email_verified and user.email and "@wechat.local" not in user.email
|
|
||||||
)
|
|
||||||
return UserProfileResponse(
|
|
||||||
user_id=user.id,
|
|
||||||
email=user.email,
|
|
||||||
username=user.username,
|
|
||||||
display_name=user.display_name,
|
|
||||||
email_verified=user.email_verified,
|
|
||||||
phone=user.phone or "",
|
|
||||||
phone_verified=user.phone_verified,
|
|
||||||
binding_complete=binding_complete,
|
|
||||||
wechat_bound=bool(user.wechat_openid),
|
|
||||||
profile_completed=user.profile_completed,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/wechat/bind/url", response_model=WechatBindUrlResponse)
|
|
||||||
async def get_wechat_bind_url(
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> WechatBindUrlResponse:
|
|
||||||
"""获取微信绑定授权链接（已登录用户场景）。state 经 Redis 存储做 CSRF 校验。"""
|
|
||||||
from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
|
|
||||||
|
|
||||||
oauth_service = get_wechat_oauth_service()
|
|
||||||
auth_url, state = oauth_service.generate_auth_url()
|
|
||||||
logger.info("[微信绑定] 用户 %s 请求绑定授权链接", current_user.user.id)
|
|
||||||
return WechatBindUrlResponse(auth_url=auth_url, state=state)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/wechat/bind", response_model=WechatBindCompleteResponse)
|
|
||||||
async def wechat_bind(
|
|
||||||
request: WechatBindCompleteRequest,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
user_repository: UserRepository = Depends(get_user_repository),
|
|
||||||
) -> WechatBindCompleteResponse:
|
|
||||||
"""微信绑定完成：扫码回调后用 code 换 openid，绑定到当前登录账号（不创建新用户）。"""
|
|
||||||
from packages.application.auth.wechat_bind_use_case import WechatBindRequest, WechatBindUseCase
|
|
||||||
from packages.application.auth.wechat_oauth_service import get_wechat_oauth_service
|
|
||||||
|
|
||||||
oauth_service = get_wechat_oauth_service()
|
|
||||||
wechat_user, err = oauth_service.handle_callback(request.code, request.state)
|
|
||||||
if err:
|
|
||||||
logger.warning("[微信绑定] 用户 %s 换取微信信息失败: %s", current_user.user.id, err)
|
|
||||||
raise HTTPException(status_code=400, detail=err)
|
|
||||||
|
|
||||||
use_case = WechatBindUseCase(user_repository=user_repository)
|
|
||||||
result, error, http_status = use_case.bind(
|
|
||||||
WechatBindRequest(
|
|
||||||
user_id=current_user.user.id,
|
|
||||||
openid=wechat_user.openid,
|
|
||||||
unionid=wechat_user.unionid or "",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if error:
|
|
||||||
logger.warning("[微信绑定] 用户 %s 绑定失败: %s", current_user.user.id, error)
|
|
||||||
raise HTTPException(status_code=http_status, detail=error)
|
|
||||||
|
|
||||||
logger.info("[微信绑定] 用户 %s 绑定成功 openid=%s", current_user.user.id, wechat_user.openid[:8])
|
|
||||||
return WechatBindCompleteResponse(success=True, user=_user_profile(result.user))
|
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/wechat/bind", response_model=WechatUnbindResponse)
|
|
||||||
async def wechat_unbind(
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
user_repository: UserRepository = Depends(get_user_repository),
|
|
||||||
) -> WechatUnbindResponse:
|
|
||||||
"""解绑微信：需账号仍有其他登录方式（密码/手机/真实邮箱），否则拒绝。"""
|
|
||||||
from packages.application.auth.wechat_bind_use_case import WechatUnbindUseCase
|
|
||||||
|
|
||||||
use_case = WechatUnbindUseCase(user_repository=user_repository)
|
|
||||||
result, error, http_status = use_case.unbind(current_user.user.id)
|
|
||||||
if error:
|
|
||||||
logger.warning("[微信解绑] 用户 %s 解绑失败: %s", current_user.user.id, error)
|
|
||||||
raise HTTPException(status_code=http_status, detail=error)
|
|
||||||
|
|
||||||
logger.info("[微信解绑] 用户 %s 解绑成功", current_user.user.id)
|
|
||||||
return WechatUnbindResponse(success=True)
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== 验证码 & 绑定 ====================
|
|
||||||
|
|
||||||
|
|
||||||
class SendVerificationCodeRequest(BaseModel):
|
|
||||||
target: str # phone / email
|
|
||||||
value: str
|
|
||||||
purpose: str # bind / login / reset_password
|
|
||||||
|
|
||||||
|
|
||||||
class SendVerificationCodeResponse(BaseModel):
|
|
||||||
expires_in: int
|
|
||||||
resend_after: int
|
|
||||||
|
|
||||||
|
|
||||||
class BindContactRequest(BaseModel):
|
|
||||||
phone: str = ""
|
|
||||||
phone_code: str = ""
|
|
||||||
email: str = ""
|
|
||||||
email_code: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
class BindContactResponse(BaseModel):
|
|
||||||
success: bool
|
|
||||||
user: dict
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/send-verification-code", response_model=SendVerificationCodeResponse)
|
|
||||||
async def send_verification_code(
|
|
||||||
request: SendVerificationCodeRequest,
|
|
||||||
) -> SendVerificationCodeResponse:
|
|
||||||
"""发送验证码（手机或邮箱）"""
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
|
|
||||||
from packages.adapters.sms.sms_service import get_sms_service
|
|
||||||
from packages.adapters.smtp import get_email_service
|
|
||||||
from packages.adapters.sqlalchemy_impl.verification_code_repository import (
|
|
||||||
SQLAlchemyVerificationCodeRepository,
|
|
||||||
)
|
|
||||||
from packages.application.auth.bind_contact_use_case import SendVerificationCodeRequest as UseCaseRequest
|
|
||||||
from packages.application.auth.bind_contact_use_case import (
|
|
||||||
SendVerificationCodeUseCase,
|
|
||||||
)
|
|
||||||
from packages.application.auth.verification_code_service import VerificationCodeService
|
|
||||||
|
|
||||||
db = next(get_db_session())
|
|
||||||
repo = SQLAlchemyVerificationCodeRepository(db)
|
|
||||||
vc_service = VerificationCodeService(repo=repo)
|
|
||||||
sms_service = get_sms_service()
|
|
||||||
email_service = get_email_service()
|
|
||||||
|
|
||||||
use_case = SendVerificationCodeUseCase(
|
|
||||||
verification_code_service=vc_service,
|
|
||||||
sms_service=sms_service,
|
|
||||||
email_service=email_service,
|
|
||||||
)
|
|
||||||
uc_request = UseCaseRequest(
|
|
||||||
target=request.target,
|
|
||||||
value=request.value,
|
|
||||||
purpose=request.purpose,
|
|
||||||
)
|
|
||||||
response, err = use_case.execute(uc_request)
|
|
||||||
if err:
|
|
||||||
raise HTTPException(status_code=400, detail=err)
|
|
||||||
|
|
||||||
return SendVerificationCodeResponse(
|
|
||||||
expires_in=response.expires_in,
|
|
||||||
resend_after=response.resend_after,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/bind-contact", response_model=BindContactResponse)
|
|
||||||
async def bind_contact(
|
|
||||||
request: BindContactRequest,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
user_repository: UserRepository = Depends(get_user_repository),
|
|
||||||
) -> BindContactResponse:
|
|
||||||
"""绑定手机号和/或邮箱（需登录态）"""
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
|
|
||||||
from packages.adapters.sqlalchemy_impl.verification_code_repository import (
|
|
||||||
SQLAlchemyVerificationCodeRepository,
|
|
||||||
)
|
|
||||||
from packages.application.auth.bind_contact_use_case import BindContactRequest as UseCaseRequest
|
|
||||||
from packages.application.auth.bind_contact_use_case import (
|
|
||||||
BindContactUseCase,
|
|
||||||
)
|
|
||||||
from packages.application.auth.verification_code_service import VerificationCodeService
|
|
||||||
|
|
||||||
db = next(get_db_session())
|
|
||||||
vc_repo = SQLAlchemyVerificationCodeRepository(db)
|
|
||||||
vc_service = VerificationCodeService(repo=vc_repo)
|
|
||||||
|
|
||||||
use_case = BindContactUseCase(
|
|
||||||
user_repository=user_repository,
|
|
||||||
verification_code_service=vc_service,
|
|
||||||
)
|
|
||||||
uc_request = UseCaseRequest(
|
|
||||||
user_id=current_user.user.id,
|
|
||||||
phone=request.phone,
|
|
||||||
phone_code=request.phone_code,
|
|
||||||
email=request.email,
|
|
||||||
email_code=request.email_code,
|
|
||||||
)
|
|
||||||
response, err = use_case.execute(uc_request)
|
|
||||||
if err:
|
|
||||||
raise HTTPException(status_code=400, detail=err)
|
|
||||||
|
|
||||||
return BindContactResponse(success=True, user=response.to_dict()["user"])
|
|
||||||
|
|
||||||
|
|
||||||
# ==================== 当前用户信息扩展 ====================
|
|
||||||
|
|
||||||
# 扩展 CurrentUserResponse 增加绑定状态字段（在原响应基础上补充）
|
|
||||||
# 通过给 get_current_user_info 返回值补充字段实现
|
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ from typing import Any
|
|||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from app.api.routes._helpers import require_project_and_library
|
from app.api.routes._helpers import require_project_and_library
|
||||||
from app.api.routes.upload import _persist_celery_task_id
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
from app.core.celery_app import celery_app
|
from app.core.celery_app import celery_app
|
||||||
from app.core.storage import OSSStorageService, get_storage_service
|
from app.core.storage import OSSStorageService, get_storage_service
|
||||||
@@ -382,8 +381,7 @@ async def complete_chunked_upload(
|
|||||||
file_hash=request.file_hash,
|
file_hash=request.file_hash,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
celery_result = celery_app.send_task("worker.ingest_asset", args=[job.id])
|
celery_app.send_task("worker.ingest_asset", args=[job.id])
|
||||||
_persist_celery_task_id(ingest_job_repository, job, getattr(celery_result, "id", ""))
|
|
||||||
|
|
||||||
# Update metadata status
|
# Update metadata status
|
||||||
meta["status"] = "completed"
|
meta["status"] = "completed"
|
||||||
|
|||||||
@@ -1,153 +0,0 @@
|
|||||||
"""封面模板 CRUD 路由。
|
|
||||||
|
|
||||||
API:
|
|
||||||
GET /api/v1/cover-templates - 列出当前用户可见的模板
|
|
||||||
POST /api/v1/cover-templates - 创建自定义模板
|
|
||||||
PUT /api/v1/cover-templates/{id} - 更新模板
|
|
||||||
DELETE /api/v1/cover-templates/{id} - 删除自定义模板（系统模板不可删）
|
|
||||||
"""
|
|
||||||
|
|
||||||
import logging
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_cover_template_repository
|
|
||||||
from app.schemas.cover_template import (
|
|
||||||
CoverTemplateResponse,
|
|
||||||
CreateCoverTemplateRequest,
|
|
||||||
ListCoverTemplatesResponse,
|
|
||||||
UpdateCoverTemplateRequest,
|
|
||||||
)
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Response
|
|
||||||
from sqlalchemy.exc import OperationalError, ProgrammingError
|
|
||||||
|
|
||||||
from packages.domain.cover_template import CoverTemplate
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/cover-templates", tags=["CoverTemplate"])
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("", response_model=ListCoverTemplatesResponse)
|
|
||||||
def list_cover_templates(
|
|
||||||
skip: int = 0,
|
|
||||||
limit: int = 100,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
repo: Any = Depends(get_cover_template_repository),
|
|
||||||
) -> ListCoverTemplatesResponse:
|
|
||||||
"""列出当前用户可见的封面模板（系统模板 + 用户自定义模板）。
|
|
||||||
|
|
||||||
当数据库表不存在时（迁移未执行），降级返回空列表而非 500。
|
|
||||||
"""
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
try:
|
|
||||||
items = repo.list_for_user(user_id, skip=skip, limit=limit)
|
|
||||||
total = repo.count_for_user(user_id)
|
|
||||||
except (OperationalError, ProgrammingError) as exc:
|
|
||||||
logger.warning("cover_templates 表查询失败（可能未迁移），返回空列表: %s", exc)
|
|
||||||
return ListCoverTemplatesResponse(items=[], total=0)
|
|
||||||
return ListCoverTemplatesResponse(
|
|
||||||
items=[
|
|
||||||
CoverTemplateResponse(
|
|
||||||
id=t.id,
|
|
||||||
name=t.name,
|
|
||||||
thumbnail_url=t.thumbnail_url,
|
|
||||||
is_system=t.is_system,
|
|
||||||
created_at=t.created_at,
|
|
||||||
config=t.config or {},
|
|
||||||
)
|
|
||||||
for t in items
|
|
||||||
],
|
|
||||||
total=total,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("", response_model=CoverTemplateResponse, status_code=201)
|
|
||||||
def create_cover_template(
|
|
||||||
request: CreateCoverTemplateRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
repo: Any = Depends(get_cover_template_repository),
|
|
||||||
) -> CoverTemplateResponse:
|
|
||||||
"""创建用户自定义封面模板。"""
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
config_dict = request.config.model_dump() if request.config else {}
|
|
||||||
template = CoverTemplate.create_user(
|
|
||||||
user_id=user_id,
|
|
||||||
name=request.name,
|
|
||||||
config=config_dict,
|
|
||||||
thumbnail_url=request.thumbnail_url,
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
created = repo.create(template)
|
|
||||||
except (OperationalError, ProgrammingError) as exc:
|
|
||||||
logger.warning("cover_templates 表不可用（可能未迁移）: %s", exc)
|
|
||||||
raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
|
|
||||||
return CoverTemplateResponse(
|
|
||||||
id=created.id,
|
|
||||||
name=created.name,
|
|
||||||
thumbnail_url=created.thumbnail_url,
|
|
||||||
is_system=created.is_system,
|
|
||||||
created_at=created.created_at,
|
|
||||||
config=created.config,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/{template_id}", response_model=CoverTemplateResponse)
|
|
||||||
def update_cover_template(
|
|
||||||
template_id: str,
|
|
||||||
request: UpdateCoverTemplateRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
repo: Any = Depends(get_cover_template_repository),
|
|
||||||
) -> CoverTemplateResponse:
|
|
||||||
"""更新封面模板（仅允许更新自己的模板）。"""
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
try:
|
|
||||||
template = repo.get(template_id)
|
|
||||||
except (OperationalError, ProgrammingError) as exc:
|
|
||||||
logger.warning("cover_templates 表不可用: %s", exc)
|
|
||||||
raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
|
|
||||||
if template is None:
|
|
||||||
raise HTTPException(status_code=404, detail="模板不存在")
|
|
||||||
if template.is_system:
|
|
||||||
raise HTTPException(status_code=403, detail="系统模板不可修改")
|
|
||||||
if template.user_id != user_id:
|
|
||||||
raise HTTPException(status_code=403, detail="无权修改该模板")
|
|
||||||
|
|
||||||
if request.name is not None:
|
|
||||||
template.update(name=request.name)
|
|
||||||
if request.config is not None:
|
|
||||||
template.update(config=request.config.model_dump())
|
|
||||||
if request.thumbnail_url is not None:
|
|
||||||
template.update(thumbnail_url=request.thumbnail_url)
|
|
||||||
|
|
||||||
updated = repo.update(template)
|
|
||||||
return CoverTemplateResponse(
|
|
||||||
id=updated.id,
|
|
||||||
name=updated.name,
|
|
||||||
thumbnail_url=updated.thumbnail_url,
|
|
||||||
is_system=updated.is_system,
|
|
||||||
created_at=updated.created_at,
|
|
||||||
config=updated.config,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{template_id}", status_code=204, response_class=Response)
|
|
||||||
def delete_cover_template(
|
|
||||||
template_id: str,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
repo: Any = Depends(get_cover_template_repository),
|
|
||||||
) -> None:
|
|
||||||
"""删除用户自定义封面模板（系统模板不可删除）。"""
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
try:
|
|
||||||
template = repo.get(template_id)
|
|
||||||
except (OperationalError, ProgrammingError) as exc:
|
|
||||||
logger.warning("cover_templates 表不可用: %s", exc)
|
|
||||||
raise HTTPException(status_code=503, detail="封面模板服务暂不可用，请稍后重试") from None
|
|
||||||
if template is None:
|
|
||||||
raise HTTPException(status_code=404, detail="模板不存在")
|
|
||||||
if template.is_system:
|
|
||||||
raise HTTPException(status_code=403, detail="系统模板不可删除")
|
|
||||||
if template.user_id != user_id:
|
|
||||||
raise HTTPException(status_code=403, detail="无权删除该模板")
|
|
||||||
repo.delete(template_id)
|
|
||||||
@@ -7,7 +7,6 @@ from typing import Any
|
|||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
from app.core.celery_app import celery_app
|
|
||||||
from app.core.storage import OSSStorageService, get_storage_service
|
from app.core.storage import OSSStorageService, get_storage_service
|
||||||
from app.dependencies import get_duplication_repository
|
from app.dependencies import get_duplication_repository
|
||||||
from app.schemas.duplication import (
|
from app.schemas.duplication import (
|
||||||
@@ -77,8 +76,6 @@ def _to_record_response(record: DuplicationRecord) -> DuplicationRecordResponse:
|
|||||||
status=record.status,
|
status=record.status,
|
||||||
duplicate_rate=record.duplicate_rate,
|
duplicate_rate=record.duplicate_rate,
|
||||||
duplicate_count=record.duplicate_count,
|
duplicate_count=record.duplicate_count,
|
||||||
visual_similarity=getattr(record, "visual_similarity", None),
|
|
||||||
match_count=getattr(record, "match_count", None),
|
|
||||||
created_at=record.created_at.isoformat(),
|
created_at=record.created_at.isoformat(),
|
||||||
updated_at=record.updated_at.isoformat(),
|
updated_at=record.updated_at.isoformat(),
|
||||||
)
|
)
|
||||||
@@ -93,8 +90,6 @@ def _to_detail_response(record: DuplicationRecord) -> DuplicationDetailResponse:
|
|||||||
status=record.status,
|
status=record.status,
|
||||||
duplicate_rate=record.duplicate_rate,
|
duplicate_rate=record.duplicate_rate,
|
||||||
duplicate_count=record.duplicate_count,
|
duplicate_count=record.duplicate_count,
|
||||||
visual_similarity=getattr(record, "visual_similarity", None),
|
|
||||||
match_count=getattr(record, "match_count", None),
|
|
||||||
created_at=record.created_at.isoformat(),
|
created_at=record.created_at.isoformat(),
|
||||||
updated_at=record.updated_at.isoformat(),
|
updated_at=record.updated_at.isoformat(),
|
||||||
segments=[
|
segments=[
|
||||||
@@ -197,8 +192,6 @@ async def upload_for_duplication(
|
|||||||
authenticated_user.user.id,
|
authenticated_user.user.id,
|
||||||
)
|
)
|
||||||
|
|
||||||
celery_app.send_task("worker.process_duplication_check", args=[record.id])
|
|
||||||
|
|
||||||
return DuplicationUploadResponse(
|
return DuplicationUploadResponse(
|
||||||
id=record.id,
|
id=record.id,
|
||||||
status=record.status,
|
status=record.status,
|
||||||
@@ -246,9 +239,7 @@ def get_duplication_detail(
|
|||||||
return _to_detail_response(record)
|
return _to_detail_response(record)
|
||||||
|
|
||||||
|
|
||||||
@router.delete(
|
@router.delete("/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
||||||
"/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response
|
|
||||||
)
|
|
||||||
def delete_duplication_record(
|
def delete_duplication_record(
|
||||||
record_id: str,
|
record_id: str,
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
@@ -296,15 +287,13 @@ def retry_duplication(
|
|||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
detail=str(e),
|
detail=str(e),
|
||||||
) from e
|
)
|
||||||
if updated is None:
|
if updated is None:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_404_NOT_FOUND,
|
status_code=status.HTTP_404_NOT_FOUND,
|
||||||
detail=f"查重记录 {record_id} 不存在",
|
detail=f"查重记录 {record_id} 不存在",
|
||||||
)
|
)
|
||||||
|
|
||||||
celery_app.send_task("worker.process_duplication_check", args=[updated.id])
|
|
||||||
|
|
||||||
return DuplicationUploadResponse(
|
return DuplicationUploadResponse(
|
||||||
id=updated.id,
|
id=updated.id,
|
||||||
status=updated.status,
|
status=updated.status,
|
||||||
|
|||||||
@@ -0,0 +1,462 @@
|
|||||||
|
"""剪辑计划管理 API — Phase 8 模板编排引擎.
|
||||||
|
|
||||||
|
RESTful CRUD for EditPlan:
|
||||||
|
- GET /api/v1/edit-plans 列表（分页 + 状态/模板筛选）
|
||||||
|
- GET /api/v1/edit-plans/{id} 详情
|
||||||
|
- POST /api/v1/edit-plans 创建
|
||||||
|
- PUT /api/v1/edit-plans/{id} 更新（含状态机流转）
|
||||||
|
- DELETE /api/v1/edit-plans/{id} 删除
|
||||||
|
|
||||||
|
拆分模块（各自独立 router，由本文件 include_router 聚合）:
|
||||||
|
- edit_plans_generation.py 生成相关（generate / generation-status / generations）
|
||||||
|
- edit_plans_ai.py AI 推荐 & 封面（ai-recommend / generate-cover）
|
||||||
|
- edit_plans_timeline.py 时间线 & 模板生成（timeline / generate-from-template）
|
||||||
|
|
||||||
|
业务逻辑委托给 EditPlanService 服务层。
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from datetime import datetime
|
||||||
|
from typing import Any, List, Optional
|
||||||
|
|
||||||
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
|
from app.dependencies import get_db_session, get_project_repository
|
||||||
|
from app.schemas.generation_task import GenerationTaskResponse
|
||||||
|
from app.services import EditPlanService
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
|
||||||
|
from pydantic import BaseModel, Field
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from packages.domain.config_schemas import normalize_plan_config
|
||||||
|
from packages.domain.edit_plan import EditPlan, EditPlanStatus
|
||||||
|
|
||||||
|
from ._helpers import check_project_access
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
# ── Pydantic Schemas ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
class EditPlanCreateRequest(BaseModel):
|
||||||
|
"""创建剪辑计划请求体"""
|
||||||
|
|
||||||
|
template_id: str = Field(..., min_length=1, max_length=32, description="关联模板 ID")
|
||||||
|
name: str = Field(..., min_length=1, max_length=200, description="计划名称")
|
||||||
|
config: dict[str, Any] = Field(default_factory=dict, description="计划配置 (JSON)")
|
||||||
|
total_duration: float = Field(default=0.0, ge=0.0, description="总时长 (秒)")
|
||||||
|
project_id: str = Field(default="", description="所属项目 ID")
|
||||||
|
|
||||||
|
|
||||||
|
class EditPlanUpdateRequest(BaseModel):
|
||||||
|
"""更新剪辑计划请求体"""
|
||||||
|
|
||||||
|
name: Optional[str] = Field(default=None, min_length=1, max_length=200, description="计划名称")
|
||||||
|
config: Optional[dict[str, Any]] = Field(default=None, description="计划配置 (JSON)")
|
||||||
|
total_duration: Optional[float] = Field(default=None, ge=0.0, description="总时长 (秒)")
|
||||||
|
status: Optional[str] = Field(
|
||||||
|
default=None,
|
||||||
|
description="目标状态 (通过状态机流转): editing / rendering / completed / failed / draft",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class EditPlanResponse(BaseModel):
|
||||||
|
"""剪辑计划响应体"""
|
||||||
|
|
||||||
|
id: str
|
||||||
|
template_id: str
|
||||||
|
name: str
|
||||||
|
status: str
|
||||||
|
total_duration: float
|
||||||
|
project_id: str = ""
|
||||||
|
created_by_user_id: str = ""
|
||||||
|
config: dict[str, Any]
|
||||||
|
created_at: datetime
|
||||||
|
updated_at: datetime
|
||||||
|
|
||||||
|
model_config = {"from_attributes": True}
|
||||||
|
|
||||||
|
|
||||||
|
class EditPlanListResponse(BaseModel):
|
||||||
|
"""剪辑计划列表响应体"""
|
||||||
|
|
||||||
|
items: List[EditPlanResponse]
|
||||||
|
total: int
|
||||||
|
page: int
|
||||||
|
page_size: int
|
||||||
|
|
||||||
|
|
||||||
|
class ClipStatusItem(BaseModel):
|
||||||
|
"""片段生成状态"""
|
||||||
|
|
||||||
|
clip_id: str
|
||||||
|
clip_type: str
|
||||||
|
order: int
|
||||||
|
status: str
|
||||||
|
asset_id: str
|
||||||
|
text_content: str
|
||||||
|
duration: float
|
||||||
|
|
||||||
|
|
||||||
|
class EditPlanGenerationStatusResponse(BaseModel):
|
||||||
|
"""剪辑计划生成进度响应体"""
|
||||||
|
|
||||||
|
plan_id: str
|
||||||
|
plan_status: str
|
||||||
|
generation_task_id: Optional[str] = None
|
||||||
|
clips: List[ClipStatusItem]
|
||||||
|
|
||||||
|
|
||||||
|
class EditPlanGenerateResponse(BaseModel):
|
||||||
|
"""剪辑计划触发生成响应体"""
|
||||||
|
|
||||||
|
plan_id: str
|
||||||
|
plan_status: str
|
||||||
|
generation_task_id: str
|
||||||
|
clip_count: int
|
||||||
|
|
||||||
|
|
||||||
|
class EditPlanGenerationsResponse(BaseModel):
|
||||||
|
"""剪辑计划关联的生成记录列表响应体"""
|
||||||
|
|
||||||
|
items: List[GenerationTaskResponse]
|
||||||
|
total: int
|
||||||
|
|
||||||
|
|
||||||
|
# ── AI 推荐片段方案 Schemas（任务 3.09） ──────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
class AIRecommendRequest(BaseModel):
|
||||||
|
"""AI 推荐片段方案请求体"""
|
||||||
|
|
||||||
|
asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
|
||||||
|
editing_mode: str = Field(default="one_take", description="剪辑模式: one_take / pip / voice_over / voice_pip")
|
||||||
|
target_duration: float = Field(default=30.0, ge=1.0, le=600.0, description="目标时长（秒）")
|
||||||
|
|
||||||
|
|
||||||
|
class AIRecommendClipItem(BaseModel):
|
||||||
|
"""AI 推荐的单个片段"""
|
||||||
|
|
||||||
|
clip_type: str = Field(..., description="片段类型: intro / showcase / title / subtitle / cta / outro")
|
||||||
|
order: int = Field(..., ge=0, description="片段顺序")
|
||||||
|
text_content: str = Field(default="", description="文字内容")
|
||||||
|
duration: float = Field(..., ge=0.0, description="片段时长（秒）")
|
||||||
|
transition_effect: str = Field(default="cut", description="转场效果")
|
||||||
|
transition_duration: float = Field(default=0.0, ge=0.0, description="转场时长（秒），0 表示使用默认值")
|
||||||
|
asset_id: str = Field(default="", description="关联素材 ID")
|
||||||
|
start_time: float = Field(default=0.0, ge=0.0, description="素材截取起始时间（秒）")
|
||||||
|
config: dict[str, Any] = Field(default_factory=dict, description="片段额外配置")
|
||||||
|
|
||||||
|
|
||||||
|
class AIRecommendResponse(BaseModel):
|
||||||
|
"""AI 推荐片段方案响应体"""
|
||||||
|
|
||||||
|
plan_id: str = Field(..., description="剪辑计划 ID")
|
||||||
|
clips: List[AIRecommendClipItem] = Field(..., description="推荐的片段列表")
|
||||||
|
config: dict[str, Any] = Field(..., description="推荐的 plan config（cover/title/subtitle/bgm）")
|
||||||
|
total_duration: float = Field(..., ge=0.0, description="推荐方案总时长（秒）")
|
||||||
|
confidence: float = Field(..., ge=0.0, le=1.0, description="AI 推荐置信度 (0~1)")
|
||||||
|
|
||||||
|
|
||||||
|
# ── AI 封面生成 Schemas（任务 3.09） ─────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
class GenerateCoverRequest(BaseModel):
|
||||||
|
"""AI 封面生成请求体"""
|
||||||
|
|
||||||
|
asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表（确定视频来源）")
|
||||||
|
cover_type: str = Field(
|
||||||
|
default="ai_frame",
|
||||||
|
description="封面类型: ai_frame / manual / upload / ai_regenerate",
|
||||||
|
)
|
||||||
|
frame_time: Optional[float] = Field(
|
||||||
|
default=None,
|
||||||
|
ge=0.0,
|
||||||
|
description="手动选帧时间点（秒），仅 cover_type=manual 时有效",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class GenerateCoverResponse(BaseModel):
|
||||||
|
"""AI 封面生成响应体"""
|
||||||
|
|
||||||
|
plan_id: str = Field(..., description="剪辑计划 ID")
|
||||||
|
cover: dict[str, Any] = Field(..., description="封面数据（type / image_url / frame_time 等）")
|
||||||
|
|
||||||
|
|
||||||
|
# ── 基于模板生成剪辑计划 Schemas ─────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
class GenerateFromTemplateRequest(BaseModel):
|
||||||
|
"""基于模板生成剪辑计划请求体"""
|
||||||
|
|
||||||
|
template_id: str = Field(..., description="剪辑模板 ID")
|
||||||
|
asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
|
||||||
|
project_id: str = Field(default="", description="所属项目 ID")
|
||||||
|
name: str = Field(default="", description="计划名称（为空则自动取模板名）")
|
||||||
|
|
||||||
|
|
||||||
|
class _PlanClipItem(BaseModel):
|
||||||
|
"""片段响应体"""
|
||||||
|
|
||||||
|
id: str
|
||||||
|
clip_type: str
|
||||||
|
order: int
|
||||||
|
asset_id: str
|
||||||
|
text_content: str
|
||||||
|
start_time: float
|
||||||
|
duration: float
|
||||||
|
transition_effect: str
|
||||||
|
transition_duration: float
|
||||||
|
playback_speed: float = 1.0
|
||||||
|
status: str
|
||||||
|
config: Optional[dict[str, Any]] = None
|
||||||
|
created_at: datetime
|
||||||
|
updated_at: datetime
|
||||||
|
|
||||||
|
model_config = {"from_attributes": True}
|
||||||
|
|
||||||
|
|
||||||
|
class GenerateFromTemplateResponse(BaseModel):
|
||||||
|
"""基于模板生成剪辑计划响应体"""
|
||||||
|
|
||||||
|
plan: EditPlanResponse
|
||||||
|
clips: List[_PlanClipItem]
|
||||||
|
|
||||||
|
|
||||||
|
# ── Helpers ───────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
def _to_response(p: EditPlan) -> EditPlanResponse:
|
||||||
|
return EditPlanResponse(
|
||||||
|
id=p.id,
|
||||||
|
template_id=p.template_id,
|
||||||
|
name=p.name,
|
||||||
|
status=p.status.value if hasattr(p.status, "value") else p.status,
|
||||||
|
total_duration=p.total_duration,
|
||||||
|
project_id=p.project_id or "",
|
||||||
|
created_by_user_id=p.created_by_user_id or "",
|
||||||
|
config=p.config,
|
||||||
|
created_at=p.created_at,
|
||||||
|
updated_at=p.updated_at,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# ── CRUD Routes ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("", response_model=EditPlanListResponse)
|
||||||
|
def list_plans(
|
||||||
|
page: int = Query(default=1, ge=1, description="页码"),
|
||||||
|
page_size: int = Query(default=20, ge=1, le=100, description="每页数量"),
|
||||||
|
template_id: Optional[str] = Query(default=None, description="按模板 ID 筛选"),
|
||||||
|
project_id: Optional[str] = Query(default=None, description="按项目 ID 筛选"),
|
||||||
|
status_filter: Optional[str] = Query(
|
||||||
|
default=None,
|
||||||
|
alias="status",
|
||||||
|
description="按状态筛选: draft / editing / rendering / completed / failed",
|
||||||
|
),
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> EditPlanListResponse:
|
||||||
|
"""获取剪辑计划列表（支持分页、按模板/状态/项目筛选）"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
|
||||||
|
# 空串 project_id 视为未传（避免 DB 中匹配到空串记录）
|
||||||
|
if project_id is not None and not project_id.strip():
|
||||||
|
project_id = None
|
||||||
|
|
||||||
|
# 解析状态筛选
|
||||||
|
status_enum: Optional[EditPlanStatus] = None
|
||||||
|
if status_filter:
|
||||||
|
try:
|
||||||
|
status_enum = EditPlanStatus(status_filter)
|
||||||
|
except ValueError:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
|
detail="无效的筛选条件，请选择正确的状态",
|
||||||
|
)
|
||||||
|
|
||||||
|
# 项目鉴权：如果指定了 project_id，校验用户是否有权访问
|
||||||
|
if project_id:
|
||||||
|
check_project_access(project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
skip = (page - 1) * page_size
|
||||||
|
plans = svc.list_plans(
|
||||||
|
template_id=template_id,
|
||||||
|
project_id=project_id,
|
||||||
|
status=status_enum,
|
||||||
|
skip=skip,
|
||||||
|
limit=page_size,
|
||||||
|
)
|
||||||
|
total = svc.count_plans(
|
||||||
|
template_id=template_id,
|
||||||
|
project_id=project_id,
|
||||||
|
status=status_enum,
|
||||||
|
)
|
||||||
|
|
||||||
|
return EditPlanListResponse(
|
||||||
|
items=[_to_response(p) for p in plans],
|
||||||
|
total=total,
|
||||||
|
page=page,
|
||||||
|
page_size=page_size,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/{plan_id}", response_model=EditPlanResponse)
|
||||||
|
def get_plan(
|
||||||
|
plan_id: str,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> EditPlanResponse:
|
||||||
|
"""获取单个剪辑计划详情"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
try:
|
||||||
|
plan = svc.get_plan_or_raise(plan_id)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_404_NOT_FOUND,
|
||||||
|
detail=str(exc),
|
||||||
|
)
|
||||||
|
# 项目鉴权
|
||||||
|
if plan.project_id:
|
||||||
|
check_project_access(plan.project_id, current_user.user.id, project_repository)
|
||||||
|
return _to_response(plan)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("", response_model=EditPlanResponse, status_code=status.HTTP_201_CREATED)
|
||||||
|
def create_plan(
|
||||||
|
body: EditPlanCreateRequest,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> EditPlanResponse:
|
||||||
|
"""创建剪辑计划"""
|
||||||
|
# 空串 project_id 统一为 ""
|
||||||
|
project_id = (body.project_id or "").strip()
|
||||||
|
# 项目鉴权
|
||||||
|
if project_id:
|
||||||
|
check_project_access(project_id, current_user.user.id, project_repository)
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
# 标准化 config，填充 cover/title/subtitle/bgm 默认值
|
||||||
|
normalized_config = normalize_plan_config(body.config)
|
||||||
|
try:
|
||||||
|
created = svc.create_plan(
|
||||||
|
template_id=body.template_id,
|
||||||
|
name=body.name,
|
||||||
|
config=normalized_config,
|
||||||
|
total_duration=body.total_duration,
|
||||||
|
project_id=project_id,
|
||||||
|
created_by_user_id=current_user.user.id,
|
||||||
|
)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
|
detail=str(exc),
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
"创建剪辑计划: id=%s name=%s by user=%s",
|
||||||
|
created.id,
|
||||||
|
created.name,
|
||||||
|
current_user.user.id,
|
||||||
|
)
|
||||||
|
return _to_response(created)
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/{plan_id}", response_model=EditPlanResponse)
|
||||||
|
def update_plan(
|
||||||
|
plan_id: str,
|
||||||
|
body: EditPlanUpdateRequest,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> EditPlanResponse:
|
||||||
|
"""更新剪辑计划（支持状态机流转）"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
# 项目鉴权
|
||||||
|
existing = svc.get_plan(plan_id)
|
||||||
|
if existing is None:
|
||||||
|
raise HTTPException(status_code=404, detail=f"剪辑计划不存在: {plan_id}")
|
||||||
|
if existing.project_id:
|
||||||
|
check_project_access(existing.project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
# 基础字段更新
|
||||||
|
try:
|
||||||
|
if body.name is not None or body.config is not None or body.total_duration is not None:
|
||||||
|
# 标准化 config（如果提供了）
|
||||||
|
config_to_update = normalize_plan_config(body.config) if body.config is not None else None
|
||||||
|
svc.update_plan(
|
||||||
|
plan_id,
|
||||||
|
name=body.name,
|
||||||
|
config=config_to_update,
|
||||||
|
total_duration=body.total_duration,
|
||||||
|
)
|
||||||
|
|
||||||
|
# 状态机流转
|
||||||
|
if body.status is not None:
|
||||||
|
try:
|
||||||
|
target_status = EditPlanStatus(body.status)
|
||||||
|
except ValueError:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
|
detail="无效的状态值，请选择正确的状态",
|
||||||
|
)
|
||||||
|
svc.transition_status(plan_id, target_status)
|
||||||
|
except ValueError as exc:
|
||||||
|
err_msg = str(exc)
|
||||||
|
if "不存在" in err_msg:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_404_NOT_FOUND,
|
||||||
|
detail=err_msg,
|
||||||
|
)
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
|
detail=err_msg,
|
||||||
|
)
|
||||||
|
|
||||||
|
# 返回最新状态
|
||||||
|
result = svc.get_plan_or_raise(plan_id)
|
||||||
|
logger.info("更新剪辑计划: id=%s by user=%s", plan_id, current_user.user.id)
|
||||||
|
return _to_response(result)
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/{plan_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
||||||
|
def delete_plan(
|
||||||
|
plan_id: str,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> None:
|
||||||
|
"""删除剪辑计划"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
# 项目鉴权
|
||||||
|
existing = svc.get_plan(plan_id)
|
||||||
|
if existing and existing.project_id:
|
||||||
|
check_project_access(existing.project_id, current_user.user.id, project_repository)
|
||||||
|
deleted = svc.delete_plan(plan_id)
|
||||||
|
if not deleted:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_404_NOT_FOUND,
|
||||||
|
detail=f"剪辑计划不存在: {plan_id}",
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
"删除剪辑计划: id=%s by user=%s",
|
||||||
|
plan_id,
|
||||||
|
current_user.user.id,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# ── Include sub-routers (拆分模块) ────────────────────────────────────────────
|
||||||
|
|
||||||
|
from .edit_plans_ai import router as ai_router
|
||||||
|
from .edit_plans_generation import router as generation_router
|
||||||
|
from .edit_plans_timeline import router as timeline_router
|
||||||
|
|
||||||
|
router.include_router(generation_router)
|
||||||
|
router.include_router(ai_router)
|
||||||
|
router.include_router(timeline_router)
|
||||||
@@ -0,0 +1,199 @@
|
|||||||
|
"""剪辑计划 AI 推荐 & 封面生成 API 端点。
|
||||||
|
|
||||||
|
从 edit_plans.py 拆分，包含：
|
||||||
|
- POST /{plan_id}/ai-recommend AI 推荐片段方案
|
||||||
|
- POST /{plan_id}/generate-cover AI 生成封面
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from app.api.routes._helpers import check_project_access
|
||||||
|
from app.api.routes.edit_plans import (
|
||||||
|
AIRecommendClipItem,
|
||||||
|
AIRecommendRequest,
|
||||||
|
AIRecommendResponse,
|
||||||
|
GenerateCoverRequest,
|
||||||
|
GenerateCoverResponse,
|
||||||
|
)
|
||||||
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
|
from app.dependencies import get_db_session, get_project_repository
|
||||||
|
from app.services import EditPlanService
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from packages.domain.config_schemas import normalize_plan_config
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
@router.post(
|
||||||
|
"/{plan_id}/ai-recommend",
|
||||||
|
response_model=AIRecommendResponse,
|
||||||
|
)
|
||||||
|
def ai_recommend_clips(
|
||||||
|
plan_id: str,
|
||||||
|
body: AIRecommendRequest,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> AIRecommendResponse:
|
||||||
|
"""AI 推荐片段方案
|
||||||
|
|
||||||
|
调用 AI 服务分析素材，自动生成片段编排方案并写入剪辑计划。
|
||||||
|
|
||||||
|
流程：
|
||||||
|
1. 验证计划存在且状态为 draft/editing
|
||||||
|
2. 调用 AI 推荐服务（当前为 stub，后续接入真实 AI）
|
||||||
|
3. 清除计划现有片段，按推荐方案重新创建
|
||||||
|
4. 更新计划 config（cover/title/subtitle/bgm）和 total_duration
|
||||||
|
5. 返回推荐方案详情
|
||||||
|
"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
|
||||||
|
try:
|
||||||
|
plan = svc.get_plan_or_raise(plan_id)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc))
|
||||||
|
|
||||||
|
if plan.project_id:
|
||||||
|
check_project_access(plan.project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
plan_status = plan.status.value if hasattr(plan.status, "value") else plan.status
|
||||||
|
if plan_status not in ("draft", "editing"):
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
|
detail="当前计划状态不支持AI推荐，请先创建或编辑计划后再试",
|
||||||
|
)
|
||||||
|
|
||||||
|
from apps.worker.worker_app.tasks.ai_tasks import run_ai_recommend
|
||||||
|
|
||||||
|
result = run_ai_recommend(
|
||||||
|
plan_id=plan_id,
|
||||||
|
template_id=plan.template_id,
|
||||||
|
asset_ids=body.asset_ids,
|
||||||
|
editing_mode=body.editing_mode,
|
||||||
|
target_duration=body.target_duration,
|
||||||
|
)
|
||||||
|
|
||||||
|
# 事务保护：清除 → 重建 → 更新 必须在同一逻辑事务中
|
||||||
|
try:
|
||||||
|
svc.delete_all_clips(plan_id)
|
||||||
|
|
||||||
|
for clip_data in result["clips"]:
|
||||||
|
svc.create_clip(
|
||||||
|
plan_id=plan_id,
|
||||||
|
clip_type=clip_data["clip_type"],
|
||||||
|
order=clip_data["order"],
|
||||||
|
text_content=clip_data.get("text_content", ""),
|
||||||
|
duration=clip_data["duration"],
|
||||||
|
transition_effect=clip_data.get("transition_effect", "cut"),
|
||||||
|
asset_id=clip_data.get("asset_id", ""),
|
||||||
|
start_time=clip_data.get("start_time", 0.0),
|
||||||
|
config=clip_data.get("config", {}),
|
||||||
|
)
|
||||||
|
|
||||||
|
normalized_config = normalize_plan_config(result.get("config", {}))
|
||||||
|
svc.update_plan(
|
||||||
|
plan_id,
|
||||||
|
config=normalized_config,
|
||||||
|
total_duration=result["total_duration"],
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
logger.exception("AI 推荐写入失败，plan_id=%s 数据可能不一致", plan_id)
|
||||||
|
try:
|
||||||
|
db.rollback()
|
||||||
|
except Exception as rollback_err:
|
||||||
|
logger.error(
|
||||||
|
"AI 推荐回滚失败，数据库会话可能处于不一致状态: plan_id=%s error=%s",
|
||||||
|
plan_id,
|
||||||
|
rollback_err,
|
||||||
|
)
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail="AI推荐结果保存失败，请稍后重试",
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"AI 推荐片段方案: plan_id=%s clips=%d duration=%.1f by user=%s",
|
||||||
|
plan_id,
|
||||||
|
len(result["clips"]),
|
||||||
|
result["total_duration"],
|
||||||
|
current_user.user.id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return AIRecommendResponse(
|
||||||
|
plan_id=plan_id,
|
||||||
|
clips=[
|
||||||
|
AIRecommendClipItem(
|
||||||
|
clip_type=c["clip_type"],
|
||||||
|
order=c["order"],
|
||||||
|
text_content=c.get("text_content", ""),
|
||||||
|
duration=c["duration"],
|
||||||
|
transition_effect=c.get("transition_effect", "cut"),
|
||||||
|
asset_id=c.get("asset_id", ""),
|
||||||
|
start_time=c.get("start_time", 0.0),
|
||||||
|
config=c.get("config", {}),
|
||||||
|
)
|
||||||
|
for c in result["clips"]
|
||||||
|
],
|
||||||
|
config=normalized_config,
|
||||||
|
total_duration=result["total_duration"],
|
||||||
|
confidence=result["confidence"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post(
|
||||||
|
"/{plan_id}/generate-cover",
|
||||||
|
response_model=GenerateCoverResponse,
|
||||||
|
)
|
||||||
|
def generate_cover(
|
||||||
|
plan_id: str,
|
||||||
|
body: GenerateCoverRequest,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> GenerateCoverResponse:
|
||||||
|
"""AI 生成封面
|
||||||
|
|
||||||
|
调用 AI 服务从视频中选帧或生成封面图，并更新计划 config.cover。
|
||||||
|
"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
|
||||||
|
try:
|
||||||
|
plan = svc.get_plan_or_raise(plan_id)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc))
|
||||||
|
|
||||||
|
if plan.project_id:
|
||||||
|
check_project_access(plan.project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
from apps.worker.worker_app.tasks.ai_tasks import run_generate_cover
|
||||||
|
|
||||||
|
cover_data = run_generate_cover(
|
||||||
|
plan_id=plan_id,
|
||||||
|
asset_ids=body.asset_ids,
|
||||||
|
cover_type=body.cover_type,
|
||||||
|
frame_time=body.frame_time,
|
||||||
|
)
|
||||||
|
|
||||||
|
current_config = dict(plan.config)
|
||||||
|
current_config["cover"] = cover_data
|
||||||
|
normalized = normalize_plan_config(current_config)
|
||||||
|
svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"AI 封面生成: plan_id=%s type=%s by user=%s",
|
||||||
|
plan_id,
|
||||||
|
body.cover_type,
|
||||||
|
current_user.user.id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return GenerateCoverResponse(
|
||||||
|
plan_id=plan_id,
|
||||||
|
cover=cover_data,
|
||||||
|
)
|
||||||
@@ -0,0 +1,383 @@
|
|||||||
|
"""剪辑计划生成相关 API 端点。
|
||||||
|
|
||||||
|
从 edit_plans.py 拆分，包含：
|
||||||
|
- POST /{plan_id}/generate 触发剪辑渲染生成
|
||||||
|
- GET /{plan_id}/generation-status 查询生成进度
|
||||||
|
- GET /{plan_id}/generations 查询关联的生成记录
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from app.api.routes._helpers import check_project_access
|
||||||
|
from app.api.routes.edit_plans import (
|
||||||
|
ClipStatusItem,
|
||||||
|
EditPlanGenerateResponse,
|
||||||
|
EditPlanGenerationsResponse,
|
||||||
|
EditPlanGenerationStatusResponse,
|
||||||
|
)
|
||||||
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
|
from app.core.celery_app import celery_app
|
||||||
|
from app.core.task_enqueue import GLOBAL_PENDING_LIMIT, USER_PENDING_LIMIT
|
||||||
|
from app.dependencies import get_asset_library_repository, get_asset_repository, get_db_session, get_project_repository
|
||||||
|
from app.services import EditPlanService
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from packages.adapters.sqlalchemy_impl.generation_task_repository import (
|
||||||
|
SQLAlchemyGenerationTaskRepository,
|
||||||
|
)
|
||||||
|
from packages.adapters.sqlalchemy_impl.template_clip_config_repository import (
|
||||||
|
SQLAlchemyTemplateClipConfigRepository,
|
||||||
|
)
|
||||||
|
from packages.adapters.sqlalchemy_impl.template_repository import (
|
||||||
|
SQLAlchemyTemplateRepository,
|
||||||
|
)
|
||||||
|
from packages.application.generation_tasks import (
|
||||||
|
CreateGenerationTaskCommand,
|
||||||
|
CreateGenerationTaskUseCase,
|
||||||
|
)
|
||||||
|
from packages.domain.edit_plan import EditPlanStatus
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
def _auto_fallback_draft_to_editing(svc: EditPlanService, plan_id: str, plan_check) -> None:
|
||||||
|
"""自动兜底 1: draft → editing"""
|
||||||
|
if plan_check.status == EditPlanStatus.DRAFT:
|
||||||
|
logger.info("自动兜底: plan=%s draft→editing", plan_id)
|
||||||
|
svc.transition_status(plan_id, EditPlanStatus.EDITING)
|
||||||
|
|
||||||
|
|
||||||
|
def _auto_fallback_copy_template_clips(svc: EditPlanService, plan_id: str, plan_check, db: Session) -> None:
|
||||||
|
"""自动兜底 2: 无片段 + 有 template_id → 从模板复制片段配置"""
|
||||||
|
existing_clips = svc.count_clips(plan_id)
|
||||||
|
if existing_clips == 0 and plan_check.template_id:
|
||||||
|
logger.info(
|
||||||
|
"自动兜底: plan=%s 无片段，从模板 %s 复制片段配置",
|
||||||
|
plan_id,
|
||||||
|
plan_check.template_id,
|
||||||
|
)
|
||||||
|
clip_config_repo = SQLAlchemyTemplateClipConfigRepository(db)
|
||||||
|
configs = clip_config_repo.list_by_template(plan_check.template_id)
|
||||||
|
if configs:
|
||||||
|
for cfg in configs:
|
||||||
|
svc.create_clip(
|
||||||
|
plan_id=plan_id,
|
||||||
|
clip_type=cfg.clip_type.value if hasattr(cfg.clip_type, "value") else cfg.clip_type,
|
||||||
|
order=cfg.order,
|
||||||
|
template_clip_config_id=cfg.id,
|
||||||
|
duration=cfg.default_duration,
|
||||||
|
transition_effect=(
|
||||||
|
cfg.transition_effect.value
|
||||||
|
if hasattr(cfg.transition_effect, "value")
|
||||||
|
else cfg.transition_effect
|
||||||
|
),
|
||||||
|
)
|
||||||
|
logger.info("自动兜底: plan=%s 从新模型 template_clip_configs 复制了 %d 个片段", plan_id, len(configs))
|
||||||
|
else:
|
||||||
|
tpl_repo = SQLAlchemyTemplateRepository(db)
|
||||||
|
segments = tpl_repo.list_segments(plan_check.template_id)
|
||||||
|
for seg in segments:
|
||||||
|
avg_duration = (seg.duration_min + seg.duration_max) / 2
|
||||||
|
svc.create_clip(
|
||||||
|
plan_id=plan_id,
|
||||||
|
clip_type="main",
|
||||||
|
order=seg.segment_order,
|
||||||
|
duration=avg_duration,
|
||||||
|
config={
|
||||||
|
"material_type": seg.material_type or "",
|
||||||
|
"template_segment_id": seg.id,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
logger.info("自动兜底: plan=%s 从旧模型 template_segments 复制了 %d 个片段", plan_id, len(segments))
|
||||||
|
|
||||||
|
|
||||||
|
def _auto_fallback_assign_assets(
|
||||||
|
svc: EditPlanService,
|
||||||
|
plan_id: str,
|
||||||
|
plan_check,
|
||||||
|
) -> list:
|
||||||
|
"""自动兜底 3: 为没有素材的片段分配素材。返回剩余无素材片段列表。"""
|
||||||
|
all_clips = svc.list_clips(plan_id)
|
||||||
|
clips_without_asset = [c for c in all_clips if not c.asset_id]
|
||||||
|
config_asset_ids = (plan_check.config or {}).get("asset_ids", [])
|
||||||
|
|
||||||
|
if clips_without_asset and config_asset_ids:
|
||||||
|
logger.info(
|
||||||
|
"自动兜底3: plan=%s 为 %d 个无素材片段分配 %d 个指定素材",
|
||||||
|
plan_id,
|
||||||
|
len(clips_without_asset),
|
||||||
|
len(config_asset_ids),
|
||||||
|
)
|
||||||
|
for i, clip in enumerate(clips_without_asset):
|
||||||
|
asset_idx = i % len(config_asset_ids)
|
||||||
|
svc.assign_asset(clip.id, config_asset_ids[asset_idx])
|
||||||
|
logger.info("自动兜底3: plan=%s 素材分配完成", plan_id)
|
||||||
|
clips_without_asset = []
|
||||||
|
|
||||||
|
return clips_without_asset
|
||||||
|
|
||||||
|
|
||||||
|
def _auto_fallback_auto_material_mode(
|
||||||
|
svc: EditPlanService,
|
||||||
|
plan_id: str,
|
||||||
|
plan_check,
|
||||||
|
clips_without_asset: list,
|
||||||
|
asset_library_repo: Any,
|
||||||
|
asset_repo: Any,
|
||||||
|
) -> None:
|
||||||
|
"""自动兜底 4: 自动素材模式 → 从项目默认视频素材库选取"""
|
||||||
|
if not clips_without_asset:
|
||||||
|
return
|
||||||
|
material_mode = (plan_check.config or {}).get("material_mode", "manual")
|
||||||
|
if material_mode != "auto" or not plan_check.project_id:
|
||||||
|
return
|
||||||
|
|
||||||
|
import random
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"自动兜底4: plan=%s 自动素材模式，从项目素材库选取素材 (%d 个片段需要)",
|
||||||
|
plan_id,
|
||||||
|
len(clips_without_asset),
|
||||||
|
)
|
||||||
|
libs = asset_library_repo.find_by_project(plan_check.project_id)
|
||||||
|
video_lib = None
|
||||||
|
for lib in libs:
|
||||||
|
lib_kind = lib.kind.value if hasattr(lib.kind, "value") else lib.kind
|
||||||
|
if lib_kind == "video":
|
||||||
|
video_lib = lib
|
||||||
|
break
|
||||||
|
|
||||||
|
if video_lib:
|
||||||
|
assets = asset_repo.find_by_library(video_lib.id)
|
||||||
|
ready_videos = [
|
||||||
|
a
|
||||||
|
for a in assets
|
||||||
|
if (a.status.value if hasattr(a.status, "value") else a.status) == "ready"
|
||||||
|
and a.mime_type
|
||||||
|
and a.mime_type.startswith("video")
|
||||||
|
]
|
||||||
|
if ready_videos:
|
||||||
|
random.shuffle(ready_videos)
|
||||||
|
for i, clip in enumerate(clips_without_asset):
|
||||||
|
asset = ready_videos[i % len(ready_videos)]
|
||||||
|
svc.assign_asset(clip.id, asset.id)
|
||||||
|
logger.info(
|
||||||
|
"自动兜底4: plan=%s 从素材库 %s 分配了 %d 个素材给 %d 个片段",
|
||||||
|
plan_id,
|
||||||
|
video_lib.name,
|
||||||
|
len(ready_videos),
|
||||||
|
len(clips_without_asset),
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
logger.warning("自动兜底4: plan=%s 素材库无可用视频素材", plan_id)
|
||||||
|
else:
|
||||||
|
logger.warning("自动兜底4: plan=%s 项目无视频素材库", plan_id)
|
||||||
|
|
||||||
|
|
||||||
|
def _check_queue_limits(gen_task_repo, user_id: str) -> None:
|
||||||
|
"""队列限流预检查"""
|
||||||
|
try:
|
||||||
|
has_count = hasattr(gen_task_repo, "count_pending_by_user") and hasattr(
|
||||||
|
gen_task_repo, "count_pending_total"
|
||||||
|
)
|
||||||
|
if has_count:
|
||||||
|
user_pending = gen_task_repo.count_pending_by_user(user_id)
|
||||||
|
global_pending = gen_task_repo.count_pending_total()
|
||||||
|
if user_pending >= USER_PENDING_LIMIT:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=429,
|
||||||
|
detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
|
||||||
|
)
|
||||||
|
if global_pending >= GLOBAL_PENDING_LIMIT:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=503,
|
||||||
|
detail="系统繁忙，请稍后再试",
|
||||||
|
)
|
||||||
|
except HTTPException:
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning("[队列限流] 剪辑计划限流检查失败，跳过: %s", e)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{plan_id}/generate", response_model=EditPlanGenerateResponse)
|
||||||
|
def generate_plan(
|
||||||
|
plan_id: str,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
asset_library_repo: Any = Depends(get_asset_library_repository),
|
||||||
|
asset_repo: Any = Depends(get_asset_repository),
|
||||||
|
) -> EditPlanGenerateResponse:
|
||||||
|
"""触发剪辑计划渲染生成
|
||||||
|
|
||||||
|
前置条件：计划状态必须为 editing，且至少有一个片段。
|
||||||
|
流程：
|
||||||
|
1. 验证计划状态为 editing
|
||||||
|
2. 将 pending 片段标记为 ready
|
||||||
|
3. 创建 GenerationTask
|
||||||
|
4. 调度 Celery 任务 worker.render_edit_plan
|
||||||
|
5. 将计划状态流转为 rendering
|
||||||
|
"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
plan_check = svc.get_plan(plan_id)
|
||||||
|
if plan_check is None:
|
||||||
|
raise HTTPException(status_code=404, detail=f"剪辑计划不存在: {plan_id}")
|
||||||
|
if plan_check.project_id:
|
||||||
|
check_project_access(plan_check.project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
# 自动兜底流程
|
||||||
|
_auto_fallback_draft_to_editing(svc, plan_id, plan_check)
|
||||||
|
_auto_fallback_copy_template_clips(svc, plan_id, plan_check, db)
|
||||||
|
clips_without_asset = _auto_fallback_assign_assets(svc, plan_id, plan_check)
|
||||||
|
_auto_fallback_auto_material_mode(svc, plan_id, plan_check, clips_without_asset, asset_library_repo, asset_repo)
|
||||||
|
|
||||||
|
# 检查是否可生成
|
||||||
|
try:
|
||||||
|
can_gen, reason = svc.can_generate(plan_id)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc))
|
||||||
|
if not can_gen:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=reason)
|
||||||
|
|
||||||
|
# 核心生成流程
|
||||||
|
try:
|
||||||
|
clip_count = svc.mark_clips_ready(plan_id)
|
||||||
|
|
||||||
|
gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
|
||||||
|
user_id = current_user.user.id
|
||||||
|
_check_queue_limits(gen_task_repo, user_id)
|
||||||
|
|
||||||
|
gen_task_use_case = CreateGenerationTaskUseCase(gen_task_repo)
|
||||||
|
plan = svc.get_plan_or_raise(plan_id)
|
||||||
|
gen_task = gen_task_use_case.execute(
|
||||||
|
CreateGenerationTaskCommand(
|
||||||
|
project_id="",
|
||||||
|
template_id=plan.template_id,
|
||||||
|
created_by_user_id=current_user.user.id,
|
||||||
|
source_edit_plan_id=plan_id,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
svc.update_plan_config(plan_id, {"generation_task_id": gen_task.id})
|
||||||
|
svc.transition_status(plan_id, EditPlanStatus.RENDERING)
|
||||||
|
celery_app.send_task("worker.render_edit_plan", args=[plan_id])
|
||||||
|
|
||||||
|
updated_plan = svc.get_plan_or_raise(plan_id)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"触发剪辑计划生成: plan_id=%s gen_task_id=%s clips=%d by user=%s",
|
||||||
|
plan_id,
|
||||||
|
gen_task.id,
|
||||||
|
clip_count,
|
||||||
|
current_user.user.id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return EditPlanGenerateResponse(
|
||||||
|
plan_id=plan_id,
|
||||||
|
plan_status=updated_plan.status.value if hasattr(updated_plan.status, "value") else updated_plan.status,
|
||||||
|
generation_task_id=gen_task.id,
|
||||||
|
clip_count=clip_count,
|
||||||
|
)
|
||||||
|
except HTTPException:
|
||||||
|
raise
|
||||||
|
except Exception:
|
||||||
|
logger.exception("触发剪辑计划生成失败: plan_id=%s", plan_id)
|
||||||
|
try:
|
||||||
|
svc.transition_status(plan_id, EditPlanStatus.FAILED)
|
||||||
|
except Exception:
|
||||||
|
logger.warning("标记计划失败状态时异常: plan_id=%s", plan_id)
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail="生成失败，请稍后重试",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/{plan_id}/generation-status",
|
||||||
|
response_model=EditPlanGenerationStatusResponse,
|
||||||
|
)
|
||||||
|
def get_generation_status(
|
||||||
|
plan_id: str,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> EditPlanGenerationStatusResponse:
|
||||||
|
"""查询剪辑计划生成进度"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
try:
|
||||||
|
gen_status = svc.get_generation_status(plan_id)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc))
|
||||||
|
|
||||||
|
plan = gen_status["plan"]
|
||||||
|
if plan.project_id:
|
||||||
|
check_project_access(plan.project_id, current_user.user.id, project_repository)
|
||||||
|
clips = gen_status["clips"]
|
||||||
|
|
||||||
|
clip_items = [
|
||||||
|
ClipStatusItem(
|
||||||
|
clip_id=c.id,
|
||||||
|
clip_type=c.clip_type,
|
||||||
|
order=c.order,
|
||||||
|
status=c.status.value if hasattr(c.status, "value") else c.status,
|
||||||
|
asset_id=c.asset_id or "",
|
||||||
|
text_content=c.text_content or "",
|
||||||
|
duration=c.duration,
|
||||||
|
)
|
||||||
|
for c in clips
|
||||||
|
]
|
||||||
|
|
||||||
|
return EditPlanGenerationStatusResponse(
|
||||||
|
plan_id=plan_id,
|
||||||
|
plan_status=plan.status.value if hasattr(plan.status, "value") else plan.status,
|
||||||
|
generation_task_id=gen_status["generation_task_id"],
|
||||||
|
clips=clip_items,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/{plan_id}/generations",
|
||||||
|
response_model=EditPlanGenerationsResponse,
|
||||||
|
)
|
||||||
|
def list_plan_generations(
|
||||||
|
plan_id: str,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> EditPlanGenerationsResponse:
|
||||||
|
"""查询剪辑计划关联的所有生成记录"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
plan = svc.get_plan_or_raise(plan_id)
|
||||||
|
if plan.project_id:
|
||||||
|
check_project_access(plan.project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
from app.schemas.generation_task import GenerationTaskResponse
|
||||||
|
|
||||||
|
gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
|
||||||
|
tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
|
||||||
|
items = [
|
||||||
|
GenerationTaskResponse(
|
||||||
|
id=t.id,
|
||||||
|
project_id=t.project_id,
|
||||||
|
asset_library_id=t.asset_library_id,
|
||||||
|
strategy_id=t.strategy_id,
|
||||||
|
voice_library_id=t.voice_library_id,
|
||||||
|
template_id=t.template_id,
|
||||||
|
asset_ids=t.asset_ids,
|
||||||
|
title_ids=t.title_ids,
|
||||||
|
voice_ids=t.voice_ids,
|
||||||
|
source_edit_plan_id=t.source_edit_plan_id or "",
|
||||||
|
status=t.status.value if hasattr(t.status, "value") else t.status,
|
||||||
|
progress=t.progress,
|
||||||
|
result_count=t.result_count,
|
||||||
|
error_message=t.error_message,
|
||||||
|
)
|
||||||
|
for t in tasks
|
||||||
|
]
|
||||||
|
return EditPlanGenerationsResponse(items=items, total=len(items))
|
||||||
+221
@@ -0,0 +1,221 @@
|
|||||||
|
"""剪辑计划时间线 & 模板生成 API 端点。
|
||||||
|
|
||||||
|
从 edit_plans.py 拆分，包含：
|
||||||
|
- GET /{plan_id}/timeline 时间线场景数据
|
||||||
|
- POST /generate-from-template 基于模板+素材自动生成剪辑计划
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from typing import Any, List
|
||||||
|
|
||||||
|
from app.api.routes._helpers import check_project_access
|
||||||
|
from app.api.routes.edit_plans import (
|
||||||
|
GenerateFromTemplateRequest,
|
||||||
|
GenerateFromTemplateResponse,
|
||||||
|
_PlanClipItem,
|
||||||
|
_to_response,
|
||||||
|
)
|
||||||
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
|
from app.dependencies import get_db_session, get_project_repository
|
||||||
|
from app.services import EditPlanService, PlanGeneratorService
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||||
|
from pydantic import BaseModel, Field
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
# ── Timeline Schemas ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
class TimelineSceneResponse(BaseModel):
|
||||||
|
"""时间线场景"""
|
||||||
|
|
||||||
|
scene: str = Field(..., description="场景描述")
|
||||||
|
time: str = Field(..., description='时间范围，如 "0:00 - 0:05"')
|
||||||
|
duration: float = Field(..., ge=0, description="时长（秒）")
|
||||||
|
color: str = Field(..., description="展示颜色")
|
||||||
|
clip_id: str = Field(default="", description="关联的片段 ID")
|
||||||
|
clip_type: str = Field(default="", description="片段类型")
|
||||||
|
|
||||||
|
|
||||||
|
class TimelineResponse(BaseModel):
|
||||||
|
"""时间线响应"""
|
||||||
|
|
||||||
|
plan_id: str
|
||||||
|
total_duration: float
|
||||||
|
scenes: List[TimelineSceneResponse]
|
||||||
|
|
||||||
|
|
||||||
|
# clip_type → 颜色映射
|
||||||
|
_CLIP_TYPE_COLORS = {
|
||||||
|
"intro": "#6366f1",
|
||||||
|
"title": "#6366f1",
|
||||||
|
"product": "#818cf8",
|
||||||
|
"showcase": "#10b981",
|
||||||
|
"scene": "#10b981",
|
||||||
|
"subtitle": "#f59e0b",
|
||||||
|
"text": "#f59e0b",
|
||||||
|
"cta": "#ef4444",
|
||||||
|
"outro": "#ef4444",
|
||||||
|
"voiceover": "#8b5cf6",
|
||||||
|
"transition": "#64748b",
|
||||||
|
}
|
||||||
|
|
||||||
|
_DEFAULT_COLOR = "#6366f1"
|
||||||
|
|
||||||
|
|
||||||
|
def _format_time(seconds: float) -> str:
|
||||||
|
"""将秒数格式化为 M:SS"""
|
||||||
|
m = int(seconds) // 60
|
||||||
|
s = int(seconds) % 60
|
||||||
|
return f"{m}:{s:02d}"
|
||||||
|
|
||||||
|
|
||||||
|
def _clip_type_to_scene_label(clip_type: str, text_content: str) -> str:
|
||||||
|
"""根据 clip_type 和 text_content 生成场景描述"""
|
||||||
|
type_labels = {
|
||||||
|
"intro": "开场",
|
||||||
|
"title": "标题",
|
||||||
|
"product": "产品展示",
|
||||||
|
"showcase": "场景展示",
|
||||||
|
"scene": "场景",
|
||||||
|
"subtitle": "字幕",
|
||||||
|
"text": "文字",
|
||||||
|
"cta": "结尾 CTA",
|
||||||
|
"outro": "结尾",
|
||||||
|
"voiceover": "配音",
|
||||||
|
"transition": "转场",
|
||||||
|
}
|
||||||
|
label = type_labels.get(clip_type, clip_type or "片段")
|
||||||
|
if text_content:
|
||||||
|
short = text_content[:20].strip()
|
||||||
|
if short:
|
||||||
|
return f"{label} - {short}"
|
||||||
|
return label
|
||||||
|
|
||||||
|
|
||||||
|
# ── Routes ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/{plan_id}/timeline",
|
||||||
|
response_model=TimelineResponse,
|
||||||
|
)
|
||||||
|
def get_plan_timeline(
|
||||||
|
plan_id: str,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> TimelineResponse:
|
||||||
|
"""获取剪辑计划的时间线场景数据"""
|
||||||
|
svc = EditPlanService(db)
|
||||||
|
plan = svc.get_plan_or_raise(plan_id)
|
||||||
|
if plan.project_id:
|
||||||
|
check_project_access(plan.project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
clips = svc.list_clips(plan_id=plan_id, skip=0, limit=200)
|
||||||
|
clips.sort(key=lambda c: c.order)
|
||||||
|
|
||||||
|
scenes: List[TimelineSceneResponse] = []
|
||||||
|
current_time = 0.0
|
||||||
|
|
||||||
|
for clip in clips:
|
||||||
|
start = current_time
|
||||||
|
end = start + clip.duration
|
||||||
|
color = _CLIP_TYPE_COLORS.get(clip.clip_type, _DEFAULT_COLOR)
|
||||||
|
scene_label = _clip_type_to_scene_label(clip.clip_type, clip.text_content)
|
||||||
|
|
||||||
|
scenes.append(
|
||||||
|
TimelineSceneResponse(
|
||||||
|
scene=scene_label,
|
||||||
|
time=f"{_format_time(start)} - {_format_time(end)}",
|
||||||
|
duration=clip.duration,
|
||||||
|
color=color,
|
||||||
|
clip_id=clip.id,
|
||||||
|
clip_type=clip.clip_type,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
current_time = end
|
||||||
|
|
||||||
|
total_duration = sum(s.duration for s in scenes) or plan.total_duration
|
||||||
|
|
||||||
|
return TimelineResponse(
|
||||||
|
plan_id=plan_id,
|
||||||
|
total_duration=total_duration,
|
||||||
|
scenes=scenes,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post(
|
||||||
|
"/generate-from-template",
|
||||||
|
response_model=GenerateFromTemplateResponse,
|
||||||
|
status_code=status.HTTP_201_CREATED,
|
||||||
|
)
|
||||||
|
def generate_from_template(
|
||||||
|
body: GenerateFromTemplateRequest,
|
||||||
|
db: Session = Depends(get_db_session),
|
||||||
|
current_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
project_repository: Any = Depends(get_project_repository),
|
||||||
|
) -> GenerateFromTemplateResponse:
|
||||||
|
"""基于模板 + 素材自动生成剪辑计划"""
|
||||||
|
from app.services import EditTemplateService
|
||||||
|
|
||||||
|
if body.project_id:
|
||||||
|
check_project_access(body.project_id, current_user.user.id, project_repository)
|
||||||
|
|
||||||
|
template_svc = EditTemplateService(db)
|
||||||
|
|
||||||
|
try:
|
||||||
|
template = template_svc.get_template_or_raise(body.template_id)
|
||||||
|
except ValueError as exc:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc))
|
||||||
|
|
||||||
|
clip_configs = template_svc.list_clip_configs(body.template_id, skip=0, limit=200)
|
||||||
|
|
||||||
|
generator = PlanGeneratorService(db)
|
||||||
|
result = generator.generate_from_template(
|
||||||
|
template=template,
|
||||||
|
clip_configs=clip_configs,
|
||||||
|
asset_ids=body.asset_ids,
|
||||||
|
project_id=body.project_id,
|
||||||
|
created_by_user_id=current_user.user.id,
|
||||||
|
name=body.name,
|
||||||
|
)
|
||||||
|
|
||||||
|
plan = result["plan"]
|
||||||
|
clips = result["clips"]
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
"基于模板生成剪辑计划: plan_id=%s template_id=%s clips=%d by user=%s",
|
||||||
|
plan.id,
|
||||||
|
body.template_id,
|
||||||
|
len(clips),
|
||||||
|
current_user.user.id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return GenerateFromTemplateResponse(
|
||||||
|
plan=_to_response(plan),
|
||||||
|
clips=[
|
||||||
|
_PlanClipItem(
|
||||||
|
id=c.id,
|
||||||
|
clip_type=c.clip_type,
|
||||||
|
order=c.order,
|
||||||
|
asset_id=c.asset_id,
|
||||||
|
text_content=c.text_content,
|
||||||
|
start_time=c.start_time,
|
||||||
|
duration=c.duration,
|
||||||
|
transition_effect=c.transition_effect,
|
||||||
|
transition_duration=c.transition_duration,
|
||||||
|
status=c.status.value if hasattr(c.status, "value") else c.status,
|
||||||
|
config=c.config,
|
||||||
|
created_at=c.created_at,
|
||||||
|
updated_at=c.updated_at,
|
||||||
|
)
|
||||||
|
for c in clips
|
||||||
|
],
|
||||||
|
)
|
||||||
@@ -32,7 +32,9 @@ logger = logging.getLogger(__name__)
|
|||||||
router = APIRouter(prefix="/internal/feature-flags", tags=["Internal"])
|
router = APIRouter(prefix="/internal/feature-flags", tags=["Internal"])
|
||||||
|
|
||||||
# 允许管理的 flag 白名单（防止误操作其他系统 flag）
|
# 允许管理的 flag 白名单（防止误操作其他系统 flag）
|
||||||
ALLOWED_FLAGS: set[str] = set()
|
ALLOWED_FLAGS = {
|
||||||
|
"render_engine",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def _get_feature_flag_store() -> RedisFeatureFlagStore:
|
def _get_feature_flag_store() -> RedisFeatureFlagStore:
|
||||||
@@ -103,7 +105,7 @@ async def list_feature_flags(
|
|||||||
return sorted(result, key=lambda x: x.name)
|
return sorted(result, key=lambda x: x.name)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.error("Failed to list feature flags: %s", exc)
|
logger.error("Failed to list feature flags: %s", exc)
|
||||||
raise HTTPException(status_code=500, detail=f"Failed to list flags: {exc}") from exc
|
raise HTTPException(status_code=500, detail=f"Failed to list flags: {exc}")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{name}", response_model=FeatureFlagResponse)
|
@router.get("/{name}", response_model=FeatureFlagResponse)
|
||||||
@@ -118,7 +120,7 @@ async def get_feature_flag(
|
|||||||
return FeatureFlagResponse.from_config(config)
|
return FeatureFlagResponse.from_config(config)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.error("Failed to get feature flag %s: %s", name, exc)
|
logger.error("Failed to get feature flag %s: %s", name, exc)
|
||||||
raise HTTPException(status_code=500, detail=f"Failed to get flag: {exc}") from exc
|
raise HTTPException(status_code=500, detail=f"Failed to get flag: {exc}")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{name}/check", response_model=FeatureFlagCheckResponse)
|
@router.get("/{name}/check", response_model=FeatureFlagCheckResponse)
|
||||||
@@ -134,7 +136,7 @@ async def check_feature_flag(
|
|||||||
return FeatureFlagCheckResponse(name=name, active=active, identifier=identifier)
|
return FeatureFlagCheckResponse(name=name, active=active, identifier=identifier)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.error("Failed to check feature flag %s: %s", name, exc)
|
logger.error("Failed to check feature flag %s: %s", name, exc)
|
||||||
raise HTTPException(status_code=500, detail=f"Failed to check flag: {exc}") from exc
|
raise HTTPException(status_code=500, detail=f"Failed to check flag: {exc}")
|
||||||
|
|
||||||
|
|
||||||
@router.put("/{name}", response_model=FeatureFlagResponse)
|
@router.put("/{name}", response_model=FeatureFlagResponse)
|
||||||
@@ -168,7 +170,7 @@ async def update_feature_flag(
|
|||||||
return FeatureFlagResponse.from_config(config)
|
return FeatureFlagResponse.from_config(config)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.error("Failed to update feature flag %s: %s", name, exc)
|
logger.error("Failed to update feature flag %s: %s", name, exc)
|
||||||
raise HTTPException(status_code=500, detail=f"Failed to update flag: {exc}") from exc
|
raise HTTPException(status_code=500, detail=f"Failed to update flag: {exc}")
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{name}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
@router.delete("/{name}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
||||||
@@ -176,7 +178,7 @@ async def delete_feature_flag(
|
|||||||
name: str,
|
name: str,
|
||||||
_: bool = Depends(_verify_internal_api_key),
|
_: bool = Depends(_verify_internal_api_key),
|
||||||
store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
|
store: RedisFeatureFlagStore = Depends(_get_feature_flag_store),
|
||||||
):
|
) :
|
||||||
"""删除 Feature Flag。
|
"""删除 Feature Flag。
|
||||||
|
|
||||||
只允许删除 ALLOWED_FLAGS 列表中的 flag。
|
只允许删除 ALLOWED_FLAGS 列表中的 flag。
|
||||||
@@ -189,4 +191,4 @@ async def delete_feature_flag(
|
|||||||
pass
|
pass
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logger.error("Failed to delete feature flag %s: %s", name, exc)
|
logger.error("Failed to delete feature flag %s: %s", name, exc)
|
||||||
raise HTTPException(status_code=500, detail=f"Failed to delete flag: {exc}") from exc
|
raise HTTPException(status_code=500, detail=f"Failed to delete flag: {exc}")
|
||||||
|
|||||||
@@ -1,879 +0,0 @@
|
|||||||
"""封面生成路由 — Generation 模块.
|
|
||||||
|
|
||||||
端点：
|
|
||||||
- POST /generate-cover AI 生成封面（从最终成片视频中抽帧，兼容预览片段回退）
|
|
||||||
|
|
||||||
挂载路径: /api/v1/generation/generate-cover
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import ipaddress
|
|
||||||
import logging
|
|
||||||
import re
|
|
||||||
from typing import Any, List, Optional
|
|
||||||
from urllib.parse import urlparse
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_db_session, get_generated_video_repository
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
||||||
from pydantic import BaseModel, Field
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from packages.adapters.sqlalchemy_impl.generation_task_repository import (
|
|
||||||
SQLAlchemyGenerationTaskRepository,
|
|
||||||
)
|
|
||||||
from packages.application import ListGeneratedVideosByTaskUseCase
|
|
||||||
from packages.domain.config_schemas import normalize_plan_config
|
|
||||||
from packages.shared.storage import get_shared_storage_service
|
|
||||||
|
|
||||||
from .templates_editor.dependencies import get_draft_plan_id, get_editor_services
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
router = APIRouter(tags=["Generation"])
|
|
||||||
|
|
||||||
|
|
||||||
# ── Schemas ──────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class GenerateCoverRequest(BaseModel):
|
|
||||||
"""AI 封面生成请求体"""
|
|
||||||
|
|
||||||
asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表（确定视频来源）")
|
|
||||||
cover_type: str = Field(
|
|
||||||
default="ai_frame",
|
|
||||||
description="封面类型: ai_frame / manual / upload / ai_regenerate",
|
|
||||||
)
|
|
||||||
frame_time: Optional[float] = Field(
|
|
||||||
default=None,
|
|
||||||
ge=0.0,
|
|
||||||
description="手动选帧时间点（秒），仅 cover_type=manual 时有效",
|
|
||||||
)
|
|
||||||
cover_url: Optional[str] = Field(
|
|
||||||
default=None,
|
|
||||||
description="上传的封面图片 URL，仅 cover_type=upload 时有效",
|
|
||||||
)
|
|
||||||
generated_video_id: Optional[str] = Field(
|
|
||||||
default=None,
|
|
||||||
description="确认生成产出的最终视频 ID。传入后封面从该视频文件抽帧，而非预览片段。",
|
|
||||||
)
|
|
||||||
video_url: Optional[str] = Field(
|
|
||||||
default=None,
|
|
||||||
description="最终视频 URL（兜底）。当 generated_video_id 不可用时，直接从此 URL 对应的视频抽帧。",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class GenerateCoverResponse(BaseModel):
|
|
||||||
"""AI 封面生成响应体"""
|
|
||||||
|
|
||||||
plan_id: str = Field(..., description="剪辑计划 ID")
|
|
||||||
cover: dict[str, Any] = Field(..., description="封面数据（type / image_url / frame_time 等）")
|
|
||||||
|
|
||||||
|
|
||||||
# ── Route ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def _select_best_frame_from_snapshots(
|
|
||||||
snapshots: list[dict], plan_id: str
|
|
||||||
) -> str:
|
|
||||||
"""从 MediaKit 抽帧结果中，通过质量评分选出最佳帧。
|
|
||||||
|
|
||||||
降级策略：cv2 不可用或评分失败时，返回第一帧。
|
|
||||||
|
|
||||||
Args:
|
|
||||||
snapshots: MediaKit 返回的帧列表 [{"image_url": str, ...}, ...]
|
|
||||||
plan_id: 计划 ID（日志用）
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
最佳帧的 image_url，或空字符串
|
|
||||||
"""
|
|
||||||
if not snapshots:
|
|
||||||
return ""
|
|
||||||
if len(snapshots) == 1:
|
|
||||||
return snapshots[0].get("image_url") or snapshots[0].get("url") or ""
|
|
||||||
|
|
||||||
try:
|
|
||||||
import tempfile
|
|
||||||
|
|
||||||
import httpx
|
|
||||||
|
|
||||||
from packages.shared.cover_frame_scorer import score_frames
|
|
||||||
|
|
||||||
scored_candidates = []
|
|
||||||
for snap in snapshots:
|
|
||||||
url = snap.get("image_url") or snap.get("url") or ""
|
|
||||||
if not url:
|
|
||||||
continue
|
|
||||||
# 下载帧到临时文件进行评分
|
|
||||||
try:
|
|
||||||
resp = httpx.get(url, timeout=15, follow_redirects=True)
|
|
||||||
resp.raise_for_status()
|
|
||||||
with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as tmp:
|
|
||||||
tmp.write(resp.content)
|
|
||||||
tmp_path = tmp.name
|
|
||||||
scored_candidates.append({"image_path": tmp_path, "url": url})
|
|
||||||
except Exception:
|
|
||||||
# 下载失败的帧跳过，给默认低分
|
|
||||||
scored_candidates.append({"image_path": None, "url": url, "score": 0.0})
|
|
||||||
|
|
||||||
if not scored_candidates:
|
|
||||||
return snapshots[0].get("image_url") or snapshots[0].get("url") or ""
|
|
||||||
|
|
||||||
scored = score_frames(scored_candidates)
|
|
||||||
best = scored[0] if scored else None
|
|
||||||
best_url = best.get("url", "") if best else ""
|
|
||||||
best_score = best.get("score", 0.0) if best else 0.0
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 帧质量评分完成: plan_id=%s candidates=%d best_score=%.1f",
|
|
||||||
plan_id,
|
|
||||||
len(scored_candidates),
|
|
||||||
best_score,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 清理临时文件
|
|
||||||
for c in scored_candidates:
|
|
||||||
path = c.get("image_path")
|
|
||||||
if path:
|
|
||||||
try:
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
Path(path).unlink(missing_ok=True)
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return best_url
|
|
||||||
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 帧质量评分失败，使用第一帧: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
return snapshots[0].get("image_url") or snapshots[0].get("url") or ""
|
|
||||||
|
|
||||||
|
|
||||||
def _persist_cover_frame(
|
|
||||||
frame_url: str,
|
|
||||||
plan_id: str,
|
|
||||||
title_text: str = "",
|
|
||||||
*,
|
|
||||||
title_color: str = "#ffffff",
|
|
||||||
title_position: str = "bottom",
|
|
||||||
title_font_size: int | None = None,
|
|
||||||
) -> str:
|
|
||||||
"""下载 MediaKit 返回的临时帧图，可选叠加标题后转存到 OSS covers/ 路径。
|
|
||||||
|
|
||||||
Args:
|
|
||||||
frame_url: MediaKit 返回的临时帧图 URL
|
|
||||||
plan_id: 剪辑计划 ID（生成 OSS key）
|
|
||||||
title_text: 非空时用 Pillow 在帧上叠加标题（用于 E2 从源素材抽帧，
|
|
||||||
因为源素材本身没有烧录标题）
|
|
||||||
title_color: 标题字体颜色（#RRGGBB）
|
|
||||||
title_position: 标题位置 top/center/bottom
|
|
||||||
title_font_size: 标题字号，None 时自动计算
|
|
||||||
"""
|
|
||||||
import tempfile
|
|
||||||
import uuid
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
tmp_path: str | None = None
|
|
||||||
try:
|
|
||||||
import httpx
|
|
||||||
|
|
||||||
resp = httpx.get(frame_url, timeout=30, follow_redirects=True)
|
|
||||||
resp.raise_for_status()
|
|
||||||
if not resp.content:
|
|
||||||
return frame_url
|
|
||||||
|
|
||||||
with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as tmp:
|
|
||||||
tmp.write(resp.content)
|
|
||||||
tmp_path = tmp.name
|
|
||||||
|
|
||||||
# E2 从源素材抽帧时，源素材无标题，叠加标题文字
|
|
||||||
if title_text and title_text.strip():
|
|
||||||
try:
|
|
||||||
from packages.shared.title_overlay import apply_title_to_image
|
|
||||||
|
|
||||||
applied = apply_title_to_image(
|
|
||||||
tmp_path,
|
|
||||||
title_text,
|
|
||||||
color=title_color,
|
|
||||||
position=title_position,
|
|
||||||
font_size=title_font_size,
|
|
||||||
)
|
|
||||||
if applied:
|
|
||||||
logger.info("[封面生成] E2 帧图已叠加标题: plan_id=%s", plan_id)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] E2 标题叠加失败（返回无标题帧）: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
storage = get_shared_storage_service()
|
|
||||||
cover_key = f"covers/{plan_id}/cover_{uuid.uuid4().hex[:8]}.jpg"
|
|
||||||
storage.upload_file(
|
|
||||||
file_or_path=tmp_path,
|
|
||||||
storage_key=cover_key,
|
|
||||||
content_type="image/jpeg",
|
|
||||||
)
|
|
||||||
public_url = storage.get_url(cover_key)
|
|
||||||
return public_url or frame_url
|
|
||||||
except Exception:
|
|
||||||
logger.warning("封面帧转存失败，返回原始 URL: plan_id=%s", plan_id, exc_info=True)
|
|
||||||
return frame_url
|
|
||||||
finally:
|
|
||||||
if tmp_path:
|
|
||||||
Path(tmp_path).unlink(missing_ok=True)
|
|
||||||
|
|
||||||
|
|
||||||
def _get_task_video_url(db: Session, task_id: str) -> Optional[str]:
|
|
||||||
"""从 GenerationTask 关联的 GeneratedVideo 中获取视频 storage_key / URL."""
|
|
||||||
try:
|
|
||||||
video_repo = get_generated_video_repository(db)
|
|
||||||
use_case = ListGeneratedVideosByTaskUseCase(video_repo)
|
|
||||||
videos = use_case.execute(task_id)
|
|
||||||
if videos:
|
|
||||||
return getattr(videos[0], "file_url", "") or ""
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[封面生成] 获取任务视频失败: task_id=%s", task_id, exc_info=True)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _resolve_storage_key_to_url(storage_key: str) -> Optional[str]:
|
|
||||||
"""将 storage_key 或完整 URL 转换为可访问的裸 URL。"""
|
|
||||||
if not storage_key:
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
if storage_key.startswith("http"):
|
|
||||||
url = storage_key
|
|
||||||
else:
|
|
||||||
storage_svc = get_shared_storage_service()
|
|
||||||
url = storage_svc.get_url(storage_key)
|
|
||||||
if url:
|
|
||||||
url = re.sub(r"(?<!:)//", "/", url)
|
|
||||||
return url
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning("[封面生成] storage_key 转 URL 失败: key=%s err=%s", storage_key, e)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _endpoint_host(value: str) -> str:
|
|
||||||
"""从 endpoint / URL 字符串中安全提取主机名（兼容有无 scheme 两种配置）。"""
|
|
||||||
v = (value or "").strip().lower()
|
|
||||||
if not v:
|
|
||||||
return ""
|
|
||||||
if "://" in v:
|
|
||||||
return (urlparse(v).hostname or "").lower()
|
|
||||||
# 无 scheme：去掉可能的端口（host:port），urlparse 补 // 以正确解析
|
|
||||||
return (urlparse("//" + v).hostname or "").lower()
|
|
||||||
|
|
||||||
|
|
||||||
def _is_private_or_reserved_host(host: str) -> bool:
|
|
||||||
"""判断主机名是否为内网/回环/链路本地/保留地址（IPv4 与 IPv6 统一处理）。
|
|
||||||
|
|
||||||
使用标准库 ipaddress 判定；非 IP 主机名（如 localhost）单独处理。
|
|
||||||
"""
|
|
||||||
h = host.strip().lower()
|
|
||||||
if h in {"localhost", "0.0.0.0", "::", "::1"}:
|
|
||||||
return True
|
|
||||||
try:
|
|
||||||
addr = ipaddress.ip_address(h)
|
|
||||||
# is_private 覆盖 10/8、172.16/12、192.168/16、127/8、169.254/16、
|
|
||||||
# ::1、fc00::/7、fe80::/10 等全部私有/保留段
|
|
||||||
return bool(addr.is_private or addr.is_loopback or addr.is_link_local or addr.is_reserved)
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _is_trusted_media_url(url: str) -> bool:
|
|
||||||
"""校验 URL 是否指向受信任的存储域名（OSS bucket / 本地存储），防止 SSRF。
|
|
||||||
|
|
||||||
用户可通过 video_url 传入视频地址，但服务端（MediaKit）会主动请求该 URL，
|
|
||||||
因此必须限制为自家存储域名，拒绝内网地址、元数据地址等任意主机。
|
|
||||||
"""
|
|
||||||
if not url:
|
|
||||||
return False
|
|
||||||
try:
|
|
||||||
parsed = urlparse(url.strip())
|
|
||||||
if parsed.scheme not in ("http", "https"):
|
|
||||||
return False
|
|
||||||
host = (parsed.hostname or "").lower()
|
|
||||||
if not host:
|
|
||||||
return False
|
|
||||||
# 拒绝一切内网/回环/链路本地/保留地址（IPv4 + IPv6，标准库判定）
|
|
||||||
if _is_private_or_reserved_host(host):
|
|
||||||
return False
|
|
||||||
# 允许：自家 OSS bucket 域名（<bucket>.<endpoint>）或 endpoint 自身及其子域
|
|
||||||
try:
|
|
||||||
storage_svc = get_shared_storage_service()
|
|
||||||
trusted_hosts = set()
|
|
||||||
public_base = getattr(storage_svc, "public_url", "") or ""
|
|
||||||
h1 = _endpoint_host(public_base)
|
|
||||||
if h1:
|
|
||||||
trusted_hosts.add(h1)
|
|
||||||
h2 = _endpoint_host(getattr(storage_svc, "endpoint", "") or "")
|
|
||||||
if h2:
|
|
||||||
trusted_hosts.add(h2)
|
|
||||||
for trusted in trusted_hosts:
|
|
||||||
if host == trusted or host.endswith("." + trusted):
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[封面生成] 存储域名白名单初始化失败，URL 校验从严拒绝", exc_info=True)
|
|
||||||
return False
|
|
||||||
return False
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[封面生成] video_url 白名单校验异常，从严拒绝: url=%s", url[:80], exc_info=True)
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/generate-cover", response_model=GenerateCoverResponse)
|
|
||||||
def generate_cover(
|
|
||||||
body: GenerateCoverRequest,
|
|
||||||
template_id: str = Query(..., description="模板 ID"),
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> GenerateCoverResponse:
|
|
||||||
"""AI 生成封面 — 优先从最终成片视频中抽帧，回退到预览片段.
|
|
||||||
|
|
||||||
流程（串行）：
|
|
||||||
1. 优先使用前端传入的 generation_task_id 定位最终成片任务，
|
|
||||||
或自动查找 plan 关联的已完成最终成片任务（is_preview=False）
|
|
||||||
2. 回退：从预览片段获取视频 URL（兼容旧流程）
|
|
||||||
3. 用裸 URL 让 MediaKit 下载视频并抽帧
|
|
||||||
4. 帧图下载后上传到 OSS covers/ 路径
|
|
||||||
|
|
||||||
MediaKit 的调用方式（strategy / max_frames / 轮询 / 重试 / 降级）不变。
|
|
||||||
"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
|
|
||||||
# ── upload 类型：直接保存前端上传的封面图片，不需要预览视频 ──────
|
|
||||||
if body.cover_type == "upload":
|
|
||||||
if not body.cover_url:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail="cover_type=upload 时必须提供 cover_url",
|
|
||||||
)
|
|
||||||
cover_data = {
|
|
||||||
"type": "upload",
|
|
||||||
"image_url": body.cover_url,
|
|
||||||
}
|
|
||||||
current_config = dict(plan.config) if plan.config else {}
|
|
||||||
current_config["cover"] = cover_data
|
|
||||||
normalized = normalize_plan_config(current_config)
|
|
||||||
plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
|
|
||||||
logger.info(
|
|
||||||
"封面上传完成: plan_id=%s cover_url=%s by user=%s",
|
|
||||||
plan_id,
|
|
||||||
body.cover_url[:80] if body.cover_url else "",
|
|
||||||
current_user.user.id,
|
|
||||||
)
|
|
||||||
return GenerateCoverResponse(plan_id=plan_id, cover=cover_data)
|
|
||||||
|
|
||||||
# ── 查找用于抽帧的视频 URL ────────────────────────────────────────
|
|
||||||
# 优先级：
|
|
||||||
# 0. 请求体显式传入的 generation_task_id（最终成片任务）
|
|
||||||
# 1. plan.config.rendered_storage_key
|
|
||||||
# 2. plan.config.generation_task_id 对应的任务
|
|
||||||
# 3. source_edit_plan_id 关联的已完成「最终成片」任务（is_preview=False）
|
|
||||||
# 4. source_edit_plan_id 关联的已完成预览任务（is_preview=True，兼容回退）
|
|
||||||
# 5. user + template 最近的已完成预览任务（兜底）
|
|
||||||
logger.info("[封面生成] 步骤1: 从 plan.config 查找 rendered_storage_key: plan_id=%s", plan_id)
|
|
||||||
rendered_storage_key = (plan.config or {}).get("rendered_storage_key", "")
|
|
||||||
|
|
||||||
# 步骤 0：请求体传入最终视频标识（generated_video_id 或 video_url）
|
|
||||||
if not rendered_storage_key:
|
|
||||||
# 0a：通过 generated_video_id 查找最终成片视频
|
|
||||||
if body.generated_video_id:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 步骤0a: 使用 generated_video_id: plan_id=%s video_id=%s",
|
|
||||||
plan_id,
|
|
||||||
body.generated_video_id,
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
gv_repo = get_generated_video_repository(db)
|
|
||||||
gv = gv_repo.get(body.generated_video_id)
|
|
||||||
if gv:
|
|
||||||
file_url = getattr(gv, "file_url", "") or ""
|
|
||||||
if file_url:
|
|
||||||
# 权限校验（双重，任何一层确认归属不符即拒绝）：
|
|
||||||
# 1) GeneratedVideo.user_id 直接归属（老数据可能为空，为空时不据此放行）
|
|
||||||
gv_owner = (getattr(gv, "user_id", "") or "").strip()
|
|
||||||
if gv_owner and gv_owner != current_user.user.id:
|
|
||||||
raise HTTPException(status_code=403, detail="无权访问该视频")
|
|
||||||
# 2) 关联 generation_task 归属校验；关联任务缺失时不可静默放行：
|
|
||||||
# 若 video 自身无 owner 信息且关联任务也查不到，拒绝访问
|
|
||||||
gv_task_id = getattr(gv, "generation_task_id", "") or ""
|
|
||||||
task0 = None
|
|
||||||
if gv_task_id:
|
|
||||||
try:
|
|
||||||
task0 = SQLAlchemyGenerationTaskRepository(db).get(gv_task_id)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤0a关联任务查询异常: plan_id=%s task_id=%s",
|
|
||||||
plan_id,
|
|
||||||
gv_task_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
if task0 is not None:
|
|
||||||
task_owner = (getattr(task0, "created_by_user_id", "") or "").strip()
|
|
||||||
if task_owner and task_owner != current_user.user.id:
|
|
||||||
raise HTTPException(status_code=403, detail="无权访问该视频")
|
|
||||||
elif not gv_owner:
|
|
||||||
# video 无 owner 且关联任务不存在/无法确认归属 → 拒绝，防止越权
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤0a视频归属无法确认，拒绝访问: plan_id=%s video_id=%s",
|
|
||||||
plan_id,
|
|
||||||
body.generated_video_id,
|
|
||||||
)
|
|
||||||
raise HTTPException(status_code=403, detail="无权访问该视频")
|
|
||||||
rendered_storage_key = file_url
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] ✅ 步骤0a找到最终成片: plan_id=%s video_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
body.generated_video_id,
|
|
||||||
file_url[:80],
|
|
||||||
)
|
|
||||||
except HTTPException:
|
|
||||||
raise
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤0a查找视频失败: plan_id=%s video_id=%s",
|
|
||||||
plan_id,
|
|
||||||
body.generated_video_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 0b：直接使用 video_url（兜底）— 必须通过存储域名白名单校验，防止 SSRF
|
|
||||||
if not rendered_storage_key and body.video_url:
|
|
||||||
if _is_trusted_media_url(body.video_url):
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 步骤0b: 使用请求体传入的 video_url(白名单通过): plan_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
body.video_url[:80],
|
|
||||||
)
|
|
||||||
rendered_storage_key = body.video_url
|
|
||||||
else:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤0b: video_url 不在受信任存储域名白名单内，已忽略: plan_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
body.video_url[:80],
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 2：通过 plan.config.generation_task_id 查找
|
|
||||||
if not rendered_storage_key:
|
|
||||||
generation_task_id = (plan.config or {}).get("generation_task_id", "")
|
|
||||||
if generation_task_id:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 步骤2: 通过 plan.config.generation_task_id 查找: plan_id=%s task_id=%s",
|
|
||||||
plan_id,
|
|
||||||
generation_task_id,
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
_repo = SQLAlchemyGenerationTaskRepository(db)
|
|
||||||
task = _repo.get(generation_task_id)
|
|
||||||
if task:
|
|
||||||
rendered_storage_key = _get_task_video_url(db, task.id) or ""
|
|
||||||
if rendered_storage_key:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] ✅ 步骤2找到视频: plan_id=%s task_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
generation_task_id,
|
|
||||||
rendered_storage_key[:80],
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤2查找失败: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 3：通过 source_edit_plan_id 查找已完成「最终成片」任务（is_preview=False）
|
|
||||||
if not rendered_storage_key:
|
|
||||||
try:
|
|
||||||
_repo = SQLAlchemyGenerationTaskRepository(db)
|
|
||||||
logger.info("[封面生成] 步骤3: 查找最终成片任务(is_preview=False): plan_id=%s", plan_id)
|
|
||||||
all_tasks = _repo.list_by_source_edit_plan(plan_id)
|
|
||||||
for pt in all_tasks:
|
|
||||||
if getattr(pt, "status", "") == "completed" and not getattr(pt, "is_preview", False):
|
|
||||||
rendered_storage_key = _get_task_video_url(db, pt.id) or ""
|
|
||||||
if rendered_storage_key:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] ✅ 步骤3找到最终成片: plan_id=%s task_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
pt.id,
|
|
||||||
rendered_storage_key[:80],
|
|
||||||
)
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤3查找最终成片失败: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 4：兼容回退 — 通过 source_edit_plan_id 查找已完成预览任务
|
|
||||||
if not rendered_storage_key:
|
|
||||||
try:
|
|
||||||
_repo = SQLAlchemyGenerationTaskRepository(db)
|
|
||||||
logger.info("[封面生成] 步骤4: 回退查找预览任务(is_preview=True): plan_id=%s", plan_id)
|
|
||||||
preview_tasks = _repo.list_by_source_edit_plan(plan_id)
|
|
||||||
for pt in preview_tasks:
|
|
||||||
if getattr(pt, "status", "") == "completed" and getattr(pt, "is_preview", False):
|
|
||||||
rendered_storage_key = _get_task_video_url(db, pt.id) or ""
|
|
||||||
if rendered_storage_key:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] ✅ 步骤4找到预览视频: plan_id=%s task_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
pt.id,
|
|
||||||
rendered_storage_key[:80],
|
|
||||||
)
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤4查找预览任务失败: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 5：按 user + template 查找最近的已完成预览任务（兜底）
|
|
||||||
if not rendered_storage_key:
|
|
||||||
try:
|
|
||||||
_repo = SQLAlchemyGenerationTaskRepository(db)
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 步骤5: 通过 user+template 查找预览任务: plan_id=%s template_id=%s",
|
|
||||||
plan_id,
|
|
||||||
template_id,
|
|
||||||
)
|
|
||||||
preview_tasks = _repo.list_latest_completed_preview(
|
|
||||||
user_id=str(current_user.user.id),
|
|
||||||
template_id=template_id,
|
|
||||||
)
|
|
||||||
if preview_tasks:
|
|
||||||
rendered_storage_key = _get_task_video_url(db, preview_tasks[0].id) or ""
|
|
||||||
if rendered_storage_key:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] ✅ 步骤5找到预览视频: plan_id=%s task_id=%s",
|
|
||||||
plan_id,
|
|
||||||
preview_tasks[0].id,
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤5 user+template 查找失败: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 将 storage_key 转换为可访问 URL；找不到视频时不立即报错，
|
|
||||||
# 因为步骤 E2 可以直接从源素材抽帧（历史数据或 Worker 抽帧失败时的兜底）
|
|
||||||
primary_video_url = None
|
|
||||||
if rendered_storage_key:
|
|
||||||
plan_svc.update_plan_config(plan_id, {"rendered_storage_key": rendered_storage_key})
|
|
||||||
primary_video_url = _resolve_storage_key_to_url(rendered_storage_key)
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 封面抽帧视频URL: plan_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
primary_video_url[:80] if primary_video_url else "",
|
|
||||||
)
|
|
||||||
|
|
||||||
# 统一封面管道：优先从 GenerationTask.cover_url 读取渲染后视频抽帧的封面
|
|
||||||
# 多步查找 cover_url，和查找视频 URL 一样的 fallback 逻辑
|
|
||||||
if body.cover_type in ("ai_frame", "ai_regenerate"):
|
|
||||||
cover_url_from_task = None
|
|
||||||
gen_task_repo = SQLAlchemyGenerationTaskRepository(db)
|
|
||||||
|
|
||||||
# 步骤 A：通过 generation_task_id 直接查找
|
|
||||||
generation_task_id = (plan.config or {}).get("generation_task_id", "")
|
|
||||||
if generation_task_id:
|
|
||||||
try:
|
|
||||||
task = gen_task_repo.get(generation_task_id)
|
|
||||||
if task and getattr(task, "cover_url", ""): # type: ignore[arg-type]
|
|
||||||
cover_url_from_task = task.cover_url
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 统一管道封面(步骤A-direct): plan_id=%s task_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
generation_task_id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤A读取 cover_url 失败: plan_id=%s task_id=%s",
|
|
||||||
plan_id,
|
|
||||||
generation_task_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 A2：通过 generated_video_id 查找其关联任务的 cover_url
|
|
||||||
if not cover_url_from_task and body.generated_video_id:
|
|
||||||
try:
|
|
||||||
gv_repo = get_generated_video_repository(db)
|
|
||||||
gv = gv_repo.get(body.generated_video_id)
|
|
||||||
if gv:
|
|
||||||
gv_task_id = getattr(gv, "generation_task_id", "") or ""
|
|
||||||
if gv_task_id:
|
|
||||||
task_a2 = gen_task_repo.get(gv_task_id)
|
|
||||||
if task_a2 and getattr(task_a2, "cover_url", ""): # type: ignore[arg-type]
|
|
||||||
cover_url_from_task = task_a2.cover_url
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 封面(步骤A2-video-task): plan_id=%s video_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
body.generated_video_id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤A2读取 cover_url 失败: plan_id=%s video_id=%s",
|
|
||||||
plan_id,
|
|
||||||
body.generated_video_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 B：通过 source_edit_plan_id 查找关联任务的 cover_url
|
|
||||||
# 优先最终成片任务(is_preview=False)，其次预览任务
|
|
||||||
if not cover_url_from_task:
|
|
||||||
try:
|
|
||||||
all_tasks = gen_task_repo.list_by_source_edit_plan(plan_id)
|
|
||||||
# 先找最终成片
|
|
||||||
for pt in all_tasks:
|
|
||||||
if (
|
|
||||||
getattr(pt, "status", "") == "completed"
|
|
||||||
and not getattr(pt, "is_preview", False)
|
|
||||||
and getattr(pt, "cover_url", "")
|
|
||||||
):
|
|
||||||
cover_url_from_task = pt.cover_url
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 封面(步骤B-final): plan_id=%s task_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
pt.id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
break
|
|
||||||
# 再找预览
|
|
||||||
if not cover_url_from_task:
|
|
||||||
for pt in all_tasks:
|
|
||||||
if (
|
|
||||||
getattr(pt, "status", "") == "completed"
|
|
||||||
and getattr(pt, "is_preview", False)
|
|
||||||
and getattr(pt, "cover_url", "")
|
|
||||||
):
|
|
||||||
cover_url_from_task = pt.cover_url
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 封面(步骤B-preview): plan_id=%s task_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
pt.id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤B查找 cover_url 失败: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 C：通过 user+template 查找最近的已完成预览任务的 cover_url
|
|
||||||
if not cover_url_from_task:
|
|
||||||
try:
|
|
||||||
preview_tasks = gen_task_repo.list_latest_completed_preview(
|
|
||||||
user_id=str(current_user.user.id),
|
|
||||||
template_id=template_id,
|
|
||||||
)
|
|
||||||
for pt in preview_tasks:
|
|
||||||
if getattr(pt, "cover_url", ""):
|
|
||||||
cover_url_from_task = pt.cover_url
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 统一管道封面(步骤C-user+template): plan_id=%s task_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
pt.id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤C查找 cover_url 失败: plan_id=%s template_id=%s",
|
|
||||||
plan_id,
|
|
||||||
template_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 D：从 plan.config.cover_candidates 读取（Worker 渲染时写入）
|
|
||||||
if not cover_url_from_task:
|
|
||||||
_candidates = (plan.config or {}).get("cover_candidates") or []
|
|
||||||
if isinstance(_candidates, list) and _candidates:
|
|
||||||
_first = _candidates[0]
|
|
||||||
if isinstance(_first, dict):
|
|
||||||
cover_url_from_task = _first.get("image_url") or _first.get("url") or ""
|
|
||||||
if cover_url_from_task:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 统一管道封面(步骤D-cover_candidates): plan_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 E1：如果有已渲染的预览视频 URL 但 cover_url 未持久化（历史数据），
|
|
||||||
# 直接从渲染视频抽帧
|
|
||||||
if not cover_url_from_task and primary_video_url:
|
|
||||||
try:
|
|
||||||
from packages.shared.mediakit_client import get_mediakit_client
|
|
||||||
|
|
||||||
mk_client = get_mediakit_client()
|
|
||||||
if mk_client.is_available:
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 步骤E1-从渲染视频抽帧: plan_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
primary_video_url[:80],
|
|
||||||
)
|
|
||||||
snapshots = mk_client.extract_frames(
|
|
||||||
video_url=primary_video_url,
|
|
||||||
strategy="SpecifiedFrames",
|
|
||||||
max_frames=5, # 抽 5 帧，通过质量评分选最佳
|
|
||||||
poll_interval=2.0,
|
|
||||||
max_poll_attempts=5,
|
|
||||||
max_retries=0,
|
|
||||||
)
|
|
||||||
if snapshots:
|
|
||||||
raw = _select_best_frame_from_snapshots(snapshots, plan_id)
|
|
||||||
if raw:
|
|
||||||
cover_url_from_task = _persist_cover_frame(raw, plan_id)
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 统一管道封面(步骤E1-rendered-video): plan_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤E1从渲染视频抽帧失败: plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 步骤 E2：当 A/B/C/D/E1 均未命中（如历史预览任务无 cover_url）时，
|
|
||||||
# 直接从用户选择的第一个视频素材中抽取封面帧作为兜底。API 请求内短超时，不阻塞。
|
|
||||||
if not cover_url_from_task and body.asset_ids:
|
|
||||||
from packages.adapters.sqlalchemy_impl.asset_repository import (
|
|
||||||
SQLAlchemyAssetRepository,
|
|
||||||
)
|
|
||||||
from packages.shared.mediakit_client import get_mediakit_client
|
|
||||||
from packages.shared.storage import get_shared_storage_service
|
|
||||||
|
|
||||||
asset_repo = SQLAlchemyAssetRepository(db)
|
|
||||||
storage_svc = get_shared_storage_service()
|
|
||||||
mk_client = get_mediakit_client()
|
|
||||||
# 从 plan.config 读取完整标题样式，E2 从源素材抽帧时叠加（源素材本身无标题）
|
|
||||||
_e2_title_cfg = (plan.config or {}).get("title", {}) or {}
|
|
||||||
if not isinstance(_e2_title_cfg, dict):
|
|
||||||
_e2_title_cfg = {}
|
|
||||||
_e2_title_text = (_e2_title_cfg.get("text", "") or "").strip() if _e2_title_cfg.get("enabled", True) else ""
|
|
||||||
# 读取标题样式：前端可能传 color 或 font_color，都兼容
|
|
||||||
_e2_title_color = _e2_title_cfg.get("color") or _e2_title_cfg.get("font_color") or "#ffffff"
|
|
||||||
_e2_title_position = _e2_title_cfg.get("position", "bottom") or "bottom"
|
|
||||||
_e2_title_font_size = _e2_title_cfg.get("font_size") or _e2_title_cfg.get("size")
|
|
||||||
if mk_client.is_available:
|
|
||||||
for aid in body.asset_ids:
|
|
||||||
try:
|
|
||||||
asset = asset_repo.get(aid)
|
|
||||||
if not asset or asset.file_type != "video":
|
|
||||||
continue
|
|
||||||
sk = asset.storage_key or ""
|
|
||||||
if not sk:
|
|
||||||
continue
|
|
||||||
src_url = sk if sk.startswith("http") else storage_svc.get_url(sk)
|
|
||||||
if not src_url:
|
|
||||||
continue
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 步骤E-从素材抽帧: plan_id=%s asset_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
aid,
|
|
||||||
src_url[:80],
|
|
||||||
)
|
|
||||||
snapshots = mk_client.extract_frames(
|
|
||||||
video_url=src_url,
|
|
||||||
strategy="SpecifiedFrames",
|
|
||||||
max_frames=5, # 抽 5 帧，通过质量评分选最佳
|
|
||||||
poll_interval=2.0,
|
|
||||||
max_poll_attempts=5,
|
|
||||||
max_retries=0,
|
|
||||||
)
|
|
||||||
if snapshots:
|
|
||||||
raw = _select_best_frame_from_snapshots(snapshots, plan_id)
|
|
||||||
if raw:
|
|
||||||
cover_url_from_task = _persist_cover_frame(
|
|
||||||
raw,
|
|
||||||
plan_id,
|
|
||||||
title_text=_e2_title_text,
|
|
||||||
title_color=_e2_title_color,
|
|
||||||
title_position=_e2_title_position,
|
|
||||||
title_font_size=_e2_title_font_size,
|
|
||||||
)
|
|
||||||
logger.info(
|
|
||||||
"[封面生成] 统一管道封面(步骤E-source-asset): plan_id=%s url=%s",
|
|
||||||
plan_id,
|
|
||||||
cover_url_from_task[:80],
|
|
||||||
)
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 步骤E从素材抽帧失败: plan_id=%s asset_id=%s",
|
|
||||||
plan_id,
|
|
||||||
aid,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
if cover_url_from_task:
|
|
||||||
# 标题已在预览视频渲染时烧录（ASS字幕），封面帧自然包含标题
|
|
||||||
cover_data: dict[str, object] = { # type: ignore[no-redef]
|
|
||||||
"type": "ai_frame",
|
|
||||||
"image_url": cover_url_from_task,
|
|
||||||
"frame_time": 0.0,
|
|
||||||
"confidence": 0.95,
|
|
||||||
}
|
|
||||||
current_config = dict(plan.config) if plan.config else {}
|
|
||||||
current_config["cover"] = cover_data
|
|
||||||
normalized = normalize_plan_config(current_config)
|
|
||||||
plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
|
|
||||||
return GenerateCoverResponse(plan_id=plan_id, cover=cover_data)
|
|
||||||
|
|
||||||
logger.warning(
|
|
||||||
"[封面生成] 统一管道未找到 cover_url (A/B/C/D均未命中): plan_id=%s",
|
|
||||||
plan_id,
|
|
||||||
)
|
|
||||||
# ai_frame/ai_regenerate 类型必须从渲染管道获取，不再回退到 AI 服务
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail="封面生成失败：未找到可抽帧的视频素材，请确认已上传视频素材后重试",
|
|
||||||
)
|
|
||||||
|
|
||||||
from packages.shared.ai_service import run_generate_cover
|
|
||||||
|
|
||||||
try:
|
|
||||||
logger.info("[封面生成] 开始调用 AI 封面生成服务: plan_id=%s", plan_id)
|
|
||||||
cover_data = run_generate_cover(
|
|
||||||
plan_id=plan_id,
|
|
||||||
asset_ids=body.asset_ids,
|
|
||||||
cover_type=body.cover_type,
|
|
||||||
frame_time=body.frame_time,
|
|
||||||
primary_video_url=primary_video_url,
|
|
||||||
)
|
|
||||||
except RuntimeError as e:
|
|
||||||
raise HTTPException(status_code=500, detail=str(e)) from e
|
|
||||||
|
|
||||||
current_config = dict(plan.config) if plan.config else {}
|
|
||||||
current_config["cover"] = cover_data
|
|
||||||
normalized = normalize_plan_config(current_config)
|
|
||||||
plan_svc.update_plan_config(plan_id, {"cover": normalized["cover"]})
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"封面生成完成: template_id=%s plan_id=%s type=%s by user=%s",
|
|
||||||
template_id,
|
|
||||||
plan_id,
|
|
||||||
body.cover_type,
|
|
||||||
current_user.user.id,
|
|
||||||
)
|
|
||||||
|
|
||||||
return GenerateCoverResponse(plan_id=plan_id, cover=cover_data)
|
|
||||||
@@ -1,658 +0,0 @@
|
|||||||
"""预览生成路由 — Phase 1：单版本预览接口（创建 + 查询）。
|
|
||||||
|
|
||||||
路径前缀：/api/v1/generation/preview（与 /generation/tasks 同体系）
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.core.storage import get_storage_service
|
|
||||||
from app.core.task_enqueue import (
|
|
||||||
GLOBAL_PENDING_LIMIT,
|
|
||||||
USER_PENDING_LIMIT,
|
|
||||||
GlobalQueueFull,
|
|
||||||
UserPendingLimitExceeded,
|
|
||||||
build_rate_limit_detail,
|
|
||||||
safe_enqueue_generation_task,
|
|
||||||
)
|
|
||||||
from app.dependencies import (
|
|
||||||
get_asset_repository,
|
|
||||||
get_db_session,
|
|
||||||
get_generated_video_repository,
|
|
||||||
get_generation_task_repository,
|
|
||||||
)
|
|
||||||
from app.schemas.generation_task import (
|
|
||||||
BatchPreviewGenerationTaskResponse,
|
|
||||||
CreatePreviewGenerationTaskRequest,
|
|
||||||
PreviewGenerationTaskResponse,
|
|
||||||
)
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from packages.adapters.sqlalchemy_impl.edit_template_repository import (
|
|
||||||
SQLAlchemyEditTemplateRepository,
|
|
||||||
)
|
|
||||||
from packages.adapters.sqlalchemy_impl.template_repository import (
|
|
||||||
SQLAlchemyTemplateRepository,
|
|
||||||
)
|
|
||||||
from packages.application import (
|
|
||||||
CreateGenerationTaskCommand,
|
|
||||||
CreateGenerationTaskUseCase,
|
|
||||||
GetGenerationTaskUseCase,
|
|
||||||
ListGeneratedVideosByTaskUseCase,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter()
|
|
||||||
|
|
||||||
|
|
||||||
# 模板 mode → 视频比例映射
|
|
||||||
_TEMPLATE_MODE_TO_RATIO = {
|
|
||||||
"pip": "9:16",
|
|
||||||
"standard": "16:9",
|
|
||||||
"square": "1:1",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def _infer_video_ratio_from_template(template_id: str, db: Session, user_id: str = "") -> str:
|
|
||||||
"""从模板 mode 推断视频比例，前端未传 video_ratio 时使用。
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
视频比例字符串（如 "9:16"），查询失败返回空字符串。
|
|
||||||
"""
|
|
||||||
if not template_id:
|
|
||||||
return ""
|
|
||||||
try:
|
|
||||||
repo = SQLAlchemyTemplateRepository(db)
|
|
||||||
template = repo.get(template_id, user_id)
|
|
||||||
if template:
|
|
||||||
mode = getattr(template, "mode", "") or ""
|
|
||||||
ratio = _TEMPLATE_MODE_TO_RATIO.get(mode.strip(), "")
|
|
||||||
if ratio:
|
|
||||||
logger.info(
|
|
||||||
"[预览生成] 从模板 mode=%s 推断 video_ratio=%s",
|
|
||||||
mode,
|
|
||||||
ratio,
|
|
||||||
)
|
|
||||||
return ratio
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[预览生成] 查询模板失败，跳过 video_ratio 推断: template_id=%s",
|
|
||||||
template_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
return ""
|
|
||||||
|
|
||||||
|
|
||||||
def _resolve_strategy_id_from_template(template_id: str, db: Session, user_id: str = "") -> str:
|
|
||||||
"""从模板读取 editing_mode / mode 作为 strategy_id。
|
|
||||||
|
|
||||||
优先查新模板系统（EditTemplate.editing_mode），fallback 旧模板（Template.mode）。
|
|
||||||
Worker 端使用 strategy_id 作为渲染 mode，为空则默认 one_take。
|
|
||||||
"""
|
|
||||||
if not template_id:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
# 优先查新模板系统
|
|
||||||
try:
|
|
||||||
new_repo = SQLAlchemyEditTemplateRepository(db)
|
|
||||||
new_template = new_repo.get(template_id)
|
|
||||||
if new_template and getattr(new_template, "editing_mode", ""): # type: ignore[arg-type]
|
|
||||||
mode = new_template.editing_mode.strip()
|
|
||||||
if mode:
|
|
||||||
logger.info(
|
|
||||||
"[预览生成] 从新模板 editing_mode=%s (template_id=%s)",
|
|
||||||
mode,
|
|
||||||
template_id,
|
|
||||||
)
|
|
||||||
# 画中画已下线，pip/voice_pip 统一映射为 one_take
|
|
||||||
if mode in ("pip", "voice_pip"):
|
|
||||||
logger.info("[预览生成] %s → one_take (画中画已下线)", mode)
|
|
||||||
mode = "one_take"
|
|
||||||
return mode
|
|
||||||
except Exception:
|
|
||||||
logger.debug(
|
|
||||||
"[预览生成] 新模板查询失败，尝试旧模板: template_id=%s",
|
|
||||||
template_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# fallback 旧模板系统
|
|
||||||
try:
|
|
||||||
old_repo = SQLAlchemyTemplateRepository(db)
|
|
||||||
old_template = old_repo.get(template_id, user_id)
|
|
||||||
if old_template:
|
|
||||||
mode = getattr(old_template, "mode", "") or ""
|
|
||||||
mode = mode.strip()
|
|
||||||
if mode:
|
|
||||||
logger.info(
|
|
||||||
"[预览生成] 从旧模板 mode=%s (template_id=%s)",
|
|
||||||
mode,
|
|
||||||
template_id,
|
|
||||||
)
|
|
||||||
# 画中画已下线，pip/voice_pip 统一映射为 one_take
|
|
||||||
if mode in ("pip", "voice_pip"):
|
|
||||||
logger.info("[预览生成] %s → one_take (画中画已下线)", mode)
|
|
||||||
mode = "one_take"
|
|
||||||
return mode
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[预览生成] 旧模板查询也失败，strategy_id 留空: template_id=%s",
|
|
||||||
template_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
return ""
|
|
||||||
|
|
||||||
|
|
||||||
def _mark_task_failed(repo, task, reason: str) -> None:
|
|
||||||
"""入队失败时将任务标记为 failed，避免产生僵尸 pending 数据。"""
|
|
||||||
try:
|
|
||||||
task.mark_failed(error_message=f"入队失败：{reason}")
|
|
||||||
repo.update(task)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("[预览生成] 标记任务失败时异常: task_id=%s", task.id)
|
|
||||||
|
|
||||||
|
|
||||||
def _to_preview_response(task, generated_videos: list | None = None) -> PreviewGenerationTaskResponse:
|
|
||||||
"""将领域任务对象转换为预览响应 DTO。
|
|
||||||
|
|
||||||
Args:
|
|
||||||
task: GenerationTask 领域对象
|
|
||||||
generated_videos: 生成的视频列表（可选），取第一个作为 video_url
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
PreviewGenerationTaskResponse
|
|
||||||
"""
|
|
||||||
video_url = ""
|
|
||||||
duration = 0.0
|
|
||||||
file_size = 0
|
|
||||||
if generated_videos:
|
|
||||||
first_video = generated_videos[0]
|
|
||||||
raw_url = getattr(first_video, "file_url", "") or ""
|
|
||||||
# rendered/* 已配置公开读，直接用裸 URL
|
|
||||||
if raw_url.startswith("http"):
|
|
||||||
video_url = raw_url
|
|
||||||
else:
|
|
||||||
storage = get_storage_service()
|
|
||||||
video_url = storage.get_url(raw_url)
|
|
||||||
duration = float(getattr(first_video, "duration", 0.0) or 0.0)
|
|
||||||
file_size = int(getattr(first_video, "file_size", 0) or 0)
|
|
||||||
|
|
||||||
# 从 extra_meta / metadata 中提取统计信息（如果有）
|
|
||||||
extra_meta = getattr(task, "extra_meta", {}) or {}
|
|
||||||
clip_count = int(extra_meta.get("clip_count", len(getattr(task, "asset_ids", [])) or 0))
|
|
||||||
transition_count = int(extra_meta.get("transition_count", max(0, clip_count - 1)))
|
|
||||||
material_usage = extra_meta.get("material_usage", {}) or {}
|
|
||||||
|
|
||||||
# 计算生成耗时
|
|
||||||
generate_duration = 0.0
|
|
||||||
started_at = getattr(task, "started_at", None)
|
|
||||||
completed_at = getattr(task, "completed_at", None)
|
|
||||||
if started_at and completed_at:
|
|
||||||
generate_duration = (completed_at - started_at).total_seconds()
|
|
||||||
|
|
||||||
title_cfg = getattr(task, "title_config", None)
|
|
||||||
title_cfg = title_cfg if isinstance(title_cfg, dict) else {}
|
|
||||||
extra_meta = getattr(task, "extra_meta", None)
|
|
||||||
extra_meta = extra_meta if isinstance(extra_meta, dict) else {}
|
|
||||||
voice_library_id = getattr(task, "voice_library_id", "") or ""
|
|
||||||
if not isinstance(voice_library_id, str):
|
|
||||||
voice_library_id = str(voice_library_id) if voice_library_id else ""
|
|
||||||
return PreviewGenerationTaskResponse(
|
|
||||||
task_id=task.id,
|
|
||||||
status=task.status.value if hasattr(task.status, "value") else str(task.status),
|
|
||||||
progress=float(task.progress or 0.0),
|
|
||||||
is_preview=bool(getattr(task, "is_preview", True)),
|
|
||||||
variant_index=int(extra_meta.get("variant_index", 0) or 0),
|
|
||||||
resolution=getattr(task, "resolution", "") or "",
|
|
||||||
video_url=video_url,
|
|
||||||
duration=duration,
|
|
||||||
file_size=file_size,
|
|
||||||
clip_count=clip_count,
|
|
||||||
transition_count=transition_count,
|
|
||||||
material_usage=material_usage,
|
|
||||||
error_message=task.error_message or "",
|
|
||||||
title_text=str(title_cfg.get("text", "") or ""),
|
|
||||||
voice_library_id=voice_library_id,
|
|
||||||
created_at=task.created_at,
|
|
||||||
started_at=started_at,
|
|
||||||
finished_at=completed_at,
|
|
||||||
generate_duration=generate_duration,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _resolve_preview_edit_plan_id(
|
|
||||||
*,
|
|
||||||
request: CreatePreviewGenerationTaskRequest,
|
|
||||||
task,
|
|
||||||
db: Session,
|
|
||||||
user_id: str,
|
|
||||||
) -> str:
|
|
||||||
"""确定任务关联的编辑计划ID：优先前端传入，否则按 template_id+user 兜底查找。"""
|
|
||||||
if task.source_edit_plan_id:
|
|
||||||
return task.source_edit_plan_id
|
|
||||||
if not request.template_id:
|
|
||||||
return ""
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.edit_plan_repository import (
|
|
||||||
SQLAlchemyEditPlanRepository,
|
|
||||||
)
|
|
||||||
|
|
||||||
_plan_repo = SQLAlchemyEditPlanRepository(db)
|
|
||||||
_plans = _plan_repo.list_by_template(request.template_id, limit=20)
|
|
||||||
for _p in _plans:
|
|
||||||
if (_p.created_by_user_id or "") == user_id:
|
|
||||||
logger.info(
|
|
||||||
"[预览生成] 自动关联编辑计划: task_id=%s plan_id=%s",
|
|
||||||
task.id,
|
|
||||||
_p.id,
|
|
||||||
)
|
|
||||||
return _p.id
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[预览生成] 查找关联编辑计划失败（不影响主流程）: task_id=%s",
|
|
||||||
task.id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
return ""
|
|
||||||
|
|
||||||
|
|
||||||
def _variant_value(values: list[str], index: int, fallback: str = "") -> str:
|
|
||||||
"""从变体数组中取值：长度1=共用，长度>N=按索引，空数组=回退 fallback。"""
|
|
||||||
if not values:
|
|
||||||
return fallback
|
|
||||||
if len(values) == 1:
|
|
||||||
return values[0]
|
|
||||||
return values[index] if index < len(values) else fallback
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/preview", response_model=BatchPreviewGenerationTaskResponse, status_code=201)
|
|
||||||
def create_preview_generation_task(
|
|
||||||
request: CreatePreviewGenerationTaskRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
generation_task_repository=Depends(get_generation_task_repository),
|
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
asset_repo=Depends(get_asset_repository),
|
|
||||||
) -> BatchPreviewGenerationTaskResponse:
|
|
||||||
"""创建预览生成任务（支持批量）。
|
|
||||||
|
|
||||||
preview_count=1 时行为与旧版完全一致（创建 1 个任务）；
|
|
||||||
preview_count=N 时一次创建 N 个独立变体任务：
|
|
||||||
- 每个变体克隆独立编辑计划（独立 clips、独立随机素材起点），N 个预览内容互不相同
|
|
||||||
- 每个变体拥有独立 task_id / 状态 / 预览视频 URL，前端按 task_id 分别轮询
|
|
||||||
- 标题样式（font/color/position 等）全局共用；标题文字/配音/封面可按变体独立
|
|
||||||
（titles[] / voice_library_ids[] / cover_urls[]，长度1=共用，长度N=独立）
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
201 + 变体任务数组 {items: [...], total: N}
|
|
||||||
"""
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
count = max(1, request.preview_count)
|
|
||||||
logger.info(
|
|
||||||
"[预览生成] 接收请求: user_id=%s, template_id=%s, asset_count=%d, preview_count=%d",
|
|
||||||
user_id,
|
|
||||||
request.template_id,
|
|
||||||
len(request.asset_ids),
|
|
||||||
count,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 预检查队列限流（按变体总数计）
|
|
||||||
try:
|
|
||||||
user_pending = generation_task_repository.count_pending_by_user(user_id)
|
|
||||||
global_pending = generation_task_repository.count_pending_total()
|
|
||||||
if user_pending + count > USER_PENDING_LIMIT:
|
|
||||||
raise UserPendingLimitExceeded(
|
|
||||||
user_id=user_id, pending_count=user_pending + count, limit=USER_PENDING_LIMIT
|
|
||||||
)
|
|
||||||
if global_pending + count > GLOBAL_PENDING_LIMIT:
|
|
||||||
raise GlobalQueueFull(pending_count=global_pending + count, limit=GLOBAL_PENDING_LIMIT)
|
|
||||||
except UserPendingLimitExceeded as e:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=429,
|
|
||||||
detail=build_rate_limit_detail(e, generation_task_repository, scope="user"),
|
|
||||||
) from e
|
|
||||||
except GlobalQueueFull as e:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=503,
|
|
||||||
detail=build_rate_limit_detail(e, generation_task_repository, scope="global"),
|
|
||||||
) from e
|
|
||||||
|
|
||||||
# 确定视频比例：优先前端传入，否则从模板 mode 推断
|
|
||||||
video_ratio = request.video_ratio or ""
|
|
||||||
if not video_ratio and request.template_id:
|
|
||||||
video_ratio = _infer_video_ratio_from_template(request.template_id, db, user_id)
|
|
||||||
|
|
||||||
# 根据 video_ratio 计算输出分辨率（默认竖屏 1080x1920）
|
|
||||||
output_width, output_height = 1080, 1920
|
|
||||||
if video_ratio:
|
|
||||||
parts = video_ratio.split(":")
|
|
||||||
if len(parts) == 2:
|
|
||||||
try:
|
|
||||||
w, h = int(parts[0]), int(parts[1])
|
|
||||||
base = 1920
|
|
||||||
if w < h:
|
|
||||||
output_width = round(base * w / h)
|
|
||||||
output_height = base
|
|
||||||
else:
|
|
||||||
output_width = base
|
|
||||||
output_height = round(base * h / w)
|
|
||||||
output_width = output_width - output_width % 2
|
|
||||||
output_height = output_height - output_height % 2
|
|
||||||
except (ValueError, ZeroDivisionError):
|
|
||||||
output_width, output_height = 1080, 1920
|
|
||||||
resolution = f"{output_width}x{output_height}"
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"[预览生成] 分辨率: video_ratio=%s → %s (%dx%d)",
|
|
||||||
video_ratio,
|
|
||||||
resolution,
|
|
||||||
output_width,
|
|
||||||
output_height,
|
|
||||||
)
|
|
||||||
|
|
||||||
strategy_id = _resolve_strategy_id_from_template(request.template_id, db, user_id)
|
|
||||||
base_title_config = request.title_config or {}
|
|
||||||
|
|
||||||
use_case = CreateGenerationTaskUseCase(generation_task_repository)
|
|
||||||
|
|
||||||
# ── 预创建第一个任务，仅用于解析源编辑计划（不落库为最终任务）──
|
|
||||||
# 先创建一个临时任务拿到 task 对象上下文，实际 N 个任务在循环中统一创建；
|
|
||||||
# 为保持与旧版一致的源 plan 解析逻辑，先创建任务0、解析源 plan，
|
|
||||||
# 再预克隆 N 个变体 plan，最后重建任务关联。
|
|
||||||
# 简化实现：直接创建全部任务，plan 关联在创建后、入队前完成。
|
|
||||||
|
|
||||||
created_tasks: list = []
|
|
||||||
variant_plan_ids: list[str] = [] # 每个变体最终关联的 plan_id（按变体顺序）
|
|
||||||
|
|
||||||
try:
|
|
||||||
for variant_index in range(count):
|
|
||||||
# 变体独立标题文字：titles[] 覆盖 title_config.text
|
|
||||||
variant_title_text = _variant_value(request.titles, variant_index, "")
|
|
||||||
variant_title_config = dict(base_title_config)
|
|
||||||
if variant_title_text.strip():
|
|
||||||
variant_title_config["text"] = variant_title_text.strip()
|
|
||||||
|
|
||||||
# 变体独立配音
|
|
||||||
variant_voice_library_id = _variant_value(
|
|
||||||
request.voice_library_ids, variant_index, request.voice_library_id
|
|
||||||
)
|
|
||||||
|
|
||||||
task = use_case.execute(
|
|
||||||
CreateGenerationTaskCommand(
|
|
||||||
project_id="",
|
|
||||||
asset_library_id="",
|
|
||||||
strategy_id=strategy_id,
|
|
||||||
voice_library_id=variant_voice_library_id,
|
|
||||||
template_id=request.template_id,
|
|
||||||
asset_ids=list(request.asset_ids),
|
|
||||||
title_ids=list(request.title_ids),
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
source_edit_plan_id=request.source_edit_plan_id,
|
|
||||||
asset_select_mode="",
|
|
||||||
batch_id="",
|
|
||||||
video_title=request.video_title,
|
|
||||||
resolution=resolution,
|
|
||||||
bgm_config=request.bgm_config or {},
|
|
||||||
auto_retry_enabled=False,
|
|
||||||
auto_retry_max=0,
|
|
||||||
is_preview=True,
|
|
||||||
title_config=variant_title_config,
|
|
||||||
output_width=output_width,
|
|
||||||
output_height=output_height,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
task.extra_meta["variant_index"] = variant_index
|
|
||||||
|
|
||||||
# 解析源编辑计划（前端传入或按模板兜底查找）
|
|
||||||
source_plan_id = _resolve_preview_edit_plan_id(request=request, task=task, db=db, user_id=user_id)
|
|
||||||
task.source_edit_plan_id = source_plan_id
|
|
||||||
generation_task_repository.update(task)
|
|
||||||
created_tasks.append(task)
|
|
||||||
except ValueError as e:
|
|
||||||
logger.warning("[预览生成] 创建失败: %s", e)
|
|
||||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
|
||||||
except Exception as e:
|
|
||||||
logger.error("[预览生成] 创建失败: %s", e, exc_info=True)
|
|
||||||
raise HTTPException(status_code=500, detail="创建预览生成任务失败，请稍后再试") from e
|
|
||||||
|
|
||||||
# ── 独立变体 plan（#1743）──
|
|
||||||
# count=1：克隆源 plan（预览不污染源 plan，仅起点重算），行为与旧版一致；
|
|
||||||
# count>1：变体 0 保留源 plan，变体 1..N-1 用 reselect_plan_for_variant 完整
|
|
||||||
# 重跑单视频选片（素材洗牌+镜头洗牌+起点随机+跨变体避让+批次 20% 重叠重选），
|
|
||||||
# 所见即所得——预览变体差异即正式成片差异。
|
|
||||||
source_plan_id = created_tasks[0].source_edit_plan_id if created_tasks else ""
|
|
||||||
|
|
||||||
# #1749：各变体配音解析（严格守卫已在 schema；此处取每变体 voice 查时长）+ 时长分配
|
|
||||||
def _preview_voice_durations() -> list[float]:
|
|
||||||
try:
|
|
||||||
from packages.domain.variant_voice_resolver import resolve_variant_voice_ids
|
|
||||||
|
|
||||||
voices = resolve_variant_voice_ids(
|
|
||||||
count=count,
|
|
||||||
voice_library_id=request.voice_library_id,
|
|
||||||
voice_library_ids=request.voice_library_ids or None,
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[预览生成] 配音解析失败（按无配音处理）", exc_info=True)
|
|
||||||
return [0.0] * count
|
|
||||||
try:
|
|
||||||
from app.api.routes.generation_tasks import _query_voice_durations
|
|
||||||
|
|
||||||
return _query_voice_durations(db, voices)
|
|
||||||
except Exception:
|
|
||||||
return [0.0] * count
|
|
||||||
|
|
||||||
voice_durations = _preview_voice_durations()
|
|
||||||
|
|
||||||
if source_plan_id and count == 1:
|
|
||||||
# 单预览：克隆一份（原逻辑）+ 配音时长分配
|
|
||||||
try:
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
|
|
||||||
_plan_svc = EditPlanService(db)
|
|
||||||
variant_plan = _plan_svc.clone_plan_for_variant(
|
|
||||||
source_plan_id,
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
name_suffix="预览变体",
|
|
||||||
)
|
|
||||||
if voice_durations and voice_durations[0] > 0:
|
|
||||||
try:
|
|
||||||
_plan_svc.apply_voice_duration_to_plan(variant_plan.id, voice_durations[0])
|
|
||||||
except Exception:
|
|
||||||
logger.exception("[预览生成] 变体0 配音分配失败（不阻断）: plan=%s", variant_plan.id)
|
|
||||||
variant_plan_ids.append(variant_plan.id)
|
|
||||||
except Exception as e:
|
|
||||||
logger.error("[预览生成] 克隆预览 plan 异常: %s", e, exc_info=True)
|
|
||||||
for t in created_tasks:
|
|
||||||
_mark_task_failed(generation_task_repository, t, "预览计划创建失败")
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=500,
|
|
||||||
detail="创建预览任务失败：无法生成独立剪辑计划，请重试",
|
|
||||||
) from e
|
|
||||||
elif source_plan_id and count > 1:
|
|
||||||
try:
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
|
|
||||||
_plan_svc = EditPlanService(db)
|
|
||||||
# #1749：变体 0 也 clone（不污染源 plan）+ 配音分配；变体 1..N-1 独立选片
|
|
||||||
_plan0 = _plan_svc.clone_plan_for_variant(
|
|
||||||
source_plan_id,
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
name_suffix="预览变体1",
|
|
||||||
)
|
|
||||||
if voice_durations and voice_durations[0] > 0:
|
|
||||||
try:
|
|
||||||
_plan_svc.apply_voice_duration_to_plan(_plan0.id, voice_durations[0])
|
|
||||||
except Exception:
|
|
||||||
logger.exception("[预览生成] 变体0 配音分配失败（不阻断）: plan=%s", _plan0.id)
|
|
||||||
variant_plan_ids.append(_plan0.id)
|
|
||||||
batch_asset_pool = list(dict.fromkeys(request.asset_ids or []))
|
|
||||||
for variant_index in range(1, count):
|
|
||||||
last_err: Exception | None = None
|
|
||||||
variant_plan = None
|
|
||||||
for _attempt in range(2): # 1 次重试，抗 DB 瞬时抖动
|
|
||||||
try:
|
|
||||||
variant_plan = _plan_svc.reselect_plan_for_variant(
|
|
||||||
source_plan_id,
|
|
||||||
batch_asset_pool,
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
name_suffix=f"预览变体{variant_index + 1}",
|
|
||||||
voice_duration=(
|
|
||||||
voice_durations[variant_index] if variant_index < len(voice_durations) else 0.0
|
|
||||||
),
|
|
||||||
)
|
|
||||||
break
|
|
||||||
except ValueError as ve:
|
|
||||||
logger.warning("[预览生成] 变体独立选片失败(素材不足): %s", ve)
|
|
||||||
for t in created_tasks:
|
|
||||||
_mark_task_failed(generation_task_repository, t, "预览变体选片失败")
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail=f"批量预览第 {variant_index + 1} 个视频无法独立选片：{ve}。"
|
|
||||||
"请增加素材库中的视频素材后重试。",
|
|
||||||
) from ve
|
|
||||||
except Exception as reselection_err: # noqa: PERF203
|
|
||||||
last_err = reselection_err
|
|
||||||
logger.warning(
|
|
||||||
"[预览生成] 变体独立选片失败(尝试%d/2): variant=%d error=%s",
|
|
||||||
_attempt + 1,
|
|
||||||
variant_index,
|
|
||||||
reselection_err,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
if variant_plan is None:
|
|
||||||
logger.error(
|
|
||||||
"[预览生成] 变体独立选片重试仍失败: variant=%d source=%s",
|
|
||||||
variant_index,
|
|
||||||
source_plan_id,
|
|
||||||
exc_info=last_err,
|
|
||||||
)
|
|
||||||
for t in created_tasks:
|
|
||||||
_mark_task_failed(generation_task_repository, t, "预览变体计划创建失败")
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=500,
|
|
||||||
detail="创建预览任务失败：无法生成独立剪辑计划，请重试",
|
|
||||||
) from last_err
|
|
||||||
variant_plan_ids.append(variant_plan.id)
|
|
||||||
except HTTPException:
|
|
||||||
raise
|
|
||||||
except Exception as e:
|
|
||||||
logger.error("[预览生成] 变体 plan 生成异常: %s", e, exc_info=True)
|
|
||||||
for t in created_tasks:
|
|
||||||
_mark_task_failed(generation_task_repository, t, "预览变体计划创建失败")
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=500,
|
|
||||||
detail="创建预览任务失败：无法生成独立剪辑计划，请重试",
|
|
||||||
) from e
|
|
||||||
|
|
||||||
# 关联变体 plan 并回写标题配置
|
|
||||||
for variant_index, task in enumerate(created_tasks):
|
|
||||||
if variant_plan_ids:
|
|
||||||
task.source_edit_plan_id = variant_plan_ids[variant_index]
|
|
||||||
generation_task_repository.update(task)
|
|
||||||
# 回写变体标题到 plan config（worker 渲染时从 plan 读取 title 配置）
|
|
||||||
if task.source_edit_plan_id and (task.title_config or {}).get("text", "").strip():
|
|
||||||
try:
|
|
||||||
from app.api.routes.generation_tasks import _writeback_edit_plan_config
|
|
||||||
|
|
||||||
_writeback_edit_plan_config(
|
|
||||||
plan_id=task.source_edit_plan_id,
|
|
||||||
task_id=task.id,
|
|
||||||
title_config=task.title_config,
|
|
||||||
db=db,
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[预览生成] 回写标题配置失败（不影响主流程）: task_id=%s",
|
|
||||||
task.id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# ── 入队 ──
|
|
||||||
responses: list[PreviewGenerationTaskResponse] = []
|
|
||||||
rate_limit_exc: Exception | None = None # 记录首个限流异常，全部失败时返回结构化提示
|
|
||||||
for variant_index, task in enumerate(created_tasks):
|
|
||||||
try:
|
|
||||||
enqueued = safe_enqueue_generation_task(
|
|
||||||
task,
|
|
||||||
generation_task_repository,
|
|
||||||
user_id=user_id,
|
|
||||||
log_prefix=f"[预览生成][变体{variant_index + 1}]",
|
|
||||||
log_task_status=True,
|
|
||||||
)
|
|
||||||
if not enqueued:
|
|
||||||
logger.warning("[预览生成] 任务入队失败: task_id=%s", task.id)
|
|
||||||
_mark_task_failed(generation_task_repository, task, "任务入队失败")
|
|
||||||
except UserPendingLimitExceeded as e:
|
|
||||||
_mark_task_failed(generation_task_repository, task, "待处理任务超限")
|
|
||||||
rate_limit_exc = rate_limit_exc or e
|
|
||||||
except GlobalQueueFull as e:
|
|
||||||
_mark_task_failed(generation_task_repository, task, "系统队列已满")
|
|
||||||
rate_limit_exc = rate_limit_exc or e
|
|
||||||
except Exception:
|
|
||||||
logger.exception("[预览生成] 入队异常: task_id=%s", task.id)
|
|
||||||
_mark_task_failed(generation_task_repository, task, "任务入队异常")
|
|
||||||
# enqueue 会原地更新 task 状态/进度，直接用 task 构造响应
|
|
||||||
responses.append(_to_preview_response(task))
|
|
||||||
|
|
||||||
# 队列满/限流时若全部失败，返回结构化错误码（前端区分"排队"与"创建失败"）
|
|
||||||
if all(r.status == "failed" for r in responses) and rate_limit_exc is not None:
|
|
||||||
if isinstance(rate_limit_exc, UserPendingLimitExceeded):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=429,
|
|
||||||
detail=build_rate_limit_detail(rate_limit_exc, generation_task_repository, scope="user"),
|
|
||||||
)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=503,
|
|
||||||
detail=build_rate_limit_detail(rate_limit_exc, generation_task_repository, scope="global"),
|
|
||||||
)
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"[预览生成] 创建完成: %d 个变体任务, task_ids=%s",
|
|
||||||
len(responses),
|
|
||||||
[r.task_id for r in responses],
|
|
||||||
)
|
|
||||||
return BatchPreviewGenerationTaskResponse(items=responses, total=len(responses))
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/preview/{task_id}", response_model=PreviewGenerationTaskResponse)
|
|
||||||
def get_preview_generation_task(
|
|
||||||
task_id: str,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
generation_task_repository=Depends(get_generation_task_repository),
|
|
||||||
generated_video_repository=Depends(get_generated_video_repository),
|
|
||||||
) -> PreviewGenerationTaskResponse:
|
|
||||||
"""查询预览生成任务状态。
|
|
||||||
|
|
||||||
Args:
|
|
||||||
task_id: 任务 ID
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
预览任务详情（含状态、进度、结果 URL 等）
|
|
||||||
"""
|
|
||||||
use_case = GetGenerationTaskUseCase(generation_task_repository)
|
|
||||||
task = use_case.execute(task_id)
|
|
||||||
if task is None:
|
|
||||||
raise HTTPException(status_code=404, detail=f"预览任务 {task_id} 不存在")
|
|
||||||
|
|
||||||
# 权限校验：任务必须属于当前用户（统一转 str 比较，避免 UUID/str 类型差异）
|
|
||||||
task_user_id = str(getattr(task, "created_by_user_id", "") or "")
|
|
||||||
if not task_user_id or task_user_id != str(authenticated_user.user.id):
|
|
||||||
raise HTTPException(status_code=403, detail="无权访问该任务")
|
|
||||||
|
|
||||||
# 校验是否为预览任务
|
|
||||||
if not getattr(task, "is_preview", False):
|
|
||||||
raise HTTPException(status_code=404, detail=f"预览任务 {task_id} 不存在")
|
|
||||||
|
|
||||||
# 查询生成的视频（取第一个）
|
|
||||||
generated_videos = []
|
|
||||||
status_val = task.status.value if hasattr(task.status, "value") else str(task.status)
|
|
||||||
if status_val == "completed":
|
|
||||||
list_use_case = ListGeneratedVideosByTaskUseCase(generated_video_repository)
|
|
||||||
generated_videos = list_use_case.execute(task_id)
|
|
||||||
|
|
||||||
return _to_preview_response(task, generated_videos=generated_videos)
|
|
||||||
Executable → Regular
+42
-714
@@ -1,4 +1,5 @@
|
|||||||
import logging
|
import logging
|
||||||
|
import random
|
||||||
import uuid
|
import uuid
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
@@ -10,13 +11,11 @@ from app.core.task_enqueue import (
|
|||||||
USER_PENDING_LIMIT,
|
USER_PENDING_LIMIT,
|
||||||
GlobalQueueFull,
|
GlobalQueueFull,
|
||||||
UserPendingLimitExceeded,
|
UserPendingLimitExceeded,
|
||||||
build_rate_limit_detail,
|
|
||||||
safe_enqueue_generation_task,
|
safe_enqueue_generation_task,
|
||||||
)
|
)
|
||||||
from app.dependencies import (
|
from app.dependencies import (
|
||||||
get_asset_library_repository,
|
get_asset_library_repository,
|
||||||
get_asset_repository,
|
get_asset_repository,
|
||||||
get_db_session,
|
|
||||||
get_generated_video_repository,
|
get_generated_video_repository,
|
||||||
get_generation_task_repository,
|
get_generation_task_repository,
|
||||||
get_project_repository,
|
get_project_repository,
|
||||||
@@ -27,13 +26,11 @@ from app.schemas.generated_video import (
|
|||||||
)
|
)
|
||||||
from app.schemas.generation_task import (
|
from app.schemas.generation_task import (
|
||||||
BatchGenerationTaskResponse,
|
BatchGenerationTaskResponse,
|
||||||
ConfirmGenerationRequest,
|
|
||||||
CreateGenerationTaskRequest,
|
CreateGenerationTaskRequest,
|
||||||
GenerationTaskResponse,
|
GenerationTaskResponse,
|
||||||
ListGenerationTasksResponse,
|
ListGenerationTasksResponse,
|
||||||
)
|
)
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from packages.application import (
|
from packages.application import (
|
||||||
CreateGenerationTaskCommand,
|
CreateGenerationTaskCommand,
|
||||||
@@ -41,46 +38,11 @@ from packages.application import (
|
|||||||
GetGenerationTaskUseCase,
|
GetGenerationTaskUseCase,
|
||||||
ListGeneratedVideosByTaskUseCase,
|
ListGeneratedVideosByTaskUseCase,
|
||||||
)
|
)
|
||||||
from packages.domain.smart_match import smart_select_assets
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
def _variant_value(values: list[str], index: int, fallback: str = "") -> str:
|
|
||||||
"""从变体数组中取值：长度1=共用，长度>N=按索引，空数组=回退 fallback。"""
|
|
||||||
if not values:
|
|
||||||
return fallback
|
|
||||||
if len(values) == 1:
|
|
||||||
return values[0]
|
|
||||||
return values[index] if index < len(values) else fallback
|
|
||||||
|
|
||||||
|
|
||||||
def _query_voice_durations(db: Session, voice_ids: list[str]) -> list[float]:
|
|
||||||
"""批量查询配音素材时长（秒），#1749 配音时长分配用。
|
|
||||||
|
|
||||||
逐项 try/float 硬化：MagicMock/异常/缺失 → 0.0（无配音不分配，不阻断）。
|
|
||||||
"""
|
|
||||||
ids = [v for v in dict.fromkeys(voice_ids or []) if v]
|
|
||||||
if not ids:
|
|
||||||
return []
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import AssetModel
|
|
||||||
|
|
||||||
rows = db.query(AssetModel.id, AssetModel.duration).filter(AssetModel.id.in_(ids)).all()
|
|
||||||
dur_map: dict[str, float] = {}
|
|
||||||
for row in rows:
|
|
||||||
try:
|
|
||||||
dur_map[row[0]] = float(row[1] or 0.0)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
dur_map[row[0]] = 0.0
|
|
||||||
return [dur_map.get(v, 0.0) for v in ids]
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[生成任务] 配音时长查询失败（按无配音处理，不阻断）", exc_info=True)
|
|
||||||
return [0.0 for _ in ids]
|
|
||||||
|
|
||||||
|
|
||||||
def _to_generation_task_response(task) -> GenerationTaskResponse:
|
def _to_generation_task_response(task) -> GenerationTaskResponse:
|
||||||
return GenerationTaskResponse(
|
return GenerationTaskResponse(
|
||||||
id=task.id,
|
id=task.id,
|
||||||
@@ -95,15 +57,6 @@ def _to_generation_task_response(task) -> GenerationTaskResponse:
|
|||||||
source_edit_plan_id=task.source_edit_plan_id or "",
|
source_edit_plan_id=task.source_edit_plan_id or "",
|
||||||
asset_select_mode=getattr(task, "asset_select_mode", ""),
|
asset_select_mode=getattr(task, "asset_select_mode", ""),
|
||||||
batch_id=getattr(task, "batch_id", ""),
|
batch_id=getattr(task, "batch_id", ""),
|
||||||
video_title=getattr(task, "video_title", ""),
|
|
||||||
resolution=getattr(task, "resolution", ""),
|
|
||||||
bgm_config=getattr(task, "bgm_config", {}) or {},
|
|
||||||
is_preview=getattr(task, "is_preview", False),
|
|
||||||
source_task_id=getattr(task, "source_task_id", ""),
|
|
||||||
output_width=getattr(task, "output_width", 1280),
|
|
||||||
output_height=getattr(task, "output_height", 720),
|
|
||||||
cover_url=getattr(task, "cover_url", ""),
|
|
||||||
title_config=getattr(task, "title_config", {}) or {},
|
|
||||||
logs=getattr(task, "logs", "[]"),
|
logs=getattr(task, "logs", "[]"),
|
||||||
status=task.status,
|
status=task.status,
|
||||||
progress=task.progress,
|
progress=task.progress,
|
||||||
@@ -126,9 +79,6 @@ def _to_generated_video_response(item, download_url: str | None = None) -> Gener
|
|||||||
height=item.height,
|
height=item.height,
|
||||||
fps=item.fps,
|
fps=item.fps,
|
||||||
download_url=download_url,
|
download_url=download_url,
|
||||||
duplicate_rate=getattr(item, "duplicate_rate", None),
|
|
||||||
visual_similarity=getattr(item, "visual_similarity", None),
|
|
||||||
match_count=getattr(item, "match_count", None),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -147,16 +97,13 @@ def _select_assets_from_library(
|
|||||||
assets: list,
|
assets: list,
|
||||||
mode: str,
|
mode: str,
|
||||||
count: int,
|
count: int,
|
||||||
rng=None,
|
|
||||||
) -> list[str]:
|
) -> list[str]:
|
||||||
"""根据选取模式从素材库中选取 ready 状态的视频素材 ID。
|
"""根据选取模式从素材库中选取 ready 状态的视频素材 ID。
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
assets: 素材库中所有素材（Asset 实体列表）
|
assets: 素材库中所有素材（Asset 实体列表）
|
||||||
mode: 选取模式 — all=全部, smart=智能匹配（多维度评分+多样性）
|
mode: 选取模式 — all=全部, random=随机, smart=按质量评分
|
||||||
count: 选取数量，0 表示全部（仅 smart 模式有效）
|
count: 选取数量，0 表示全部（仅 random/smart 模式有效）
|
||||||
rng: 可选随机源（smart 模式排序噪声用），生产环境不传则内部随机；
|
|
||||||
测试可注入固定种子或零噪声随机源获得确定性结果。
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
选中的素材 ID 列表
|
选中的素材 ID 列表
|
||||||
@@ -166,81 +113,29 @@ def _select_assets_from_library(
|
|||||||
if not ready_video_assets:
|
if not ready_video_assets:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
if mode == "random":
|
||||||
|
selected = (
|
||||||
|
ready_video_assets if count <= 0 else random.sample(ready_video_assets, min(count, len(ready_video_assets)))
|
||||||
|
)
|
||||||
|
return [a.id for a in selected]
|
||||||
|
|
||||||
if mode == "smart":
|
if mode == "smart":
|
||||||
# 智能匹配：统一使用 packages/domain/smart_match.py 的多维评分+多样性选取
|
# 按质量分降序排列（质量分高的优先），质量分相同时按时长降序
|
||||||
# 评分维度：质量分(40%) + 时长适配(30%) + 新鲜度(20%) + 未使用加分(10%)
|
sorted_assets = sorted(
|
||||||
# 排序注入随机噪声（#1743）：同分素材每次选出不同组合，从素材组合层面降重
|
ready_video_assets,
|
||||||
limit = count if count > 0 else None
|
key=lambda a: (
|
||||||
results = smart_select_assets(ready_video_assets, limit=limit, kind="video", rng=rng)
|
a.quality_score if a.quality_score is not None else 0.0,
|
||||||
return [r.asset.id for r in results]
|
a.duration if a.duration is not None else 0.0,
|
||||||
|
),
|
||||||
|
reverse=True,
|
||||||
|
)
|
||||||
|
selected = sorted_assets if count <= 0 else sorted_assets[:count]
|
||||||
|
return [a.id for a in selected]
|
||||||
|
|
||||||
# 默认 all 模式：返回全部 ready 视频素材
|
# 默认 all 模式：返回全部 ready 视频素材
|
||||||
return [a.id for a in ready_video_assets]
|
return [a.id for a in ready_video_assets]
|
||||||
|
|
||||||
|
|
||||||
def _writeback_edit_plan_config(
|
|
||||||
plan_id: str,
|
|
||||||
task_id: str,
|
|
||||||
title_config: dict | None,
|
|
||||||
db: Session,
|
|
||||||
) -> None:
|
|
||||||
"""任务入队成功后，回写 EditPlan.config：generation_task_id + title_config。
|
|
||||||
|
|
||||||
用 merge 方式更新，不整体覆盖 config，避免丢失其他字段。
|
|
||||||
失败只记日志，不影响任务创建。
|
|
||||||
"""
|
|
||||||
if not plan_id:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import EditPlanModel
|
|
||||||
|
|
||||||
plan_model = db.query(EditPlanModel).filter(EditPlanModel.id == plan_id).first()
|
|
||||||
if plan_model is None:
|
|
||||||
logger.warning("[生成任务] 回写plan.config失败: plan不存在 plan_id=%s", plan_id)
|
|
||||||
return
|
|
||||||
|
|
||||||
current_config = plan_model.config if isinstance(plan_model.config, dict) else {}
|
|
||||||
merged = dict(current_config)
|
|
||||||
merged["generation_task_id"] = task_id
|
|
||||||
|
|
||||||
# 检查标题是否发生变化，如果变化则清除 cover 字段强制重新生成封面
|
|
||||||
if title_config:
|
|
||||||
old_title_config = merged.get("title_config", {}) or {}
|
|
||||||
old_title_text = (old_title_config.get("text") or "").strip()
|
|
||||||
new_title_text = (title_config.get("text") or "").strip()
|
|
||||||
if old_title_text != new_title_text:
|
|
||||||
# 标题变化，清除旧封面
|
|
||||||
if "cover" in merged:
|
|
||||||
del merged["cover"]
|
|
||||||
logger.info(
|
|
||||||
"[生成任务] 标题变化，清除旧封面: plan_id=%s old_title=%s new_title=%s",
|
|
||||||
plan_id,
|
|
||||||
old_title_text,
|
|
||||||
new_title_text,
|
|
||||||
)
|
|
||||||
merged["title_config"] = title_config
|
|
||||||
|
|
||||||
plan_model.config = merged
|
|
||||||
db.commit()
|
|
||||||
logger.info(
|
|
||||||
"[生成任务] 回写plan.config成功: plan_id=%s task_id=%s keys=%s",
|
|
||||||
plan_id,
|
|
||||||
task_id,
|
|
||||||
list(merged.keys()),
|
|
||||||
)
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning(
|
|
||||||
"[生成任务] 回写plan.config异常（不影响任务创建）: plan_id=%s error=%s",
|
|
||||||
plan_id,
|
|
||||||
e,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
db.rollback()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def _resolve_project_and_library(
|
def _resolve_project_and_library(
|
||||||
request: CreateGenerationTaskRequest,
|
request: CreateGenerationTaskRequest,
|
||||||
project_repository: Any,
|
project_repository: Any,
|
||||||
@@ -286,7 +181,6 @@ def create_generation_task(
|
|||||||
project_repository: Any = Depends(get_project_repository),
|
project_repository: Any = Depends(get_project_repository),
|
||||||
asset_library_repository: Any = Depends(get_asset_library_repository),
|
asset_library_repository: Any = Depends(get_asset_library_repository),
|
||||||
asset_repository: Any = Depends(get_asset_repository),
|
asset_repository: Any = Depends(get_asset_repository),
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
) -> BatchGenerationTaskResponse:
|
) -> BatchGenerationTaskResponse:
|
||||||
logger.info(
|
logger.info(
|
||||||
"[生成任务] 接收请求: user_id=%s, template_id=%s, asset_count=%d, mode=%s, count=%d",
|
"[生成任务] 接收请求: user_id=%s, template_id=%s, asset_count=%d, mode=%s, count=%d",
|
||||||
@@ -327,107 +221,10 @@ def create_generation_task(
|
|||||||
mode=request.asset_select_mode,
|
mode=request.asset_select_mode,
|
||||||
count=request.asset_select_count,
|
count=request.asset_select_count,
|
||||||
)
|
)
|
||||||
elif project_id and not resolved_asset_ids and request.asset_select_mode in ("smart",):
|
|
||||||
# 项目级模式：未指定 asset_ids 且选择了 smart 模式时，也自动选取
|
|
||||||
assets = asset_repository.find_by_project(project_id)
|
|
||||||
if assets:
|
|
||||||
resolved_asset_ids = _select_assets_from_library(
|
|
||||||
assets,
|
|
||||||
mode=request.asset_select_mode,
|
|
||||||
count=request.asset_select_count,
|
|
||||||
)
|
|
||||||
if not resolved_asset_ids:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=422,
|
|
||||||
detail="当前项目没有符合条件的视频素材，请先上传并等待导入完成后再生成。",
|
|
||||||
)
|
|
||||||
|
|
||||||
# ── 兜底复用预览产物 ──
|
|
||||||
# 前端刷新后 previewTaskId 丢失，降级调 create 接口时，
|
|
||||||
# 如果同一 edit_plan 有已完成的预览任务，直接复用（秒出）。
|
|
||||||
if request.source_edit_plan_id and not request.is_preview:
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import (
|
|
||||||
GenerationTaskModel,
|
|
||||||
)
|
|
||||||
|
|
||||||
_preview_model = (
|
|
||||||
db.query(GenerationTaskModel)
|
|
||||||
.filter(
|
|
||||||
GenerationTaskModel.source_edit_plan_id == request.source_edit_plan_id,
|
|
||||||
GenerationTaskModel.is_preview.is_(True),
|
|
||||||
GenerationTaskModel.status == "completed",
|
|
||||||
GenerationTaskModel.created_by_user_id == authenticated_user.user.id,
|
|
||||||
)
|
|
||||||
.order_by(GenerationTaskModel.created_at.desc())
|
|
||||||
.first()
|
|
||||||
)
|
|
||||||
if _preview_model is not None:
|
|
||||||
# 校验分辨率一致性（与 confirm 端点逻辑相同）
|
|
||||||
req_w = request.output_width or 0
|
|
||||||
req_h = request.output_height or 0
|
|
||||||
src_w = getattr(_preview_model, "output_width", 0) or 0
|
|
||||||
src_h = getattr(_preview_model, "output_height", 0) or 0
|
|
||||||
resolution_match = (req_w == 0 or req_w == src_w) and (req_h == 0 or req_h == src_h)
|
|
||||||
|
|
||||||
if resolution_match:
|
|
||||||
from packages.adapters.sqlalchemy_impl.generation_task_repository import (
|
|
||||||
_to_domain,
|
|
||||||
)
|
|
||||||
|
|
||||||
preview_task = _to_domain(_preview_model)
|
|
||||||
|
|
||||||
# 如果传了标题，更新 title_config
|
|
||||||
fallback_title_config = None
|
|
||||||
if request.title_config and request.title_config.get("text", "").strip():
|
|
||||||
fallback_title_config = dict(preview_task.title_config or {})
|
|
||||||
fallback_title_config.update(request.title_config)
|
|
||||||
|
|
||||||
preview_task.mark_confirmed(
|
|
||||||
cover_url=request.cover_url or preview_task.cover_url,
|
|
||||||
output_width=request.output_width or preview_task.output_width,
|
|
||||||
output_height=request.output_height or preview_task.output_height,
|
|
||||||
title_config=fallback_title_config,
|
|
||||||
)
|
|
||||||
generation_task_repository.update(preview_task)
|
|
||||||
|
|
||||||
# 同步标题到 EditPlan.config
|
|
||||||
if fallback_title_config:
|
|
||||||
_writeback_edit_plan_config(
|
|
||||||
plan_id=request.source_edit_plan_id,
|
|
||||||
task_id=preview_task.id,
|
|
||||||
title_config=fallback_title_config,
|
|
||||||
db=db,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"[生成任务] 兜底复用预览产物: preview_task_id=%s, plan_id=%s",
|
|
||||||
preview_task.id,
|
|
||||||
request.source_edit_plan_id,
|
|
||||||
)
|
|
||||||
return BatchGenerationTaskResponse(
|
|
||||||
items=[_to_generation_task_response(preview_task)],
|
|
||||||
total=1,
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
logger.info(
|
|
||||||
"[生成任务] 兜底复用跳过（分辨率不一致）: plan_id=%s, src=%sx%s, req=%sx%s",
|
|
||||||
request.source_edit_plan_id,
|
|
||||||
src_w,
|
|
||||||
src_h,
|
|
||||||
req_w,
|
|
||||||
req_h,
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[生成任务] 兜底复用预览产物异常（不影响主流程）: plan_id=%s",
|
|
||||||
request.source_edit_plan_id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
use_case = CreateGenerationTaskUseCase(generation_task_repository)
|
use_case = CreateGenerationTaskUseCase(generation_task_repository)
|
||||||
count = request.count
|
count = request.count
|
||||||
created_tasks: list = []
|
created_tasks = []
|
||||||
failed_tasks = []
|
failed_tasks = []
|
||||||
user_id = authenticated_user.user.id
|
user_id = authenticated_user.user.id
|
||||||
# 同批次任务共享 batch_id，用于视频查重时批次内比对
|
# 同批次任务共享 batch_id，用于视频查重时批次内比对
|
||||||
@@ -446,307 +243,35 @@ def create_generation_task(
|
|||||||
except UserPendingLimitExceeded as e:
|
except UserPendingLimitExceeded as e:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=429,
|
status_code=429,
|
||||||
detail=build_rate_limit_detail(e, generation_task_repository, scope="user"),
|
detail=f"您的待处理任务过多（当前 {e.pending_count - count}/{e.limit}，本次提交 {count} 个），请等待完成后再提交",
|
||||||
) from e
|
) from e
|
||||||
except GlobalQueueFull as e:
|
except GlobalQueueFull as e:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=503,
|
status_code=503,
|
||||||
detail=build_rate_limit_detail(e, generation_task_repository, scope="global"),
|
detail="系统繁忙，请稍后再试",
|
||||||
) from e
|
) from e
|
||||||
|
|
||||||
# 画中画已下线：strategy_id 中的 pip/voice_pip 统一映射为 one_take
|
|
||||||
effective_strategy_id = request.strategy_id
|
|
||||||
if effective_strategy_id in ("pip", "voice_pip"):
|
|
||||||
logger.info("画中画已下线，strategy_id %s → one_take", effective_strategy_id)
|
|
||||||
effective_strategy_id = "one_take"
|
|
||||||
|
|
||||||
# 批量生成（count>1）：每个变体必须走与单视频完全相同的独立选片流程（#1743/#1749）。
|
|
||||||
# - 变体 0：clone 源 plan（不污染源 plan），变体 1..N-1 用 reselect_plan_for_variant
|
|
||||||
# 完整重跑选片（素材级去重：fresh 优先 → 受控复用 overlap≤20% → 短素材禁复用）；
|
|
||||||
# - #1749：前端可回传 variant-plans 接口预生成的 plan_id（variant_plan_ids），直接复用；
|
|
||||||
# 回传 plan 仍按各变体配音幂等重分配段长（防 variant-plans 阶段未带配音/占位时长）；
|
|
||||||
# - 配音时长：独立配音各自时长、统一配音同值，逐变体 apply_voice_duration_to_plan，
|
|
||||||
# 成片总时长=配音时长（素材短→末帧冻结，禁慢放/禁截配音）；
|
|
||||||
# - count>1 但没有源 plan 时，不允许 N 个任务兜底共用同一 plan，直接 4xx 中断。
|
|
||||||
# 在创建任何任务【之前】预生成/校验全部变体 plan：失败直接中断（此时无脏数据）。
|
|
||||||
variant_plan_ids: list[str] = []
|
|
||||||
if count > 1:
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
|
|
||||||
from packages.domain.variant_voice_resolver import VariantVoiceError, resolve_variant_voice_ids
|
|
||||||
|
|
||||||
_plan_svc = EditPlanService(db)
|
|
||||||
|
|
||||||
# 解析每变体配音（严格守卫：独立配音长度/缺值 → 400，禁静默 fallback）
|
|
||||||
try:
|
|
||||||
variant_voices = resolve_variant_voice_ids(
|
|
||||||
count=count,
|
|
||||||
voice_library_id=request.voice_library_id,
|
|
||||||
voice_library_ids=request.voice_library_ids or None,
|
|
||||||
)
|
|
||||||
except VariantVoiceError as ve:
|
|
||||||
raise HTTPException(status_code=400, detail=str(ve)) from ve
|
|
||||||
# 各变体配音时长（查询硬化：异常 → 0.0 不阻断）
|
|
||||||
voice_durations = _query_voice_durations(db, variant_voices)
|
|
||||||
|
|
||||||
# 解析批量源 plan：优先前端传入；否则按 template_id + user 查最新（与单任务兜底同源）
|
|
||||||
batch_source_plan_id = request.source_edit_plan_id
|
|
||||||
if not batch_source_plan_id and request.template_id:
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import EditPlanModel
|
|
||||||
|
|
||||||
_latest = (
|
|
||||||
db.query(EditPlanModel)
|
|
||||||
.filter(
|
|
||||||
EditPlanModel.template_id == request.template_id,
|
|
||||||
EditPlanModel.created_by_user_id == user_id,
|
|
||||||
)
|
|
||||||
.order_by(EditPlanModel.created_at.desc())
|
|
||||||
.first()
|
|
||||||
)
|
|
||||||
if _latest:
|
|
||||||
batch_source_plan_id = _latest.id
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[生成任务] 批量源 plan 解析失败", exc_info=True)
|
|
||||||
|
|
||||||
if not batch_source_plan_id and not request.variant_plan_ids:
|
|
||||||
# 无任何可用源 plan：批量变体无从选片，明确报错，严禁静默共用/同源
|
|
||||||
logger.error("[生成任务] 批量 count=%d 但无可编辑计划（无 source_edit_plan_id/template plan）", count)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail="批量生成需要先完成预览生成（缺少剪辑计划）。请先生成预览后再批量创建。",
|
|
||||||
)
|
|
||||||
|
|
||||||
# 批次素材池：请求显式素材 + 库自动匹配素材（resolved_asset_ids）
|
|
||||||
batch_asset_pool = list(dict.fromkeys(resolved_asset_ids or []))
|
|
||||||
|
|
||||||
if request.variant_plan_ids:
|
|
||||||
# ① 前端回传 variant-plans 预生成结果：直接复用（轻量选片接口已建好 plan）
|
|
||||||
if len(request.variant_plan_ids) != count:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail=f"variant_plan_ids 数量({len(request.variant_plan_ids)})与视频数量({count})不一致",
|
|
||||||
)
|
|
||||||
# 校验归属权
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import EditPlanModel
|
|
||||||
|
|
||||||
for _pid in request.variant_plan_ids:
|
|
||||||
_pm = db.query(EditPlanModel).filter(EditPlanModel.id == _pid).first()
|
|
||||||
if _pm is None:
|
|
||||||
raise HTTPException(status_code=400, detail=f"剪辑计划不存在: {_pid}")
|
|
||||||
if _pm.created_by_user_id and _pm.created_by_user_id != user_id:
|
|
||||||
raise HTTPException(status_code=403, detail=f"无权使用剪辑计划: {_pid}")
|
|
||||||
variant_plan_ids = list(request.variant_plan_ids)
|
|
||||||
else:
|
|
||||||
# ② 服务端选片：变体 0 clone 源 plan（不污染源 plan）
|
|
||||||
try:
|
|
||||||
_plan0 = _plan_svc.clone_plan_for_variant(
|
|
||||||
batch_source_plan_id,
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
name_suffix="批量1",
|
|
||||||
)
|
|
||||||
except Exception as clone_err:
|
|
||||||
logger.error("[生成任务] 变体0 clone 失败: %s", clone_err, exc_info=True)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=500, detail="创建批量任务失败：无法生成独立剪辑计划，请重试"
|
|
||||||
) from clone_err
|
|
||||||
variant_plan_ids.append(_plan0.id)
|
|
||||||
|
|
||||||
# 变体 1..N-1 独立选片
|
|
||||||
for task_index in range(1, count):
|
|
||||||
variant = None
|
|
||||||
last_err: Exception | None = None
|
|
||||||
for _attempt in range(2): # 1 次重试，抗 DB 瞬时抖动
|
|
||||||
try:
|
|
||||||
variant = _plan_svc.reselect_plan_for_variant(
|
|
||||||
batch_source_plan_id,
|
|
||||||
batch_asset_pool,
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
name_suffix=f"批量{task_index + 1}",
|
|
||||||
voice_duration=voice_durations[task_index] if task_index < len(voice_durations) else 0.0,
|
|
||||||
)
|
|
||||||
break
|
|
||||||
except ValueError as ve:
|
|
||||||
# 素材不足等可预期错误：不重试，直接中断并给出明确提示
|
|
||||||
logger.warning("[生成任务] 变体独立选片失败(素材不足): %s", ve)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail=f"批量生成第 {task_index + 1} 个视频无法独立选片：{ve}。"
|
|
||||||
"请增加素材库中的视频素材后重试。",
|
|
||||||
) from ve
|
|
||||||
except Exception as reselection_err: # noqa: PERF203
|
|
||||||
last_err = reselection_err
|
|
||||||
logger.warning(
|
|
||||||
"[生成任务] 变体独立选片失败(尝试%d/2): source=%s error=%s",
|
|
||||||
_attempt + 1,
|
|
||||||
batch_source_plan_id,
|
|
||||||
reselection_err,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
if variant is None:
|
|
||||||
logger.error(
|
|
||||||
"[生成任务] 变体独立选片重试仍失败，中断批量创建: source=%s",
|
|
||||||
batch_source_plan_id,
|
|
||||||
exc_info=last_err,
|
|
||||||
)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=500,
|
|
||||||
detail="创建批量任务失败：无法生成独立剪辑计划，请重试",
|
|
||||||
) from last_err
|
|
||||||
variant_plan_ids.append(variant.id)
|
|
||||||
|
|
||||||
# ③ 配音时长分配（回传 plan / clone 变体0 均需幂等分配；reselect 已在选片时分配）
|
|
||||||
for _vi, _pid in enumerate(variant_plan_ids):
|
|
||||||
_vd = voice_durations[_vi] if _vi < len(voice_durations) else 0.0
|
|
||||||
if _vd > 0:
|
|
||||||
try:
|
|
||||||
_plan_svc.apply_voice_duration_to_plan(_pid, _vd)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("[生成任务] 变体%d 配音时长分配失败（不阻断）: plan=%s", _vi, _pid)
|
|
||||||
|
|
||||||
# N=1 正式生成：渲染侧全局慢放兜底已删除（#1749），enqueue 前也必须按配音分配段长
|
|
||||||
if count == 1 and not request.is_preview:
|
|
||||||
from packages.domain.variant_voice_resolver import VariantVoiceError, resolve_variant_voice_ids
|
|
||||||
|
|
||||||
try:
|
|
||||||
_voices = resolve_variant_voice_ids(
|
|
||||||
count=1,
|
|
||||||
voice_library_id=request.voice_library_id,
|
|
||||||
voice_library_ids=request.voice_library_ids or None,
|
|
||||||
)
|
|
||||||
_single_vd: list[float] = _query_voice_durations(db, _voices)
|
|
||||||
_single_dur = _single_vd[0] if _single_vd else 0.0
|
|
||||||
_single_plan = request.source_edit_plan_id
|
|
||||||
if not _single_plan and request.template_id:
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import EditPlanModel
|
|
||||||
|
|
||||||
_latest = (
|
|
||||||
db.query(EditPlanModel)
|
|
||||||
.filter(
|
|
||||||
EditPlanModel.template_id == request.template_id,
|
|
||||||
EditPlanModel.created_by_user_id == user_id,
|
|
||||||
)
|
|
||||||
.order_by(EditPlanModel.created_at.desc())
|
|
||||||
.first()
|
|
||||||
)
|
|
||||||
if _latest:
|
|
||||||
_single_plan = _latest.id
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[生成任务] 单任务源 plan 解析失败", exc_info=True)
|
|
||||||
if _single_dur > 0 and _single_plan:
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
|
|
||||||
try:
|
|
||||||
EditPlanService(db).apply_voice_duration_to_plan(_single_plan, _single_dur)
|
|
||||||
except Exception:
|
|
||||||
logger.exception("[生成任务] N=1 配音时长分配失败（不阻断）: plan=%s", _single_plan)
|
|
||||||
except VariantVoiceError as ve:
|
|
||||||
raise HTTPException(status_code=400, detail=str(ve)) from ve
|
|
||||||
except Exception:
|
|
||||||
logger.exception("[生成任务] N=1 配音分配兜底异常（不阻断）")
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
for task_index in range(count):
|
for _ in range(count):
|
||||||
# #1749：count>1 时每个变体（含变体0）都关联各自独立 plan（clone/reselect/variant-plans）。
|
|
||||||
if count > 1 and variant_plan_ids:
|
|
||||||
effective_plan_id = variant_plan_ids[task_index]
|
|
||||||
else:
|
|
||||||
effective_plan_id = request.source_edit_plan_id
|
|
||||||
|
|
||||||
# 变体级独立配置：titles[]/voice_library_ids[]/cover_urls[]
|
|
||||||
# 长度1=所有变体共用，长度=count=每个变体独立，空数组=回退单值字段
|
|
||||||
variant_title_text = _variant_value(request.titles, task_index, "")
|
|
||||||
variant_title_config = dict(request.title_config or {})
|
|
||||||
if variant_title_text.strip():
|
|
||||||
variant_title_config["text"] = variant_title_text.strip()
|
|
||||||
variant_voice_library_id = _variant_value(request.voice_library_ids, task_index, request.voice_library_id)
|
|
||||||
variant_cover_url = _variant_value(request.cover_urls, task_index, request.cover_url)
|
|
||||||
|
|
||||||
task = use_case.execute(
|
task = use_case.execute(
|
||||||
CreateGenerationTaskCommand(
|
CreateGenerationTaskCommand(
|
||||||
project_id=project_id,
|
project_id=project_id,
|
||||||
asset_library_id=asset_library_id,
|
asset_library_id=asset_library_id,
|
||||||
strategy_id=effective_strategy_id,
|
strategy_id=request.strategy_id,
|
||||||
voice_library_id=variant_voice_library_id,
|
voice_library_id=request.voice_library_id,
|
||||||
template_id=request.template_id,
|
template_id=request.template_id,
|
||||||
asset_ids=resolved_asset_ids,
|
asset_ids=resolved_asset_ids,
|
||||||
title_ids=request.title_ids,
|
title_ids=request.title_ids,
|
||||||
|
voice_ids=request.voice_ids,
|
||||||
created_by_user_id=user_id,
|
created_by_user_id=user_id,
|
||||||
source_edit_plan_id=effective_plan_id,
|
source_edit_plan_id=request.source_edit_plan_id,
|
||||||
asset_select_mode=request.asset_select_mode,
|
asset_select_mode=request.asset_select_mode,
|
||||||
batch_id=batch_id,
|
batch_id=batch_id,
|
||||||
video_title=request.video_title,
|
|
||||||
resolution=request.resolution,
|
|
||||||
bgm_config=request.bgm_config,
|
|
||||||
auto_retry_enabled=request.auto_retry_enabled,
|
auto_retry_enabled=request.auto_retry_enabled,
|
||||||
auto_retry_max=request.auto_retry_max,
|
auto_retry_max=request.auto_retry_max,
|
||||||
is_preview=request.is_preview,
|
|
||||||
source_task_id=request.source_task_id,
|
|
||||||
output_width=request.output_width,
|
|
||||||
output_height=request.output_height,
|
|
||||||
cover_url=variant_cover_url,
|
|
||||||
title_config=variant_title_config,
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
# 变体序号写入 extra_meta（响应/排查时可辨识）
|
|
||||||
task.extra_meta["variant_index"] = task_index
|
|
||||||
try:
|
try:
|
||||||
# 兜底关联编辑计划：前端未传 source_edit_plan_id 时，
|
|
||||||
# 通过 template_id + user_id 在 DB 层直接查找最新的 plan。
|
|
||||||
# 必须在 enqueue 之前执行，避免 worker 读取时 source_edit_plan_id 为空（竞态条件）。
|
|
||||||
# #1743：批量（count>1）场景严禁兜底共用——变体 plan 已在上方预生成，
|
|
||||||
# 走到这里还缺 plan 说明预生成漏配，直接报错中断，不允许 N 任务关联同一 plan。
|
|
||||||
if not task.source_edit_plan_id and count > 1:
|
|
||||||
logger.error(
|
|
||||||
"[生成任务] 批量任务缺少独立 plan（禁止共用兜底）: task_index=%d task_id=%s",
|
|
||||||
task_index,
|
|
||||||
task.id,
|
|
||||||
)
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=500,
|
|
||||||
detail="创建批量任务失败：变体剪辑计划缺失，请重新预览后再批量生成。",
|
|
||||||
)
|
|
||||||
if not task.source_edit_plan_id and request.template_id:
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import EditPlanModel
|
|
||||||
|
|
||||||
_plan_model = (
|
|
||||||
db.query(EditPlanModel)
|
|
||||||
.filter(
|
|
||||||
EditPlanModel.template_id == request.template_id,
|
|
||||||
EditPlanModel.created_by_user_id == user_id,
|
|
||||||
)
|
|
||||||
.order_by(EditPlanModel.created_at.desc())
|
|
||||||
.first()
|
|
||||||
)
|
|
||||||
if _plan_model:
|
|
||||||
task.source_edit_plan_id = _plan_model.id
|
|
||||||
generation_task_repository.update(task)
|
|
||||||
logger.info(
|
|
||||||
"[生成任务] 自动关联编辑计划: task_id=%s plan_id=%s",
|
|
||||||
task.id,
|
|
||||||
_plan_model.id,
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"[生成任务] 查找关联编辑计划失败（不影响主流程）: task_id=%s",
|
|
||||||
task.id,
|
|
||||||
exc_info=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 回写 plan.config：必须在 enqueue 之前执行，
|
|
||||||
# 确保 worker 读取 plan 时 config 中已包含 generation_task_id。
|
|
||||||
# 批量场景下每个变体关联独立 plan，需各自回写自己的变体标题配置。
|
|
||||||
_effective_plan_id = task.source_edit_plan_id
|
|
||||||
if _effective_plan_id:
|
|
||||||
_writeback_edit_plan_config(
|
|
||||||
plan_id=_effective_plan_id,
|
|
||||||
task_id=task.id,
|
|
||||||
title_config=variant_title_config,
|
|
||||||
db=db,
|
|
||||||
)
|
|
||||||
|
|
||||||
if safe_enqueue_generation_task(
|
if safe_enqueue_generation_task(
|
||||||
task,
|
task,
|
||||||
generation_task_repository,
|
generation_task_repository,
|
||||||
@@ -757,162 +282,33 @@ def create_generation_task(
|
|||||||
created_tasks.append(task)
|
created_tasks.append(task)
|
||||||
else:
|
else:
|
||||||
failed_tasks.append(task)
|
failed_tasks.append(task)
|
||||||
except UserPendingLimitExceeded as _e:
|
except UserPendingLimitExceeded:
|
||||||
# 兜底：如果预检查后又并发提交了，在这里也拦住
|
# 兜底：如果预检查后又并发提交了，在这里也拦住
|
||||||
failed_tasks.append(task)
|
failed_tasks.append(task)
|
||||||
if not created_tasks:
|
if not created_tasks:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=429,
|
status_code=429,
|
||||||
detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
|
detail="您的待处理任务过多，请等待完成后再提交",
|
||||||
) from _e
|
)
|
||||||
break
|
break
|
||||||
except GlobalQueueFull as _e:
|
except GlobalQueueFull:
|
||||||
failed_tasks.append(task)
|
failed_tasks.append(task)
|
||||||
if not created_tasks:
|
if not created_tasks:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=503,
|
status_code=503,
|
||||||
detail=build_rate_limit_detail(_e, generation_task_repository, scope="global"),
|
detail="系统繁忙，请稍后再试",
|
||||||
) from _e
|
)
|
||||||
break
|
break
|
||||||
except HTTPException:
|
except HTTPException:
|
||||||
raise
|
raise
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("[生成任务] 创建失败: %s", e, exc_info=True)
|
logger.error("[生成任务] 创建失败: %s", e, exc_info=True)
|
||||||
raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志") from e
|
raise HTTPException(status_code=500, detail="创建生成任务失败，请稍后重试或查看任务日志")
|
||||||
|
|
||||||
items = [_to_generation_task_response(t) for t in created_tasks + failed_tasks]
|
items = [_to_generation_task_response(t) for t in created_tasks + failed_tasks]
|
||||||
return BatchGenerationTaskResponse(items=items, total=len(items))
|
return BatchGenerationTaskResponse(items=items, total=len(items))
|
||||||
|
|
||||||
|
|
||||||
@router.post("/tasks/{task_id}/confirm", response_model=BatchGenerationTaskResponse)
|
|
||||||
def confirm_generation(
|
|
||||||
task_id: str,
|
|
||||||
request: ConfirmGenerationRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
generation_task_repository: Any = Depends(get_generation_task_repository),
|
|
||||||
project_repository: Any = Depends(get_project_repository),
|
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
) -> BatchGenerationTaskResponse:
|
|
||||||
"""确认生成 -- 复用预览渲染产物（预览与正式品质一致）。
|
|
||||||
|
|
||||||
预览已使用 1080p / CRF 23 / medium 渲染，品质与正式生成一致。
|
|
||||||
确认时直接将预览任务标记为正式产出，无需重新渲染，实现秒出。
|
|
||||||
仅当预览任务未完成时，才创建新的正式任务走渲染流程。
|
|
||||||
"""
|
|
||||||
# 1. 查找源预览任务
|
|
||||||
source_task = generation_task_repository.get(task_id)
|
|
||||||
if source_task is None:
|
|
||||||
raise HTTPException(status_code=404, detail=f"Preview task {task_id} not found")
|
|
||||||
|
|
||||||
# 2. 权限检查
|
|
||||||
if source_task.created_by_user_id and source_task.created_by_user_id != authenticated_user.user.id:
|
|
||||||
raise HTTPException(status_code=403, detail="Access denied to this task")
|
|
||||||
if source_task.project_id:
|
|
||||||
check_project_access(source_task.project_id, authenticated_user.user.id, project_repository)
|
|
||||||
|
|
||||||
# 3. 如果预览任务已完成，检查分辨率一致性后复用产物（秒出）
|
|
||||||
if source_task.is_completed and getattr(source_task, "is_preview", False):
|
|
||||||
# 校验请求的分辨率是否与预览实际渲染的分辨率一致
|
|
||||||
req_w = request.output_width or 0
|
|
||||||
req_h = request.output_height or 0
|
|
||||||
src_w = getattr(source_task, "output_width", 0) or 0
|
|
||||||
src_h = getattr(source_task, "output_height", 0) or 0
|
|
||||||
resolution_match = (req_w == 0 or req_w == src_w) and (req_h == 0 or req_h == src_h)
|
|
||||||
|
|
||||||
if resolution_match:
|
|
||||||
# 如果用户传了 custom_title，同步更新 title_config
|
|
||||||
confirmed_title_config = None
|
|
||||||
if request.custom_title and request.custom_title.strip():
|
|
||||||
confirmed_title_config = dict(getattr(source_task, "title_config", {}) or {})
|
|
||||||
confirmed_title_config["text"] = request.custom_title.strip()
|
|
||||||
|
|
||||||
source_task.mark_confirmed(
|
|
||||||
cover_url=request.cover_url,
|
|
||||||
output_width=request.output_width,
|
|
||||||
output_height=request.output_height,
|
|
||||||
title_config=confirmed_title_config,
|
|
||||||
)
|
|
||||||
generation_task_repository.update(source_task)
|
|
||||||
|
|
||||||
# 同步标题到 EditPlan.config
|
|
||||||
if confirmed_title_config and source_task.source_edit_plan_id:
|
|
||||||
_writeback_edit_plan_config(
|
|
||||||
plan_id=source_task.source_edit_plan_id,
|
|
||||||
task_id=source_task.id,
|
|
||||||
title_config=confirmed_title_config,
|
|
||||||
db=db,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"[确认生成] 复用预览产物: task_id=%s, user_id=%s",
|
|
||||||
task_id,
|
|
||||||
authenticated_user.user.id,
|
|
||||||
)
|
|
||||||
return BatchGenerationTaskResponse(
|
|
||||||
items=[_to_generation_task_response(source_task)],
|
|
||||||
total=1,
|
|
||||||
)
|
|
||||||
# 分辨率不一致，跳过复用，走新建任务流程
|
|
||||||
logger.info(
|
|
||||||
"[确认生成] 分辨率不一致，跳过复用: task_id=%s, src=%sx%s, req=%sx%s",
|
|
||||||
task_id,
|
|
||||||
src_w,
|
|
||||||
src_h,
|
|
||||||
req_w,
|
|
||||||
req_h,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 4. 预览任务未完成，创建新的正式任务走渲染流程
|
|
||||||
use_case = CreateGenerationTaskUseCase(generation_task_repository)
|
|
||||||
new_task = use_case.execute(
|
|
||||||
CreateGenerationTaskCommand(
|
|
||||||
project_id=source_task.project_id,
|
|
||||||
asset_library_id=source_task.asset_library_id,
|
|
||||||
strategy_id=source_task.strategy_id,
|
|
||||||
voice_library_id=source_task.voice_library_id,
|
|
||||||
template_id=source_task.template_id,
|
|
||||||
asset_ids=source_task.asset_ids,
|
|
||||||
title_ids=source_task.title_ids,
|
|
||||||
created_by_user_id=authenticated_user.user.id,
|
|
||||||
source_edit_plan_id=source_task.source_edit_plan_id or "",
|
|
||||||
asset_select_mode=source_task.asset_select_mode,
|
|
||||||
video_title=getattr(source_task, "video_title", ""),
|
|
||||||
resolution=getattr(source_task, "resolution", ""),
|
|
||||||
is_preview=False,
|
|
||||||
source_task_id=task_id,
|
|
||||||
output_width=request.output_width,
|
|
||||||
output_height=request.output_height,
|
|
||||||
cover_url=request.cover_url,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
# 5. 调度 worker
|
|
||||||
try:
|
|
||||||
if not safe_enqueue_generation_task(
|
|
||||||
new_task,
|
|
||||||
generation_task_repository,
|
|
||||||
user_id=authenticated_user.user.id,
|
|
||||||
log_prefix="[确认生成]",
|
|
||||||
log_task_status=True,
|
|
||||||
):
|
|
||||||
logger.warning("[确认生成] 入队失败: task_id=%s", new_task.id)
|
|
||||||
except UserPendingLimitExceeded as _e:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=429,
|
|
||||||
detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
|
|
||||||
) from None
|
|
||||||
except GlobalQueueFull as _e:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=503,
|
|
||||||
detail=build_rate_limit_detail(_e, generation_task_repository, scope="global"),
|
|
||||||
) from None
|
|
||||||
|
|
||||||
return BatchGenerationTaskResponse(
|
|
||||||
items=[_to_generation_task_response(new_task)],
|
|
||||||
total=1,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/tasks", response_model=ListGenerationTasksResponse)
|
@router.get("/tasks", response_model=ListGenerationTasksResponse)
|
||||||
def list_generation_tasks(
|
def list_generation_tasks(
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
@@ -986,24 +382,12 @@ def retry_generation_task(
|
|||||||
if user_pending >= USER_PENDING_LIMIT:
|
if user_pending >= USER_PENDING_LIMIT:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=429,
|
status_code=429,
|
||||||
detail=build_rate_limit_detail(
|
detail=f"您的待处理任务过多（当前 {user_pending}/{USER_PENDING_LIMIT}），请等待完成后再提交",
|
||||||
UserPendingLimitExceeded(
|
|
||||||
user_id=user_id,
|
|
||||||
pending_count=user_pending,
|
|
||||||
limit=USER_PENDING_LIMIT,
|
|
||||||
),
|
|
||||||
generation_task_repository,
|
|
||||||
scope="user",
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
if global_pending >= GLOBAL_PENDING_LIMIT:
|
if global_pending >= GLOBAL_PENDING_LIMIT:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=503,
|
status_code=503,
|
||||||
detail=build_rate_limit_detail(
|
detail="系统繁忙，请稍后再试",
|
||||||
GlobalQueueFull(pending_count=global_pending, limit=GLOBAL_PENDING_LIMIT),
|
|
||||||
generation_task_repository,
|
|
||||||
scope="global",
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
use_case = CreateGenerationTaskUseCase(generation_task_repository)
|
use_case = CreateGenerationTaskUseCase(generation_task_repository)
|
||||||
@@ -1016,16 +400,10 @@ def retry_generation_task(
|
|||||||
template_id=task.template_id,
|
template_id=task.template_id,
|
||||||
asset_ids=task.asset_ids,
|
asset_ids=task.asset_ids,
|
||||||
title_ids=task.title_ids,
|
title_ids=task.title_ids,
|
||||||
|
voice_ids=task.voice_ids,
|
||||||
created_by_user_id=user_id,
|
created_by_user_id=user_id,
|
||||||
source_edit_plan_id=task.source_edit_plan_id or "",
|
source_edit_plan_id=task.source_edit_plan_id or "",
|
||||||
asset_select_mode=getattr(task, "asset_select_mode", ""),
|
asset_select_mode=getattr(task, "asset_select_mode", ""),
|
||||||
video_title=getattr(task, "video_title", ""),
|
|
||||||
resolution=getattr(task, "resolution", ""),
|
|
||||||
is_preview=getattr(task, "is_preview", False),
|
|
||||||
source_task_id=getattr(task, "source_task_id", ""),
|
|
||||||
output_width=getattr(task, "output_width", 1280),
|
|
||||||
output_height=getattr(task, "output_height", 720),
|
|
||||||
cover_url=getattr(task, "cover_url", ""),
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
@@ -1037,64 +415,14 @@ def retry_generation_task(
|
|||||||
log_task_status=True,
|
log_task_status=True,
|
||||||
):
|
):
|
||||||
logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
|
logger.warning("[生成任务] 重试入队失败: task_id=%s", retried.id)
|
||||||
except UserPendingLimitExceeded as _e:
|
except UserPendingLimitExceeded:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=429,
|
status_code=429,
|
||||||
detail=build_rate_limit_detail(_e, generation_task_repository, scope="user"),
|
detail="您的待处理任务过多，请等待完成后再提交",
|
||||||
) from None
|
) from None
|
||||||
except GlobalQueueFull as _e:
|
except GlobalQueueFull:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=503,
|
status_code=503,
|
||||||
detail=build_rate_limit_detail(_e, generation_task_repository, scope="global"),
|
detail="系统繁忙，请稍后再试",
|
||||||
) from None
|
) from None
|
||||||
return _to_generation_task_response(retried)
|
return _to_generation_task_response(retried)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/tasks/{task_id}/cancel", response_model=GenerationTaskResponse)
|
|
||||||
def cancel_generation_task(
|
|
||||||
task_id: str,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
generation_task_repository: Any = Depends(get_generation_task_repository),
|
|
||||||
) -> GenerationTaskResponse:
|
|
||||||
"""取消生成任务。
|
|
||||||
|
|
||||||
仅 pending / running 状态的任务可取消；取消后状态变为 cancelled。
|
|
||||||
对于已在运行的 Celery 任务，标记为 cancelled 后，worker 在下次检查点会中止执行。
|
|
||||||
"""
|
|
||||||
task = generation_task_repository.get(task_id)
|
|
||||||
if task is None:
|
|
||||||
raise HTTPException(status_code=404, detail="Generation task not found")
|
|
||||||
|
|
||||||
# 权限校验
|
|
||||||
if task.created_by_user_id and task.created_by_user_id != authenticated_user.user.id:
|
|
||||||
raise HTTPException(status_code=403, detail="Access denied to this task")
|
|
||||||
|
|
||||||
status_val = task.status.value if hasattr(task.status, "value") else str(task.status)
|
|
||||||
|
|
||||||
# 终态不可取消
|
|
||||||
if status_val in ("completed", "failed", "cancelled"):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=409,
|
|
||||||
detail=f"Cannot cancel task in {status_val} status",
|
|
||||||
)
|
|
||||||
|
|
||||||
# 执行取消
|
|
||||||
try:
|
|
||||||
task.mark_cancelled()
|
|
||||||
task.append_log(
|
|
||||||
stage="cancelled",
|
|
||||||
message="用户主动取消任务",
|
|
||||||
level="INFO",
|
|
||||||
cancelled_by=authenticated_user.user.id,
|
|
||||||
)
|
|
||||||
generation_task_repository.update(task)
|
|
||||||
logger.info(
|
|
||||||
"生成任务已取消: task_id=%s user_id=%s previous_status=%s",
|
|
||||||
task_id,
|
|
||||||
authenticated_user.user.id,
|
|
||||||
status_val,
|
|
||||||
)
|
|
||||||
except ValueError as e:
|
|
||||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
|
||||||
|
|
||||||
return _to_generation_task_response(task)
|
|
||||||
|
|||||||
@@ -1,178 +0,0 @@
|
|||||||
"""轻量选片接口 POST /generation/variant-plans（#1749）。
|
|
||||||
|
|
||||||
与正式生成共用同一套选片函数（EditPlanService.ensure_variant_plans →
|
|
||||||
clone_plan_for_variant / reselect_plan_for_variant → variant_plan_selector），
|
|
||||||
但**不建任务、不入队、不渲染**：
|
|
||||||
|
|
||||||
- 仅为 N 个变体创建/选好 EditPlan + clips，返回 plan_id 与片段列表；
|
|
||||||
- 前端确认后调正式生成接口回传 variant_plan_ids，直接复用这些 plan，
|
|
||||||
不再重复选片（回传后仍按各变体配音幂等重分配段长）；
|
|
||||||
- 配音守卫：voice_library_ids 长度/缺值 → 400（variant_voice_resolver），
|
|
||||||
禁静默 fallback；
|
|
||||||
- 素材不足等选片失败 → 400（与正式生成同口径）；除此之外不报错打断。
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
|
||||||
from pydantic import BaseModel, Field, model_validator
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from packages.domain.variant_voice_resolver import VariantVoiceError, resolve_variant_voice_ids
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter()
|
|
||||||
|
|
||||||
|
|
||||||
class VariantPlanRequest(BaseModel):
|
|
||||||
"""轻量选片请求体（与前端 variantPlans.ts 契约一致）。"""
|
|
||||||
|
|
||||||
template_id: str = Field(default="", description="模板 ID（无 source_edit_plan_id 时用于查找骨架 plan）")
|
|
||||||
asset_ids: list[str] = Field(default_factory=list, description="批次素材池")
|
|
||||||
count: int = Field(default=1, ge=1, le=50, description="变体数量")
|
|
||||||
source_edit_plan_id: str = Field(default="", description="源剪辑计划 ID（优先）")
|
|
||||||
# 配音（可选；传独立配音时严格守卫）
|
|
||||||
voice_library_id: str = Field(default="", description="统一配音 ID")
|
|
||||||
voice_library_ids: list[str] = Field(default_factory=list, description="独立配音 ID 列表（长度须=count）")
|
|
||||||
|
|
||||||
@model_validator(mode="after")
|
|
||||||
def _validate(self) -> "VariantPlanRequest":
|
|
||||||
if not self.template_id.strip() and not self.source_edit_plan_id.strip():
|
|
||||||
raise ValueError("template_id 与 source_edit_plan_id 至少需要提供一个")
|
|
||||||
try:
|
|
||||||
resolve_variant_voice_ids(
|
|
||||||
count=self.count,
|
|
||||||
voice_library_id=self.voice_library_id,
|
|
||||||
voice_library_ids=self.voice_library_ids or None,
|
|
||||||
)
|
|
||||||
except VariantVoiceError as exc:
|
|
||||||
raise ValueError(str(exc)) from exc
|
|
||||||
return self
|
|
||||||
|
|
||||||
|
|
||||||
class VariantPlanItem(BaseModel):
|
|
||||||
variant_index: int
|
|
||||||
plan_id: str
|
|
||||||
clips: list[dict[str, Any]] = Field(default_factory=list)
|
|
||||||
|
|
||||||
|
|
||||||
class VariantPlanResponse(BaseModel):
|
|
||||||
items: list[VariantPlanItem]
|
|
||||||
total: int
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/variant-plans", response_model=VariantPlanResponse)
|
|
||||||
def create_variant_plans(
|
|
||||||
request: VariantPlanRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
) -> VariantPlanResponse:
|
|
||||||
"""轻量选片：为 N 个变体创建独立 EditPlan + clips，不建任务/不渲染。
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
200 + {items: [{variant_index, plan_id, clips}], total}
|
|
||||||
"""
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
|
|
||||||
# 配音严格守卫（schema 已校验，此处复用解析取每变体配音）
|
|
||||||
try:
|
|
||||||
voices = resolve_variant_voice_ids(
|
|
||||||
count=request.count,
|
|
||||||
voice_library_id=request.voice_library_id,
|
|
||||||
voice_library_ids=request.voice_library_ids or None,
|
|
||||||
)
|
|
||||||
except VariantVoiceError as exc:
|
|
||||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
|
||||||
|
|
||||||
# 解析源 plan：显式传入优先；否则按 template_id + user 查最新
|
|
||||||
source_plan_id = request.source_edit_plan_id.strip()
|
|
||||||
if not source_plan_id and request.template_id.strip():
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.models import EditPlanModel
|
|
||||||
|
|
||||||
_latest = (
|
|
||||||
db.query(EditPlanModel)
|
|
||||||
.filter(
|
|
||||||
EditPlanModel.template_id == request.template_id.strip(),
|
|
||||||
EditPlanModel.created_by_user_id == user_id,
|
|
||||||
)
|
|
||||||
.order_by(EditPlanModel.created_at.desc())
|
|
||||||
.first()
|
|
||||||
)
|
|
||||||
if _latest:
|
|
||||||
source_plan_id = _latest.id
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[variant-plans] 源 plan 解析失败", exc_info=True)
|
|
||||||
|
|
||||||
if not source_plan_id:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail="缺少剪辑计划：请先完成一次预览生成（或传入 source_edit_plan_id）后再试。",
|
|
||||||
)
|
|
||||||
|
|
||||||
# 配音时长（硬化：异常 → 0.0 不阻断选片）
|
|
||||||
try:
|
|
||||||
from app.api.routes.generation_tasks import _query_voice_durations
|
|
||||||
|
|
||||||
voice_durations = _query_voice_durations(db, voices)
|
|
||||||
except Exception:
|
|
||||||
logger.warning("[variant-plans] 配音时长查询失败（按占位段长选片）", exc_info=True)
|
|
||||||
voice_durations = [0.0] * request.count
|
|
||||||
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
|
|
||||||
svc = EditPlanService(db)
|
|
||||||
try:
|
|
||||||
plan_ids = svc.ensure_variant_plans(
|
|
||||||
source_plan_id,
|
|
||||||
request.count,
|
|
||||||
list(dict.fromkeys(request.asset_ids or [])),
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
voice_durations=voice_durations,
|
|
||||||
)
|
|
||||||
except ValueError as ve:
|
|
||||||
# 素材池为空/时长全未知等可预期错误 → 400（与正式生成同口径）
|
|
||||||
logger.warning("[variant-plans] 选片失败: %s", ve)
|
|
||||||
raise HTTPException(status_code=400, detail=f"变体选片失败：{ve}。请增加素材后重试。") from ve
|
|
||||||
except HTTPException:
|
|
||||||
raise
|
|
||||||
except Exception as e:
|
|
||||||
logger.error("[variant-plans] 选片异常: %s", e, exc_info=True)
|
|
||||||
raise HTTPException(status_code=500, detail="选片失败，请稍后重试") from e
|
|
||||||
|
|
||||||
# 组装 clips 响应
|
|
||||||
items: list[VariantPlanItem] = []
|
|
||||||
for idx, pid in enumerate(plan_ids):
|
|
||||||
clips = svc.list_clips(pid)
|
|
||||||
clip_dicts = [
|
|
||||||
{
|
|
||||||
"id": c.id,
|
|
||||||
"order": c.order,
|
|
||||||
"asset_id": c.asset_id,
|
|
||||||
"start_time": float(c.start_time or 0.0),
|
|
||||||
"duration": float(c.duration or 0.0),
|
|
||||||
"clip_type": c.clip_type,
|
|
||||||
"transition_effect": c.transition_effect,
|
|
||||||
"transition_duration": float(c.transition_duration or 0.0),
|
|
||||||
"playback_speed": float(c.playback_speed or 1.0),
|
|
||||||
"text_content": c.text_content or "",
|
|
||||||
"status": c.status or "ready",
|
|
||||||
}
|
|
||||||
for c in clips
|
|
||||||
]
|
|
||||||
items.append(VariantPlanItem(variant_index=idx, plan_id=pid, clips=clip_dicts))
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"[variant-plans] 轻量选片完成: user=%s source=%s count=%d plans=%d",
|
|
||||||
user_id,
|
|
||||||
source_plan_id,
|
|
||||||
request.count,
|
|
||||||
len(plan_ids),
|
|
||||||
)
|
|
||||||
return VariantPlanResponse(items=items, total=len(items))
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
from datetime import datetime, timezone
|
from datetime import datetime
|
||||||
|
|
||||||
import psycopg
|
import psycopg2
|
||||||
import redis
|
import redis
|
||||||
from app.config import settings
|
from app.config import settings
|
||||||
from fastapi import APIRouter, status
|
from fastapi import APIRouter, status
|
||||||
@@ -13,7 +13,7 @@ router = APIRouter(tags=["Health"])
|
|||||||
async def health_check():
|
async def health_check():
|
||||||
return {
|
return {
|
||||||
"status": "healthy",
|
"status": "healthy",
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
"timestamp": datetime.utcnow().isoformat(),
|
||||||
"version": settings.APP_VERSION,
|
"version": settings.APP_VERSION,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@ async def startup_check():
|
|||||||
all_ready = all(check["status"] == "healthy" for check in checks.values())
|
all_ready = all(check["status"] == "healthy" for check in checks.values())
|
||||||
response = {
|
response = {
|
||||||
"status": "started" if all_ready else "starting",
|
"status": "started" if all_ready else "starting",
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
"timestamp": datetime.utcnow().isoformat(),
|
||||||
"checks": checks,
|
"checks": checks,
|
||||||
}
|
}
|
||||||
if not all_ready:
|
if not all_ready:
|
||||||
@@ -49,7 +49,7 @@ async def _check_database() -> dict:
|
|||||||
"message": "Using in-memory database",
|
"message": "Using in-memory database",
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
|
conn = psycopg2.connect(settings.DATABASE_URL, connect_timeout=3)
|
||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
cur.execute("SELECT 1")
|
cur.execute("SELECT 1")
|
||||||
cur.fetchone()
|
cur.fetchone()
|
||||||
@@ -124,7 +124,7 @@ async def _check_migrations() -> dict:
|
|||||||
"message": "Using in-memory database, no migrations needed",
|
"message": "Using in-memory database, no migrations needed",
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
conn = psycopg.connect(settings.DATABASE_URL, connect_timeout=3)
|
conn = psycopg2.connect(settings.DATABASE_URL, connect_timeout=3)
|
||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
cur.execute("""
|
cur.execute("""
|
||||||
SELECT COUNT(*) FROM information_schema.tables
|
SELECT COUNT(*) FROM information_schema.tables
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from typing import Any
|
|||||||
from app.core.celery_app import celery_app
|
from app.core.celery_app import celery_app
|
||||||
from app.dependencies import get_ingest_job_repository
|
from app.dependencies import get_ingest_job_repository
|
||||||
from app.schemas.ingest_job import IngestJobResponse, SubmitIngestJobRequest
|
from app.schemas.ingest_job import IngestJobResponse, SubmitIngestJobRequest
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
from fastapi import APIRouter, Depends
|
||||||
|
|
||||||
from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
|
from packages.application import SubmitIngestJobCommand, SubmitIngestJobUseCase
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ def get_ingest_job(
|
|||||||
) -> IngestJobResponse:
|
) -> IngestJobResponse:
|
||||||
job = ingest_job_repository.get(job_id)
|
job = ingest_job_repository.get(job_id)
|
||||||
if job is None:
|
if job is None:
|
||||||
raise HTTPException(status_code=404, detail=f"IngestJob {job_id} not found")
|
raise ValueError(f"IngestJob {job_id} not found")
|
||||||
return IngestJobResponse(
|
return IngestJobResponse(
|
||||||
id=job.id,
|
id=job.id,
|
||||||
project_id=job.project_id,
|
project_id=job.project_id,
|
||||||
@@ -43,13 +43,7 @@ def submit_ingest_job(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
celery_result = celery_app.send_task("worker.ingest_asset", args=[job.id])
|
celery_app.send_task("worker.ingest_asset", args=[job.id])
|
||||||
if getattr(celery_result, "id", ""):
|
|
||||||
try:
|
|
||||||
job.celery_task_id = celery_result.id
|
|
||||||
ingest_job_repository.update(job)
|
|
||||||
except Exception: # noqa: BLE001
|
|
||||||
pass
|
|
||||||
|
|
||||||
return IngestJobResponse(
|
return IngestJobResponse(
|
||||||
id=job.id,
|
id=job.id,
|
||||||
|
|||||||
@@ -1,145 +0,0 @@
|
|||||||
"""对口型 API 路由 — #1796 MediaKit 对口型.
|
|
||||||
|
|
||||||
接口：
|
|
||||||
POST /api/v1/lipsync/jobs 提交对口型任务
|
|
||||||
GET /api/v1/lipsync/jobs 任务列表
|
|
||||||
GET /api/v1/lipsync/jobs/{id} 任务详情
|
|
||||||
POST /api/v1/lipsync/jobs/{id}/refresh 刷新任务状态
|
|
||||||
POST /api/v1/lipsync/jobs/{id}/cancel 取消任务
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
from app.schemas.lipsync import CreateLipsyncJobRequest, LipsyncJobResponse
|
|
||||||
from app.services.lipsync_service import LipsyncService
|
|
||||||
from app.services.mediakit_client import MediaKitError
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter()
|
|
||||||
|
|
||||||
|
|
||||||
def _get_service(db: Session = Depends(get_db_session)) -> LipsyncService:
|
|
||||||
return LipsyncService(db)
|
|
||||||
|
|
||||||
|
|
||||||
# ── POST /jobs — 提交对口型任务 ───────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jobs", response_model=LipsyncJobResponse, status_code=201)
|
|
||||||
def create_lipsync_job(
|
|
||||||
body: CreateLipsyncJobRequest,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: LipsyncService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""提交对口型任务.
|
|
||||||
|
|
||||||
输入人物视频 + 驱动音频，异步生成口型对齐视频。
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
job = svc.create_job(
|
|
||||||
user_id=current_user.id,
|
|
||||||
video_url=body.video_url,
|
|
||||||
audio_url=body.audio_url,
|
|
||||||
enable_video_loop=body.enable_video_loop,
|
|
||||||
project_id=body.project_id,
|
|
||||||
)
|
|
||||||
except MediaKitError as exc:
|
|
||||||
# 创建失败（job 已记录 error），返回 502
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=502,
|
|
||||||
detail={
|
|
||||||
"code": exc.code,
|
|
||||||
"message": str(exc),
|
|
||||||
"request_id": exc.request_id,
|
|
||||||
},
|
|
||||||
) from exc
|
|
||||||
|
|
||||||
return job
|
|
||||||
|
|
||||||
|
|
||||||
# ── GET /jobs — 任务列表 ─────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/jobs", response_model=dict)
|
|
||||||
def list_lipsync_jobs(
|
|
||||||
project_id: str = Query("", description="项目 ID 过滤"),
|
|
||||||
status: str = Query("", description="状态过滤"),
|
|
||||||
offset: int = Query(0, ge=0),
|
|
||||||
limit: int = Query(20, ge=1, le=100),
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: LipsyncService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""获取对口型任务列表."""
|
|
||||||
items, total = svc.list_jobs(
|
|
||||||
user_id=current_user.id,
|
|
||||||
project_id=project_id,
|
|
||||||
status=status,
|
|
||||||
offset=offset,
|
|
||||||
limit=limit,
|
|
||||||
)
|
|
||||||
return {
|
|
||||||
"items": [LipsyncJobResponse.model_validate(j) for j in items],
|
|
||||||
"total": total,
|
|
||||||
"offset": offset,
|
|
||||||
"limit": limit,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# ── GET /jobs/{job_id} — 任务详情 ────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/jobs/{job_id}", response_model=LipsyncJobResponse)
|
|
||||||
def get_lipsync_job(
|
|
||||||
job_id: str,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: LipsyncService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""获取对口型任务详情."""
|
|
||||||
job = svc.get_job(job_id, current_user.id)
|
|
||||||
if job is None:
|
|
||||||
raise HTTPException(status_code=404, detail="任务不存在")
|
|
||||||
return job
|
|
||||||
|
|
||||||
|
|
||||||
# ── POST /jobs/{job_id}/refresh — 刷新状态 ───────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jobs/{job_id}/refresh", response_model=LipsyncJobResponse)
|
|
||||||
def refresh_lipsync_job(
|
|
||||||
job_id: str,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: LipsyncService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""从 MediaKit 拉取最新状态并更新."""
|
|
||||||
job = svc.refresh_job_status(job_id, current_user.id)
|
|
||||||
if job is None:
|
|
||||||
raise HTTPException(status_code=404, detail="任务不存在")
|
|
||||||
return job
|
|
||||||
|
|
||||||
|
|
||||||
# ── POST /jobs/{job_id}/cancel — 取消任务 ────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jobs/{job_id}/cancel", response_model=LipsyncJobResponse)
|
|
||||||
def cancel_lipsync_job(
|
|
||||||
job_id: str,
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: LipsyncService = Depends(_get_service),
|
|
||||||
):
|
|
||||||
"""取消对口型任务（仅 pending/submitted 状态可取消）."""
|
|
||||||
job = svc.cancel_job(job_id, current_user.id)
|
|
||||||
if job is None:
|
|
||||||
raise HTTPException(status_code=404, detail="任务不存在")
|
|
||||||
if job.status != "cancelled":
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail=f"任务状态 {job.status} 不可取消，仅 pending/submitted 可取消",
|
|
||||||
)
|
|
||||||
return job
|
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
from app.dependencies import get_asset_library_repository, get_project_repository
|
from app.dependencies import get_project_repository
|
||||||
from app.schemas.project import (
|
from app.schemas.project import (
|
||||||
CreateProjectRequest,
|
CreateProjectRequest,
|
||||||
ListProjectsResponse,
|
ListProjectsResponse,
|
||||||
ProjectResponse,
|
ProjectResponse,
|
||||||
)
|
)
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Response, status
|
from fastapi import APIRouter, Depends, HTTPException, Response, status
|
||||||
from pydantic import BaseModel
|
|
||||||
|
|
||||||
from packages.application import (
|
from packages.application import (
|
||||||
CreateProjectCommand,
|
CreateProjectCommand,
|
||||||
@@ -17,20 +16,10 @@ from packages.application import (
|
|||||||
GetProjectUseCase,
|
GetProjectUseCase,
|
||||||
ListProjectsUseCase,
|
ListProjectsUseCase,
|
||||||
)
|
)
|
||||||
from packages.domain import AssetLibraryKind
|
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
class DefaultContextResponse(BaseModel):
|
|
||||||
"""幂等默认上下文响应（Issue #1775）：默认项目 + 各类型默认素材库 ID。"""
|
|
||||||
|
|
||||||
project_id: str
|
|
||||||
image_library_id: str
|
|
||||||
video_library_id: str
|
|
||||||
voice_library_id: str
|
|
||||||
|
|
||||||
|
|
||||||
def _to_project_response(item) -> ProjectResponse:
|
def _to_project_response(item) -> ProjectResponse:
|
||||||
return ProjectResponse(
|
return ProjectResponse(
|
||||||
id=item.id,
|
id=item.id,
|
||||||
@@ -83,35 +72,6 @@ def create_project(
|
|||||||
return _to_project_response(project)
|
return _to_project_response(project)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/ensure-default", response_model=DefaultContextResponse)
|
|
||||||
def ensure_default_project_and_libraries(
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
project_repository: Any = Depends(get_project_repository),
|
|
||||||
asset_library_repository: Any = Depends(get_asset_library_repository),
|
|
||||||
) -> DefaultContextResponse:
|
|
||||||
"""幂等获取/创建当前用户的默认项目和三类默认素材库（Issue #1775）。
|
|
||||||
|
|
||||||
- 同一用户永远只有一个默认项目（部分唯一索引 uq_projects_owner_default）
|
|
||||||
- 同一项目同 kind 永远只有一个默认素材库（唯一约束 uq_asset_libraries_project_kind）
|
|
||||||
- 并发调用/失败重试：唯一约束冲突时返回已存在记录，不报 500
|
|
||||||
- 项目和素材库的创建各自在仓储事务内幂等，冲突回滚后重查返回同一条
|
|
||||||
"""
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
project = project_repository.get_or_create_default_project(user_id)
|
|
||||||
|
|
||||||
libraries = {}
|
|
||||||
for kind in (AssetLibraryKind.VIDEO, AssetLibraryKind.VOICE, AssetLibraryKind.IMAGE):
|
|
||||||
library = asset_library_repository.get_or_create_default_library(project.id, kind)
|
|
||||||
libraries[kind] = library.id
|
|
||||||
|
|
||||||
return DefaultContextResponse(
|
|
||||||
project_id=project.id,
|
|
||||||
image_library_id=libraries[AssetLibraryKind.IMAGE],
|
|
||||||
video_library_id=libraries[AssetLibraryKind.VIDEO],
|
|
||||||
voice_library_id=libraries[AssetLibraryKind.VOICE],
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
@router.delete("/{project_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
||||||
def delete_project(
|
def delete_project(
|
||||||
project_id: str,
|
project_id: str,
|
||||||
@@ -121,11 +81,11 @@ def delete_project(
|
|||||||
use_case = DeleteProjectUseCase(project_repository)
|
use_case = DeleteProjectUseCase(project_repository)
|
||||||
try:
|
try:
|
||||||
deleted = use_case.execute(project_id, authenticated_user.user.id)
|
deleted = use_case.execute(project_id, authenticated_user.user.id)
|
||||||
except PermissionError as _e:
|
except PermissionError:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_403_FORBIDDEN,
|
status_code=status.HTTP_403_FORBIDDEN,
|
||||||
detail="Only the project owner can delete this project",
|
detail="Only the project owner can delete this project",
|
||||||
) from _e
|
)
|
||||||
if not deleted:
|
if not deleted:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
|
||||||
return # type: ignore[return-value]
|
return
|
||||||
|
|||||||
@@ -1,123 +0,0 @@
|
|||||||
"""Script (口播文案库) CRUD routes — Issue #1795."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
from app.schemas.script import (
|
|
||||||
CreateScriptRequest,
|
|
||||||
ScriptListResponse,
|
|
||||||
ScriptResponse,
|
|
||||||
ScriptSegment,
|
|
||||||
UpdateScriptRequest,
|
|
||||||
)
|
|
||||||
from app.services.script_service import ScriptNotFoundError, ScriptService
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
router = APIRouter()
|
|
||||||
|
|
||||||
|
|
||||||
def _get_service(session: Session = Depends(get_db_session)) -> ScriptService:
|
|
||||||
return ScriptService(session)
|
|
||||||
|
|
||||||
|
|
||||||
def _to_response(script) -> ScriptResponse:
|
|
||||||
segments = script.segments or []
|
|
||||||
return ScriptResponse(
|
|
||||||
id=script.id,
|
|
||||||
user_id=script.user_id,
|
|
||||||
title=script.title,
|
|
||||||
content=script.content,
|
|
||||||
segments=[
|
|
||||||
ScriptSegment(text=s.get("text", ""), duration=s.get("duration")) if isinstance(s, dict) else s
|
|
||||||
for s in segments
|
|
||||||
],
|
|
||||||
tags=script.tags or [],
|
|
||||||
created_at=script.created_at,
|
|
||||||
updated_at=script.updated_at,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("", response_model=ScriptListResponse)
|
|
||||||
def list_scripts(
|
|
||||||
skip: int = Query(0, ge=0),
|
|
||||||
limit: int = Query(50, ge=1, le=200),
|
|
||||||
tag: Optional[str] = Query(None, description="按标签筛选"),
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: ScriptService = Depends(_get_service),
|
|
||||||
) -> ScriptListResponse:
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
items, total = svc.list_scripts(user_id, skip=skip, limit=limit, tag=tag)
|
|
||||||
return ScriptListResponse(
|
|
||||||
items=[_to_response(i) for i in items],
|
|
||||||
total=total,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("", response_model=ScriptResponse, status_code=status.HTTP_201_CREATED)
|
|
||||||
def create_script(
|
|
||||||
request: CreateScriptRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: ScriptService = Depends(_get_service),
|
|
||||||
) -> ScriptResponse:
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
script = svc.create_script(
|
|
||||||
user_id=user_id,
|
|
||||||
title=request.title,
|
|
||||||
content=request.content,
|
|
||||||
segments=[s.model_dump() for s in request.segments],
|
|
||||||
tags=request.tags,
|
|
||||||
)
|
|
||||||
return _to_response(script)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{script_id}", response_model=ScriptResponse)
|
|
||||||
def get_script(
|
|
||||||
script_id: str,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: ScriptService = Depends(_get_service),
|
|
||||||
) -> ScriptResponse:
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
try:
|
|
||||||
script = svc.get_script(script_id, user_id)
|
|
||||||
except ScriptNotFoundError as exc:
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Script not found") from exc
|
|
||||||
return _to_response(script)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/{script_id}", response_model=ScriptResponse)
|
|
||||||
def update_script(
|
|
||||||
script_id: str,
|
|
||||||
request: UpdateScriptRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: ScriptService = Depends(_get_service),
|
|
||||||
) -> ScriptResponse:
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
try:
|
|
||||||
script = svc.update_script(
|
|
||||||
script_id=script_id,
|
|
||||||
user_id=user_id,
|
|
||||||
title=request.title,
|
|
||||||
content=request.content,
|
|
||||||
segments=[s.model_dump() for s in request.segments] if request.segments is not None else None,
|
|
||||||
tags=request.tags,
|
|
||||||
)
|
|
||||||
except ScriptNotFoundError as exc:
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Script not found") from exc
|
|
||||||
return _to_response(script)
|
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{script_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
|
||||||
def delete_script(
|
|
||||||
script_id: str,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
svc: ScriptService = Depends(_get_service),
|
|
||||||
) -> Response:
|
|
||||||
user_id = authenticated_user.user.id
|
|
||||||
deleted = svc.delete_script(script_id, user_id)
|
|
||||||
if not deleted:
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Script not found")
|
|
||||||
return
|
|
||||||
@@ -1,298 +0,0 @@
|
|||||||
"""视频分享 API 路由."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
from app.api.routes._helpers import format_utc_datetime
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.core.storage import OSSStorageService, get_storage_service
|
|
||||||
from app.dependencies import get_db_session, get_generated_video_repository
|
|
||||||
from app.schemas.video_share import (
|
|
||||||
CreateShareRequest,
|
|
||||||
ShareAccessResponse,
|
|
||||||
ShareListResponse,
|
|
||||||
ShareMetaResponse,
|
|
||||||
ShareResponse,
|
|
||||||
UpdateShareRequest,
|
|
||||||
VerifySharePasswordRequest,
|
|
||||||
)
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, Response, status
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from packages.adapters.sqlalchemy_impl.video_share_repository import (
|
|
||||||
SQLAlchemyVideoShareRepository,
|
|
||||||
)
|
|
||||||
from packages.application.video_share.commands import (
|
|
||||||
CreateShareCommand,
|
|
||||||
UpdateShareCommand,
|
|
||||||
)
|
|
||||||
from packages.application.video_share.use_cases import (
|
|
||||||
AccessShareUseCase,
|
|
||||||
CreateShareUseCase,
|
|
||||||
GetShareByTokenUseCase,
|
|
||||||
InvalidPasswordError,
|
|
||||||
ListSharesByUserUseCase,
|
|
||||||
ListSharesByVideoUseCase,
|
|
||||||
NotFoundError,
|
|
||||||
PasswordRequiredError,
|
|
||||||
RecordShareDownloadUseCase,
|
|
||||||
RevokeShareUseCase,
|
|
||||||
ShareExpiredError,
|
|
||||||
UpdateShareUseCase,
|
|
||||||
VideoNotFoundError,
|
|
||||||
)
|
|
||||||
from packages.ports.generated_video_repository import GeneratedVideoRepository
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter()
|
|
||||||
|
|
||||||
|
|
||||||
def _get_share_repository(
|
|
||||||
session: Session = Depends(get_db_session),
|
|
||||||
) -> SQLAlchemyVideoShareRepository:
|
|
||||||
return SQLAlchemyVideoShareRepository(session)
|
|
||||||
|
|
||||||
|
|
||||||
def _to_share_response(share) -> ShareResponse:
|
|
||||||
return ShareResponse(
|
|
||||||
id=share.id,
|
|
||||||
video_id=share.video_id,
|
|
||||||
share_token=share.share_token,
|
|
||||||
has_password=share.has_password,
|
|
||||||
expires_at=share.expires_at,
|
|
||||||
view_count=share.view_count,
|
|
||||||
download_count=share.download_count,
|
|
||||||
is_active=share.is_active,
|
|
||||||
created_at=format_utc_datetime(share.created_at),
|
|
||||||
updated_at=format_utc_datetime(share.updated_at),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ── 用户侧：创建/管理分享 ──────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/videos/{video_id}/share", response_model=ShareResponse)
|
|
||||||
def create_share(
|
|
||||||
video_id: str,
|
|
||||||
request: CreateShareRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
video_repo: GeneratedVideoRepository = Depends(get_generated_video_repository),
|
|
||||||
) -> ShareResponse:
|
|
||||||
"""为视频创建分享链接."""
|
|
||||||
use_case = CreateShareUseCase(share_repo, video_repo)
|
|
||||||
try:
|
|
||||||
share = use_case.execute(
|
|
||||||
CreateShareCommand(
|
|
||||||
video_id=video_id,
|
|
||||||
user_id=authenticated_user.user.id,
|
|
||||||
password=request.password,
|
|
||||||
expires_at=request.expires_at,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
except VideoNotFoundError as e:
|
|
||||||
raise HTTPException(status_code=404, detail=str(e)) from e
|
|
||||||
except ValueError as e:
|
|
||||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"Share created: video_id=%s share_id=%s token=%s user=%s",
|
|
||||||
video_id,
|
|
||||||
share.id,
|
|
||||||
share.share_token,
|
|
||||||
authenticated_user.user.id,
|
|
||||||
)
|
|
||||||
return _to_share_response(share)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/videos/{video_id}/shares", response_model=ShareListResponse)
|
|
||||||
def list_video_shares(
|
|
||||||
video_id: str,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
) -> ShareListResponse:
|
|
||||||
"""获取某个视频的所有分享记录."""
|
|
||||||
use_case = ListSharesByVideoUseCase(share_repo)
|
|
||||||
items = use_case.execute(video_id, authenticated_user.user.id)
|
|
||||||
return ShareListResponse(
|
|
||||||
items=[_to_share_response(s) for s in items],
|
|
||||||
total=len(items),
|
|
||||||
skip=0,
|
|
||||||
limit=len(items),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/shares", response_model=ShareListResponse)
|
|
||||||
def list_user_shares(
|
|
||||||
skip: int = Query(0, ge=0),
|
|
||||||
limit: int = Query(20, ge=1, le=100),
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
) -> ShareListResponse:
|
|
||||||
"""获取用户创建的所有分享记录."""
|
|
||||||
use_case = ListSharesByUserUseCase(share_repo)
|
|
||||||
items, total = use_case.execute(authenticated_user.user.id, skip=skip, limit=limit)
|
|
||||||
return ShareListResponse(
|
|
||||||
items=[_to_share_response(s) for s in items],
|
|
||||||
total=total,
|
|
||||||
skip=skip,
|
|
||||||
limit=limit,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.patch("/shares/{share_id}", response_model=ShareResponse)
|
|
||||||
def update_share(
|
|
||||||
share_id: str,
|
|
||||||
request: UpdateShareRequest,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
) -> ShareResponse:
|
|
||||||
"""更新分享配置（密码、有效期等）."""
|
|
||||||
use_case = UpdateShareUseCase(share_repo)
|
|
||||||
try:
|
|
||||||
share = use_case.execute(
|
|
||||||
UpdateShareCommand(
|
|
||||||
share_id=share_id,
|
|
||||||
user_id=authenticated_user.user.id,
|
|
||||||
password=request.password,
|
|
||||||
expires_at=request.expires_at,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
except NotFoundError as e:
|
|
||||||
raise HTTPException(status_code=404, detail=str(e)) from e
|
|
||||||
except ValueError as e:
|
|
||||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
|
||||||
return _to_share_response(share)
|
|
||||||
|
|
||||||
|
|
||||||
@router.delete(
|
|
||||||
"/shares/{share_id}",
|
|
||||||
status_code=status.HTTP_204_NO_CONTENT,
|
|
||||||
response_model=None,
|
|
||||||
response_class=Response,
|
|
||||||
)
|
|
||||||
def revoke_share(
|
|
||||||
share_id: str,
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
) -> Response:
|
|
||||||
"""撤销/删除分享链接."""
|
|
||||||
use_case = RevokeShareUseCase(share_repo)
|
|
||||||
try:
|
|
||||||
use_case.execute(share_id, authenticated_user.user.id)
|
|
||||||
except NotFoundError as e:
|
|
||||||
raise HTTPException(status_code=404, detail=str(e)) from e
|
|
||||||
return Response(status_code=status.HTTP_204_NO_CONTENT)
|
|
||||||
|
|
||||||
|
|
||||||
# ── 公开侧：访问分享内容（无需登录） ──────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/share/{token}/meta", response_model=ShareMetaResponse)
|
|
||||||
def get_share_meta(
|
|
||||||
token: str,
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
video_repo: GeneratedVideoRepository = Depends(get_generated_video_repository),
|
|
||||||
storage: OSSStorageService = Depends(get_storage_service),
|
|
||||||
) -> ShareMetaResponse:
|
|
||||||
"""获取分享元信息（不需要密码，用于分享页加载前判断）。"""
|
|
||||||
use_case = GetShareByTokenUseCase(share_repo)
|
|
||||||
try:
|
|
||||||
share = use_case.execute(token)
|
|
||||||
except (NotFoundError, ShareExpiredError) as e:
|
|
||||||
raise HTTPException(status_code=404, detail="分享链接不存在或已失效") from e
|
|
||||||
|
|
||||||
video = video_repo.get(share.video_id)
|
|
||||||
video_name = video.name if video else ""
|
|
||||||
video_duration = video.duration if video else 0.0
|
|
||||||
thumbnail_url = None
|
|
||||||
if video and video.thumbnail_url:
|
|
||||||
try:
|
|
||||||
thumbnail_url = storage.get_download_url(video.thumbnail_url)
|
|
||||||
except Exception:
|
|
||||||
thumbnail_url = video.thumbnail_url
|
|
||||||
|
|
||||||
return ShareMetaResponse(
|
|
||||||
share_token=share.share_token,
|
|
||||||
has_password=share.has_password,
|
|
||||||
is_expired=share.is_expired,
|
|
||||||
is_active=share.is_active,
|
|
||||||
video_name=video_name,
|
|
||||||
video_duration=video_duration,
|
|
||||||
thumbnail_url=thumbnail_url,
|
|
||||||
created_at=format_utc_datetime(share.created_at),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/share/{token}/access", response_model=ShareAccessResponse)
|
|
||||||
def access_share(
|
|
||||||
token: str,
|
|
||||||
request: Optional[VerifySharePasswordRequest] = None,
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
video_repo: GeneratedVideoRepository = Depends(get_generated_video_repository),
|
|
||||||
storage: OSSStorageService = Depends(get_storage_service),
|
|
||||||
) -> ShareAccessResponse:
|
|
||||||
"""访问分享内容（验证密码后返回视频信息+播放/下载地址）。"""
|
|
||||||
use_case = AccessShareUseCase(share_repo, video_repo)
|
|
||||||
password = request.password if request else None
|
|
||||||
try:
|
|
||||||
result = use_case.execute(token, password=password)
|
|
||||||
except NotFoundError as e:
|
|
||||||
raise HTTPException(status_code=404, detail="分享链接不存在或已失效") from e
|
|
||||||
except ShareExpiredError as e:
|
|
||||||
raise HTTPException(status_code=410, detail="分享链接已过期或已撤销") from e
|
|
||||||
except PasswordRequiredError as e:
|
|
||||||
raise HTTPException(status_code=403, detail="需要访问密码") from e
|
|
||||||
except InvalidPasswordError as e:
|
|
||||||
raise HTTPException(status_code=403, detail="密码错误") from e
|
|
||||||
except VideoNotFoundError as e:
|
|
||||||
raise HTTPException(status_code=404, detail="视频不存在") from e
|
|
||||||
|
|
||||||
# 生成下载URL
|
|
||||||
download_url = None
|
|
||||||
if result.video.file_url:
|
|
||||||
try:
|
|
||||||
download_url = storage.get_download_url(result.video.file_url)
|
|
||||||
except Exception:
|
|
||||||
download_url = result.video.file_url
|
|
||||||
|
|
||||||
# 缩略图URL
|
|
||||||
thumbnail_url = None
|
|
||||||
if result.video.thumbnail_url:
|
|
||||||
try:
|
|
||||||
thumbnail_url = storage.get_download_url(result.video.thumbnail_url)
|
|
||||||
except Exception:
|
|
||||||
thumbnail_url = result.video.thumbnail_url
|
|
||||||
|
|
||||||
return ShareAccessResponse(
|
|
||||||
share=_to_share_response(result.share),
|
|
||||||
video_name=result.video.name,
|
|
||||||
video_duration=result.video.duration,
|
|
||||||
video_size=result.video.file_size,
|
|
||||||
thumbnail_url=thumbnail_url,
|
|
||||||
download_url=download_url,
|
|
||||||
password_verified=result.password_verified,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/share/{token}/download")
|
|
||||||
def record_share_download(
|
|
||||||
token: str,
|
|
||||||
request: Optional[VerifySharePasswordRequest] = None,
|
|
||||||
share_repo: SQLAlchemyVideoShareRepository = Depends(_get_share_repository),
|
|
||||||
) -> dict:
|
|
||||||
"""记录分享下载（下载计数+1）。"""
|
|
||||||
use_case = RecordShareDownloadUseCase(share_repo)
|
|
||||||
password = request.password if request else None
|
|
||||||
try:
|
|
||||||
use_case.execute(token, password=password)
|
|
||||||
except NotFoundError as e:
|
|
||||||
raise HTTPException(status_code=404, detail="分享链接不存在或已失效") from e
|
|
||||||
except ShareExpiredError as e:
|
|
||||||
raise HTTPException(status_code=410, detail="分享链接已过期或已撤销") from e
|
|
||||||
except InvalidPasswordError as e:
|
|
||||||
raise HTTPException(status_code=403, detail="密码错误") from e
|
|
||||||
return {"success": True}
|
|
||||||
Executable → Regular
+1
-6
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
|
||||||
from dataclasses import replace
|
from dataclasses import replace
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone
|
||||||
from typing import List
|
from typing import List
|
||||||
@@ -21,8 +20,6 @@ from fastapi import APIRouter, Depends, HTTPException, status
|
|||||||
|
|
||||||
from packages.ports.user_repository import UserRepository
|
from packages.ports.user_repository import UserRepository
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
@@ -257,9 +254,7 @@ async def payment_callback(
|
|||||||
return {"success": True, "message": "支付成功", "record_id": record_id}
|
return {"success": True, "message": "支付成功", "record_id": record_id}
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
session.rollback()
|
session.rollback()
|
||||||
logger.error(f"支付回调处理失败: user_id={user_id}, plan={plan}, error={e}")
|
raise HTTPException(status_code=500, detail=f"支付处理失败: {str(e)}")
|
||||||
# 不返回原始异常信息，避免泄漏内部实现细节
|
|
||||||
raise HTTPException(status_code=500, detail="支付处理失败，请稍后重试") from e
|
|
||||||
finally:
|
finally:
|
||||||
session.close()
|
session.close()
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import logging
|
import logging
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from app.api.routes._helpers import format_utc_datetime
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
from app.auth import AuthenticatedUser, get_current_user
|
||||||
from app.core.celery_app import celery_app
|
from app.core.celery_app import celery_app
|
||||||
from app.core.task_enqueue import (
|
from app.core.task_enqueue import (
|
||||||
@@ -25,6 +24,8 @@ from app.schemas.task_center import (
|
|||||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||||
|
|
||||||
from packages.application import (
|
from packages.application import (
|
||||||
|
CreateGenerationTaskCommand,
|
||||||
|
CreateGenerationTaskUseCase,
|
||||||
RetryGenerationTaskUseCase,
|
RetryGenerationTaskUseCase,
|
||||||
SubmitIngestJobCommand,
|
SubmitIngestJobCommand,
|
||||||
SubmitIngestJobUseCase,
|
SubmitIngestJobUseCase,
|
||||||
@@ -100,8 +101,8 @@ def _generation_task_to_user_response(task) -> UserTaskResponse:
|
|||||||
retryable=_status_value(task.status) == "failed",
|
retryable=_status_value(task.status) == "failed",
|
||||||
retry_count=task.retry_count or 0,
|
retry_count=task.retry_count or 0,
|
||||||
source_id=task.id,
|
source_id=task.id,
|
||||||
created_at=format_utc_datetime(task.created_at),
|
created_at=task.created_at,
|
||||||
updated_at=format_utc_datetime(task.completed_at or task.started_at or task.created_at),
|
updated_at=task.completed_at or task.started_at or task.created_at,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -120,8 +121,8 @@ def _generation_task_to_project_response(task) -> ProjectTaskResponse:
|
|||||||
retry_count=task.retry_count or 0,
|
retry_count=task.retry_count or 0,
|
||||||
source_id=task.id,
|
source_id=task.id,
|
||||||
template_id=task.template_id,
|
template_id=task.template_id,
|
||||||
created_at=format_utc_datetime(task.created_at),
|
created_at=task.created_at,
|
||||||
updated_at=format_utc_datetime(task.completed_at or task.started_at or task.created_at),
|
updated_at=task.completed_at or task.started_at or task.created_at,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -285,8 +286,8 @@ def list_project_tasks(
|
|||||||
user_message=_humanize_task_error(job.error_message),
|
user_message=_humanize_task_error(job.error_message),
|
||||||
retryable=_status_value(job.status) == "failed",
|
retryable=_status_value(job.status) == "failed",
|
||||||
source_id=job.id,
|
source_id=job.id,
|
||||||
created_at=format_utc_datetime(job.created_at),
|
created_at=job.created_at,
|
||||||
updated_at=format_utc_datetime(job.updated_at),
|
updated_at=job.updated_at,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -367,21 +368,15 @@ def retry_project_task(
|
|||||||
raise HTTPException(status_code=404, detail="Ingest job not found")
|
raise HTTPException(status_code=404, detail="Ingest job not found")
|
||||||
if _status_value(job.status) != "failed":
|
if _status_value(job.status) != "failed":
|
||||||
raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
|
raise HTTPException(status_code=409, detail="Only failed tasks can be retried")
|
||||||
use_case = SubmitIngestJobUseCase(ingest_job_repository) # type: ignore[assignment]
|
use_case = SubmitIngestJobUseCase(ingest_job_repository)
|
||||||
retried = use_case.execute(
|
retried = use_case.execute(
|
||||||
SubmitIngestJobCommand( # type: ignore[arg-type]
|
SubmitIngestJobCommand(
|
||||||
project_id=job.project_id,
|
project_id=job.project_id,
|
||||||
library_id=job.library_id,
|
library_id=job.library_id,
|
||||||
storage_key=job.storage_key,
|
storage_key=job.storage_key,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
celery_result = celery_app.send_task("worker.ingest_asset", args=[retried.id])
|
celery_app.send_task("worker.ingest_asset", args=[retried.id])
|
||||||
if getattr(celery_result, "id", ""):
|
|
||||||
try:
|
|
||||||
retried.celery_task_id = celery_result.id
|
|
||||||
ingest_job_repository.update(retried)
|
|
||||||
except Exception: # noqa: BLE001
|
|
||||||
pass
|
|
||||||
return ProjectTaskResponse(
|
return ProjectTaskResponse(
|
||||||
id=f"ingest:{retried.id}",
|
id=f"ingest:{retried.id}",
|
||||||
task_type="ingest",
|
task_type="ingest",
|
||||||
@@ -390,7 +385,7 @@ def retry_project_task(
|
|||||||
progress=0,
|
progress=0,
|
||||||
current_step=_ingest_step(retried),
|
current_step=_ingest_step(retried),
|
||||||
source_id=retried.id,
|
source_id=retried.id,
|
||||||
created_at=format_utc_datetime(retried.created_at),
|
created_at=retried.created_at,
|
||||||
updated_at=format_utc_datetime(retried.updated_at), # type: ignore[attr-defined]
|
updated_at=retried.updated_at,
|
||||||
)
|
)
|
||||||
raise HTTPException(status_code=400, detail="Unsupported task type")
|
raise HTTPException(status_code=400, detail="Unsupported task type")
|
||||||
|
|||||||
@@ -106,10 +106,6 @@ def list_templates(
|
|||||||
tag: str | None = Query(None, description="按标签筛选"),
|
tag: str | None = Query(None, description="按标签筛选"),
|
||||||
keyword: str | None = Query(None, description="按名称关键词搜索"),
|
keyword: str | None = Query(None, description="按名称关键词搜索"),
|
||||||
mode: str | None = Query(None, description="按剪辑模式筛选"),
|
mode: str | None = Query(None, description="按剪辑模式筛选"),
|
||||||
valid_only: bool = Query(
|
|
||||||
False,
|
|
||||||
description="仅返回已配置片段的模板（剪辑页传 true；模板编辑器不传，可查看全部模板含草稿）",
|
|
||||||
),
|
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
|
template_repository: SQLAlchemyTemplateRepository = Depends(_get_template_repository),
|
||||||
) -> ListTemplatesResponse:
|
) -> ListTemplatesResponse:
|
||||||
@@ -120,7 +116,6 @@ def list_templates(
|
|||||||
tag=tag,
|
tag=tag,
|
||||||
keyword=keyword,
|
keyword=keyword,
|
||||||
mode=mode,
|
mode=mode,
|
||||||
valid_only=valid_only,
|
|
||||||
)
|
)
|
||||||
use_case = ListTemplatesUseCase(template_repository)
|
use_case = ListTemplatesUseCase(template_repository)
|
||||||
templates = use_case.execute(user_id, skip=skip, limit=limit, filter=tpl_filter)
|
templates = use_case.execute(user_id, skip=skip, limit=limit, filter=tpl_filter)
|
||||||
@@ -152,9 +147,9 @@ def get_template(
|
|||||||
use_case = GetTemplateUseCase(template_repository)
|
use_case = GetTemplateUseCase(template_repository)
|
||||||
template = use_case.execute(template_id, user_id)
|
template = use_case.execute(template_id, user_id)
|
||||||
usage = template_repository.get_usage_count(template_id)
|
usage = template_repository.get_usage_count(template_id)
|
||||||
except Exception as _e:
|
except Exception:
|
||||||
logger.exception("get_template 查询失败: template_id=%s", template_id)
|
logger.exception("get_template 查询失败: template_id=%s", template_id)
|
||||||
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="模板查询失败") from _e
|
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="模板查询失败")
|
||||||
if template is None:
|
if template is None:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
||||||
return _to_response(template, usage_count=usage)
|
return _to_response(template, usage_count=usage)
|
||||||
@@ -191,7 +186,7 @@ def create_template(
|
|||||||
try:
|
try:
|
||||||
template = use_case.execute(command)
|
template = use_case.execute(command)
|
||||||
except ValidationError as exc:
|
except ValidationError as exc:
|
||||||
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
|
||||||
return _to_response(template)
|
return _to_response(template)
|
||||||
|
|
||||||
|
|
||||||
@@ -231,10 +226,10 @@ def update_template(
|
|||||||
use_case = UpdateTemplateUseCase(template_repository)
|
use_case = UpdateTemplateUseCase(template_repository)
|
||||||
try:
|
try:
|
||||||
template = use_case.execute(command)
|
template = use_case.execute(command)
|
||||||
except NotFoundError as _e:
|
except NotFoundError:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
||||||
except ValidationError as exc:
|
except ValidationError as exc:
|
||||||
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
|
||||||
return _to_response(template)
|
return _to_response(template)
|
||||||
|
|
||||||
|
|
||||||
@@ -269,10 +264,10 @@ def copy_template(
|
|||||||
use_case = CopyTemplateUseCase(template_repository)
|
use_case = CopyTemplateUseCase(template_repository)
|
||||||
try:
|
try:
|
||||||
template = use_case.execute(command)
|
template = use_case.execute(command)
|
||||||
except NotFoundError as _e:
|
except NotFoundError:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
||||||
except ValidationError as exc:
|
except ValidationError as exc:
|
||||||
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
|
||||||
return _to_response(template)
|
return _to_response(template)
|
||||||
|
|
||||||
|
|
||||||
@@ -304,9 +299,9 @@ def toggle_favorite(
|
|||||||
use_case = GetTemplateUseCase(template_repository)
|
use_case = GetTemplateUseCase(template_repository)
|
||||||
try:
|
try:
|
||||||
template = use_case.execute(template_id, user_id)
|
template = use_case.execute(template_id, user_id)
|
||||||
except Exception as _e:
|
except Exception:
|
||||||
logger.exception("toggle_favorite 查询失败: template_id=%s", template_id)
|
logger.exception("toggle_favorite 查询失败: template_id=%s", template_id)
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
||||||
if template is None:
|
if template is None:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
||||||
return ToggleFavoriteResponse(id=template_id, is_favorite=False)
|
return ToggleFavoriteResponse(id=template_id, is_favorite=False)
|
||||||
@@ -331,10 +326,10 @@ def validate_template(
|
|||||||
use_case = ValidateTemplateUseCase(template_repository)
|
use_case = ValidateTemplateUseCase(template_repository)
|
||||||
try:
|
try:
|
||||||
result = use_case.execute(command)
|
result = use_case.execute(command)
|
||||||
except NotFoundError as _e:
|
except NotFoundError:
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found") from _e
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Template not found")
|
||||||
except ValidationError as exc:
|
except ValidationError as exc:
|
||||||
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(exc))
|
||||||
|
|
||||||
return ValidateTemplateResponse(
|
return ValidateTemplateResponse(
|
||||||
template=_to_response(result.template),
|
template=_to_response(result.template),
|
||||||
@@ -380,9 +375,7 @@ def create_category(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.delete(
|
@router.delete("/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
|
||||||
"/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response
|
|
||||||
)
|
|
||||||
def delete_category(
|
def delete_category(
|
||||||
category_id: str,
|
category_id: str,
|
||||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||||
|
|||||||
@@ -1,58 +0,0 @@
|
|||||||
"""模板编辑器 API 路由包.
|
|
||||||
|
|
||||||
模块拆分：
|
|
||||||
- schemas.py: 所有 Pydantic model
|
|
||||||
- dependencies.py: 依赖注入
|
|
||||||
- _utils.py: 工具函数
|
|
||||||
- draft.py: 草稿管理（详情/更新/发布/版本/回滚）
|
|
||||||
- clips.py: 片段管理（CRUD/分割/合并/重排/批量删除/从素材创建）
|
|
||||||
- adjustments.py: 片段调整（速度/音量/裁剪/批量调速）
|
|
||||||
- bgm.py: BGM 管理
|
|
||||||
- effects.py: 转场 + 滤镜
|
|
||||||
- export.py: 导出配置
|
|
||||||
- subtitles.py: 字幕管理
|
|
||||||
- ai_features.py: AI 推荐
|
|
||||||
- timeline.py: 时间线
|
|
||||||
|
|
||||||
挂载路径: /api/v1/templates/{template_id}/editor/
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
# 向后兼容：测试和其他模块可能直接从 templates_editor 导入这些符号
|
|
||||||
from app.auth import get_current_user # noqa: F401
|
|
||||||
from app.dependencies import get_db_session # noqa: F401
|
|
||||||
from fastapi import APIRouter
|
|
||||||
|
|
||||||
from .adjustments import router as adjustments_router
|
|
||||||
from .ai_features import router as ai_features_router
|
|
||||||
from .bgm import router as bgm_router
|
|
||||||
from .clips import router as clips_router
|
|
||||||
from .dependencies import get_draft_plan_id, get_editor_services # noqa: F401
|
|
||||||
from .draft import router as draft_router
|
|
||||||
from .effects import router as effects_router
|
|
||||||
from .export import router as export_router
|
|
||||||
from .subtitles import router as subtitles_router
|
|
||||||
from .timeline import router as timeline_router
|
|
||||||
|
|
||||||
# 主 router，所有子路由都合并到这里
|
|
||||||
router = APIRouter(tags=["Template Editor"])
|
|
||||||
|
|
||||||
# 合并所有子模块的路由（不用 include_router 是因为子路由有空路径 ""）
|
|
||||||
_sub_routers = [
|
|
||||||
draft_router,
|
|
||||||
clips_router,
|
|
||||||
adjustments_router,
|
|
||||||
bgm_router,
|
|
||||||
effects_router,
|
|
||||||
export_router,
|
|
||||||
subtitles_router,
|
|
||||||
ai_features_router,
|
|
||||||
timeline_router,
|
|
||||||
]
|
|
||||||
|
|
||||||
for sub in _sub_routers:
|
|
||||||
for route in sub.routes:
|
|
||||||
router.routes.append(route)
|
|
||||||
|
|
||||||
__all__ = ["router"]
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
"""模板编辑器内部工具函数.
|
|
||||||
|
|
||||||
纯函数，不依赖请求上下文。
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from .schemas import ClipAdjustResponse
|
|
||||||
|
|
||||||
# 时间线场景颜色映射
|
|
||||||
_CLIP_TYPE_COLORS = {
|
|
||||||
"intro": "#6366f1",
|
|
||||||
"title": "#6366f1",
|
|
||||||
"product": "#818cf8",
|
|
||||||
"showcase": "#10b981",
|
|
||||||
"scene": "#10b981",
|
|
||||||
"subtitle": "#f59e0b",
|
|
||||||
"text": "#f59e0b",
|
|
||||||
"cta": "#ef4444",
|
|
||||||
"outro": "#ef4444",
|
|
||||||
"voiceover": "#8b5cf6",
|
|
||||||
"transition": "#64748b",
|
|
||||||
}
|
|
||||||
_DEFAULT_COLOR = "#6366f1"
|
|
||||||
|
|
||||||
|
|
||||||
def _format_time(seconds: float) -> str:
|
|
||||||
"""秒数格式化为 m:ss"""
|
|
||||||
m = int(seconds) // 60
|
|
||||||
s = int(seconds) % 60
|
|
||||||
return f"{m}:{s:02d}"
|
|
||||||
|
|
||||||
|
|
||||||
def _clip_type_to_scene_label(clip_type: str, text_content: str) -> str:
|
|
||||||
"""片段类型转时间线场景标签"""
|
|
||||||
type_labels = {
|
|
||||||
"intro": "开场",
|
|
||||||
"title": "标题",
|
|
||||||
"product": "产品展示",
|
|
||||||
"showcase": "场景展示",
|
|
||||||
"scene": "场景",
|
|
||||||
"subtitle": "字幕",
|
|
||||||
"text": "文字",
|
|
||||||
"cta": "结尾 CTA",
|
|
||||||
"outro": "结尾",
|
|
||||||
"voiceover": "配音",
|
|
||||||
"transition": "转场",
|
|
||||||
}
|
|
||||||
label = type_labels.get(clip_type, clip_type or "片段")
|
|
||||||
if text_content:
|
|
||||||
short = text_content[:20].strip()
|
|
||||||
if short:
|
|
||||||
return f"{label} - {short}"
|
|
||||||
return label
|
|
||||||
|
|
||||||
|
|
||||||
# ── 片段调整相关工具 ────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
def _get_clip_config(clip) -> dict:
|
|
||||||
"""安全获取 clip.config"""
|
|
||||||
config = getattr(clip, "config", {}) or {}
|
|
||||||
if not isinstance(config, dict):
|
|
||||||
config = {}
|
|
||||||
return config
|
|
||||||
|
|
||||||
|
|
||||||
def _get_adjust_volume(clip) -> float:
|
|
||||||
"""获取片段音量"""
|
|
||||||
config = _get_clip_config(clip)
|
|
||||||
return float(config.get("volume", 1.0))
|
|
||||||
|
|
||||||
|
|
||||||
def _get_adjust_trim(clip) -> tuple[float, float]:
|
|
||||||
"""获取片段裁剪起止"""
|
|
||||||
config = _get_clip_config(clip)
|
|
||||||
trim_start = float(config.get("trim_start", 0.0))
|
|
||||||
trim_end = float(config.get("trim_end", 0.0))
|
|
||||||
return trim_start, trim_end
|
|
||||||
|
|
||||||
|
|
||||||
def _build_adjust_response(clip) -> ClipAdjustResponse:
|
|
||||||
"""构造片段调整响应"""
|
|
||||||
trim_start, trim_end = _get_adjust_trim(clip)
|
|
||||||
return ClipAdjustResponse(
|
|
||||||
clip_id=clip.id,
|
|
||||||
speed=clip.playback_speed,
|
|
||||||
volume=_get_adjust_volume(clip),
|
|
||||||
trim_start=trim_start,
|
|
||||||
trim_end=trim_end,
|
|
||||||
duration=clip.duration,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _validate_trim(trim_start: float, trim_end: float, total_duration: float) -> None:
|
|
||||||
"""校验裁剪时长合法性"""
|
|
||||||
if trim_start + trim_end >= total_duration:
|
|
||||||
raise ValueError(
|
|
||||||
f"裁剪总时长（{trim_start + trim_end:.2f}s）不能大于等于片段总时长（{total_duration:.2f}s）"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _clip_value(value: Any) -> str:
|
|
||||||
"""获取枚举/字符串值的统一方法"""
|
|
||||||
if hasattr(value, "value"):
|
|
||||||
return value.value
|
|
||||||
return str(value)
|
|
||||||
@@ -1,167 +0,0 @@
|
|||||||
"""片段调整路由.
|
|
||||||
|
|
||||||
端点：
|
|
||||||
- PUT /clips/{clip_id}/speed 调速
|
|
||||||
- PUT /clips/{clip_id}/volume 调音量
|
|
||||||
- PUT /clips/{clip_id}/trim 裁剪
|
|
||||||
- PUT /clips/{clip_id}/adjustments 统一调整
|
|
||||||
- POST /clips/batch-speed 批量调速
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
|
||||||
|
|
||||||
from ._utils import _build_adjust_response, _get_adjust_trim, _get_clip_config, _validate_trim
|
|
||||||
from .dependencies import get_draft_plan_id, get_editor_services
|
|
||||||
from .schemas import (
|
|
||||||
BatchSpeedRequest,
|
|
||||||
BatchSpeedResponse,
|
|
||||||
ClipAdjustmentsRequest,
|
|
||||||
ClipAdjustResponse,
|
|
||||||
SpeedAdjustRequest,
|
|
||||||
TrimAdjustRequest,
|
|
||||||
VolumeAdjustRequest,
|
|
||||||
)
|
|
||||||
|
|
||||||
router = APIRouter(tags=["Template Editor"])
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/clips/{clip_id}/speed", response_model=ClipAdjustResponse)
|
|
||||||
def adjust_editor_clip_speed(
|
|
||||||
template_id: str,
|
|
||||||
clip_id: str,
|
|
||||||
body: SpeedAdjustRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ClipAdjustResponse:
|
|
||||||
"""调整片段播放速度"""
|
|
||||||
_, plan_svc = services
|
|
||||||
clip = plan_svc.get_clip(clip_id)
|
|
||||||
if not clip:
|
|
||||||
raise HTTPException(status_code=404, detail="片段不存在")
|
|
||||||
|
|
||||||
updated = plan_svc.update_clip(clip_id, playback_speed=body.speed)
|
|
||||||
return _build_adjust_response(updated)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/clips/{clip_id}/volume", response_model=ClipAdjustResponse)
|
|
||||||
def adjust_editor_clip_volume(
|
|
||||||
template_id: str,
|
|
||||||
clip_id: str,
|
|
||||||
body: VolumeAdjustRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ClipAdjustResponse:
|
|
||||||
"""调整片段音量"""
|
|
||||||
_, plan_svc = services
|
|
||||||
clip = plan_svc.get_clip(clip_id)
|
|
||||||
if not clip:
|
|
||||||
raise HTTPException(status_code=404, detail="片段不存在")
|
|
||||||
|
|
||||||
config = dict(_get_clip_config(clip))
|
|
||||||
config["volume"] = body.volume
|
|
||||||
updated = plan_svc.update_clip(clip_id, config=config)
|
|
||||||
return _build_adjust_response(updated)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/clips/{clip_id}/trim", response_model=ClipAdjustResponse)
|
|
||||||
def adjust_editor_clip_trim(
|
|
||||||
template_id: str,
|
|
||||||
clip_id: str,
|
|
||||||
body: TrimAdjustRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ClipAdjustResponse:
|
|
||||||
"""裁剪片段（trim in/out）"""
|
|
||||||
_, plan_svc = services
|
|
||||||
clip = plan_svc.get_clip(clip_id)
|
|
||||||
if not clip:
|
|
||||||
raise HTTPException(status_code=404, detail="片段不存在")
|
|
||||||
|
|
||||||
try:
|
|
||||||
_validate_trim(body.trim_start, body.trim_end, clip.duration)
|
|
||||||
except ValueError as e:
|
|
||||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
|
||||||
|
|
||||||
config = dict(_get_clip_config(clip))
|
|
||||||
config["trim_start"] = body.trim_start
|
|
||||||
config["trim_end"] = body.trim_end
|
|
||||||
updated = plan_svc.update_clip(clip_id, config=config)
|
|
||||||
return _build_adjust_response(updated)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/clips/{clip_id}/adjustments", response_model=ClipAdjustResponse)
|
|
||||||
def adjust_editor_clip_all(
|
|
||||||
template_id: str,
|
|
||||||
clip_id: str,
|
|
||||||
body: ClipAdjustmentsRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ClipAdjustResponse:
|
|
||||||
"""统一调整片段的 speed / volume / trim"""
|
|
||||||
_, plan_svc = services
|
|
||||||
clip = plan_svc.get_clip(clip_id)
|
|
||||||
if not clip:
|
|
||||||
raise HTTPException(status_code=404, detail="片段不存在")
|
|
||||||
|
|
||||||
update_kwargs: dict[str, Any] = {}
|
|
||||||
config_updates: dict[str, Any] = {}
|
|
||||||
|
|
||||||
if body.speed is not None:
|
|
||||||
update_kwargs["playback_speed"] = body.speed
|
|
||||||
if body.volume is not None:
|
|
||||||
config_updates["volume"] = body.volume
|
|
||||||
if body.trim_start is not None:
|
|
||||||
config_updates["trim_start"] = body.trim_start
|
|
||||||
if body.trim_end is not None:
|
|
||||||
config_updates["trim_end"] = body.trim_end
|
|
||||||
|
|
||||||
current_trim_start, current_trim_end = _get_adjust_trim(clip)
|
|
||||||
new_trim_start = body.trim_start if body.trim_start is not None else current_trim_start
|
|
||||||
new_trim_end = body.trim_end if body.trim_end is not None else current_trim_end
|
|
||||||
|
|
||||||
if body.trim_start is not None or body.trim_end is not None:
|
|
||||||
try:
|
|
||||||
_validate_trim(new_trim_start, new_trim_end, clip.duration)
|
|
||||||
except ValueError as e:
|
|
||||||
raise HTTPException(status_code=400, detail=str(e)) from e
|
|
||||||
|
|
||||||
if config_updates:
|
|
||||||
config = dict(_get_clip_config(clip))
|
|
||||||
config.update(config_updates)
|
|
||||||
update_kwargs["config"] = config
|
|
||||||
|
|
||||||
if not update_kwargs:
|
|
||||||
return _build_adjust_response(clip)
|
|
||||||
|
|
||||||
updated = plan_svc.update_clip(clip_id, **update_kwargs)
|
|
||||||
return _build_adjust_response(updated)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/clips/batch-speed", response_model=BatchSpeedResponse)
|
|
||||||
def batch_adjust_editor_speed(
|
|
||||||
template_id: str,
|
|
||||||
body: BatchSpeedRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> BatchSpeedResponse:
|
|
||||||
"""批量调整草稿内所有片段的播放速度"""
|
|
||||||
_, plan_svc = services
|
|
||||||
clips = plan_svc.list_clips(plan_id, limit=500, skip=0)
|
|
||||||
count = 0
|
|
||||||
for clip in clips:
|
|
||||||
plan_svc.update_clip(clip.id, playback_speed=body.speed)
|
|
||||||
count += 1
|
|
||||||
|
|
||||||
return BatchSpeedResponse(updated_count=count, plan_id=plan_id)
|
|
||||||
@@ -1,213 +0,0 @@
|
|||||||
"""AI 功能路由.
|
|
||||||
|
|
||||||
端点：
|
|
||||||
- POST /ai-recommend AI 推荐片段方案
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from packages.domain.config_schemas import normalize_plan_config
|
|
||||||
|
|
||||||
from .dependencies import get_draft_plan_id, get_editor_services
|
|
||||||
from .schemas import AIRecommendRequest, AIRecommendResponse
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
router = APIRouter(tags=["Template Editor"])
|
|
||||||
|
|
||||||
|
|
||||||
def _build_asset_analyses(
|
|
||||||
asset_ids: list[str],
|
|
||||||
db: Session,
|
|
||||||
) -> dict[str, str]:
|
|
||||||
"""调用 MediaKit 视频理解，返回 {asset_id: 分析文本}.
|
|
||||||
|
|
||||||
如果 MediaKit 不可用或分析失败，返回空 dict（调用方降级处理）。
|
|
||||||
"""
|
|
||||||
if not asset_ids:
|
|
||||||
return {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
from packages.adapters.sqlalchemy_impl.asset_repository import SQLAlchemyAssetRepository
|
|
||||||
from packages.shared.mediakit_client import get_mediakit_client
|
|
||||||
from packages.shared.storage import get_shared_storage_service
|
|
||||||
|
|
||||||
client = get_mediakit_client()
|
|
||||||
if not client.is_available:
|
|
||||||
logger.info("MediaKit 未配置，跳过视频理解分析")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
asset_repo = SQLAlchemyAssetRepository(db)
|
|
||||||
storage_svc = get_shared_storage_service()
|
|
||||||
|
|
||||||
# 查找素材并获取下载 URL（使用并行列表保持索引对应，避免 URL 重复导致映射覆盖）
|
|
||||||
video_urls: list[str] = []
|
|
||||||
valid_asset_ids: list[str] = []
|
|
||||||
|
|
||||||
for aid in asset_ids[:10]: # MediaKit 单次最多 10 个视频
|
|
||||||
asset = asset_repo.get(aid)
|
|
||||||
if not asset or not asset.storage_key:
|
|
||||||
continue
|
|
||||||
# 只处理视频素材
|
|
||||||
mime = getattr(asset, "mime_type", "")
|
|
||||||
if not mime.startswith("video/"):
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
url = storage_svc.get_download_url(asset.storage_key)
|
|
||||||
if url:
|
|
||||||
video_urls.append(url)
|
|
||||||
valid_asset_ids.append(aid)
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning("获取素材URL失败: asset_id=%s error=%s", aid, str(e))
|
|
||||||
|
|
||||||
if not video_urls:
|
|
||||||
logger.info("无可用视频素材，跳过视频理解分析")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# 调用 MediaKit 视频理解
|
|
||||||
prompt = (
|
|
||||||
"请简要描述这段视频的主要内容，包括：场景（室内/室外/具体场所）、"
|
|
||||||
"主体（人物/物体/动物）、动作/活动、氛围/情绪、主要色调。"
|
|
||||||
"控制在100字以内。"
|
|
||||||
)
|
|
||||||
|
|
||||||
# 限制轮询参数以适配 API 网关超时（nginx 60s）
|
|
||||||
# 视频理解最多 30s（poll_interval=2s * max_poll_attempts=15）
|
|
||||||
# 剩余 30s 留给 LLM 调用
|
|
||||||
contents = client.analyze_videos(
|
|
||||||
video_urls=video_urls,
|
|
||||||
prompt=prompt,
|
|
||||||
level="Economy",
|
|
||||||
poll_interval=2.0,
|
|
||||||
max_poll_attempts=15,
|
|
||||||
)
|
|
||||||
|
|
||||||
if not contents:
|
|
||||||
logger.warning("MediaKit 视频理解未返回结果")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
# 将结果映射回 asset_id（通过索引对应）
|
|
||||||
analyses: dict[str, str] = {}
|
|
||||||
for i, content in enumerate(contents):
|
|
||||||
if i < len(valid_asset_ids) and content:
|
|
||||||
analyses[valid_asset_ids[i]] = content
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"MediaKit 视频理解完成: total=%d analyzed=%d",
|
|
||||||
len(video_urls),
|
|
||||||
len(analyses),
|
|
||||||
)
|
|
||||||
return analyses
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning("MediaKit 视频理解异常，将降级到无分析模式: %s", str(e))
|
|
||||||
return {}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/ai-recommend", response_model=AIRecommendResponse)
|
|
||||||
def editor_ai_recommend(
|
|
||||||
template_id: str,
|
|
||||||
body: AIRecommendRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> AIRecommendResponse:
|
|
||||||
"""AI 推荐片段方案"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
|
|
||||||
plan_status = plan.status.value if hasattr(plan.status, "value") else plan.status
|
|
||||||
if plan_status not in ("draft", "editing"):
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
|
||||||
detail="当前草稿状态不支持AI推荐，请先编辑后再试",
|
|
||||||
)
|
|
||||||
|
|
||||||
from packages.shared.ai_service import run_ai_recommend
|
|
||||||
|
|
||||||
# 调用 MediaKit 视频理解，获取素材内容分析
|
|
||||||
asset_analyses = _build_asset_analyses(body.asset_ids, db)
|
|
||||||
|
|
||||||
result = run_ai_recommend(
|
|
||||||
plan_id=plan_id,
|
|
||||||
template_id=plan.template_id,
|
|
||||||
asset_ids=body.asset_ids,
|
|
||||||
editing_mode=body.editing_mode,
|
|
||||||
target_duration=body.target_duration,
|
|
||||||
asset_analyses=asset_analyses,
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
plan_svc.delete_all_clips(plan_id)
|
|
||||||
|
|
||||||
for clip_data in result["clips"]:
|
|
||||||
plan_svc.create_clip(
|
|
||||||
plan_id=plan_id,
|
|
||||||
clip_type=clip_data["clip_type"],
|
|
||||||
order=clip_data["order"],
|
|
||||||
text_content=clip_data.get("text_content", ""),
|
|
||||||
duration=clip_data["duration"],
|
|
||||||
transition_effect=clip_data.get("transition_effect", "cut"),
|
|
||||||
asset_id=clip_data.get("asset_id", ""),
|
|
||||||
start_time=clip_data.get("start_time", 0.0),
|
|
||||||
config=clip_data.get("config", {}),
|
|
||||||
)
|
|
||||||
|
|
||||||
normalized_config = normalize_plan_config(result.get("config", {}))
|
|
||||||
plan_svc.update_plan(
|
|
||||||
plan_id,
|
|
||||||
config=normalized_config,
|
|
||||||
total_duration=result["total_duration"],
|
|
||||||
)
|
|
||||||
except Exception as _e:
|
|
||||||
logger.exception(
|
|
||||||
"模板编辑器AI推荐写入失败: template_id=%s plan_id=%s",
|
|
||||||
template_id,
|
|
||||||
plan_id,
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
db.rollback()
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
|
||||||
detail="AI推荐结果保存失败，请稍后重试",
|
|
||||||
) from _e
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"模板编辑器AI推荐: template_id=%s plan_id=%s clips=%d duration=%.1f by user=%s",
|
|
||||||
template_id,
|
|
||||||
plan_id,
|
|
||||||
len(result["clips"]),
|
|
||||||
result["total_duration"],
|
|
||||||
current_user.user.id,
|
|
||||||
)
|
|
||||||
|
|
||||||
return AIRecommendResponse(
|
|
||||||
plan_id=plan_id,
|
|
||||||
clips=[
|
|
||||||
{
|
|
||||||
"clip_type": c["clip_type"],
|
|
||||||
"order": c["order"],
|
|
||||||
"text_content": c.get("text_content", ""),
|
|
||||||
"duration": c["duration"],
|
|
||||||
"transition_effect": c.get("transition_effect", "cut"),
|
|
||||||
"asset_id": c.get("asset_id", ""),
|
|
||||||
"start_time": c.get("start_time", 0.0),
|
|
||||||
"config": c.get("config", {}),
|
|
||||||
}
|
|
||||||
for c in result["clips"]
|
|
||||||
],
|
|
||||||
config=normalized_config,
|
|
||||||
total_duration=result["total_duration"],
|
|
||||||
confidence=result["confidence"],
|
|
||||||
)
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
"""BGM 管理路由.
|
|
||||||
|
|
||||||
端点：
|
|
||||||
- GET /bgm 获取 BGM 配置
|
|
||||||
- PUT /bgm 更新 BGM 配置
|
|
||||||
- GET /bgm/presets 预设 BGM 列表
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
|
||||||
|
|
||||||
from .dependencies import get_draft_plan_id, get_editor_services
|
|
||||||
from .schemas import BGMConfigUpdateRequest
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
router = APIRouter(tags=["Template Editor"])
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/bgm", response_model=dict[str, Any])
|
|
||||||
def get_editor_bgm(
|
|
||||||
template_id: str,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""获取草稿的 BGM 配置"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
config = plan.config or {}
|
|
||||||
return {
|
|
||||||
"plan_id": plan.id,
|
|
||||||
"bgm": config.get("bgm", {}),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/bgm", response_model=dict[str, Any])
|
|
||||||
def update_editor_bgm(
|
|
||||||
template_id: str,
|
|
||||||
body: BGMConfigUpdateRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""更新草稿的 BGM 配置"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
|
|
||||||
config = dict(plan.config) if plan.config else {}
|
|
||||||
current_bgm = dict(config.get("bgm", {}))
|
|
||||||
update_data = body.model_dump(exclude_none=True)
|
|
||||||
current_bgm.update(update_data)
|
|
||||||
|
|
||||||
if current_bgm.get("enabled"):
|
|
||||||
has_source = any(
|
|
||||||
current_bgm.get(key)
|
|
||||||
for key in ("asset_id", "preset_id", "audio_url")
|
|
||||||
if current_bgm.get(key)
|
|
||||||
)
|
|
||||||
if not has_source:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
|
||||||
detail="启用 BGM 时需要指定素材来源（asset_id / preset_id / audio_url）",
|
|
||||||
)
|
|
||||||
|
|
||||||
config["bgm"] = current_bgm
|
|
||||||
updated_plan = plan_svc.update_plan_config(plan_id, config)
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"模板编辑器更新BGM: template_id=%s plan_id=%s enabled=%s by user=%s",
|
|
||||||
template_id,
|
|
||||||
plan_id,
|
|
||||||
current_bgm.get("enabled", False),
|
|
||||||
current_user.user.id,
|
|
||||||
)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"plan_id": updated_plan.id,
|
|
||||||
"bgm": current_bgm,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/bgm/presets", response_model=dict[str, Any])
|
|
||||||
def list_editor_bgm_presets(
|
|
||||||
style: str | None = Query(default=None, description="按风格筛选"),
|
|
||||||
keyword: str | None = Query(default=None, description="关键词搜索"),
|
|
||||||
skip: int = Query(default=0, ge=0, description="分页偏移"),
|
|
||||||
limit: int = Query(default=50, ge=1, le=200, description="每页数量"),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""获取预设 BGM 列表"""
|
|
||||||
from packages.domain.preset_bgm import (
|
|
||||||
BGM_STYLES,
|
|
||||||
PRESET_BGM_LIBRARY,
|
|
||||||
list_preset_bgm_by_style,
|
|
||||||
search_preset_bgm,
|
|
||||||
)
|
|
||||||
|
|
||||||
bgm_list = PRESET_BGM_LIBRARY
|
|
||||||
if keyword:
|
|
||||||
bgm_list = search_preset_bgm(keyword)
|
|
||||||
elif style:
|
|
||||||
bgm_list = list_preset_bgm_by_style(style)
|
|
||||||
|
|
||||||
total = len(bgm_list)
|
|
||||||
paged = bgm_list[skip : skip + limit]
|
|
||||||
|
|
||||||
return {
|
|
||||||
"total": total,
|
|
||||||
"skip": skip,
|
|
||||||
"limit": limit,
|
|
||||||
"styles": BGM_STYLES,
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"id": bgm.id,
|
|
||||||
"name": bgm.name,
|
|
||||||
"style": bgm.style,
|
|
||||||
"style_label": BGM_STYLES.get(bgm.style, bgm.style),
|
|
||||||
"duration": bgm.duration,
|
|
||||||
"artist": bgm.artist,
|
|
||||||
"description": bgm.description,
|
|
||||||
"tags": bgm.tags,
|
|
||||||
"audio_url": bgm.audio_url,
|
|
||||||
}
|
|
||||||
for bgm in paged
|
|
||||||
],
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,117 +0,0 @@
|
|||||||
"""模板编辑器依赖注入.
|
|
||||||
|
|
||||||
核心依赖：
|
|
||||||
- get_editor_services: 获取模板+计划服务
|
|
||||||
- get_draft_plan_id: 根据 template_id 获取或创建草稿，返回 plan_id
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.dependencies import get_db_session
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import Depends, HTTPException, status
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from packages.adapters.sqlalchemy_impl.template_repository import (
|
|
||||||
SQLAlchemyTemplateRepository,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
def get_editor_services(
|
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
) -> tuple[EditTemplateService, EditPlanService]:
|
|
||||||
"""获取模板编辑器所需的两个服务"""
|
|
||||||
return EditTemplateService(db), EditPlanService(db)
|
|
||||||
|
|
||||||
|
|
||||||
def get_draft_plan_id(
|
|
||||||
template_id: str,
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
current_user: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
db: Session = Depends(get_db_session),
|
|
||||||
) -> str:
|
|
||||||
"""路径依赖：根据 template_id 获取或创建草稿，返回 plan_id.
|
|
||||||
|
|
||||||
这是模板编辑器路由的核心依赖——所有编辑器端点都先经过这里，
|
|
||||||
确保 template_id → plan_id 的映射始终存在。
|
|
||||||
|
|
||||||
模板读取遵循单一数据源、显式判定（不使用异常降级）：
|
|
||||||
- 用户自建模板在旧表 ``templates``（归属 user_id，is_active=True）；
|
|
||||||
- 全局模板在新表 ``edit_templates``（无 user_id，全局可读）。
|
|
||||||
模板不存在、已删除或不归属于当前用户时，一律返回 404。
|
|
||||||
"""
|
|
||||||
tpl_svc, plan_svc = services
|
|
||||||
user_id = str(current_user.user.id)
|
|
||||||
|
|
||||||
# 0. 门禁：校验模板存在且可访问（即使草稿已缓存命中也要校验，
|
|
||||||
# 避免模板被删除/无权访问后仍可通过既有草稿 plan 继续操作）。
|
|
||||||
old_repo = SQLAlchemyTemplateRepository(db)
|
|
||||||
old_template = old_repo.get_active(template_id, user_id)
|
|
||||||
is_global_template = tpl_svc.get_template(template_id) is not None
|
|
||||||
if old_template is None and not is_global_template:
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="模板不存在")
|
|
||||||
|
|
||||||
# 1. 草稿已存在 → 直接返回
|
|
||||||
draft = tpl_svc.get_template_draft(template_id)
|
|
||||||
if draft is not None:
|
|
||||||
return draft.id
|
|
||||||
|
|
||||||
# 2. 全局模板（新系统）→ 用新服务创建草稿
|
|
||||||
if is_global_template:
|
|
||||||
draft = tpl_svc.create_template_draft(template_id, user_id=user_id)
|
|
||||||
return draft.id
|
|
||||||
|
|
||||||
# 3. 旧模板（templates 表）→ 基于旧模板创建草稿计划
|
|
||||||
from app.services.plan_generator_service import PlanGeneratorService
|
|
||||||
|
|
||||||
from packages.domain.edit_template import EditTemplate, EditTemplateStatus
|
|
||||||
from packages.domain.template_clip_config import ClipType, TemplateClipConfig
|
|
||||||
|
|
||||||
# 构造伪 EditTemplate 对象（只填 generate_from_template 需要的字段）
|
|
||||||
pseudo_template = EditTemplate(
|
|
||||||
id=old_template.id,
|
|
||||||
name=old_template.name,
|
|
||||||
editing_mode=old_template.mode,
|
|
||||||
status=EditTemplateStatus.ACTIVE,
|
|
||||||
)
|
|
||||||
|
|
||||||
# 将旧模板 segments 转换为 clip_configs
|
|
||||||
clip_configs: list[TemplateClipConfig] = []
|
|
||||||
for seg in old_template.segments or []:
|
|
||||||
clip_configs.append(
|
|
||||||
TemplateClipConfig(
|
|
||||||
id=f"seg_{seg.id}",
|
|
||||||
template_id=old_template.id,
|
|
||||||
clip_type=ClipType.MAIN,
|
|
||||||
order=seg.segment_order,
|
|
||||||
min_duration=seg.duration_min,
|
|
||||||
max_duration=seg.duration_max,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
generator = PlanGeneratorService(db)
|
|
||||||
result = generator.generate_from_template(
|
|
||||||
template=pseudo_template,
|
|
||||||
clip_configs=clip_configs,
|
|
||||||
asset_ids=[],
|
|
||||||
created_by_user_id=user_id,
|
|
||||||
name=f"{old_template.name} - 草稿",
|
|
||||||
)
|
|
||||||
plan = result["plan"]
|
|
||||||
|
|
||||||
# 标记为模板草稿（后续可复用 tpl_svc.get_template_draft 的查找逻辑）
|
|
||||||
plan_svc.update_plan_config(plan.id, {"is_template_draft": True})
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"旧模板自动创建草稿: template_id=%s draft_plan_id=%s user_id=%s",
|
|
||||||
template_id,
|
|
||||||
plan.id,
|
|
||||||
user_id,
|
|
||||||
)
|
|
||||||
return plan.id
|
|
||||||
@@ -1,194 +0,0 @@
|
|||||||
"""草稿管理路由.
|
|
||||||
|
|
||||||
端点：
|
|
||||||
- GET / 获取草稿详情
|
|
||||||
- PUT / 更新草稿
|
|
||||||
- POST /publish 发布草稿到模板
|
|
||||||
- GET /versions 模板版本历史
|
|
||||||
- POST /rollback 回滚到指定版本
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
|
||||||
|
|
||||||
from .dependencies import get_draft_plan_id, get_editor_services
|
|
||||||
from .schemas import (
|
|
||||||
EditorClipBatchUpdateRequest,
|
|
||||||
EditorClipBatchUpdateResponse,
|
|
||||||
EditorDraftResponse,
|
|
||||||
EditorPublishResponse,
|
|
||||||
EditorRollbackRequest,
|
|
||||||
EditorRollbackResponse,
|
|
||||||
EditorTemplateVersionItem,
|
|
||||||
EditorUpdateRequest,
|
|
||||||
EditorVersionListResponse,
|
|
||||||
)
|
|
||||||
|
|
||||||
router = APIRouter(tags=["Template Editor"])
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("", response_model=EditorDraftResponse)
|
|
||||||
def get_editor_draft(
|
|
||||||
template_id: str,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""获取模板编辑器草稿详情
|
|
||||||
|
|
||||||
首次访问时自动创建草稿。
|
|
||||||
"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
clips = plan_svc.list_clips(plan_id)
|
|
||||||
return EditorDraftResponse(
|
|
||||||
plan_id=plan.id,
|
|
||||||
template_id=plan.template_id,
|
|
||||||
name=plan.name,
|
|
||||||
status=plan.status.value if hasattr(plan.status, "value") else str(plan.status),
|
|
||||||
config=plan.config or {},
|
|
||||||
total_duration=plan.total_duration,
|
|
||||||
clip_count=len(clips),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("", response_model=EditorDraftResponse)
|
|
||||||
def update_editor_draft(
|
|
||||||
template_id: str,
|
|
||||||
req: EditorUpdateRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""更新模板编辑器草稿"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.update_plan(
|
|
||||||
plan_id,
|
|
||||||
name=req.name,
|
|
||||||
config=req.config,
|
|
||||||
total_duration=req.total_duration,
|
|
||||||
)
|
|
||||||
clips = plan_svc.list_clips(plan_id)
|
|
||||||
return EditorDraftResponse(
|
|
||||||
plan_id=plan.id,
|
|
||||||
template_id=plan.template_id,
|
|
||||||
name=plan.name,
|
|
||||||
status=plan.status.value if hasattr(plan.status, "value") else str(plan.status),
|
|
||||||
config=plan.config or {},
|
|
||||||
total_duration=plan.total_duration,
|
|
||||||
clip_count=len(clips),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/publish", response_model=EditorPublishResponse, status_code=status.HTTP_200_OK)
|
|
||||||
def publish_draft_to_template(
|
|
||||||
template_id: str,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""将草稿发布（同步）到正式模板
|
|
||||||
|
|
||||||
草稿的 config 和 clips 会同步覆盖到模板，事务保证一致性。
|
|
||||||
"""
|
|
||||||
tpl_svc, plan_svc = services
|
|
||||||
try:
|
|
||||||
tpl = tpl_svc.publish_template_from_draft(template_id, plan_id)
|
|
||||||
except ValueError as exc:
|
|
||||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
|
||||||
|
|
||||||
clips = plan_svc.list_clips(plan_id)
|
|
||||||
return EditorPublishResponse(
|
|
||||||
template_id=tpl.id,
|
|
||||||
status="published",
|
|
||||||
clip_count=len(clips),
|
|
||||||
version=tpl.version,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/versions", response_model=EditorVersionListResponse)
|
|
||||||
def list_template_versions(
|
|
||||||
template_id: str,
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
limit: int = Query(default=50, ge=1, le=200),
|
|
||||||
):
|
|
||||||
"""查询模板发布版本历史"""
|
|
||||||
tpl_svc, _ = services
|
|
||||||
versions = tpl_svc.list_template_versions(template_id, limit=limit)
|
|
||||||
items = [
|
|
||||||
EditorTemplateVersionItem(
|
|
||||||
version=v.version,
|
|
||||||
name=v.name,
|
|
||||||
editing_mode=v.editing_mode,
|
|
||||||
clip_count=len(v.clip_configs),
|
|
||||||
change_note=v.change_note,
|
|
||||||
published_by=v.published_by,
|
|
||||||
created_at=(v.created_at.isoformat() if hasattr(v.created_at, "isoformat") else str(v.created_at)),
|
|
||||||
)
|
|
||||||
for v in versions
|
|
||||||
]
|
|
||||||
return EditorVersionListResponse(versions=items, total=len(items))
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/rollback", response_model=EditorRollbackResponse, status_code=status.HTTP_200_OK)
|
|
||||||
def rollback_template(
|
|
||||||
template_id: str,
|
|
||||||
request: EditorRollbackRequest,
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""回滚模板到指定历史版本
|
|
||||||
|
|
||||||
回滚本身也是一次发布，版本号会 +1，可以再次回滚。
|
|
||||||
"""
|
|
||||||
tpl_svc, _ = services
|
|
||||||
try:
|
|
||||||
tpl = tpl_svc.rollback_to_version(template_id, request.version)
|
|
||||||
except ValueError as exc:
|
|
||||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
|
|
||||||
|
|
||||||
clip_configs = tpl_svc.list_clip_configs(template_id)
|
|
||||||
return EditorRollbackResponse(
|
|
||||||
template_id=tpl.id,
|
|
||||||
status="rolled_back",
|
|
||||||
rollback_to_version=request.version,
|
|
||||||
new_version=tpl.version,
|
|
||||||
clip_count=len(clip_configs),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/clips", response_model=EditorClipBatchUpdateResponse)
|
|
||||||
def batch_update_clips(
|
|
||||||
template_id: str,
|
|
||||||
req: EditorClipBatchUpdateRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""批量替换草稿clips（全量覆盖，用于前端选择素材后同步片段）
|
|
||||||
|
|
||||||
事务保证：清空→创建→标记ready 在同一数据库事务内完成，
|
|
||||||
任何步骤失败时自动回滚，避免数据不一致。
|
|
||||||
"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
|
|
||||||
clips_data = []
|
|
||||||
for clip_item in req.clips:
|
|
||||||
item = {
|
|
||||||
"asset_id": clip_item.asset_id,
|
|
||||||
"start_time": clip_item.start_time,
|
|
||||||
"duration": clip_item.duration,
|
|
||||||
}
|
|
||||||
if clip_item.order is not None:
|
|
||||||
item["order"] = clip_item.order
|
|
||||||
clips_data.append(item)
|
|
||||||
|
|
||||||
plan_svc.replace_all_clips_transactional(plan_id, clips_data)
|
|
||||||
|
|
||||||
return EditorClipBatchUpdateResponse(plan_id=plan_id, clip_count=len(req.clips))
|
|
||||||
@@ -1,195 +0,0 @@
|
|||||||
"""转场 & 滤镜路由.
|
|
||||||
|
|
||||||
端点：
|
|
||||||
- GET /transition-presets 转场预设列表
|
|
||||||
- PUT /clips/{clip_id}/transition 单片段转场
|
|
||||||
- POST /transitions/batch 批量转场
|
|
||||||
- GET /filter-presets 滤镜预设列表
|
|
||||||
- GET /filter 滤镜配置
|
|
||||||
- PUT /filter 更新滤镜
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
|
||||||
|
|
||||||
from packages.domain.config_schemas import normalize_plan_config
|
|
||||||
|
|
||||||
from .dependencies import get_draft_plan_id, get_editor_services
|
|
||||||
from .schemas import (
|
|
||||||
BatchTransitionRequest,
|
|
||||||
BatchTransitionResponse,
|
|
||||||
ClipTransitionResponse,
|
|
||||||
FilterConfigResponse,
|
|
||||||
FilterPresetListResponse,
|
|
||||||
FilterUpdateRequest,
|
|
||||||
TransitionPresetListResponse,
|
|
||||||
TransitionUpdateRequest,
|
|
||||||
)
|
|
||||||
|
|
||||||
router = APIRouter(tags=["Template Editor"])
|
|
||||||
|
|
||||||
|
|
||||||
# ── 转场 ────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/transition-presets", response_model=TransitionPresetListResponse)
|
|
||||||
def list_editor_transition_presets(
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> TransitionPresetListResponse:
|
|
||||||
"""获取转场预设列表"""
|
|
||||||
from packages.domain.transition_presets import TRANSITION_PRESET_LIBRARY
|
|
||||||
|
|
||||||
items = [
|
|
||||||
{
|
|
||||||
"id": p.id,
|
|
||||||
"name": p.name,
|
|
||||||
"category": p.category,
|
|
||||||
"duration": p.default_duration,
|
|
||||||
"description": p.description,
|
|
||||||
}
|
|
||||||
for p in TRANSITION_PRESET_LIBRARY
|
|
||||||
]
|
|
||||||
return TransitionPresetListResponse(items=items, total=len(items))
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/clips/{clip_id}/transition", response_model=ClipTransitionResponse)
|
|
||||||
def update_editor_clip_transition(
|
|
||||||
template_id: str,
|
|
||||||
clip_id: str,
|
|
||||||
body: TransitionUpdateRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ClipTransitionResponse:
|
|
||||||
"""设置单个片段的转场效果"""
|
|
||||||
_, plan_svc = services
|
|
||||||
try:
|
|
||||||
clip = plan_svc.update_clip(
|
|
||||||
clip_id,
|
|
||||||
transition_effect=body.effect,
|
|
||||||
transition_duration=body.duration,
|
|
||||||
)
|
|
||||||
except ValueError as exc:
|
|
||||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
|
||||||
|
|
||||||
return ClipTransitionResponse(
|
|
||||||
clip_id=clip.id,
|
|
||||||
effect=clip.transition_effect.value
|
|
||||||
if hasattr(clip.transition_effect, "value")
|
|
||||||
else clip.transition_effect,
|
|
||||||
duration=clip.transition_duration or 0.5,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/transitions/batch", response_model=BatchTransitionResponse)
|
|
||||||
def batch_update_editor_transitions(
|
|
||||||
template_id: str,
|
|
||||||
body: BatchTransitionRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> BatchTransitionResponse:
|
|
||||||
"""批量设置所有片段的转场效果"""
|
|
||||||
_, plan_svc = services
|
|
||||||
clips = plan_svc.list_clips(plan_id, limit=500)
|
|
||||||
updated = 0
|
|
||||||
for clip in clips:
|
|
||||||
if clip.order > 0: # 第一个片段不加转场
|
|
||||||
try:
|
|
||||||
plan_svc.update_clip(
|
|
||||||
clip.id,
|
|
||||||
transition_effect=body.effect,
|
|
||||||
transition_duration=body.duration,
|
|
||||||
)
|
|
||||||
updated += 1
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return BatchTransitionResponse(
|
|
||||||
updated_count=updated,
|
|
||||||
plan_id=plan_id,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ── 滤镜 ────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/filter-presets", response_model=FilterPresetListResponse)
|
|
||||||
def list_editor_filter_presets(
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> FilterPresetListResponse:
|
|
||||||
"""获取滤镜预设列表"""
|
|
||||||
from packages.domain.filter_presets import FILTER_PRESET_LIBRARY
|
|
||||||
|
|
||||||
items = [
|
|
||||||
{
|
|
||||||
"id": p.id,
|
|
||||||
"name": p.name,
|
|
||||||
"category": p.category,
|
|
||||||
"thumbnail": p.lut_url,
|
|
||||||
"description": p.description,
|
|
||||||
}
|
|
||||||
for p in FILTER_PRESET_LIBRARY
|
|
||||||
]
|
|
||||||
return FilterPresetListResponse(items=items, total=len(items))
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/filter", response_model=FilterConfigResponse)
|
|
||||||
def get_editor_filter(
|
|
||||||
template_id: str,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> FilterConfigResponse:
|
|
||||||
"""获取草稿的全局滤镜配置"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
config = plan.config or {}
|
|
||||||
filter_config = config.get("filter", {})
|
|
||||||
|
|
||||||
return FilterConfigResponse(
|
|
||||||
plan_id=plan.id,
|
|
||||||
enabled=filter_config.get("enabled", False),
|
|
||||||
preset_id=filter_config.get("preset_id", ""),
|
|
||||||
intensity=filter_config.get("intensity", 1.0),
|
|
||||||
brightness=filter_config.get("brightness", 0.0),
|
|
||||||
contrast=filter_config.get("contrast", 1.0),
|
|
||||||
saturation=filter_config.get("saturation", 1.0),
|
|
||||||
warmth=filter_config.get("warmth", 0.0),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/filter", response_model=FilterConfigResponse)
|
|
||||||
def update_editor_filter(
|
|
||||||
template_id: str,
|
|
||||||
body: FilterUpdateRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> FilterConfigResponse:
|
|
||||||
"""更新草稿的全局滤镜配置"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
|
|
||||||
config = dict(plan.config) if plan.config else {}
|
|
||||||
current_filter = dict(config.get("filter", {}))
|
|
||||||
update_data = body.model_dump(exclude_none=True)
|
|
||||||
current_filter.update(update_data)
|
|
||||||
|
|
||||||
config["filter"] = current_filter
|
|
||||||
updated_plan = plan_svc.update_plan_config(plan_id, normalize_plan_config(config))
|
|
||||||
|
|
||||||
return FilterConfigResponse(
|
|
||||||
plan_id=updated_plan.id,
|
|
||||||
enabled=current_filter.get("enabled", False),
|
|
||||||
preset_id=current_filter.get("preset_id", ""),
|
|
||||||
intensity=current_filter.get("intensity", 1.0),
|
|
||||||
brightness=current_filter.get("brightness", 0.0),
|
|
||||||
contrast=current_filter.get("contrast", 1.0),
|
|
||||||
saturation=current_filter.get("saturation", 1.0),
|
|
||||||
warmth=current_filter.get("warmth", 0.0),
|
|
||||||
)
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
"""导出配置路由.
|
|
||||||
|
|
||||||
端点：
|
|
||||||
- GET /export-presets 导出预设列表
|
|
||||||
- GET /export 导出配置
|
|
||||||
- PUT /export 更新导出配置
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from app.auth import AuthenticatedUser, get_current_user
|
|
||||||
from app.services.edit_plan_service import EditPlanService
|
|
||||||
from app.services.edit_template_service import EditTemplateService
|
|
||||||
from fastapi import APIRouter, Depends
|
|
||||||
|
|
||||||
from packages.domain.config_schemas import normalize_plan_config
|
|
||||||
|
|
||||||
from .dependencies import get_draft_plan_id, get_editor_services
|
|
||||||
from .schemas import ExportConfigResponse, ExportPresetListResponse, ExportUpdateRequest
|
|
||||||
|
|
||||||
router = APIRouter(tags=["Template Editor"])
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/export-presets", response_model=ExportPresetListResponse)
|
|
||||||
def list_editor_export_presets(
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ExportPresetListResponse:
|
|
||||||
"""获取导出预设列表"""
|
|
||||||
from packages.domain.export_presets import EXPORT_PRESETS
|
|
||||||
|
|
||||||
items = [
|
|
||||||
{
|
|
||||||
"id": p["id"],
|
|
||||||
"name": p["name"],
|
|
||||||
"resolution": p.get("resolution", "1080p"),
|
|
||||||
"fps": p.get("fps", 30),
|
|
||||||
"video_bitrate": p.get("bitrate", ""),
|
|
||||||
"audio_bitrate": p.get("audio_bitrate", 128),
|
|
||||||
"format": p.get("format", "mp4"),
|
|
||||||
"quality_preset": p.get("quality_preset", "balanced"),
|
|
||||||
"description": p.get("description", ""),
|
|
||||||
"size_hint": p.get("size_hint", ""),
|
|
||||||
}
|
|
||||||
for p in EXPORT_PRESETS
|
|
||||||
]
|
|
||||||
return ExportPresetListResponse(items=items, total=len(items))
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/export", response_model=ExportConfigResponse)
|
|
||||||
def get_editor_export(
|
|
||||||
template_id: str,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ExportConfigResponse:
|
|
||||||
"""获取草稿的导出配置"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
config = plan.config or {}
|
|
||||||
export_config = config.get("export", {})
|
|
||||||
|
|
||||||
return ExportConfigResponse(
|
|
||||||
plan_id=plan.id,
|
|
||||||
resolution=export_config.get("resolution", "1080p"),
|
|
||||||
fps=export_config.get("fps", 30),
|
|
||||||
video_bitrate=export_config.get("video_bitrate", 4000),
|
|
||||||
audio_bitrate=export_config.get("audio_bitrate", 128),
|
|
||||||
format=export_config.get("format", "mp4"),
|
|
||||||
quality_preset=export_config.get("quality_preset", "balanced"),
|
|
||||||
watermark_enabled=export_config.get("watermark_enabled", True),
|
|
||||||
watermark_text=export_config.get("watermark_text", ""),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.put("/export", response_model=ExportConfigResponse)
|
|
||||||
def update_editor_export(
|
|
||||||
template_id: str,
|
|
||||||
body: ExportUpdateRequest,
|
|
||||||
plan_id: str = Depends(get_draft_plan_id),
|
|
||||||
services: tuple[EditTemplateService, EditPlanService] = Depends(get_editor_services),
|
|
||||||
_: AuthenticatedUser = Depends(get_current_user),
|
|
||||||
) -> ExportConfigResponse:
|
|
||||||
"""更新草稿的导出配置"""
|
|
||||||
_, plan_svc = services
|
|
||||||
plan = plan_svc.get_plan_or_raise(plan_id)
|
|
||||||
|
|
||||||
config = dict(plan.config) if plan.config else {}
|
|
||||||
current_export = dict(config.get("export", {}))
|
|
||||||
update_data = body.model_dump(exclude_none=True)
|
|
||||||
current_export.update(update_data)
|
|
||||||
|
|
||||||
config["export"] = current_export
|
|
||||||
updated_plan = plan_svc.update_plan_config(plan_id, normalize_plan_config(config))
|
|
||||||
updated_export = (updated_plan.config or {}).get("export", {})
|
|
||||||
|
|
||||||
return ExportConfigResponse(
|
|
||||||
plan_id=updated_plan.id,
|
|
||||||
resolution=updated_export.get("resolution", "1080p"),
|
|
||||||
fps=updated_export.get("fps", 30),
|
|
||||||
video_bitrate=updated_export.get("video_bitrate", 4000),
|
|
||||||
audio_bitrate=updated_export.get("audio_bitrate", 128),
|
|
||||||
format=updated_export.get("format", "mp4"),
|
|
||||||
quality_preset=updated_export.get("quality_preset", "balanced"),
|
|
||||||
watermark_enabled=updated_export.get("watermark_enabled", True),
|
|
||||||
watermark_text=updated_export.get("watermark_text", ""),
|
|
||||||
)
|
|
||||||
@@ -1,557 +0,0 @@
|
|||||||
"""模板编辑器所有 Pydantic Schema 定义.
|
|
||||||
|
|
||||||
集中管理，避免在路由文件里散落 40+ 个 model。
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import re as _re
|
|
||||||
from typing import Any, List, Optional
|
|
||||||
|
|
||||||
from pydantic import BaseModel, Field, validator
|
|
||||||
|
|
||||||
_EXPORT_RESOLUTION_PATTERN = _re.compile(r"^\d+x\d+$")
|
|
||||||
_EXPORT_VALID_QUALITY_PRESETS = {"ultra_fast", "fast", "balanced", "high", "best"}
|
|
||||||
_EXPORT_VALID_FORMATS = {"mp4", "mov"}
|
|
||||||
|
|
||||||
|
|
||||||
# ── AI 推荐 ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class AIRecommendRequest(BaseModel):
|
|
||||||
"""AI 推荐片段方案请求体"""
|
|
||||||
|
|
||||||
asset_ids: List[str] = Field(default_factory=list, description="素材 ID 列表")
|
|
||||||
editing_mode: str = Field(default="one_take", description="剪辑模式: one_take / pip / voice_over / voice_pip")
|
|
||||||
target_duration: float = Field(default=30.0, ge=1.0, le=600.0, description="目标时长（秒）")
|
|
||||||
|
|
||||||
|
|
||||||
class AIRecommendClipItem(BaseModel):
|
|
||||||
"""AI 推荐的单个片段"""
|
|
||||||
|
|
||||||
clip_type: str = Field(..., description="片段类型: intro / showcase / title / subtitle / cta / outro")
|
|
||||||
order: int = Field(..., ge=0, description="片段顺序")
|
|
||||||
text_content: str = Field(default="", description="文字内容")
|
|
||||||
duration: float = Field(..., ge=0.0, description="片段时长（秒）")
|
|
||||||
transition_effect: str = Field(default="cut", description="转场效果")
|
|
||||||
transition_duration: float = Field(default=0.0, ge=0.0, description="转场时长（秒），0 表示使用默认值")
|
|
||||||
asset_id: str = Field(default="", description="关联素材 ID")
|
|
||||||
start_time: float = Field(default=0.0, ge=0.0, description="素材截取起始时间（秒）")
|
|
||||||
config: dict[str, Any] = Field(default_factory=dict, description="片段额外配置")
|
|
||||||
|
|
||||||
|
|
||||||
class AIRecommendResponse(BaseModel):
|
|
||||||
"""AI 推荐片段方案响应体"""
|
|
||||||
|
|
||||||
plan_id: str = Field(..., description="剪辑计划 ID")
|
|
||||||
clips: List[AIRecommendClipItem] = Field(..., description="推荐的片段列表")
|
|
||||||
config: dict[str, Any] = Field(..., description="推荐的 plan config（cover/title/subtitle/bgm）")
|
|
||||||
total_duration: float = Field(..., ge=0.0, description="推荐方案总时长（秒）")
|
|
||||||
confidence: float = Field(..., ge=0.0, le=1.0, description="AI 推荐置信度 (0~1)")
|
|
||||||
|
|
||||||
|
|
||||||
# ── BGM ────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class BGMConfigUpdateRequest(BaseModel):
|
|
||||||
"""更新BGM配置请求体"""
|
|
||||||
|
|
||||||
enabled: Optional[bool] = Field(default=None, description="是否启用 BGM")
|
|
||||||
source: Optional[str] = Field(default=None, description="BGM 来源: library/upload/ai_recommend")
|
|
||||||
asset_id: Optional[str] = Field(default=None, max_length=64, description="BGM 素材 ID")
|
|
||||||
preset_id: Optional[str] = Field(default=None, max_length=64, description="预设 BGM ID")
|
|
||||||
audio_url: Optional[str] = Field(default=None, max_length=500, description="BGM 音频 URL")
|
|
||||||
volume: Optional[float] = Field(default=None, ge=0.0, le=1.0, description="音量 (0.0 ~ 1.0)")
|
|
||||||
fade_in: Optional[float] = Field(default=None, ge=0.0, le=30.0, description="淡入时长（秒）")
|
|
||||||
fade_out: Optional[float] = Field(default=None, ge=0.0, le=30.0, description="淡出时长（秒）")
|
|
||||||
loop_enabled: Optional[bool] = Field(default=None, description="是否循环播放")
|
|
||||||
sidechain_enabled: Optional[bool] = Field(default=None, description="是否启用人声闪避")
|
|
||||||
sidechain_ratio: Optional[float] = Field(default=None, ge=0.0, le=1.0, description="闪避音量降低比例")
|
|
||||||
|
|
||||||
|
|
||||||
# ── 片段调整 ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class SpeedAdjustRequest(BaseModel):
|
|
||||||
"""调速请求"""
|
|
||||||
|
|
||||||
speed: float = Field(..., ge=0.25, le=4.0, description="播放速度 0.25~4.0")
|
|
||||||
|
|
||||||
|
|
||||||
class VolumeAdjustRequest(BaseModel):
|
|
||||||
"""音量调节请求"""
|
|
||||||
|
|
||||||
volume: float = Field(..., ge=0.0, le=2.0, description="音量倍率 0~2.0（1.0=原音量）")
|
|
||||||
|
|
||||||
|
|
||||||
class TrimAdjustRequest(BaseModel):
|
|
||||||
"""裁剪请求"""
|
|
||||||
|
|
||||||
trim_start: float = Field(0.0, ge=0.0, description="开头裁剪秒数")
|
|
||||||
trim_end: float = Field(0.0, ge=0.0, description="结尾裁剪秒数")
|
|
||||||
|
|
||||||
|
|
||||||
class ClipAdjustmentsRequest(BaseModel):
|
|
||||||
"""统一调整请求"""
|
|
||||||
|
|
||||||
speed: Optional[float] = Field(default=None, ge=0.25, le=4.0)
|
|
||||||
volume: Optional[float] = Field(default=None, ge=0.0, le=2.0)
|
|
||||||
trim_start: Optional[float] = Field(default=None, ge=0.0)
|
|
||||||
trim_end: Optional[float] = Field(default=None, ge=0.0)
|
|
||||||
|
|
||||||
|
|
||||||
class BatchSpeedRequest(BaseModel):
|
|
||||||
"""批量调速请求"""
|
|
||||||
|
|
||||||
speed: float = Field(..., ge=0.25, le=4.0, description="播放速度")
|
|
||||||
|
|
||||||
|
|
||||||
class ClipAdjustResponse(BaseModel):
|
|
||||||
"""片段调整响应"""
|
|
||||||
|
|
||||||
clip_id: str
|
|
||||||
speed: float
|
|
||||||
volume: float
|
|
||||||
trim_start: float
|
|
||||||
trim_end: float
|
|
||||||
duration: float
|
|
||||||
|
|
||||||
|
|
||||||
class BatchSpeedResponse(BaseModel):
|
|
||||||
"""批量调速响应"""
|
|
||||||
|
|
||||||
updated_count: int
|
|
||||||
plan_id: str
|
|
||||||
|
|
||||||
|
|
||||||
# ── 片段批量操作 ────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class ClipReorderItem(BaseModel):
|
|
||||||
"""重排序条目"""
|
|
||||||
|
|
||||||
clip_id: str
|
|
||||||
new_order: int = Field(..., ge=0, description="新的排序序号")
|
|
||||||
|
|
||||||
|
|
||||||
class ClipReorderRequest(BaseModel):
|
|
||||||
"""片段重排序请求"""
|
|
||||||
|
|
||||||
items: List[ClipReorderItem] = Field(..., min_length=1, max_length=500, description="重排序条目列表")
|
|
||||||
|
|
||||||
|
|
||||||
class ClipReorderResponse(BaseModel):
|
|
||||||
"""片段重排序响应"""
|
|
||||||
|
|
||||||
success: bool = True
|
|
||||||
updated_count: int
|
|
||||||
message: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
class ClipBatchDeleteRequest(BaseModel):
|
|
||||||
"""批量删除片段请求"""
|
|
||||||
|
|
||||||
clip_ids: List[str] = Field(..., min_length=1, max_length=500, description="要删除的片段ID列表")
|
|
||||||
|
|
||||||
|
|
||||||
class ClipBatchDeleteResponse(BaseModel):
|
|
||||||
"""批量删除片段响应"""
|
|
||||||
|
|
||||||
success: bool = True
|
|
||||||
deleted_count: int
|
|
||||||
message: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
class ClipsFromAssetsRequest(BaseModel):
|
|
||||||
"""从素材批量创建片段请求"""
|
|
||||||
|
|
||||||
asset_ids: List[str] = Field(..., min_length=1, max_length=200, description="素材 ID 列表，按顺序追加到时间线末尾")
|
|
||||||
clip_type: str = Field(default="main", description="片段类型，默认 main")
|
|
||||||
required_clips_count: Optional[int] = Field(
|
|
||||||
default=None, ge=1, le=200, description="要求创建的片段数量；不传则等于素材数量"
|
|
||||||
)
|
|
||||||
|
|
||||||
@validator("asset_ids", pre=True)
|
|
||||||
def _drop_invalid_asset_ids(cls, v): # noqa: N805
|
|
||||||
"""容错过滤：前端异常情况下可能把 undefined 序列化成 null 或空串混入
|
|
||||||
asset_ids（会直接 422 或导致后续 /assets/{id} 404），这里统一剔除。
|
|
||||||
过滤后为空时由 Field(min_length=1) / 路由层 400 兜底。"""
|
|
||||||
if not isinstance(v, list):
|
|
||||||
return v
|
|
||||||
return [x for x in v if isinstance(x, str) and x.strip()]
|
|
||||||
|
|
||||||
|
|
||||||
class ClipsFromAssetsResponse(BaseModel):
|
|
||||||
"""从素材批量创建片段响应"""
|
|
||||||
|
|
||||||
success: bool = True
|
|
||||||
created_count: int
|
|
||||||
plan_id: str = ""
|
|
||||||
message: str = ""
|
|
||||||
clip_ids: List[str] = Field(default_factory=list, description="创建的片段ID列表")
|
|
||||||
duplicate_warning: Optional[str] = Field(default=None, description="查重率超标警告")
|
|
||||||
exhaustion_warning: Optional[str] = Field(default=None, description="素材耗尽警告")
|
|
||||||
|
|
||||||
|
|
||||||
# ── 封面配置 ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
# ── 导出配置 ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class ExportConfigResponse(BaseModel):
|
|
||||||
"""导出配置响应"""
|
|
||||||
|
|
||||||
resolution: str
|
|
||||||
fps: int
|
|
||||||
video_bitrate: int
|
|
||||||
audio_bitrate: int
|
|
||||||
format: str
|
|
||||||
quality_preset: str
|
|
||||||
watermark_enabled: bool
|
|
||||||
watermark_text: str
|
|
||||||
|
|
||||||
|
|
||||||
class ExportUpdateRequest(BaseModel):
|
|
||||||
"""更新导出配置请求"""
|
|
||||||
|
|
||||||
resolution: Optional[str] = None
|
|
||||||
fps: Optional[int] = Field(default=None, ge=15, le=60)
|
|
||||||
video_bitrate: Optional[int] = Field(default=None, ge=1000, le=20000)
|
|
||||||
audio_bitrate: Optional[int] = Field(default=None, ge=64, le=320)
|
|
||||||
format: Optional[str] = None
|
|
||||||
quality_preset: Optional[str] = None
|
|
||||||
watermark_enabled: Optional[bool] = None
|
|
||||||
watermark_text: Optional[str] = None
|
|
||||||
|
|
||||||
@validator("resolution")
|
|
||||||
def validate_resolution(cls, v):
|
|
||||||
if v is None:
|
|
||||||
return v
|
|
||||||
if not _EXPORT_RESOLUTION_PATTERN.match(v):
|
|
||||||
raise ValueError("分辨率格式错误，应为 宽x高，如 1080x1920")
|
|
||||||
w, h = v.split("x")
|
|
||||||
if int(w) < 100 or int(h) < 100:
|
|
||||||
raise ValueError("分辨率数值过小")
|
|
||||||
if int(w) > 4096 or int(h) > 4096:
|
|
||||||
raise ValueError("分辨率数值过大，最大 4096x4096")
|
|
||||||
return v
|
|
||||||
|
|
||||||
@validator("format")
|
|
||||||
def validate_format(cls, v):
|
|
||||||
if v is None:
|
|
||||||
return v
|
|
||||||
if v not in _EXPORT_VALID_FORMATS:
|
|
||||||
raise ValueError(f"无效格式: {v}，支持: {_EXPORT_VALID_FORMATS}")
|
|
||||||
return v
|
|
||||||
|
|
||||||
@validator("quality_preset")
|
|
||||||
def validate_quality_preset(cls, v):
|
|
||||||
if v is None:
|
|
||||||
return v
|
|
||||||
if v not in _EXPORT_VALID_QUALITY_PRESETS:
|
|
||||||
raise ValueError(f"无效质量预设: {v}，支持: {_EXPORT_VALID_QUALITY_PRESETS}")
|
|
||||||
return v
|
|
||||||
|
|
||||||
|
|
||||||
class ExportPresetItem(BaseModel):
|
|
||||||
"""导出预设条目"""
|
|
||||||
|
|
||||||
id: str
|
|
||||||
name: str
|
|
||||||
resolution: str
|
|
||||||
fps: int
|
|
||||||
video_bitrate: int
|
|
||||||
audio_bitrate: int
|
|
||||||
format: str
|
|
||||||
quality_preset: str
|
|
||||||
description: str
|
|
||||||
size_hint: str
|
|
||||||
|
|
||||||
|
|
||||||
class ExportPresetListResponse(BaseModel):
|
|
||||||
"""导出预设列表响应"""
|
|
||||||
|
|
||||||
items: List[ExportPresetItem]
|
|
||||||
total: int
|
|
||||||
|
|
||||||
|
|
||||||
# ── 滤镜 ────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class FilterPresetResponse(BaseModel):
|
|
||||||
"""滤镜预设响应"""
|
|
||||||
|
|
||||||
id: str
|
|
||||||
name: str
|
|
||||||
category: str
|
|
||||||
description: str
|
|
||||||
tags: List[str] = Field(default_factory=list)
|
|
||||||
|
|
||||||
|
|
||||||
class FilterConfigResponse(BaseModel):
|
|
||||||
"""滤镜配置响应"""
|
|
||||||
|
|
||||||
enabled: bool
|
|
||||||
preset_id: str
|
|
||||||
intensity: int
|
|
||||||
brightness: float
|
|
||||||
contrast: float
|
|
||||||
saturation: float
|
|
||||||
warmth: float
|
|
||||||
|
|
||||||
|
|
||||||
class FilterUpdateRequest(BaseModel):
|
|
||||||
"""更新滤镜配置请求"""
|
|
||||||
|
|
||||||
enabled: Optional[bool] = None
|
|
||||||
preset_id: Optional[str] = None
|
|
||||||
intensity: Optional[int] = Field(default=None, ge=0, le=100)
|
|
||||||
brightness: Optional[float] = Field(default=None, ge=-1.0, le=1.0)
|
|
||||||
contrast: Optional[float] = Field(default=None, ge=0.0, le=2.0)
|
|
||||||
saturation: Optional[float] = Field(default=None, ge=0.0, le=3.0)
|
|
||||||
warmth: Optional[float] = Field(default=None, ge=-1.0, le=1.0)
|
|
||||||
|
|
||||||
|
|
||||||
class FilterPresetListResponse(BaseModel):
|
|
||||||
"""滤镜预设列表响应"""
|
|
||||||
|
|
||||||
items: List[FilterPresetResponse]
|
|
||||||
total: int
|
|
||||||
|
|
||||||
|
|
||||||
# ── 转场 ────────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class TransitionPresetResponse(BaseModel):
|
|
||||||
"""转场预设响应"""
|
|
||||||
|
|
||||||
id: str
|
|
||||||
name: str
|
|
||||||
category: str
|
|
||||||
description: str
|
|
||||||
tags: List[str] = Field(default_factory=list)
|
|
||||||
default_duration: float
|
|
||||||
min_duration: float
|
|
||||||
max_duration: float
|
|
||||||
|
|
||||||
|
|
||||||
class TransitionUpdateRequest(BaseModel):
|
|
||||||
"""更新转场请求"""
|
|
||||||
|
|
||||||
effect: str = Field(..., description="转场效果 ID")
|
|
||||||
duration: Optional[float] = Field(default=None, ge=0.0, description="转场时长（秒）")
|
|
||||||
|
|
||||||
|
|
||||||
class BatchTransitionRequest(BaseModel):
|
|
||||||
"""批量设置转场请求"""
|
|
||||||
|
|
||||||
effect: str = Field(..., description="转场效果 ID")
|
|
||||||
duration: Optional[float] = Field(default=None, ge=0.0, description="转场时长（秒）")
|
|
||||||
apply_to: str = Field(
|
|
||||||
default="all",
|
|
||||||
description="应用范围: all=所有片段, except_first=除第一个外, except_last=除最后一个, middle=中间片段",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ClipTransitionResponse(BaseModel):
|
|
||||||
"""片段转场信息响应"""
|
|
||||||
|
|
||||||
clip_id: str
|
|
||||||
effect: str
|
|
||||||
duration: float
|
|
||||||
|
|
||||||
|
|
||||||
class BatchTransitionResponse(BaseModel):
|
|
||||||
"""批量转场响应"""
|
|
||||||
|
|
||||||
updated_count: int
|
|
||||||
plan_id: str
|
|
||||||
|
|
||||||
|
|
||||||
class TransitionPresetListResponse(BaseModel):
|
|
||||||
"""转场预设列表响应"""
|
|
||||||
|
|
||||||
items: List[TransitionPresetResponse]
|
|
||||||
total: int
|
|
||||||
|
|
||||||
|
|
||||||
# ── 编辑器草稿 & 片段 ───────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class EditorDraftResponse(BaseModel):
|
|
||||||
"""模板编辑器草稿详情响应"""
|
|
||||||
|
|
||||||
plan_id: str
|
|
||||||
template_id: str
|
|
||||||
name: str
|
|
||||||
status: str
|
|
||||||
config: dict[str, Any]
|
|
||||||
total_duration: float
|
|
||||||
clip_count: int
|
|
||||||
is_draft: bool = True
|
|
||||||
|
|
||||||
|
|
||||||
class EditorUpdateRequest(BaseModel):
|
|
||||||
"""更新草稿请求"""
|
|
||||||
|
|
||||||
name: Optional[str] = Field(default=None, min_length=1, max_length=200)
|
|
||||||
config: Optional[dict[str, Any]] = Field(default=None)
|
|
||||||
total_duration: Optional[float] = Field(default=None, ge=0.0)
|
|
||||||
|
|
||||||
|
|
||||||
class EditorClipResponse(BaseModel):
|
|
||||||
"""片段响应 — 与数据库 edit_plan_clips 表字段对齐"""
|
|
||||||
|
|
||||||
id: str
|
|
||||||
plan_id: str
|
|
||||||
clip_type: str
|
|
||||||
order: int
|
|
||||||
duration: float
|
|
||||||
start_time: float = 0.0
|
|
||||||
text_content: str = ""
|
|
||||||
transition_effect: str = "cut"
|
|
||||||
transition_duration: float = 0.0
|
|
||||||
playback_speed: float = 1.0
|
|
||||||
asset_id: str = ""
|
|
||||||
asset_url: str | None = Field(
|
|
||||||
default=None,
|
|
||||||
description="素材视频签名URL（1小时有效），用于前端预览播放",
|
|
||||||
)
|
|
||||||
status: str = "pending"
|
|
||||||
template_clip_config_id: str = ""
|
|
||||||
config: dict[str, Any] = Field(default_factory=dict)
|
|
||||||
created_at: str = ""
|
|
||||||
updated_at: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
class EditorClipListResponse(BaseModel):
|
|
||||||
"""片段列表响应"""
|
|
||||||
|
|
||||||
items: List[EditorClipResponse]
|
|
||||||
total: int
|
|
||||||
|
|
||||||
|
|
||||||
class EditorClipCreateRequest(BaseModel):
|
|
||||||
"""创建片段请求"""
|
|
||||||
|
|
||||||
clip_type: str = Field(..., min_length=1, max_length=32)
|
|
||||||
order: int = Field(..., ge=0)
|
|
||||||
duration: float = Field(..., gt=0.0)
|
|
||||||
text_content: str = Field(default="", max_length=2000)
|
|
||||||
transition_effect: str = Field(default="cut", max_length=32)
|
|
||||||
config: dict[str, Any] = Field(default_factory=dict)
|
|
||||||
|
|
||||||
|
|
||||||
class EditorClipUpdateRequest(BaseModel):
|
|
||||||
"""更新片段请求"""
|
|
||||||
|
|
||||||
order: Optional[int] = Field(default=None, ge=0)
|
|
||||||
duration: Optional[float] = Field(default=None, gt=0.0)
|
|
||||||
text_content: Optional[str] = Field(default=None, max_length=2000)
|
|
||||||
transition_effect: Optional[str] = Field(default=None, max_length=32)
|
|
||||||
playback_speed: Optional[float] = Field(default=None, gt=0.0)
|
|
||||||
config: Optional[dict[str, Any]] = None
|
|
||||||
|
|
||||||
|
|
||||||
class EditorClipBatchItem(BaseModel):
|
|
||||||
"""批量更新clips的单个片段"""
|
|
||||||
|
|
||||||
asset_id: str = Field(default="", max_length=100, description="关联素材ID，可为空（占位片段）")
|
|
||||||
start_time: float = Field(default=0.0, ge=0.0)
|
|
||||||
duration: float = Field(default=0.0, ge=0.0)
|
|
||||||
order: Optional[int] = Field(default=None, ge=0, description="排序，None表示按数组顺序")
|
|
||||||
|
|
||||||
|
|
||||||
class EditorClipBatchUpdateRequest(BaseModel):
|
|
||||||
"""批量替换clips请求（全量覆盖）"""
|
|
||||||
|
|
||||||
clips: List[EditorClipBatchItem] = Field(default_factory=list)
|
|
||||||
|
|
||||||
|
|
||||||
class EditorClipBatchUpdateResponse(BaseModel):
|
|
||||||
"""批量更新clips响应"""
|
|
||||||
|
|
||||||
plan_id: str
|
|
||||||
clip_count: int
|
|
||||||
|
|
||||||
|
|
||||||
class EditorPublishResponse(BaseModel):
|
|
||||||
"""发布草稿响应"""
|
|
||||||
|
|
||||||
template_id: str
|
|
||||||
status: str = "published"
|
|
||||||
clip_count: int
|
|
||||||
version: int = 1
|
|
||||||
|
|
||||||
|
|
||||||
class EditorTemplateVersionItem(BaseModel):
|
|
||||||
"""模板版本历史条目"""
|
|
||||||
|
|
||||||
version: int
|
|
||||||
name: str
|
|
||||||
editing_mode: str
|
|
||||||
clip_count: int
|
|
||||||
change_note: str
|
|
||||||
published_by: str
|
|
||||||
created_at: str
|
|
||||||
|
|
||||||
|
|
||||||
class EditorVersionListResponse(BaseModel):
|
|
||||||
"""模板版本列表响应"""
|
|
||||||
|
|
||||||
versions: list[EditorTemplateVersionItem]
|
|
||||||
total: int
|
|
||||||
|
|
||||||
|
|
||||||
class EditorRollbackRequest(BaseModel):
|
|
||||||
"""回滚请求体"""
|
|
||||||
|
|
||||||
version: int
|
|
||||||
|
|
||||||
|
|
||||||
class EditorRollbackResponse(BaseModel):
|
|
||||||
"""回滚响应"""
|
|
||||||
|
|
||||||
template_id: str
|
|
||||||
status: str = "rolled_back"
|
|
||||||
rollback_to_version: int
|
|
||||||
new_version: int
|
|
||||||
clip_count: int
|
|
||||||
|
|
||||||
|
|
||||||
# ── 片段分割与合并 ──────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class SplitClipRequest(BaseModel):
|
|
||||||
"""分割片段请求体"""
|
|
||||||
|
|
||||||
split_time: float = Field(..., gt=0, description="分割点（秒，相对于片段起始）")
|
|
||||||
|
|
||||||
|
|
||||||
class MergeClipsRequest(BaseModel):
|
|
||||||
"""合并片段请求体"""
|
|
||||||
|
|
||||||
clip_ids: list[str] = Field(..., min_length=2, description="要合并的片段 ID 列表")
|
|
||||||
|
|
||||||
|
|
||||||
# ── 时间线 ──────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
|
|
||||||
class EditorTimelineSceneResponse(BaseModel):
|
|
||||||
"""时间线场景"""
|
|
||||||
|
|
||||||
scene: str
|
|
||||||
time: str
|
|
||||||
duration: float
|
|
||||||
color: str
|
|
||||||
clip_id: str = ""
|
|
||||||
clip_type: str = ""
|
|
||||||
|
|
||||||
|
|
||||||
class EditorTimelineResponse(BaseModel):
|
|
||||||
"""时间线响应"""
|
|
||||||
|
|
||||||
plan_id: str
|
|
||||||
total_duration: float
|
|
||||||
scenes: List[EditorTimelineSceneResponse]
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user