Skip to content

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

Fix Qwen chat response parsing

harry0703ae52fecf3622
diff --git a/app/services/llm.py b/app/services/llm.py
index dda9561f..cbb844ff 100644
--- a/app/services/llm.py
+++ b/app/services/llm.py
@@ -79,6 +79,39 @@ def _extract_chat_completion_text(response, llm_provider: str) -> str:
return _normalize_text_response(content, llm_provider)
+def _get_response_field(value, key: str):
+ """兼容 dict 和 SDK 响应对象的字段读取。"""
+ if isinstance(value, dict):
+ return value.get(key)
+
+ try:
+ return value[key]
+ except (KeyError, TypeError, AttributeError):
+ return getattr(value, key, None)
+
+
+def _extract_qwen_generation_text(response) -> str:
+ """
+ 从 DashScope Generation 响应中提取文本。
+
+ Qwen 使用 `messages` 调用时返回的是 chat 结构:
+ `output.choices[0].message.content`;旧 completion 形态才会返回
+ `output.text`。这里两个路径都兼容,避免 `output.text` 为 None 时
+ 继续 `.replace()` 触发不可诊断的 AttributeError。
+ """
+ output = _get_response_field(response, "output")
+ choices = _get_response_field(output, "choices") if output else None
+ if choices:
+ first_choice = choices[0]
+ message = _get_response_field(first_choice, "message")
+ content = _get_response_field(message, "content") if message else None
+ if content is not None:
+ return _normalize_text_response(content, "qwen")
+
+ text = _get_response_field(output, "text") if output else None
+ return _normalize_text_response(text, "qwen")
+
+
def _generate_response(prompt: str) -> str:
try:
content = ""
@@ -295,8 +328,7 @@ def _generate_response(prompt: str) -> str:
f'[{llm_provider}] returned an error response: "{response}"'
)
- content = response["output"]["text"]
- return content.replace("\n", "")
+ return _extract_qwen_generation_text(response)
else:
raise Exception(
f'[{llm_provider}] returned an invalid response: "{response}"'
diff --git a/test/services/test_llm.py b/test/services/test_llm.py
index 2c2a3e95..fa70aa4b 100644
--- a/test/services/test_llm.py
+++ b/test/services/test_llm.py
@@ -208,6 +208,75 @@ class TestLiteLLMProvider(unittest.TestCase):
self.assertIn("api_key is not set", result)
self.assertNotIn("litellm", result.lower())
+ def _use_qwen_provider(self):
+ config.app["llm_provider"] = "qwen"
+ config.app["qwen_api_key"] = "qwen-key"
+ config.app["qwen_model_name"] = "qwen-max"
+
+ def _patch_dashscope_generation(self, response):
+ class FakeGenerationResponse(dict):
+ pass
+
+ fake_response = FakeGenerationResponse(response)
+ fake_response.status_code = response.get("status_code", 200)
+ fake_dashscope = types.SimpleNamespace(
+ api_key="",
+ Generation=types.SimpleNamespace(call=lambda **kwargs: fake_response),
+ )
+ fake_dashscope_response = types.SimpleNamespace(
+ GenerationResponse=FakeGenerationResponse
+ )
+
+ return patch.dict(
+ sys.modules,
+ {
+ "dashscope": fake_dashscope,
+ "dashscope.api_entities": types.SimpleNamespace(),
+ "dashscope.api_entities.dashscope_response": fake_dashscope_response,
+ },
+ )
+
+ def test_qwen_provider_reads_chat_choices_content(self):
+ """
+ DashScope chat 模式会把文本放在 `output.choices[0].message.content`。
+ 这里覆盖 issue #966 报告的 `output.text is None` 场景,避免再次触发
+ `'NoneType' object has no attribute 'replace'`。
+ """
+ self._use_qwen_provider()
+ response = {
+ "output": {
+ "text": None,
+ "choices": [{"message": {"content": "你好\n世界"}}],
+ }
+ }
+
+ with self._patch_dashscope_generation(response):
+ result = llm._generate_response("Say hello")
+
+ self.assertEqual(result, "你好世界")
+
+ def test_qwen_provider_falls_back_to_output_text(self):
+ """保留旧 DashScope completion 响应结构的兼容路径。"""
+ self._use_qwen_provider()
+ response = {"output": {"text": "旧格式\n响应"}}
+
+ with self._patch_dashscope_generation(response):
+ result = llm._generate_response("Say hello")
+
+ self.assertEqual(result, "旧格式响应")
+
+ def test_qwen_provider_reports_empty_text(self):
+ """Qwen 空响应应返回可诊断错误,而不是底层 AttributeError。"""
+ self._use_qwen_provider()
+ response = {"output": {"text": None, "choices": [{"message": {"content": None}}]}}
+
+ with self._patch_dashscope_generation(response):
+ result = llm._generate_response("Say hello")
+
+ self.assertIn("Error:", result)
+ self.assertIn("returned empty text content", result)
+ self.assertNotIn("NoneType", result)
+
def test_aihubmix_provider_uses_openai_compatible_client(self):
"""
AIHubMix 是 OpenAI-compatible 网关。这里用 fake OpenAI client