Resolve conflicts
This commit is contained in:
@@ -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
|
from crazy_functions.rag_fns.milvus_worker import MilvusRagWorker as LlamaIndexRagWorker
|
||||||
except:
|
except:
|
||||||
VECTOR_STORE_TYPE = "Simple"
|
VECTOR_STORE_TYPE = "Simple"
|
||||||
|
|
||||||
if VECTOR_STORE_TYPE == "Simple":
|
if VECTOR_STORE_TYPE == "Simple":
|
||||||
from crazy_functions.rag_fns.llama_index_worker import LlamaIndexRagWorker
|
from crazy_functions.rag_fns.llama_index_worker import LlamaIndexRagWorker
|
||||||
# Define commands
|
|
||||||
|
|
||||||
# 1. Retrieve RAG worker from global context
|
# 1. Retrieve RAG worker from global context
|
||||||
user_name = chatbot.get_user()
|
user_name = chatbot.get_user()
|
||||||
|
|||||||
Reference in New Issue
Block a user