From dc07cba1d441627fedc992491a0868f5864d5353 Mon Sep 17 00:00:00 2001
From: zR <2448370773@qq.com>
Date: Sat, 20 Jan 2024 22:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirements.txt                                      |  2 +-
 requirements_api.txt                                  |  2 +-
 requirements_lite.txt                                 |  2 +-
 server/knowledge_base/kb_service/zilliz_kb_service.py | 10 ++--------
 server/utils.py                                       |  4 ----
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 5ab39657..bbccbcb4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ sentence_transformers==2.2.2
 langchain==0.0.354
 langchain-experimental==0.0.47
 pydantic==1.10.13
-fschat==0.2.34
+fschat==0.2.35
 openai~=1.7.1
 fastapi~=0.108.0
 sse_starlette==1.8.2
diff --git a/requirements_api.txt b/requirements_api.txt
index 0e2a9eee..e1580d5d 100644
--- a/requirements_api.txt
+++ b/requirements_api.txt
@@ -8,7 +8,7 @@ sentence_transformers==2.2.2
 langchain==0.0.354
 langchain-experimental==0.0.47
 pydantic==1.10.13
-fschat==0.2.34
+fschat==0.2.35
 openai~=1.7.1
 fastapi~=0.108.0
 sse_starlette==1.8.2
diff --git a/requirements_lite.txt b/requirements_lite.txt
index db57273a..e431b746 100644
--- a/requirements_lite.txt
+++ b/requirements_lite.txt
@@ -3,7 +3,7 @@
 langchain==0.0.354
 langchain-experimental==0.0.47
 pydantic==1.10.13
-fschat==0.2.34
+fschat==0.2.35
 openai~=1.7.1
 fastapi~=0.108.0
 sse_starlette==1.8.2
diff --git a/server/knowledge_base/kb_service/zilliz_kb_service.py b/server/knowledge_base/kb_service/zilliz_kb_service.py
index 5d00a49e..c7f0f2de 100644
--- a/server/knowledge_base/kb_service/zilliz_kb_service.py
+++ b/server/knowledge_base/kb_service/zilliz_kb_service.py
@@ -16,13 +16,10 @@ class ZillizKBService(KBService):
         from pymilvus import Collection
         return Collection(zilliz_name)
 
-    # def save_vector_store(self):
-    #     if self.zilliz.col:
-    #         self.zilliz.col.flush()
-
     def get_doc_by_ids(self, ids: List[str]) -> List[Document]:
         result = []
         if self.zilliz.col:
+            ids = [int(id) for id in ids]  # for milvus if needed
             data_list = self.zilliz.col.query(expr=f'pk in {ids}', output_fields=["*"])
             for data in data_list:
                 text = data.pop("text")
@@ -50,8 +47,7 @@ class ZillizKBService(KBService):
     def _load_zilliz(self):
         zilliz_args = kbs_config.get("zilliz")
         self.zilliz = Zilliz(embedding_function=EmbeddingsFunAdapter(self.embed_model),
-                            collection_name=self.kb_name, connection_args=zilliz_args)
-
+                             collection_name=self.kb_name, connection_args=zilliz_args)
 
     def do_init(self):
         self._load_zilliz()
@@ -95,9 +91,7 @@ class ZillizKBService(KBService):
 
 
 if __name__ == '__main__':
-
     from server.db.base import Base, engine
 
     Base.metadata.create_all(bind=engine)
     zillizService = ZillizKBService("test")
-
diff --git a/server/utils.py b/server/utils.py
index 270c5158..26ef967e 100644
--- a/server/utils.py
+++ b/server/utils.py
@@ -503,16 +503,12 @@ def set_httpx_config(
             no_proxy.append(host)
     os.environ["NO_PROXY"] = ",".join(no_proxy)
 
-    # TODO: 简单的清除系统代理不是个好的选择，影响太多。似乎修改代理服务器的bypass列表更好。
-    # patch requests to use custom proxies instead of system settings
     def _get_proxies():
         return proxies
 
     import urllib.request
     urllib.request.getproxies = _get_proxies
 
-    # 自动检查torch可用的设备。分布式部署时，不运行LLM的机器上可以不装torch
-
 
 def detect_device() -> Literal["cuda", "mps", "cpu"]:
     try: