From 3db586cd602195762b39d4f386e0808e1937c954 Mon Sep 17 00:00:00 2001 From: GinHa <15201596918@163.com> Date: Thu, 16 Jul 2026 15:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=88=86=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- video-gen-admin/src/App.tsx | 2 + video-gen-admin/src/api/index.ts | 13 + .../src/pages/AdminVideoUpscale.tsx | 262 +++ video-gen-admin/src/types/index.ts | 45 + video-gen-api/.env | 1 + ...3f47680a71d0_add_video_upscale_pipeline.py | 180 +++ video-gen-api/app/api/admin/__init__.py | 2 + video-gen-api/app/api/admin/video_upscale.py | 53 + video-gen-api/app/api/v1/admin.py | 33 +- video-gen-api/app/api/v1/generation.py | 162 +- video-gen-api/app/api/v1/generation_ai.py | 14 + video-gen-api/app/api/v1/projects.py | 5 + video-gen-api/app/cmd/retry_video_upscale.py | 188 +++ video-gen-api/app/config.py | 22 + video-gen-api/app/enums/celery_queue.py | 8 + video-gen-api/app/enums/generation_status.py | 19 + video-gen-api/app/enums/generation_task.py | 21 + video-gen-api/app/enums/video_upscale.py | 97 ++ video-gen-api/app/models/__init__.py | 3 +- .../app/models/chat_generation_task.py | 5 +- video-gen-api/app/models/generation_record.py | 8 +- .../app/models/video_upscale_task.py | 85 + video-gen-api/app/schemas/generation.py | 2 + video-gen-api/app/schemas/video_upscale.py | 59 + .../generation/ai/task_create_service.py | 20 + .../generation/ai/task_group_service.py | 25 +- .../services/generation/download_service.py | 40 + .../generation/history_delete_service.py | 8 + .../services/generation/recovery_service.py | 6 + .../generation/task_factory_service.py | 12 + .../module_generation_flow_base_service.py | 6 + video-gen-api/app/services/video_gen.py | 2 +- video-gen-api/app/services/video_queue.py | 294 ++-- .../app/services/video_upscale/__init__.py | 0 .../services/video_upscale/config_service.py | 175 ++ .../services/video_upscale/guard_service.py | 61 + .../video_upscale/local_ffmpeg_service.py | 128 ++ .../app/services/video_upscale/log_service.py | 108 ++ .../services/video_upscale/media_service.py | 207 +++ .../services/video_upscale/owner_service.py | 120 ++ .../video_upscale/snapshot_service.py | 176 ++ .../services/video_upscale/task_service.py | 1431 +++++++++++++++++ .../services/video_upscale/volc_service.py | 270 ++++ video-gen-api/app/tasks/celery_app.py | 41 +- .../app/tasks/generation_create_tasks.py | 2 +- .../app/tasks/generation_download_tasks.py | 44 +- .../app/tasks/generation_recovery_tasks.py | 15 + .../app/tasks/video_upscale_tasks.py | 109 ++ .../app/types/generation/provider.py | 1 + 49 files changed, 4423 insertions(+), 167 deletions(-) create mode 100644 video-gen-admin/src/pages/AdminVideoUpscale.tsx create mode 100644 video-gen-api/alembic/versions/3f47680a71d0_add_video_upscale_pipeline.py create mode 100644 video-gen-api/app/api/admin/video_upscale.py create mode 100644 video-gen-api/app/cmd/retry_video_upscale.py create mode 100644 video-gen-api/app/enums/video_upscale.py create mode 100644 video-gen-api/app/models/video_upscale_task.py create mode 100644 video-gen-api/app/schemas/video_upscale.py create mode 100644 video-gen-api/app/services/video_upscale/__init__.py create mode 100644 video-gen-api/app/services/video_upscale/config_service.py create mode 100644 video-gen-api/app/services/video_upscale/guard_service.py create mode 100644 video-gen-api/app/services/video_upscale/local_ffmpeg_service.py create mode 100644 video-gen-api/app/services/video_upscale/log_service.py create mode 100644 video-gen-api/app/services/video_upscale/media_service.py create mode 100644 video-gen-api/app/services/video_upscale/owner_service.py create mode 100644 video-gen-api/app/services/video_upscale/snapshot_service.py create mode 100644 video-gen-api/app/services/video_upscale/task_service.py create mode 100644 video-gen-api/app/services/video_upscale/volc_service.py create mode 100644 video-gen-api/app/tasks/video_upscale_tasks.py diff --git a/video-gen-admin/src/App.tsx b/video-gen-admin/src/App.tsx index 92eaf1d6..0d785256 100644 --- a/video-gen-admin/src/App.tsx +++ b/video-gen-admin/src/App.tsx @@ -32,6 +32,7 @@ import AdminShotReplications from './pages/AdminShotReplications'; import AdminShotTaskSetDetail from './pages/AdminShotTaskSetDetail'; import AdminReplicationProjectDetail from './pages/AdminReplicationProjectDetail'; import AdminVideoPromptSchemaConfig from './pages/AdminVideoPromptSchemaConfig'; +import AdminVideoUpscale from './pages/AdminVideoUpscale'; import AdminContactRequests from './pages/AdminContactRequests'; import AdminHomeMaterials from './pages/AdminHomeMaterials'; import AdminPreTestTemplates from './pages/AdminPreTestTemplates'; @@ -98,6 +99,7 @@ const App = () => { } /> } /> } /> + } /> } /> } /> } /> diff --git a/video-gen-admin/src/api/index.ts b/video-gen-admin/src/api/index.ts index d9a02ed8..9e760f29 100644 --- a/video-gen-admin/src/api/index.ts +++ b/video-gen-admin/src/api/index.ts @@ -17,6 +17,7 @@ import type { AdminTeam, AdminTeamListResponse, AdminTeamOption, AdminTeamPayload, AdminTeamQueryParams, PrivatePortraitConfig, PrivatePortraitProjectListOut, PrivatePortraitAssetListOut, AdminUploadFileResult, AdminUploadResourceType, AdminUploadScene, + VideoUpscaleConfigOut, VideoUpscaleConfigSavePayload, } from '../types'; import type { @@ -41,6 +42,18 @@ import type { HomeMaterialWatermarkQueryParams, } from '../types'; + +// ── Video Upscale ──────────────────────────────────────── + +export async function getVideoUpscaleConfig(): Promise { + return api.get('/admin/video-upscale/config'); +} + +export async function saveVideoUpscaleConfig(payload: VideoUpscaleConfigSavePayload): Promise { + return api.put('/admin/video-upscale/config', payload); +} + + // ── Auth ────────────────────────────────────────────────── export async function login(username: string, password: string, captchaToken?: string, rememberMe?: boolean): Promise { diff --git a/video-gen-admin/src/pages/AdminVideoUpscale.tsx b/video-gen-admin/src/pages/AdminVideoUpscale.tsx new file mode 100644 index 00000000..66bde398 --- /dev/null +++ b/video-gen-admin/src/pages/AdminVideoUpscale.tsx @@ -0,0 +1,262 @@ +import React, { useCallback, useEffect, useState } from 'react'; +import { + App, + Button, + Card, + Col, + Empty, + Row, + Select, + Space, + Spin, + Switch, + Tag, + Typography, +} from 'antd'; +import { DeleteOutlined, PlusOutlined, ReloadOutlined, SaveOutlined } from '@ant-design/icons'; + +import { getVideoUpscaleConfig, saveVideoUpscaleConfig } from '../api'; +import type { + VideoUpscaleConfigData, + VideoUpscaleProcessorKey, + VideoUpscaleResolutionRule, +} from '../types'; + +const { Title, Text, Paragraph } = Typography; + +const PROCESSORS: Array<{ key: VideoUpscaleProcessorKey; label: string }> = [ + { key: 'local_ffmpeg_crop_v1', label: '本地 FFmpeg(crop)' }, + { key: 'volc_standard_v1', label: '火山画质增强(标准版)' }, + { key: 'volc_professional_v1', label: '火山画质增强(专业版)' }, + { key: 'volc_large_model_v1', label: '火山画质增强(大模型)' }, +]; + +const RESOLUTION_OPTIONS = ['480p', '720p', '1080p', '2K', '4K'].map((value) => ({ + label: value, + value, +})); + +const defaultRule = (): VideoUpscaleResolutionRule => ({ + targetResolution: '1080p', + providerGenerationResolution: '720p', + processorKey: 'local_ffmpeg_crop_v1', + enabled: true, +}); + +function normalizeConfig(data: VideoUpscaleConfigData): VideoUpscaleConfigData { + return { + enabled: !!data.enabled, + version: Number(data.version || 1), + deleteSourceAfterSuccess: data.deleteSourceAfterSuccess !== false, + rules: Array.isArray(data.rules) ? data.rules.map((rule) => ({ ...rule })) : [], + }; +} + +function toSavePayload(data: VideoUpscaleConfigData) { + return { + data: { + enabled: data.enabled, + version: data.version, + delete_source_after_success: data.deleteSourceAfterSuccess, + rules: data.rules.map((rule) => ({ + target_resolution: rule.targetResolution, + provider_generation_resolution: rule.providerGenerationResolution, + processor_key: rule.processorKey, + enabled: rule.enabled, + })), + }, + }; +} + +const AdminVideoUpscale: React.FC = () => { + const { message, modal } = App.useApp(); + const [loading, setLoading] = useState(true); + const [saving, setSaving] = useState(false); + const [config, setConfig] = useState(null); + + const load = useCallback(async () => { + setLoading(true); + try { + const result = await getVideoUpscaleConfig(); + setConfig(normalizeConfig(result.data)); + } catch (error) { + message.error(error instanceof Error ? error.message : '读取视频超分配置失败'); + } finally { + setLoading(false); + } + }, [message]); + + useEffect(() => { + void load(); + }, [load]); + + const updateRule = (index: number, patch: Partial) => { + setConfig((current) => { + if (!current) return current; + return { + ...current, + rules: current.rules.map((item, itemIndex) => itemIndex === index ? { ...item, ...patch } : item), + }; + }); + }; + + const removeRule = (index: number) => { + setConfig((current) => current ? { + ...current, + rules: current.rules.filter((_, itemIndex) => itemIndex !== index), + } : current); + }; + + const addRule = () => { + setConfig((current) => current ? { ...current, rules: [...current.rules, defaultRule()] } : current); + }; + + const save = async () => { + if (!config) return; + const targets = config.rules + .filter((item) => item.enabled) + .map((item) => item.targetResolution.trim().toLowerCase()); + if (new Set(targets).size !== targets.length) { + message.error('同一个客户目标分辨率只能存在一条启用规则'); + return; + } + + setSaving(true); + try { + const result = await saveVideoUpscaleConfig(toSavePayload(config)); + setConfig(normalizeConfig(result.data)); + message.success(`视频超分配置已保存,版本 ${result.data.version}`); + } catch (error) { + message.error(error instanceof Error ? error.message : '保存失败'); + } finally { + setSaving(false); + } + }; + + if (loading || !config) { + return ( +
+ +
+ ); + } + + return ( + + + + + 视频超分配置 + + 规则只按客户选择的目标分辨率匹配。视频比例和最终像素由客户任务参数在创建任务时自动计算并固化快照。 + + + + + 配置版本 {config.version} + + + + + + + + + 全局开启超分 + setConfig({ ...config, enabled })} + /> + 关闭后新任务走原流程,已经创建的任务仍按自身快照执行。 + + + 超分成功后删除源视频 + setConfig({ ...config, deleteSourceAfterSuccess })} + /> + + 默认开启。关闭仅用于调试,会保留超分前源视频并持续占用服务器磁盘;超分失败时始终保留源视频。 + + + + + + } onClick={addRule}>新增规则} + > + {config.rules.length === 0 ? ( + + ) : ( + + {config.rules.map((rule, index) => { + const duplicate = rule.enabled && config.rules.filter( + (item) => item.enabled && item.targetResolution.toLowerCase() === rule.targetResolution.toLowerCase(), + ).length > 1; + return ( + + + + 客户选择分辨率 + updateRule(index, { providerGenerationResolution: value })} + /> + + + 处理方式 +