Merge pull request 'fix: 修复封面标题叠加根因 - custom_title 未传入渲染流程' (#1368) from fix/custom-title-render into develop
CI/CD Pipeline / Validate - Migration (alembic) (push) Successful in 2m2s
CI/CD Pipeline / Validate - Type Check (mypy) (push) Successful in 2m43s
CI/CD Pipeline / Build Staging Web Image (push) Successful in 3m51s
CI/CD Pipeline / Build Staging Worker Image (push) Successful in 3m51s
CI/CD Pipeline / Frontend Unit Tests (push) Successful in 3m51s
CI/CD Pipeline / Validate - Code Quality (push) Successful in 6m16s
CI/CD Pipeline / Integration Tests (push) Successful in 2m46s
CI/CD Pipeline / Unit Tests (push) Successful in 9m30s
CI/CD Pipeline / Build Staging API Image (push) Successful in 16m7s
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Successful in 1m10s
CI/CD Pipeline / ACR Image Cleanup (push) Successful in 39s
CI/CD Pipeline / Staging E2E Tests (push) Successful in 1m2s
CI/CD Pipeline / Staging API Integration Tests (push) Successful in 2m48s
CI/CD Pipeline / Canary Release to Production (push) Failing after 792h1m13s
CI/CD Pipeline / Build Production Worker Image (push) Failing after 792h11m50s
CI/CD Pipeline / Build Production Web Image (push) Failing after 792h11m50s
CI/CD Pipeline / Production Browser E2E (push) Failing after 792h11m48s
CI/CD Pipeline / PR Build Worker Image (push) Failing after 792h21m18s
CI/CD Pipeline / PR Build Web Image (push) Failing after 792h21m19s
CI/CD Pipeline / Deploy Production (push) Failing after 792h11m49s
CI/CD Pipeline / Frontend Lint (push) Failing after 792h21m21s
CI/CD Pipeline / Check if frontend-only change (push) Failing after 792h21m24s
CI/CD Pipeline / CI Gate (push) Failing after 792h45m21s
CI/CD Pipeline / Build Production API Image (push) Failing after 792h45m21s
CI/CD Pipeline / PR Build API Image (push) Failing after 792h54m51s
CI/CD Pipeline / Validate - Migration (alembic) (push) Successful in 2m2s
CI/CD Pipeline / Validate - Type Check (mypy) (push) Successful in 2m43s
CI/CD Pipeline / Build Staging Web Image (push) Successful in 3m51s
CI/CD Pipeline / Build Staging Worker Image (push) Successful in 3m51s
CI/CD Pipeline / Frontend Unit Tests (push) Successful in 3m51s
CI/CD Pipeline / Validate - Code Quality (push) Successful in 6m16s
CI/CD Pipeline / Integration Tests (push) Successful in 2m46s
CI/CD Pipeline / Unit Tests (push) Successful in 9m30s
CI/CD Pipeline / Build Staging API Image (push) Successful in 16m7s
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Successful in 1m10s
CI/CD Pipeline / ACR Image Cleanup (push) Successful in 39s
CI/CD Pipeline / Staging E2E Tests (push) Successful in 1m2s
CI/CD Pipeline / Staging API Integration Tests (push) Successful in 2m48s
CI/CD Pipeline / Canary Release to Production (push) Failing after 792h1m13s
CI/CD Pipeline / Build Production Worker Image (push) Failing after 792h11m50s
CI/CD Pipeline / Build Production Web Image (push) Failing after 792h11m50s
CI/CD Pipeline / Production Browser E2E (push) Failing after 792h11m48s
CI/CD Pipeline / PR Build Worker Image (push) Failing after 792h21m18s
CI/CD Pipeline / PR Build Web Image (push) Failing after 792h21m19s
CI/CD Pipeline / Deploy Production (push) Failing after 792h11m49s
CI/CD Pipeline / Frontend Lint (push) Failing after 792h21m21s
CI/CD Pipeline / Check if frontend-only change (push) Failing after 792h21m24s
CI/CD Pipeline / CI Gate (push) Failing after 792h45m21s
CI/CD Pipeline / Build Production API Image (push) Failing after 792h45m21s
CI/CD Pipeline / PR Build API Image (push) Failing after 792h54m51s
This commit was merged in pull request #1368.
This commit is contained in:
@@ -1123,6 +1123,7 @@ def _render_video(
|
||||
resolution: str = "",
|
||||
bgm_config: dict | None = None,
|
||||
voice_ids: list[str] | None = None,
|
||||
custom_title: str = "",
|
||||
) -> tuple[Path, float]:
|
||||
"""渲染视频(含配音混音)。
|
||||
|
||||
@@ -1169,6 +1170,20 @@ def _render_video(
|
||||
merged_bgm.get("source", ""),
|
||||
)
|
||||
|
||||
# 用户自定义标题覆盖模板标题(用户指定优先级最高)
|
||||
if custom_title and custom_title.strip():
|
||||
plan_cfg = dict(virtual_plan.config or {})
|
||||
title_cfg = dict(plan_cfg.get("title", {}) or {})
|
||||
title_cfg["text"] = custom_title.strip()
|
||||
title_cfg["enabled"] = True
|
||||
plan_cfg["title"] = title_cfg
|
||||
virtual_plan.config = plan_cfg
|
||||
logger.info(
|
||||
"[task_id=%s] [渲染] 用户自定义标题已注入: title=%s",
|
||||
task_id,
|
||||
custom_title[:50],
|
||||
)
|
||||
|
||||
# 确保输出分辨率配置存在
|
||||
# 优先级:用户指定 > 模板配置 > 默认 1280x720
|
||||
# 预览模式:强制 854x480 + 低码率
|
||||
@@ -1529,6 +1544,7 @@ def generate_video(self, task_id: str) -> dict:
|
||||
resolution=_resolved_resolution,
|
||||
bgm_config=task_info.get("bgm_config", {}),
|
||||
voice_ids=task_info.get("voice_ids", []),
|
||||
custom_title=task_info.get("custom_title", ""),
|
||||
)
|
||||
|
||||
if gen_task:
|
||||
|
||||
Reference in New Issue
Block a user