Merge branch 'develop' into refactor/templates-api

将 168 行的 templates.ts 拆分为目录化结构：
- types.ts: 类型定义（TemplateItem/TemplateSegment 等）
- constants.ts: 常量配置（分类/时长筛选选项）
- templates.ts: 全部 6 个 API 函数
- index.ts: 统一入口 re-export，保持 @/api/templates 路径向后兼容

主入口从 168 行减少到约 35 行，按职责清晰分层。

apps/api/app/services/ai_service.py

@@ -12,6 +12,7 @@
 
 from __future__ import annotations
 
+import json
 import logging
 from typing import Any, Dict, List, Optional
 

apps/web/src/api/templates.ts

@@ -1,168 +0,0 @@
-/**
- * 模板相关 API
- * 对接后端模板管理接口：
- * - GET  /api/v1/templates              — 模板列表（分页/筛选）
- * - GET  /api/v1/templates/{id}         — 模板详情
- * - POST /api/v1/templates/{id}/copy    — 复制模板
- * - POST /api/v1/templates/{id}/generate — 从模板生成
- * - POST /api/v1/templates/{id}/toggle-favorite — 收藏/取消收藏
- */
-import apiClient from "./client"
-import type { TitleConfig, SubtitleConfig, BgmConfig } from "./editing-planner"
-import type { EditPlanConfig } from "./template-editor"
-
-/* ──────────── 类型定义 ──────────── */
-
-/** 模板条目（后端 TemplateResponse） */
-export interface TemplateItem {
-  id: string
-  user_id?: string
-  name: string
-  description?: string
-  mode?: string
-  category: string
-  tags?: string[]
-  /** 预估时长（后端字段名 estimated_duration） */
-  estimated_duration?: number
-  /** @deprecated 后端已改名为 estimated_duration，保留兼容 */
-  target_duration?: number
-  clip_count?: number
-  /** 使用次数 */
-  usage_count?: number
-  thumbnail_url?: string
-  preview_url?: string
-  is_active?: boolean
-  is_favorite?: boolean
-  /** 素材规则（片段配置） */
-  segments?: TemplateSegment[]
-  /** 字幕样式 */
-  subtitle_config?: SubtitleConfig
-  /** BGM 配置 */
-  bgm_config?: BgmConfig
-  /** 标题配置 */
-  title_config?: TitleConfig
-  /** 视频比例 */
-  aspect_ratio?: string
-  created_at?: string
-  updated_at?: string
-}
-
-/** 模板片段（素材规则） */
-export interface TemplateSegment {
-  id?: string
-  segment_order: number
-  duration_min: number
-  duration_max: number
-  material_type: string | null
-  description?: string
-}
-
-/** 模板列表查询参数 */
-export interface TemplateListParams {
-  page?: number
-  page_size?: number
-  category?: string
-  tags?: string
-  keyword?: string
-  /** 时长筛选（秒）：short < 30, medium 30-120, long > 120 */
-  duration_range?: "short" | "medium" | "long"
-}
-
-/** 模板列表分页响应 */
-export interface TemplateListResponse {
-  items: TemplateItem[]
-  total: number
-  page: number
-  page_size: number
-}
-
-/** 从模板生成请求 */
-export interface GenerateFromTemplateRequest {
-  asset_ids?: string[]
-  name?: string
-  config?: EditPlanConfig
-}
-
-/** 从模板生成响应 */
-export interface GenerateFromTemplateResponse {
-  plan_id: string
-  template_id: string
-  status: string
-  name: string
-}
-
-/** 复制模板响应 */
-export interface CopyTemplateResponse {
-  id: string
-  name: string
-  source_template_id: string
-}
-
-/* ──────────── API 函数 ──────────── */
-
-/** 获取模板列表（支持分页和筛选） */
-export const getTemplates = async (params?: TemplateListParams): Promise<TemplateListResponse> => {
-  const { data } = await apiClient.get<TemplateListResponse>("/templates", {
-    params,
-  })
-  return data
-}
-
-/** 获取模板列表（兼容旧接口，返回数组） */
-export const getTemplatesList = async (): Promise<TemplateItem[]> => {
-  const response = await apiClient.get("/templates")
-  return response.data.items || response.data || []
-}
-
-/** 获取单个模板详情 */
-export const getTemplate = async (templateId: string): Promise<TemplateItem> => {
-  const response = await apiClient.get(`/templates/${templateId}`)
-  return response.data
-}
-
-/** 收藏 / 取消收藏模板 */
-export const toggleFavoriteTemplate = async (
-  templateId: string,
-): Promise<{ is_favorite: boolean }> => {
-  const response = await apiClient.post(`/templates/${templateId}/toggle-favorite`)
-  return response.data
-}
-
-/** 复制模板（创建副本到我的模板） */
-export const copyTemplate = async (templateId: string): Promise<CopyTemplateResponse> => {
-  const response = await apiClient.post<CopyTemplateResponse>(`/templates/${templateId}/copy`)
-  return response.data
-}
-
-/** 从模板生成 */
-export const generateFromTemplate = async (
-  templateId: string,
-  data?: GenerateFromTemplateRequest,
-): Promise<GenerateFromTemplateResponse> => {
-  const response = await apiClient.post<GenerateFromTemplateResponse>(
-    `/templates/${templateId}/generate`,
-    data,
-  )
-  return response.data
-}
-
-/* ──────────── 常量 ──────────── */
-
-/** 模板分类选项 */
-export const TEMPLATE_CATEGORY_OPTIONS = [
-  { value: "", label: "全部分类" },
-  { value: "口播", label: "口播" },
-  { value: "种草", label: "种草" },
-  { value: "产品", label: "产品" },
-  { value: "品牌", label: "品牌" },
-  { value: "混剪", label: "混剪" },
-  { value: "Vlog", label: "Vlog" },
-]
-
-/** 时长筛选选项 */
-export const TEMPLATE_DURATION_OPTIONS = [
-  { value: "", label: "全部时长" },
-  { value: "short", label: "30秒以内" },
-  { value: "medium", label: "30秒-2分钟" },
-  { value: "long", label: "2分钟以上" },
-]

apps/web/src/api/templates/constants.ts

@@ -0,0 +1,22 @@
+/**
+ * 模板相关常量
+ */
+
+/** 模板分类选项 */
+export const TEMPLATE_CATEGORY_OPTIONS = [
+  { value: "", label: "全部分类" },
+  { value: "口播", label: "口播" },
+  { value: "种草", label: "种草" },
+  { value: "产品", label: "产品" },
+  { value: "品牌", label: "品牌" },
+  { value: "混剪", label: "混剪" },
+  { value: "Vlog", label: "Vlog" },
+]
+
+/** 时长筛选选项 */
+export const TEMPLATE_DURATION_OPTIONS = [
+  { value: "", label: "全部时长" },
+  { value: "short", label: "30秒以内" },
+  { value: "medium", label: "30秒-2分钟" },
+  { value: "long", label: "2分钟以上" },
+]

apps/web/src/api/templates/index.ts

@@ -0,0 +1,28 @@
+/**
+ * 模板相关 API — 目录化入口
+ * 保持与原 templates.ts 相同导出，向后兼容
+ */
+
+// 类型
+export type {
+  TemplateItem,
+  TemplateSegment,
+  TemplateListParams,
+  TemplateListResponse,
+  GenerateFromTemplateRequest,
+  GenerateFromTemplateResponse,
+  CopyTemplateResponse,
+} from "./types"
+
+// 常量
+export { TEMPLATE_CATEGORY_OPTIONS, TEMPLATE_DURATION_OPTIONS } from "./constants"
+
+// API 函数
+export {
+  getTemplates,
+  getTemplatesList,
+  getTemplate,
+  toggleFavoriteTemplate,
+  copyTemplate,
+  generateFromTemplate,
+} from "./templates"

apps/web/src/api/templates/templates.ts

@@ -0,0 +1,59 @@
+/**
+ * 模板相关 API 函数
+ * 对接后端模板管理接口
+ */
+import apiClient from "../client"
+import type {
+  CopyTemplateResponse,
+  GenerateFromTemplateRequest,
+  GenerateFromTemplateResponse,
+  TemplateItem,
+  TemplateListParams,
+  TemplateListResponse,
+} from "./types"
+
+/** 获取模板列表（支持分页和筛选） */
+export const getTemplates = async (params?: TemplateListParams): Promise<TemplateListResponse> => {
+  const { data } = await apiClient.get<TemplateListResponse>("/templates", {
+    params,
+  })
+  return data
+}
+
+/** 获取模板列表（兼容旧接口，返回数组） */
+export const getTemplatesList = async (): Promise<TemplateItem[]> => {
+  const response = await apiClient.get("/templates")
+  return response.data.items || response.data || []
+}
+
+/** 获取单个模板详情 */
+export const getTemplate = async (templateId: string): Promise<TemplateItem> => {
+  const response = await apiClient.get(`/templates/${templateId}`)
+  return response.data
+}
+
+/** 收藏 / 取消收藏模板 */
+export const toggleFavoriteTemplate = async (
+  templateId: string,
+): Promise<{ is_favorite: boolean }> => {
+  const response = await apiClient.post(`/templates/${templateId}/toggle-favorite`)
+  return response.data
+}
+
+/** 复制模板（创建副本到我的模板） */
+export const copyTemplate = async (templateId: string): Promise<CopyTemplateResponse> => {
+  const response = await apiClient.post<CopyTemplateResponse>(`/templates/${templateId}/copy`)
+  return response.data
+}
+
+/** 从模板生成 */
+export const generateFromTemplate = async (
+  templateId: string,
+  data?: GenerateFromTemplateRequest,
+): Promise<GenerateFromTemplateResponse> => {
+  const response = await apiClient.post<GenerateFromTemplateResponse>(
+    `/templates/${templateId}/generate`,
+    data,
+  )
+  return response.data
+}

apps/web/src/api/templates/types.ts

@@ -0,0 +1,90 @@
+/**
+ * 模板相关类型定义
+ */
+import type { TitleConfig, SubtitleConfig, BgmConfig } from "../editing-planner"
+import type { EditPlanConfig } from "../template-editor"
+
+/** 模板条目（后端 TemplateResponse） */
+export interface TemplateItem {
+  id: string
+  user_id?: string
+  name: string
+  description?: string
+  mode?: string
+  category: string
+  tags?: string[]
+  /** 预估时长（后端字段名 estimated_duration） */
+  estimated_duration?: number
+  /** @deprecated 后端已改名为 estimated_duration，保留兼容 */
+  target_duration?: number
+  clip_count?: number
+  /** 使用次数 */
+  usage_count?: number
+  thumbnail_url?: string
+  preview_url?: string
+  is_active?: boolean
+  is_favorite?: boolean
+  /** 素材规则（片段配置） */
+  segments?: TemplateSegment[]
+  /** 字幕样式 */
+  subtitle_config?: SubtitleConfig
+  /** BGM 配置 */
+  bgm_config?: BgmConfig
+  /** 标题配置 */
+  title_config?: TitleConfig
+  /** 视频比例 */
+  aspect_ratio?: string
+  created_at?: string
+  updated_at?: string
+}
+
+/** 模板片段（素材规则） */
+export interface TemplateSegment {
+  id?: string
+  segment_order: number
+  duration_min: number
+  duration_max: number
+  material_type: string | null
+  description?: string
+}
+
+/** 模板列表查询参数 */
+export interface TemplateListParams {
+  page?: number
+  page_size?: number
+  category?: string
+  tags?: string
+  keyword?: string
+  /** 时长筛选（秒）：short < 30, medium 30-120, long > 120 */
+  duration_range?: "short" | "medium" | "long"
+}
+
+/** 模板列表分页响应 */
+export interface TemplateListResponse {
+  items: TemplateItem[]
+  total: number
+  page: number
+  page_size: number
+}
+
+/** 从模板生成请求 */
+export interface GenerateFromTemplateRequest {
+  asset_ids?: string[]
+  name?: string
+  config?: EditPlanConfig
+}
+
+/** 从模板生成响应 */
+export interface GenerateFromTemplateResponse {
+  plan_id: string
+  template_id: string
+  status: string
+  name: string
+}
+
+/** 复制模板响应 */
+export interface CopyTemplateResponse {
+  id: string
+  name: string
+  source_template_id: string
+}

apps/worker/video_processing/chroma_key_engine.py

@@ -9,11 +9,12 @@
 from __future__ import annotations
 
 import logging
+from typing import Optional
 
-from packages.domain.chroma_key_config import CHROMA_KEY_PRESETS  # noqa: F401
-from packages.domain.chroma_key_config import apply_chroma_key_if_needed  # noqa: F401
 from packages.domain.chroma_key_config import (
+    CHROMA_KEY_PRESETS,
     ChromaKeyConfig,
+    apply_chroma_key_if_needed,
 )
 from packages.domain.chroma_key_config import (  # noqa: F401 — 向后兼容
     build_chromakey_filter as _build_chromakey_filter_base,

apps/worker/video_processing/color_grade_engine.py

@@ -195,3 +195,17 @@ class ColorGradeEngine:
 
 
 # ── 便捷函数 ──────────────────────────────────────────────────────────────────
+
+
+def get_preset_names() -> list[tuple[str, str]]:
+    """获取所有预设名称列表.
+
+    Returns:
+        [(preset_key, display_name), ...]
+    """
+    return [(key, PRESET_DISPLAY_NAMES.get(key, key)) for key in PRESET_PARAMS.keys()]
+
+
+def get_preset_params(preset: str) -> dict[str, float] | None:
+    """获取指定预设的参数."""
+    return PRESET_PARAMS.get(preset)

apps/worker/video_processing/ffmpeg_utils.py

@@ -22,9 +22,11 @@ from shared.ffmpeg_utils import (  # noqa: F401
 
 # xfade 转场纯逻辑已抽离到 domain 层，这里 re-export 保持向后兼容
 from packages.domain.xfade_builder import DEFAULT_TRANSITION_DURATION as _default_transition_duration_base  # noqa: F401
-from packages.domain.xfade_builder import SUPPORTED_TRANSITIONS  # noqa: F401
-from packages.domain.xfade_builder import XFADE_TRANSITION_MAP  # noqa: F401
-from packages.domain.xfade_builder import XFade_TRANSITION_NAMES  # noqa: F401
+from packages.domain.xfade_builder import (
+    SUPPORTED_TRANSITIONS,
+    XFADE_TRANSITION_MAP,
+    XFade_TRANSITION_NAMES,
+)
 from packages.domain.xfade_builder import build_xfade_filter_chain as _build_xfade_filter_chain_base
 from packages.domain.xfade_builder import chain_filters as _chain_filters_base
 from packages.domain.xfade_builder import resolve_xfade_transition as _resolve_xfade_transition_base

apps/worker/video_processing/noise_reduction_engine.py

@@ -9,21 +9,16 @@ from __future__ import annotations
 
 import logging
 
-# isort: off
 from packages.domain.noise_reduction_config import (
     NoiseReductionConfig,
-    NoiseReductionLevel,  # noqa: F401
+    NoiseReductionLevel,
 )
 from packages.domain.noise_reduction_config import (
     apply_noise_reduction_if_needed as _apply_noise_reduction_if_needed_base,
 )
-from packages.domain.noise_reduction_config import (
-    build_afftdn_filter as _build_afftdn_filter_base,
-)  # noqa: F401 — 向后兼容
+from packages.domain.noise_reduction_config import build_afftdn_filter as _build_afftdn_filter_base  # noqa: F401 — 向后兼容
 from packages.domain.noise_reduction_config import build_arnndn_filter as _build_arnndn_filter_base
 
-# isort: on
-
 logger = logging.getLogger(__name__)
 
 

apps/worker/video_processing/pip_engine.py

@@ -18,13 +18,22 @@ from pathlib import Path
 
 # 向后兼容：POSITION_BOTTOM_CENTER 也从 pip_config 再导出
 from packages.domain.pip_config import POSITION_BOTTOM_CENTER  # noqa: E402, F401
-from packages.domain.pip_config import PiPConfig  # noqa: F401
 from packages.domain.pip_config import (
     ANIMATION_FADE,
+    ANIMATION_SCALE,
     ANIMATION_SLIDE_BOTTOM,
     ANIMATION_SLIDE_LEFT,
     ANIMATION_SLIDE_RIGHT,
     ANIMATION_SLIDE_TOP,
+    POSITION_BOTTOM_LEFT,
+    POSITION_BOTTOM_RIGHT,
+    POSITION_CENTER,
+    POSITION_CENTER_LEFT,
+    POSITION_CENTER_RIGHT,
+    POSITION_TOP_CENTER,
+    POSITION_TOP_LEFT,
+    POSITION_TOP_RIGHT,
+    PiPConfig,
     PiPLayerConfig,
 )
 from packages.domain.pip_config import (  # noqa: F401 — 向后兼容：保留模块级导出

apps/worker/video_processing/render_subtitles.py

@@ -13,6 +13,9 @@ from pathlib import Path
 from typing import Any
 
 from packages.domain.ass_subtitle_builder import (
+    TITLE_MARGIN_BOTTOM,
+    TITLE_MARGIN_SIDE,
+    TITLE_MARGIN_TOP,
     build_ass_content,
 )
 from packages.domain.ass_subtitle_builder import build_ass_style as _build_ass_style_base  # noqa: F401 — 向后兼容

apps/worker/video_processing/sticker_engine.py

@@ -14,20 +14,16 @@ import logging
 from pathlib import Path
 from typing import Any
 
-# isort: off
 from packages.domain.sticker_config import (
-    POSITION_PRESETS,  # noqa: F401
-    STICKER_CATEGORIES,  # noqa: F401
+    POSITION_PRESETS,
+    STICKER_CATEGORIES,
     ImageStickerConfig,
     StickerOverlayResult,
     TextStickerConfig,
 )
-from packages.domain.sticker_config import (
-    get_sticker_categories as _get_sticker_categories_base,
-)  # noqa: F401  向后兼容导出
+from packages.domain.sticker_config import get_sticker_categories as _get_sticker_categories_base  # noqa: F401  向后兼容导出
 from packages.domain.sticker_config import parse_stickers_from_config as _parse_stickers_base
 from packages.domain.sticker_config import (
-    # isort: on
     resolve_sticker_position,
 )
 

apps/worker/video_processing/subtitle_render_engine.py

@@ -25,22 +25,28 @@ from __future__ import annotations
 
 import logging
 from pathlib import Path
-from typing import Any
 
 from video_processing.path_security import PathSecurityError, is_in_allowed_dirs, safe_resolve_path
 
 from packages.domain.subtitle_style import (
     ALLOWED_SUBTITLE_EXTENSIONS,
+    DEFAULT_COLOR,
+    DEFAULT_FONT,
     DEFAULT_FONT_SIZE,
+    DEFAULT_MAX_CHARS_PER_LINE,
     DEFAULT_POSITION,
+    DEFAULT_STROKE_COLOR,
+    DEFAULT_STROKE_WIDTH,
+    POSITION_ALIASES,
+    POSITION_ALIGNMENT,
     SubtitleSegment,
     SubtitleStyle,
 )
 from packages.domain.subtitle_style import escape_ass_text as _escape_ass_text  # noqa: F401  向后兼容导出
 from packages.domain.subtitle_style import format_ass_time as _format_ass_time
-from packages.domain.subtitle_style import hex_to_ass_bgr as _hex_to_ass_bgr  # noqa: F401
-from packages.domain.subtitle_style import hex_to_ass_color as _hex_to_ass_color  # noqa: F401
-from packages.domain.subtitle_style import opacity_to_ass_alpha as _opacity_to_ass_alpha  # noqa: F401
+from packages.domain.subtitle_style import hex_to_ass_bgr as _hex_to_ass_bgr
+from packages.domain.subtitle_style import hex_to_ass_color as _hex_to_ass_color
+from packages.domain.subtitle_style import opacity_to_ass_alpha as _opacity_to_ass_alpha
 from packages.domain.subtitle_style import wrap_text as _wrap_text
 
 logger = logging.getLogger(__name__)

apps/worker/video_processing/trim_engine.py

@@ -15,14 +15,16 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from packages.domain.trim_config import MIN_TRIM_DURATION  # noqa: F401
-from packages.domain.trim_config import extract_trim_from_clip_config  # noqa: F401
 from packages.domain.trim_config import (
+    MIN_TRIM_DURATION,
     TrimConfig,
     TrimSegment,
 )
 from packages.domain.trim_config import build_audio_trim_filter as _build_audio_trim_filter  # noqa: F401 — 向后兼容
 from packages.domain.trim_config import build_video_trim_filter as _build_video_trim_filter
+from packages.domain.trim_config import (
+    extract_trim_from_clip_config,
+)
 from packages.domain.trim_config import parse_segments_from_config as _parse_segments_from_config
 from packages.domain.trim_config import resolve_segments as _resolve_segments
 

apps/worker/video_processing/unified_render_service.py

@@ -53,6 +53,7 @@ from video_processing.tts_engine import TtsEngine
 from video_processing.watermark_engine import WatermarkConfig, WatermarkEngine
 
 from packages.domain.render_layer_utils import LAYER_Z_INDEX as _IMPORTED_LAYER_Z_INDEX
+from packages.domain.render_layer_utils import can_pass_through as _can_pass_through_pure
 from packages.domain.render_layer_utils import clip_adjusted_duration as _clip_adjusted_duration_pure
 from packages.domain.render_layer_utils import clip_effective_duration as _clip_effective_duration_pure
 from packages.domain.render_layer_utils import clip_playback_speed as _clip_playback_speed_pure

apps/worker/video_processing/watermark_engine.py

@@ -14,9 +14,10 @@
 from __future__ import annotations
 
 import logging
+from typing import Any
 
-from packages.domain.watermark_config import WATERMARK_POSITIONS  # noqa: F401
 from packages.domain.watermark_config import (
+    WATERMARK_POSITIONS,
     WatermarkConfig,
 )
 from packages.domain.watermark_config import (  # noqa: F401 — 向后兼容

packages/domain/pip_config.py

@@ -186,7 +186,7 @@ class PiPConfig:
         """最大 z_index."""
         if not self.layers:
             return 0
-        return max(layer.z_index for layer in self.layers)
+        return max(l.z_index for l in self.layers)
 
 
 # ── 纯逻辑工具函数 ───────────────────────────────────────────────────────────

packages/domain/subtitle_style.py

@@ -6,7 +6,7 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any
 
 # ── 常量 ──────────────────────────────────────────────────────────────────────

packages/domain/trim_config.py

@@ -11,7 +11,7 @@
 from __future__ import annotations
 
 import logging
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any
 
 logger = logging.getLogger(__name__)

packages/domain/watermark_config.py

@@ -10,7 +10,7 @@
 from __future__ import annotations
 
 import logging
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any
 
 logger = logging.getLogger(__name__)

tests/unit/test_color_grade_config.py

@@ -39,7 +39,7 @@ class TestConstants:
 
     def test_preset_params_complete(self):
         assert set(PRESET_PARAMS.keys()) == VALID_PRESETS
-        for _preset, params in PRESET_PARAMS.items():
+        for preset, params in PRESET_PARAMS.items():
             assert set(params.keys()) == set(ALL_PARAM_KEYS)
 
     def test_default_params_keys(self):
@@ -54,7 +54,7 @@ class TestConstants:
             assert min_val <= DEFAULT_PARAMS[key] <= max_val
 
     def test_all_presets_within_ranges(self):
-        for _preset, params in PRESET_PARAMS.items():
+        for preset, params in PRESET_PARAMS.items():
             for key in ALL_PARAM_KEYS:
                 min_val, max_val = PARAM_RANGES[key]
                 assert min_val <= params[key] <= max_val, f"{preset}.{key}={params[key]} out of range"

tests/unit/test_pip_config.py

@@ -208,7 +208,7 @@ class TestPiPConfigFromDict:
             }
         )
         assert cfg.layer_count == 3
-        assert [layer.source for layer in cfg.layers] == ["bottom", "mid", "top"]
+        assert [l.source for l in cfg.layers] == ["bottom", "mid", "top"]
 
     def test_invalid_layer_skipped(self):
         cfg = PiPConfig.from_dict(

tests/unit/test_sticker_config.py

@@ -23,7 +23,7 @@ class TestConstants:
         assert len(POSITION_PRESETS) == 9
 
     def test_position_presets_normalized(self):
-        for _name, (x, y) in POSITION_PRESETS.items():
+        for name, (x, y) in POSITION_PRESETS.items():
             assert 0.0 <= x <= 1.0
             assert 0.0 <= y <= 1.0