From 35ae290e7368c6d8a0d451de52759e487202548e Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:13:57 +0800 Subject: [PATCH 1/8] fix: xinference tti and image model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051237 --user=刘瑞斌 【模型管理】Xorbits Inference添加自定义模型报错问题汇总 https://www.tapd.cn/57709429/s/1642278 --- .../xinference_model_provider.py | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/apps/setting/models_provider/impl/xinference_model_provider/xinference_model_provider.py b/apps/setting/models_provider/impl/xinference_model_provider/xinference_model_provider.py index 4c7b9c0c7db..a2846ae8c20 100644 --- a/apps/setting/models_provider/impl/xinference_model_provider/xinference_model_provider.py +++ b/apps/setting/models_provider/impl/xinference_model_provider/xinference_model_provider.py @@ -521,25 +521,29 @@ rerank_list = [ModelInfo('bce-reranker-base_v1', '发布新的重新排名器，建立在强大的 M3 和LLM （GEMMA 和 MiniCPM，实际上没那么大）骨干上，支持多语言处理和更大的输入，大幅提高 BEIR、C-MTEB/Retrieval 的排名性能、MIRACL、LlamaIndex 评估', ModelTypeConst.RERANKER, XInferenceRerankerModelCredential(), XInferenceReranker)] -model_info_manage = (ModelInfoManage.builder() - .append_model_info_list(model_info_list) - .append_model_info_list(voice_model_info) - .append_default_model_info(voice_model_info[0]) - .append_default_model_info(voice_model_info[1]) - .append_default_model_info(ModelInfo('phi3', - 'Phi-3 Mini是Microsoft的3.8B参数，轻量级，最先进的开放模型。', - ModelTypeConst.LLM, xinference_llm_model_credential, - XinferenceChatModel)) - .append_model_info_list(embedding_model_info) - .append_default_model_info(ModelInfo('', - '', - ModelTypeConst.EMBEDDING, - xinference_embedding_model_credential, XinferenceEmbedding)) - .append_model_info_list(rerank_list) - .append_model_info_list(image_model_info) - .append_model_info_list(tti_model_info) - .append_default_model_info(rerank_list[0]) - .build()) +model_info_manage = ( + ModelInfoManage.builder() + .append_model_info_list(model_info_list) + .append_model_info_list(voice_model_info) + .append_default_model_info(voice_model_info[0]) + .append_default_model_info(voice_model_info[1]) + .append_default_model_info(ModelInfo('phi3', + 'Phi-3 Mini是Microsoft的3.8B参数，轻量级，最先进的开放模型。', + ModelTypeConst.LLM, xinference_llm_model_credential, + XinferenceChatModel)) + .append_model_info_list(embedding_model_info) + .append_default_model_info(ModelInfo('', + '', + ModelTypeConst.EMBEDDING, + xinference_embedding_model_credential, XinferenceEmbedding)) + .append_model_info_list(rerank_list) + .append_model_info_list(image_model_info) + .append_default_model_info(image_model_info[0]) + .append_model_info_list(tti_model_info) + .append_default_model_info(tti_model_info[0]) + .append_default_model_info(rerank_list[0]) + .build() +) def get_base_url(url: str): From 7f8eae39e1b5da68d5d20dfd704665c49a2acaea Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:15:15 +0800 Subject: [PATCH 2/8] fix: zhipu tti and image model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051236 --user=刘瑞斌 【模型管理】智谱AI添加自定义模型报错问题汇总 https://www.tapd.cn/57709429/s/1642279 --- .../impl/zhipu_model_provider/zhipu_model_provider.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py b/apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py index e6d1979a68d..6a934c08630 100644 --- a/apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py +++ b/apps/setting/models_provider/impl/zhipu_model_provider/zhipu_model_provider.py @@ -58,6 +58,7 @@ .append_model_info_list(model_info_list) .append_default_model_info(ModelInfo('glm-4', '', ModelTypeConst.LLM, qwen_model_credential, ZhipuChatModel)) .append_model_info_list(model_info_image_list) + .append_default_model_info(model_info_image_list[0]) .append_model_info_list(model_info_tti_list) .append_default_model_info(model_info_tti_list[0]) .build() From 547e860d62679245703bbf9ff95a232ecdaa324b Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:17:57 +0800 Subject: [PATCH 3/8] fix: xunfei tts and stt model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051233 --user=刘瑞斌 【模型管理】讯飞星火添加自定义模型报错问题汇总 https://www.tapd.cn/57709429/s/1642301 --- .../impl/xf_model_provider/xf_model_provider.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py b/apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py index dc8fde91909..b7295842478 100644 --- a/apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py +++ b/apps/setting/models_provider/impl/xf_model_provider/xf_model_provider.py @@ -40,8 +40,18 @@ ModelInfo('embedding', '', ModelTypeConst.EMBEDDING, embedding_model_credential, XFEmbedding) ] -model_info_manage = ModelInfoManage.builder().append_model_info_list(model_info_list).append_default_model_info( - ModelInfo('generalv3.5', '', ModelTypeConst.LLM, qwen_model_credential, XFChatSparkLLM)).build() +model_info_manage = ( + ModelInfoManage.builder() + .append_model_info_list(model_info_list) + .append_default_model_info( + ModelInfo('generalv3.5', '', ModelTypeConst.LLM, qwen_model_credential, XFChatSparkLLM)) + .append_default_model_info( + ModelInfo('iat', '中英文识别', ModelTypeConst.STT, stt_model_credential, XFSparkSpeechToText), + ) + .append_default_model_info( + ModelInfo('tts', '', ModelTypeConst.TTS, tts_model_credential, XFSparkTextToSpeech)) + .build() +) class XunFeiModelProvider(IModelProvider): From c7b36511098f0194a8b6c287ee83406e56d716b6 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:19:43 +0800 Subject: [PATCH 4/8] fix: volcanic tts and stt model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051231 --user=刘瑞斌 【模型管理】火山引擎添加自定义模型报错问题汇总 https://www.tapd.cn/57709429/s/1642307 --- .../volcanic_engine_model_provider.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/setting/models_provider/impl/volcanic_engine_model_provider/volcanic_engine_model_provider.py b/apps/setting/models_provider/impl/volcanic_engine_model_provider/volcanic_engine_model_provider.py index 2223d1ccbe4..b0cb1343f9a 100644 --- a/apps/setting/models_provider/impl/volcanic_engine_model_provider/volcanic_engine_model_provider.py +++ b/apps/setting/models_provider/impl/volcanic_engine_model_provider/volcanic_engine_model_provider.py @@ -93,6 +93,9 @@ .append_model_info_list(model_info_list) .append_default_model_info(model_info_list[0]) .append_default_model_info(model_info_list[1]) + .append_default_model_info(model_info_list[2]) + .append_default_model_info(model_info_list[3]) + .append_default_model_info(model_info_list[4]) .build() ) From 381ae710a2adc4c0eb5fbc91a36b6597bfdfa440 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:21:18 +0800 Subject: [PATCH 5/8] fix: tencent tti and image model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051229 --user=刘瑞斌 【模型管理】腾讯混元添加自定义模型报错问题汇总 https://www.tapd.cn/57709429/s/1642310 --- .../impl/tencent_model_provider/tencent_model_provider.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/setting/models_provider/impl/tencent_model_provider/tencent_model_provider.py b/apps/setting/models_provider/impl/tencent_model_provider/tencent_model_provider.py index ccef1b90eaf..90edaabb080 100644 --- a/apps/setting/models_provider/impl/tencent_model_provider/tencent_model_provider.py +++ b/apps/setting/models_provider/impl/tencent_model_provider/tencent_model_provider.py @@ -101,7 +101,9 @@ def _initialize_model_info(): .append_model_info_list(model_info_list) \ .append_model_info_list(model_info_embedding_list) \ .append_model_info_list(model_info_vision_list) \ + .append_default_model_info(model_info_vision_list[0]) \ .append_model_info_list(model_info_tti_list) \ + .append_default_model_info(model_info_tti_list[0]) \ .append_default_model_info(model_info_list[0]) \ .build() From 908c90730b221d80a5fa3cef2493043307c851c2 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:22:13 +0800 Subject: [PATCH 6/8] fix: qwen tti and image model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051228 --user=刘瑞斌 【模型管理】通义千问添加自定义模型报错问题汇总 https://www.tapd.cn/57709429/s/1642313 --- .../impl/qwen_model_provider/qwen_model_provider.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/setting/models_provider/impl/qwen_model_provider/qwen_model_provider.py b/apps/setting/models_provider/impl/qwen_model_provider/qwen_model_provider.py index fc2506a9c59..de91c9fabd2 100644 --- a/apps/setting/models_provider/impl/qwen_model_provider/qwen_model_provider.py +++ b/apps/setting/models_provider/impl/qwen_model_provider/qwen_model_provider.py @@ -46,7 +46,9 @@ .append_default_model_info( ModelInfo('qwen-turbo', '', ModelTypeConst.LLM, qwen_model_credential, QwenChatModel)) .append_model_info_list(module_info_vl_list) + .append_default_model_info(module_info_vl_list[0]) .append_model_info_list(module_info_tti_list) + .append_default_model_info(module_info_tti_list[0]) .build() ) From 2647f55c8cdbef8068e1a714b16251951b2ccc33 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:24:16 +0800 Subject: [PATCH 7/8] fix: openai tti, tts, stt and image model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051227 --user=刘瑞斌 【模型管理】OpenAI添加自定义模型报错问题汇总 https://www.tapd.cn/57709429/s/1642314 --- .../impl/openai_model_provider/openai_model_provider.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py b/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py index be659291efc..60c5318ceb3 100644 --- a/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py +++ b/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py @@ -121,7 +121,16 @@ .append_model_info_list(model_info_embedding_list) .append_default_model_info(model_info_embedding_list[0]) .append_model_info_list(model_info_image_list) + .append_default_model_info(model_info_image_list[0]) .append_model_info_list(model_info_tti_list) + .append_default_model_info(model_info_tti_list[0]) + .append_default_model_info(ModelInfo('whisper-1', '', + ModelTypeConst.STT, openai_stt_model_credential, + OpenAISpeechToText) + ) + .append_default_model_info(ModelInfo('tts-1', '', + ModelTypeConst.TTS, openai_tts_model_credential, + OpenAITextToSpeech)) .build() ) From 057504740ae7e9d074c3fedb5496e55cdee79cd0 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 6 Jan 2025 18:25:53 +0800 Subject: [PATCH 8/8] fix: bailian tti and image model set default model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051223 --user=刘瑞斌 【模型管理】阿里云百炼自定义添加图片生成模型报错 https://www.tapd.cn/57709429/s/1642319 --bug=1051218 --user=刘瑞斌 【模型管理】阿里云百炼自定义添加图片理解模型报错 https://www.tapd.cn/57709429/s/1642323 --- .../aliyun_bai_lian_model_provider.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/setting/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py b/apps/setting/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py index c48052251bd..c508a50020b 100644 --- a/apps/setting/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py +++ b/apps/setting/models_provider/impl/aliyun_bai_lian_model_provider/aliyun_bai_lian_model_provider.py @@ -73,7 +73,9 @@ ModelInfoManage.builder() .append_model_info_list(model_info_list) .append_model_info_list(module_info_vl_list) + .append_default_model_info(module_info_vl_list[0]) .append_model_info_list(module_info_tti_list) + .append_default_model_info(module_info_tti_list[0]) .append_default_model_info(model_info_list[1]) .append_default_model_info(model_info_list[2]) .append_default_model_info(model_info_list[3])