From 050a585a9d7db1e51b56df0de92fadd4d7c5cd4e Mon Sep 17 00:00:00 2001 From: Pickupppp Date: Thu, 24 Aug 2023 21:31:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20milvus=20=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=BC=82=E5=B8=B8=E5=92=8C=E8=B0=83=E7=94=A8?= =?UTF-8?q?search=E6=96=B9=E6=B3=95=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/knowledge_base/kb_service/milvus_kb_service.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/knowledge_base/kb_service/milvus_kb_service.py b/server/knowledge_base/kb_service/milvus_kb_service.py index 87588ed..fc92c00 100644 --- a/server/knowledge_base/kb_service/milvus_kb_service.py +++ b/server/knowledge_base/kb_service/milvus_kb_service.py @@ -45,7 +45,7 @@ class MilvusKBService(KBService): def do_drop_kb(self): self.milvus.col.drop() - def do_search(self, query: str, top_k: int, embeddings: Embeddings): + def do_search(self, query: str, top_k: int,score_threshold: float, embeddings: Embeddings): # todo: support score threshold self._load_milvus(embeddings=embeddings) return self.milvus.similarity_search_with_score(query, top_k) @@ -70,7 +70,8 @@ class MilvusKBService(KBService): self.milvus.col.delete(expr=f'pk in {delete_list}') def do_clear_vs(self): - self.milvus.col.drop() + if not self.milvus.col: + self.milvus.col.drop() if __name__ == '__main__': From bc3dbb443e323e0d8f859ce641375312d45baa52 Mon Sep 17 00:00:00 2001 From: Meiracle Date: Thu, 24 Aug 2023 22:18:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E8=81=8A=E5=A4=A9=E6=8E=A5=E5=8F=A3=20(#1228?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复搜索引擎聊天接口 * 修复知识库聊天接口 * 恢复 --- server/chat/search_engine_chat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/chat/search_engine_chat.py b/server/chat/search_engine_chat.py index 15834d0..96de525 100644 --- a/server/chat/search_engine_chat.py +++ b/server/chat/search_engine_chat.py @@ -117,7 +117,7 @@ def search_engine_chat(query: str = Body(..., description="用户输入", exampl answer = "" async for token in callback.aiter(): answer += token - yield json.dumps({"answer": token, + yield json.dumps({"answer": answer, "docs": source_documents}, ensure_ascii=False) await task