From 2c08fce6b074e7c7476cc3a1e9e1c1afbb2b1736 Mon Sep 17 00:00:00 2001
From: zR <2448370773@qq.com>
Date: Fri, 19 Jan 2024 21:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configs/loom.yaml.example                     |  2 ++
 openai_plugins/openai/profile_endpoint.py     | 20 +++++++++----------
 openai_plugins/zhipuai/controller.py          |  1 -
 openai_plugins/zhipuai/install.py             |  2 --
 ...ipuai_plugins.json => openai_plugins.json} |  0
 openai_plugins/zhipuai/profile_endpoint.py    | 20 +++++++++----------
 6 files changed, 22 insertions(+), 23 deletions(-)
 rename openai_plugins/zhipuai/{zhipuai_plugins.json => openai_plugins.json} (100%)

diff --git a/configs/loom.yaml.example b/configs/loom.yaml.example
index 1f7a3bfb..089206df 100644
--- a/configs/loom.yaml.example
+++ b/configs/loom.yaml.example
@@ -18,6 +18,8 @@ openai_plugins_load_folder:
 plugins:
   - openai:
       name: "openai"
+  - zhipuai:
+      name: "zhipuai"
 
   - imitater:
       name: "imitater"
diff --git a/openai_plugins/openai/profile_endpoint.py b/openai_plugins/openai/profile_endpoint.py
index f333c66f..ebd6d2d1 100644
--- a/openai_plugins/openai/profile_endpoint.py
+++ b/openai_plugins/openai/profile_endpoint.py
@@ -43,11 +43,11 @@ class OpenAIProfileEndpointAdapter(ProfileEndpointAdapter):
                                          model_description="gpt-4-1106-preview",
                                          providers=["model", "embedding"],
                                          model_extra_info="{}"))
-        list_worker.append(LLMWorkerInfo(worker_id="text-embedding-ada-002",
-                                         model_name="text-embedding-ada-002",
-                                         model_description="text-embedding-ada-002",
-                                         providers=["embedding"],
-                                         model_extra_info="{}"))
+        # list_worker.append(LLMWorkerInfo(worker_id="text-embedding-ada-002",
+        #                                  model_name="text-embedding-ada-002",
+        #                                  model_description="text-embedding-ada-002",
+        #                                  providers=["embedding"],
+        #                                  model_extra_info="{}"))
         return list_worker
 
     def list_llm_models(self) -> List[LLMWorkerInfo]:
@@ -68,11 +68,11 @@ class OpenAIProfileEndpointAdapter(ProfileEndpointAdapter):
                                          model_description="gpt-4-1106-preview",
                                          providers=["model", "embedding"],
                                          model_extra_info="{}"))
-        list_worker.append(LLMWorkerInfo(worker_id="text-embedding-ada-002",
-                                         model_name="text-embedding-ada-002",
-                                         model_description="text-embedding-ada-002",
-                                         providers=["embedding"],
-                                         model_extra_info="{}"))
+        # list_worker.append(LLMWorkerInfo(worker_id="text-embedding-ada-002",
+        #                                  model_name="text-embedding-ada-002",
+        #                                  model_description="text-embedding-ada-002",
+        #                                  providers=["embedding"],
+        #                                  model_extra_info="{}"))
         return list_worker
 
     def get_model_config(self, model_name) -> LLMWorkerInfo:
diff --git a/openai_plugins/zhipuai/controller.py b/openai_plugins/zhipuai/controller.py
index e83f2e4e..6b0f3f35 100644
--- a/openai_plugins/zhipuai/controller.py
+++ b/openai_plugins/zhipuai/controller.py
@@ -5,7 +5,6 @@ import sys
 import logging
 
 logger = logging.getLogger(__name__)
-# 为了能使用插件中的函数，需要将当前目录加入到sys.path中
 root_dir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(root_dir)
 
diff --git a/openai_plugins/zhipuai/install.py b/openai_plugins/zhipuai/install.py
index d69b3457..a7b8cf57 100644
--- a/openai_plugins/zhipuai/install.py
+++ b/openai_plugins/zhipuai/install.py
@@ -9,8 +9,6 @@ import locale
 logger = logging.getLogger(__name__)
 root_dir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(root_dir)
-
-# Perform install
 processed_install = set()
 pip_list = None
 
diff --git a/openai_plugins/zhipuai/zhipuai_plugins.json b/openai_plugins/zhipuai/openai_plugins.json
similarity index 100%
rename from openai_plugins/zhipuai/zhipuai_plugins.json
rename to openai_plugins/zhipuai/openai_plugins.json
diff --git a/openai_plugins/zhipuai/profile_endpoint.py b/openai_plugins/zhipuai/profile_endpoint.py
index 513aba98..0fd8969b 100644
--- a/openai_plugins/zhipuai/profile_endpoint.py
+++ b/openai_plugins/zhipuai/profile_endpoint.py
@@ -37,11 +37,11 @@ class ZhipuAIProfileEndpointAdapter(ProfileEndpointAdapter):
                                          model_description="glm-3-turbo",
                                          providers=["model", "embedding"],
                                          model_extra_info="{}"))
-        list_worker.append(LLMWorkerInfo(worker_id="embedding-2",
-                                         model_name="embedding-2",
-                                         model_description="embedding-2",
-                                         providers=["embedding"],
-                                         model_extra_info="{}"))
+        # list_worker.append(LLMWorkerInfo(worker_id="embedding-2",
+        #                                  model_name="embedding-2",
+        #                                  model_description="embedding-2",
+        #                                  providers=["embedding"],
+        #                                  model_extra_info="{}"))
         return list_worker
 
     def list_llm_models(self) -> List[LLMWorkerInfo]:
@@ -57,11 +57,11 @@ class ZhipuAIProfileEndpointAdapter(ProfileEndpointAdapter):
                                          model_description="glm-3-turbo",
                                          providers=["model", "embedding"],
                                          model_extra_info="{}"))
-        list_worker.append(LLMWorkerInfo(worker_id="embedding-2",
-                                         model_name="embedding-2",
-                                         model_description="embedding-2",
-                                         providers=["embedding"],
-                                         model_extra_info="{}"))
+        # list_worker.append(LLMWorkerInfo(worker_id="embedding-2",
+        #                                  model_name="embedding-2",
+        #                                  model_description="embedding-2",
+        #                                  providers=["embedding"],
+        #                                  model_extra_info="{}"))
         return list_worker
 
     def get_model_config(self, model_name) -> LLMWorkerInfo: