Resolve conflicts

2024-10-11 22:29:56 +08:00
parent 584e747565
commit 85cf3d08eb
1 changed files with 0 additions and 2 deletions
--- a/crazy_functions/Rag_Interface.py
+++ b/crazy_functions/Rag_Interface.py
@@ -71,10 +71,8 @@ def Rag问答(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, u
            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

    # 1. Retrieve RAG worker from global context
    user_name = chatbot.get_user()