From 39f9400de75911d1f1c5119d1cf0f80444566a5a Mon Sep 17 00:00:00 2001
From: Junyan Qin <rockchinq@gmail.com>
Date: Wed, 14 May 2025 15:35:37 +0800
Subject: [PATCH] fix: modelscope no usable

---
 pkg/provider/modelmgr/requesters/modelscope.svg          | 1 +
 pkg/provider/modelmgr/requesters/modelscopechatcmpl.py   | 6 +++---
 pkg/provider/modelmgr/requesters/modelscopechatcmpl.yaml | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 pkg/provider/modelmgr/requesters/modelscope.svg

diff --git a/pkg/provider/modelmgr/requesters/modelscope.svg b/pkg/provider/modelmgr/requesters/modelscope.svg
new file mode 100644
index 00000000..2ef222de
--- /dev/null
+++ b/pkg/provider/modelmgr/requesters/modelscope.svg
@@ -0,0 +1 @@
+<svg id="_层_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 274.37 172.76"><defs><style>.cls-2{fill:#36cfd1}.cls-3{fill:#624aff}</style></defs><g id="_层_1-2"><path class="cls-3" d="M24.78 73.55h25.65V99.2H24.78zm99.14 25.66h25.65v25.65h-25.65zm76.95 25.65h-25.65v22.19h47.84V99.21h-22.19v25.65z"/><path class="cls-2" d="M149.57 73.55h25.65V99.2h-25.65zM24.78 47.9h25.65v25.65H24.78z"/><path class="cls-3" d="M223.06 73.55h25.65V99.2h-25.65z"/><path class="cls-2" d="M223.06 47.9h25.65v25.65h-25.65z"/><path class="cls-3" d="M175.22 25.71V47.9h25.65v25.65h22.19V25.71h-47.84z"/><path class="cls-2" d="M98.27 73.55h25.65V99.2H98.27z"/><path class="cls-3" d="M72.62 47.9h25.65V25.71H50.43v47.84h22.19V47.9zm0 51.31H50.43v47.84h47.84v-22.19H72.62V99.21z"/><path style="fill:none" d="M0 0h274.37v172.76H0z"/></g></svg>
\ No newline at end of file
diff --git a/pkg/provider/modelmgr/requesters/modelscopechatcmpl.py b/pkg/provider/modelmgr/requesters/modelscopechatcmpl.py
index 993c833a..e5fb42a9 100644
--- a/pkg/provider/modelmgr/requesters/modelscopechatcmpl.py
+++ b/pkg/provider/modelmgr/requesters/modelscopechatcmpl.py
@@ -27,7 +27,7 @@ class ModelScopeChatCompletions(requester.LLMAPIRequester):
     async def initialize(self):
         self.client = openai.AsyncClient(
             api_key='',
-            base_url=self.requester_cfg['base-url'],
+            base_url=self.requester_cfg['base_url'],
             timeout=self.requester_cfg['timeout'],
             http_client=httpx.AsyncClient(trust_env=True, timeout=self.requester_cfg['timeout']),
         )
@@ -125,14 +125,14 @@ class ModelScopeChatCompletions(requester.LLMAPIRequester):
         self,
         query: core_entities.Query,
         req_messages: list[dict],
-        use_model: entities.LLMModelInfo,
+        use_model: requester.RuntimeLLMModel,
         use_funcs: list[tools_entities.LLMFunction] = None,
         extra_args: dict[str, typing.Any] = {},
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
 
         args = {}
-        args['model'] = use_model.name if use_model.model_name is None else use_model.model_name
+        args['model'] = use_model.model_entity.name
 
         if use_funcs:
             tools = await self.ap.tool_mgr.generate_tools_for_openai(use_funcs)
diff --git a/pkg/provider/modelmgr/requesters/modelscopechatcmpl.yaml b/pkg/provider/modelmgr/requesters/modelscopechatcmpl.yaml
index 954d92f1..d48f6f29 100644
--- a/pkg/provider/modelmgr/requesters/modelscopechatcmpl.yaml
+++ b/pkg/provider/modelmgr/requesters/modelscopechatcmpl.yaml
@@ -5,6 +5,7 @@ metadata:
   label:
     en_US: ModelScope
     zh_CN: 魔搭社区
+  icon: modelscope.svg
 spec:
   config:
     - name: base_url