确保冲突数据不丢失

.gitignore

@@ -186,7 +186,6 @@ ui/
 main.py
 
 /data/vector_base
-<<<<<<< HEAD
 .idea
 
 # 本地chatterbot项目路径
@@ -195,7 +194,4 @@ chatterbot/ChatterBot_update/
 # 虚拟环境
 venv/
 
-output/
-=======
-.idea
->>>>>>> 348a7eee0f20d5855de9ece69981679eb8158d4e
+output/

config.json

@@ -50,8 +50,8 @@
     "separator": "\n",
     "chunk_size": 100,
     "chunk_overlap": 50,
-    "max_query": 3,
     "embedding_model": "sebastian-hofstaetter/distilbert-dot-tas_b-b256-msmarco",
+    "max_query": 3,
     "question_prompt": "请根据以上content信息进行归纳总结，并结合question的内容给出一个符合content和question语气、语调、背景的回答。不要出现'概括''综上''感谢'等字样，向朋友直接互相交流即可。如果发现不能content的信息与question不相符，抛弃content的提示，直接回答question即可。任何情况下都要简要地回答!",
     "chain_type": "stuff",
     "show_cost": true

utils/faiss_handler.py

@@ -224,4 +224,4 @@ def load_faiss_index_from_zip(path_to_zip_file):
         encode_kwargs=encode_kwargs)
     create_faiss_index_from_zip(path_to_zip_file=zip_file_path, pdf_loader=PyPDFLoader, embeddings=embeddings)
 
-    db = load_faiss_index_from_zip(zip_file_path)
+    db = load_faiss_index_from_zip(zip_file_path)

utils/langchain_pdf_local.py

@@ -147,4 +147,4 @@ def get_langchain_pdf_local_resp(self, chat_type="langchain_pdf", question=""):
     my_handle = My_handle("config.json")
     if my_handle is None:
         print("程序初始化失败！")
-        exit(0)
+        exit(0)

utils/my_handle.py

@@ -12,7 +12,6 @@ class My_handle():
     common = None
     # 配置信息
     config = None
-
     audio = None
 
     room_id = None