Skip to content

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

fix(llm): stop term generation on provider errors

TechDou8cbaa0eedcc4
diff --git a/app/services/llm.py b/app/services/llm.py
index 4ef3f47c..b5f3a159 100644
--- a/app/services/llm.py
+++ b/app/services/llm.py
@@ -650,9 +650,13 @@ Please note that you must use English for generating video search terms; Chinese
for i in range(_max_retries):
try:
response = _generate_response(prompt)
- if "Error: " in response:
- logger.error(f"failed to generate video script: {response}")
- return response
+ if response.startswith("Error: "):
+ # generate_terms 的公开返回类型是 List[str]。如果把 Provider 的
+ # 错误文案原样返回,下游只做空值判断时会把非空字符串误认为成功,
+ # 素材下载循环还会按字符遍历错误文案,产生无意义的外部请求。
+ # 这里统一返回空列表,让任务编排层在真实故障位置立即结束任务。
+ logger.error(f"failed to generate video terms: {response}")
+ return []
search_terms = json.loads(_strip_code_fence(response))
if not isinstance(search_terms, list) or not all(
isinstance(term, str) for term in search_terms
diff --git a/test/services/test_llm.py b/test/services/test_llm.py
index a6e888f9..b332ee8e 100644
--- a/test/services/test_llm.py
+++ b/test/services/test_llm.py
@@ -142,6 +142,26 @@ class TestScriptPromptOptions(unittest.TestCase):
self.assertIn("chronological stock-video search terms", captured["prompt"])
self.assertIn("same order as the script narration", captured["prompt"])
+ def test_generate_terms_returns_empty_list_on_provider_error(self):
+ """
+ Provider 错误必须保持 generate_terms 的 List[str] 返回契约。
+
+ 非空的 ``Error: ...`` 字符串在 Python 中是真值;如果直接返回,任务层
+ 会把它当成有效关键词,素材下载层随后还可能逐字符发起搜索请求。
+ """
+ with patch.object(
+ llm,
+ "_generate_response",
+ return_value="Error: invalid API key",
+ ):
+ result = llm.generate_terms(
+ video_subject="startup story",
+ video_script="A short startup story.",
+ )
+
+ self.assertEqual(result, [])
+ self.assertIsInstance(result, list)
+
def test_video_script_request_rejects_invalid_advanced_options(self):
"""
API 请求模型需要限制高级 prompt 参数,避免外部调用绕过 WebUI
diff --git a/test/services/test_task.py b/test/services/test_task.py
index f783c6d0..4bd541a0 100644
--- a/test/services/test_task.py
+++ b/test/services/test_task.py
@@ -97,6 +97,38 @@ class TestTaskService(unittest.TestCase):
amount=8,
match_script_order=True,
)
+
+ def test_start_stops_before_materials_when_term_provider_fails(self):
+ """
+ 关键词 Provider 失败后,任务必须立即结束,不能继续生成音频或下载素材。
+
+ 这里从任务入口覆盖完整的错误传播路径,避免未来只修服务层返回类型,
+ 却又在任务编排层把空列表转换成其它真值后继续执行外部请求。
+ """
+ params = VideoParams(
+ video_subject="startup story",
+ video_script="A short startup story.",
+ )
+
+ with (
+ patch.object(
+ tm.llm,
+ "_generate_response",
+ return_value="Error: invalid API key",
+ ),
+ patch.object(tm, "generate_audio") as generate_audio,
+ patch.object(tm, "get_video_materials") as get_video_materials,
+ patch.object(tm.sm.state, "update_task") as update_task,
+ ):
+ result = tm.start("term-provider-error", params)
+
+ self.assertIsNone(result)
+ generate_audio.assert_not_called()
+ get_video_materials.assert_not_called()
+ update_task.assert_any_call(
+ "term-provider-error",
+ state=tm.const.TASK_STATE_FAILED,
+ )
def test_generate_audio_uses_custom_file_inside_task_directory(self):
task_id = "test-custom-audio-safe"