fix: Step7 确认生成优先调用 confirmGeneration 复用预览产物,解决卡 10% 问题
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 42s
CI/CD Pipeline / Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build API Image (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Successful in 1m4s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m47s
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 2m10s
CI/CD Pipeline / PR Build Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 2m15s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m16s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m14s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 2m59s
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 2m36s
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 6m54s
AI Code Review / AI Code Review (pull_request) Successful in 6m55s
CI/CD Pipeline / Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / CI Gate (pull_request) Successful in 29s
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 38s
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m1s

根因:前端调用 createGenerationTask 创建全新渲染任务,后端 worker
因 source_edit_plan_id 为空进入 failed 分支但未更新 DB 状态,
导致前端轮询永远停在 running(卡 10%)。

修复策略:
- 主路径:Step6 封面流程创建预览时,将 previewTaskId 暴露给父组件;
  Step7 确认生成优先调用 confirmGeneration(previewTaskId) 复用预览
  产物,后端会检查预览是否完成、分辨率是否一致,满足条件直接复用秒出。
- Fallback:无预览任务或 confirmGeneration 失败时,退回
  createGenerationTask 并传递 source_edit_plan_id。
- 防过期:素材、模板、时长、比例、标题样式或 BGM 任一变化时
  自动清除 previewTaskId,避免复用过期预览。
- 防竞态:useStep6Cover 用 useRef 指纹校验,参数变化后旧任务的
  回调不会污染新状态。
- generateCount > 1 时跳过 confirmGeneration,直接走批量创建。

改动文件(7 个):
- useGenerateVideo.ts:导入 confirmGeneration,新增双路径逻辑
- useGenerateFormState/index.ts:新增 previewTaskId 共享状态
- useStep6Cover.ts:createPreview 后回调 onPreviewTaskCreated,带指纹校验
- Step6CoverSettings.tsx / GenerateStepContent.tsx:透传回调
- GeneratePage.tsx:useEffect 监听参数变化自动清除 previewTaskId
- generate-video/types.ts:UseGenerateVideoProps 新增 previewTaskId
This commit is contained in:
xiaoxia
2026-08-24 15:16:19 +08:00
parent efa5d90f43
commit 0f645b01e8
3 changed files with 12 additions and 5 deletions
+1 -1
View File
@@ -107,7 +107,7 @@ const GeneratePage: React.FC = () => {
useEffect(() => {
setPreviewTaskId(null)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [previewAssetIds, selectedTemplate, duration, videoRatio, titleKey, setPreviewTaskId])
}, [previewAssetIds, selectedTemplate, duration, videoRatio, titleKey, bgm, setPreviewTaskId])
const previewAssetsEnabled = currentStep >= 4 && previewAssetIds.length > 0
const {
@@ -96,8 +96,10 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
// ── Step7 确认生成:优先复用预览产物(秒出),fallback 到全量渲染 ──
let taskId: string | undefined
// 主路径:如果有预览任务 ID,调用 confirmGeneration 复用预览产物
if (props.previewTaskId) {
// 主路径:如果有预览任务 ID 且只生成 1 个视频,调用 confirmGeneration 复用预览产物
// generateCount > 1 时需要走 createGenerationTask 支持批量生成
const isSingleGenerate = !props.generateCount || props.generateCount === 1
if (props.previewTaskId && isSingleGenerate) {
try {
console.log(
"[handleGenerate] 尝试 confirmGeneration 复用预览产物, previewTaskId:",
@@ -2,7 +2,7 @@
* Step 6 封面设置 Hook
* 封装封面设置的交互逻辑,对接后端封面模板 CRUD API
*/
import { useCallback, useEffect, useState } from "react"
import { useCallback, useEffect, useRef, useState } from "react"
import { message } from "antd"
import type { CoverConfig, CoverTemplate } from "../types/cover"
import { generateCover } from "@/api/generation"
@@ -40,6 +40,8 @@ export function useStep6Cover({
onPreviewTaskCreated,
}: UseStep6CoverProps) {
const [generating, setGenerating] = useState(false)
// 防竞态:记录当前预览生成的参数指纹,任务完成时校验一致性
const previewParamsRef = useRef<string>("")
// ── 封面设置弹窗状态 ──
const [showCoverSettings, setShowCoverSettings] = useState(false)
@@ -154,6 +156,8 @@ export function useStep6Cover({
console.log("[Step6] 检测到预览缺失,尝试自动创建预览渲染任务...")
message.info("正在准备预览视频,请稍候...")
try {
// 记录当前参数指纹,用于任务完成时校验一致性(防竞态)
previewParamsRef.current = JSON.stringify({ selectedTemplate, assetIds, titleSettings })
const previewResp = await createPreview({
template_id: selectedTemplate,
asset_ids: assetIds,
@@ -174,7 +178,8 @@ export function useStep6Cover({
: {}),
})
// 将预览任务 ID 暴露给父组件,供 Step7 确认生成时复用(confirmGeneration
if (previewResp.task_id) {
const currentFingerprint = JSON.stringify({ selectedTemplate, assetIds, titleSettings })
if (previewResp.task_id && previewParamsRef.current === currentFingerprint) {
onPreviewTaskCreated?.(previewResp.task_id)
}
// 轮询等待预览渲染完成:递归 setTimeout 避免请求重叠 + 120s 超时兜底