From 9eefbcb6f2790397fb7df9c9925d993c0cea15c6 Mon Sep 17 00:00:00 2001 From: wanjiaju <邮箱> Date: Sat, 8 Feb 2025 10:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=E7=99=BE=E7=82=BC?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增阿里云请求器配置、阿里云模型配置、阿里云令牌配置 新增硅基模型配置 --- pkg/provider/modelmgr/modelmgr.py | 2 +- .../modelmgr/requesters/aliyunchatcmpl.py | 21 ++++++++++++++++ templates/metadata/llm-models.json | 24 +++++++++++++++++++ templates/provider.json | 2 +- 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 pkg/provider/modelmgr/requesters/aliyunchatcmpl.py diff --git a/pkg/provider/modelmgr/modelmgr.py b/pkg/provider/modelmgr/modelmgr.py index 33a65ff3..6748291c 100644 --- a/pkg/provider/modelmgr/modelmgr.py +++ b/pkg/provider/modelmgr/modelmgr.py @@ -6,7 +6,7 @@ from . import entities, requester from ...core import app from . import token -from .requesters import chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, xaichatcmpl, zhipuaichatcmpl, lmstudiochatcmpl, siliconflowchatcmpl +from .requesters import chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, xaichatcmpl, zhipuaichatcmpl, lmstudiochatcmpl, siliconflowchatcmpl, aliyunchatcmpl FETCH_MODEL_LIST_URL = "https://api.qchatgpt.rockchin.top/api/v2/fetch/model_list" diff --git a/pkg/provider/modelmgr/requesters/aliyunchatcmpl.py b/pkg/provider/modelmgr/requesters/aliyunchatcmpl.py new file mode 100644 index 00000000..4f4900d7 --- /dev/null +++ b/pkg/provider/modelmgr/requesters/aliyunchatcmpl.py @@ -0,0 +1,21 @@ +from __future__ import annotations + +import openai + +from . import chatcmpl +from .. import requester +from ....core import app + + +@requester.requester_class("aliyun-chat-completions") +class AliyunChatCompletions(chatcmpl.OpenAIChatCompletions): + """Aliyun ChatCompletion API 请求器""" + + client: openai.AsyncClient + + requester_cfg: dict + + def __init__(self, ap: app.Application): + self.ap = ap + + self.requester_cfg = self.ap.provider_cfg.data['requester']['aliyun-chat-completions'] diff --git a/templates/metadata/llm-models.json b/templates/metadata/llm-models.json index b5c29cf3..110c18da 100644 --- a/templates/metadata/llm-models.json +++ b/templates/metadata/llm-models.json @@ -211,6 +211,30 @@ "requester": "zhipuai-chat-completions", "token_mgr": "zhipuai", "vision_supported": true + }, + { + "name": "siliconflow-r1", + "model_name": "deepseek-ai/DeepSeek-R1", + "requester": "siliconflow-chat-completions", + "token_mgr": "siliconflow" + }, + { + "name": "siliconflow-v3", + "model_name": "deepseek-ai/DeepSeek-V3", + "requester": "siliconflow-chat-completions", + "token_mgr": "siliconflow" + }, + { + "name": "aliyun-r1", + "model_name": "deepseek-r1", + "requester": "aliyun-chat-completions", + "token_mgr": "aliyun" + }, + { + "name": "aliyun-v3", + "model_name": "deepseek-v3", + "requester": "aliyun-chat-completions", + "token_mgr": "aliyun" } ] } \ No newline at end of file diff --git a/templates/provider.json b/templates/provider.json index 5ab5cd64..0d6e6ea0 100644 --- a/templates/provider.json +++ b/templates/provider.json @@ -84,7 +84,7 @@ "model": "gpt-4o", "prompt-mode": "normal", "prompt": { - "default": "" + "default": "" }, "runner": "local-agent", "dify-service-api": {