From 02ba653c192993414439a4750e45480ace4a4ce6 Mon Sep 17 00:00:00 2001
From: lbykkkk <liuboyin2019@ia.ac.cn>
Date: Fri, 11 Oct 2024 22:21:53 +0800
Subject: [PATCH] Resolve conflicts

---
 crazy_functions/Rag_Interface.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/crazy_functions/Rag_Interface.py b/crazy_functions/Rag_Interface.py
index 2f0bc0f4..817d31bf 100644
--- a/crazy_functions/Rag_Interface.py
+++ b/crazy_functions/Rag_Interface.py
@@ -7,20 +7,8 @@ from crazy_functions.crazy_utils import input_clipping, request_gpt_model_in_new
 from toolbox import CatchException, update_ui, get_log_folder, update_ui_lastest_msg
 from toolbox import report_exception
 from crazy_functions.rag_fns.rag_file_support import extract_text
-VECTOR_STORE_TYPE = "Milvus"
-
-if VECTOR_STORE_TYPE == "Milvus":
-    try:
-        from crazy_functions.rag_fns.milvus_worker import MilvusRagWorker as LlamaIndexRagWorker
-    except:
-        VECTOR_STORE_TYPE = "Simple"
-
-if VECTOR_STORE_TYPE == "Simple":
-    from crazy_functions.rag_fns.llama_index_worker import LlamaIndexRagWorker
-
 
 RAG_WORKER_REGISTER = {}
-
 MAX_HISTORY_ROUND = 5
 MAX_CONTEXT_TOKEN_LIMIT = 4096
 REMEMBER_PREVIEW = 1000
@@ -85,6 +73,17 @@ def Rag问答(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, u
         system_prompt: System prompt.
         user_request: User request.
     """
+    # import vector store lib
+    VECTOR_STORE_TYPE = "Milvus"
+
+    if VECTOR_STORE_TYPE == "Milvus":
+        try:
+            from crazy_functions.rag_fns.milvus_worker import MilvusRagWorker as LlamaIndexRagWorker
+        except:
+            VECTOR_STORE_TYPE = "Simple"
+
+    if VECTOR_STORE_TYPE == "Simple":
+        from crazy_functions.rag_fns.llama_index_worker import LlamaIndexRagWorker
     # Define commands
     CLEAR_VECTOR_DB_CMD = "清空向量数据库"