From 6cab2a9e60617cd8eac6e2e7c6677bdc402e490e Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Mon, 16 Nov 2026 12:09:24 +0800 Subject: [PATCH] fix: enhance model list retrieval to fallback on built-in models when dynamic list is empty --- apps/models_provider/base_model_provider.py | 8 +++-- .../tencent_model_provider.py | 4 +++ apps/models_provider/tests/test_minimax.py | 23 +++++++++++++ .../tests/test_tencent_provider.py | 32 +++++++++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 apps/models_provider/tests/test_tencent_provider.py diff --git a/apps/models_provider/base_model_provider.py b/apps/models_provider/base_model_provider.py index 904a621ea49..a836809991f 100644 --- a/apps/models_provider/base_model_provider.py +++ b/apps/models_provider/base_model_provider.py @@ -123,8 +123,12 @@ def get_model_list(self, model_type, api_key=None, api_base=None, credential=Non if api_key or credential: manage = self._get_dynamic_manage_cached(api_key, api_base, credential) if manage is not None: - return manage.get_model_list_by_model_type(model_type) - if not allow_builtin_fallback: + dynamic_list = manage.get_model_list_by_model_type(model_type) + # 官方实时列表里没有该类型的模型时,按 allow_builtin_fallback 决定是否 + # 回退到内置列表;否则返回空列表,交由视图继续走缓存/内置兜底。 + if dynamic_list or not allow_builtin_fallback: + return dynamic_list + elif not allow_builtin_fallback: return [] return self.get_model_info_manage().get_model_list_by_model_type(model_type) diff --git a/apps/models_provider/impl/tencent_model_provider/tencent_model_provider.py b/apps/models_provider/impl/tencent_model_provider/tencent_model_provider.py index d99678c2e7a..c7ea17ab3d6 100644 --- a/apps/models_provider/impl/tencent_model_provider/tencent_model_provider.py +++ b/apps/models_provider/impl/tencent_model_provider/tencent_model_provider.py @@ -154,6 +154,9 @@ def _initialize_model_info(): ] tencent_embedding_model_info = model_info_embedding_list[0] + # STT 默认模型:未选择基础模型时 model_form 依赖该默认凭证表单,避免返回“模型不支持”。 + model_info_stt_list = [info for info in model_info_list if info.model_type == ModelTypeConst.STT.name] + model_info_vision_list = [ _create_model_info( "hunyuan-vision", @@ -214,6 +217,7 @@ def _initialize_model_info(): .append_model_info_list(model_info_itv_list) .append_default_model_info(model_info_itv_list[0]) .append_default_model_info(model_info_list[0]) + .append_default_model_info(model_info_stt_list[0]) .append_default_model_info(tencent_embedding_model_info) .build() ) diff --git a/apps/models_provider/tests/test_minimax.py b/apps/models_provider/tests/test_minimax.py index ce3660d84c8..b730ad5ad0f 100644 --- a/apps/models_provider/tests/test_minimax.py +++ b/apps/models_provider/tests/test_minimax.py @@ -119,6 +119,29 @@ def test_dynamic_model_list_falls_back_without_or_with_bad_key(self): self.assertEqual([m["name"] for m in fallback], [m["name"] for m in builtin]) self.assertTrue(len(builtin) > 0) + def test_dynamic_model_list_type_missing_falls_back_to_builtin(self): + """官方 /models 未返回所选类型(如 MiniMax 的 TTS/TTI)时,get_model_list 须回退到内置列表。""" + from models_provider.base_model_provider import ModelTypeConst + + def fake_get(url, headers=None, timeout=None): + resp = Mock() + resp.status_code = 200 + # 官方列表只返回对话模型,不含 TTS(复现 Bug 1:语音合成获取模型返回 data: [])。 + resp.json.return_value = {"object": "list", "data": [{"id": "MiniMax-M2", "object": "model"}]} + return resp + + with patch("models_provider.base_model_provider.requests.get", side_effect=fake_get): + # 实时查询(不带内置兜底)对该类型仍应为空。 + live = self.provider.get_model_list("TTS", api_key="type-missing-key", allow_builtin_fallback=False) + # 内置兜底开启时,应返回内置 TTS 模型,而不是空列表。 + tts = self.provider.get_model_list("TTS", api_key="type-missing-key") + + self.assertEqual(live, []) + builtin_tts = self.provider.get_model_list("TTS") + self.assertEqual([m["name"] for m in tts], [m["name"] for m in builtin_tts]) + self.assertTrue(len(tts) > 0) + self.assertEqual(tts[0]["model_type"], ModelTypeConst.TTS.name) + def test_current_catalog_and_default(self): self.assertEqual( [model["name"] for model in self.provider.get_model_list("LLM")], diff --git a/apps/models_provider/tests/test_tencent_provider.py b/apps/models_provider/tests/test_tencent_provider.py new file mode 100644 index 00000000000..8a788e44b8f --- /dev/null +++ b/apps/models_provider/tests/test_tencent_provider.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +from django.test import SimpleTestCase + +from models_provider.impl.tencent_model_provider.tencent_model_provider import TencentModelProvider + + +class TencentModelProviderTests(SimpleTestCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.provider = TencentModelProvider() + + def test_stt_model_type_is_exposed(self): + model_types = {item.get("value") for item in self.provider.get_model_type_list()} + self.assertIn("STT", model_types) + + def test_stt_default_credential_without_model_name(self): + # model_form 在未选择基础模型(model_name 为空)时应返回默认 STT 凭证, + # 否则 create-model 流程会以“模型不支持”报 500。 + credential = self.provider.get_model_credential("STT", "") + self.assertIsNotNone(credential) + self.assertTrue(credential.to_form_list()) + + def test_wand_asr_v1_uses_tokenhub_credential(self): + from models_provider.impl.tencent_model_provider.credential.tokenhub_stt import ( + TencentTokenhubSTTModelCredential, + ) + + credential = self.provider.get_model_credential("STT", "wand-asr-v1") + self.assertIsInstance(credential, TencentTokenhubSTTModelCredential) + fields = {item.get("field") for item in credential.to_form_list()} + self.assertIn("api_key", fields)