Skip to content

利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.

fix(cli): support AI music prompt for every provider

c0206277e784c5b85cc
diff --git a/cli.py b/cli.py
index bccf812c..6dfd567f 100644
--- a/cli.py
+++ b/cli.py
@@ -176,14 +176,22 @@ def _video_fit_mode(value: str) -> str:
return normalized
+# 只有这些取值会请求外部音乐生成服务,因此只有它们消费配乐提示词。取值需与
+# app/services/task.py 的 _VIDEO_MUSIC_PROVIDERS 保持一致;集中定义后,新增
+# 配乐供应商不会再次遗漏 --bgm-type 校验、批量校验和提示词参数。
+_CLI_MUSIC_BGM_TYPES = ("sonilo", "elevenlabs")
+_BGM_TYPE_CHOICES_TEXT = "none, random, custom, " + ", ".join(_CLI_MUSIC_BGM_TYPES)
+_BGM_TYPE_METAVAR = "{none,random,custom," + ",".join(_CLI_MUSIC_BGM_TYPES) + "}"
+
+
def _bgm_type(value: str) -> str:
normalized = value.strip().lower()
if normalized == "none":
return ""
- if normalized in {"", "random", "custom", "sonilo", "elevenlabs"}:
+ if normalized in {"", "random", "custom", *_CLI_MUSIC_BGM_TYPES}:
return normalized
raise argparse.ArgumentTypeError(
- "bgm-type must be one of: none, random, custom, sonilo, elevenlabs"
+ f"bgm-type must be one of: {_BGM_TYPE_CHOICES_TEXT}"
)
@@ -439,7 +447,7 @@ Batch manifests:
"--bgm-type",
type=_bgm_type,
default=None,
- metavar="{none,random,custom,sonilo,elevenlabs}",
+ metavar=_BGM_TYPE_METAVAR,
help=(
"background music mode; Sonilo reads its API key from config.toml or "
"SONILO_API_KEY, ElevenLabs from config.toml or ELEVENLABS_API_KEY; "
@@ -451,6 +459,15 @@ Batch manifests:
default=None,
help="optional music style prompt for Sonilo, up to 2000 characters",
)
+ audio_group.add_argument(
+ "--video-music-prompt",
+ default=None,
+ help=(
+ "optional music style prompt for the selected AI background music "
+ "provider (sonilo or elevenlabs); the provider's own length limit "
+ "is enforced before generation"
+ ),
+ )
audio_group.add_argument(
"--bgm-file",
default=None,
@@ -665,6 +682,18 @@ Batch manifests:
"--sonilo-bgm-prompt can only be combined with --bgm-type sonilo"
)
+ # 提示词字段本身与供应商无关,所以不像 Sonilo 专用参数那样推断 bgm_type:
+ # 推断出来的供应商可能不是用户想要的那个。必须显式选择 AI 配乐供应商,
+ # 否则该提示词会被静默丢弃。批量清单仍可按任务单独设置该字段。
+ if (
+ not args.batch_file
+ and args.video_music_prompt
+ and args.bgm_type not in _CLI_MUSIC_BGM_TYPES
+ ):
+ parser.error(
+ "--video-music-prompt requires --bgm-type sonilo or elevenlabs"
+ )
+
if (
not args.batch_file
and args.custom_position is not None
@@ -814,6 +843,7 @@ def build_video_params(args: argparse.Namespace) -> VideoParams:
"bgm_file",
"bgm_volume",
"sonilo_bgm_prompt",
+ "video_music_prompt",
"font_name",
"subtitle_position",
"custom_position",
@@ -1139,14 +1169,16 @@ def _validate_batch_task_params(
if value is not None and value < 1:
raise ValueError(f"{name} must be >= 1")
- if params.bgm_type not in {"", "random", "custom", "sonilo", "elevenlabs"}:
- raise ValueError(
- "bgm_type must be one of: none, random, custom, sonilo, elevenlabs"
- )
+ if params.bgm_type not in {"", "random", "custom", *_CLI_MUSIC_BGM_TYPES}:
+ raise ValueError(f"bgm_type must be one of: {_BGM_TYPE_CHOICES_TEXT}")
if params.bgm_file and params.bgm_type != "custom":
raise ValueError("bgm_file requires bgm_type=custom")
if params.sonilo_bgm_prompt and params.bgm_type != "sonilo":
raise ValueError("sonilo_bgm_prompt requires bgm_type=sonilo")
+ if params.video_music_prompt and params.bgm_type not in _CLI_MUSIC_BGM_TYPES:
+ raise ValueError(
+ "video_music_prompt requires bgm_type=sonilo or elevenlabs"
+ )
def _build_batch_tasks(args: argparse.Namespace) -> list[VideoParams]:
diff --git a/test/services/test_cli.py b/test/services/test_cli.py
index e234304f..413dd651 100644
--- a/test/services/test_cli.py
+++ b/test/services/test_cli.py
@@ -6,7 +6,7 @@ import subprocess
import sys
import tempfile
import unittest
-from contextlib import redirect_stdout
+from contextlib import redirect_stderr, redirect_stdout
from pathlib import Path
from unittest.mock import patch
from uuid import uuid4
@@ -584,6 +584,52 @@ class TestCli(unittest.TestCase):
self.assertEqual(params.bgm_type, "sonilo")
self.assertEqual(params.sonilo_bgm_prompt, "warm acoustic")
+ def test_video_music_prompt_reaches_every_ai_music_provider(self):
+ # video_music_prompt 与供应商无关,WebUI 为每个 AI 配乐供应商都写入
+ # 该字段。CLI 若只提供 Sonilo 专用参数,选中 ElevenLabs 的用户就无法
+ # 传提示词。期望值从运行时注册表推导,避免两份清单再次漂移。
+ from app.services import task as task_service
+
+ for provider in sorted(task_service._VIDEO_MUSIC_PROVIDERS):
+ args = cli.parse_args(
+ [
+ "--video-subject",
+ "test",
+ "--bgm-type",
+ provider,
+ "--video-music-prompt",
+ "warm acoustic",
+ ]
+ )
+ params = cli.build_video_params(args)
+ self.assertEqual(params.bgm_type, provider)
+ self.assertEqual(params.video_music_prompt, "warm acoustic")
+
+ def test_video_music_prompt_requires_an_ai_music_provider(self):
+ # 下游只在 AI 配乐供应商分支读取该提示词。同一个 --bgm-type random 在
+ # 没有提示词时仍然可用,说明这里的拒绝来自提示词与供应商的组合,而不是
+ # 参数本身不被识别。
+ cli.parse_args(["--video-subject", "test", "--bgm-type", "random"])
+ for bgm_type in ("random", "none"):
+ error_output = io.StringIO()
+ with redirect_stderr(error_output):
+ with self.assertRaises(SystemExit) as cm:
+ cli.parse_args(
+ [
+ "--video-subject",
+ "test",
+ "--bgm-type",
+ bgm_type,
+ "--video-music-prompt",
+ "warm acoustic",
+ ]
+ )
+ self.assertEqual(cm.exception.code, 2)
+ self.assertIn(
+ "--video-music-prompt requires --bgm-type sonilo or elevenlabs",
+ error_output.getvalue(),
+ )
+
def test_local_material_filename_resolved_to_absolute_path(self):
"""After preprocess_video, material.url should be an absolute path, not a bare filename."""
import os