From a1033698dd4bd6d8ba3deddf648dc5248bf18756 Mon Sep 17 00:00:00 2001 From: imClumsyPanda Date: Sun, 23 Apr 2023 21:49:42 +0800 Subject: [PATCH] update local_doc_qa.py, webui.py and README.md --- README.md | 2 +- chains/local_doc_qa.py | 21 ++++++++++++--------- webui.py | 22 +++++++++++++++++----- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2e64046..3c72b4c 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ $ docker run -d --restart=always --name chatglm -p 7860:7860 -v /www/wwwroot/cod > 注：鉴于环境部署过程中可能遇到问题，建议首先测试命令行脚本。建议命令行脚本测试可正常运行后再运行 Web UI。 -执行 [knowledge_based_chatglm.py](cli_demo.py) 脚本体验**命令行交互**： +执行 [cli_demo.py](cli_demo.py) 脚本体验**命令行交互**： ```shell $ python cli_demo.py ``` diff --git a/chains/local_doc_qa.py b/chains/local_doc_qa.py index 2640760..0552db3 100644 --- a/chains/local_doc_qa.py +++ b/chains/local_doc_qa.py @@ -95,17 +95,20 @@ class LocalDocQA: except Exception as e: print(e) print(f"{file} 未能成功加载") + if len(docs) > 0: + if vs_path and os.path.isdir(vs_path): + vector_store = FAISS.load_local(vs_path, self.embeddings) + vector_store.add_documents(docs) + else: + if not vs_path: + vs_path = f"""{VS_ROOT_PATH}{os.path.splitext(file)[0]}_FAISS_{datetime.datetime.now().strftime("%Y%m%d_%H%M%S")}""" + vector_store = FAISS.from_documents(docs, self.embeddings) - if vs_path and os.path.isdir(vs_path): - vector_store = FAISS.load_local(vs_path, self.embeddings) - vector_store.add_documents(docs) + vector_store.save_local(vs_path) + return vs_path, loaded_files else: - if not vs_path: - vs_path = f"""{VS_ROOT_PATH}{os.path.splitext(file)[0]}_FAISS_{datetime.datetime.now().strftime("%Y%m%d_%H%M%S")}""" - vector_store = FAISS.from_documents(docs, self.embeddings) - - vector_store.save_local(vs_path) - return vs_path if len(docs) > 0 else None, loaded_files + print("文件均未成功加载，请检查依赖包或替换为其他文件再次上传。") + return None, loaded_files def get_knowledge_based_answer(self, query, diff --git a/webui.py b/webui.py index 04ed490..a5f9973 100644 --- a/webui.py +++ b/webui.py @@ -55,10 +55,18 @@ def init_model(): try: local_doc_qa.init_cfg() local_doc_qa.llm._call("你好") - return """模型已成功加载，可以开始对话，或从右侧选择模式后开始对话""" + reply = """模型已成功加载，可以开始对话，或从右侧选择模式后开始对话""" + print(reply) + return reply except Exception as e: print(e) - return """模型未成功加载，请到页面左上角"模型配置"选项卡中重新选择后点击"加载模型"按钮""" + reply = """模型未成功加载，请到页面左上角"模型配置"选项卡中重新选择后点击"加载模型"按钮""" + if str(e) == "Unknown platform: darwin": + print("改报错可能因为您使用的是 macOS 操作系统，需先下载模型至本地后执行 Web UI，具体方法请参考项目 README 中本地部署方法及常见问题：" + " https://github.com/imClumsyPanda/langchain-ChatGLM") + else: + print(reply) + return reply def reinit_model(llm_model, embedding_model, llm_history_len, use_ptuning_v2, top_k, history): @@ -69,9 +77,11 @@ def reinit_model(llm_model, embedding_model, llm_history_len, use_ptuning_v2, to use_ptuning_v2=use_ptuning_v2, top_k=top_k) model_status = """模型已成功重新加载，可以开始对话，或从右侧选择模式后开始对话""" + print(model_status) except Exception as e: print(e) model_status = """模型未成功重新加载，请到页面左上角"模型配置"选项卡中重新选择后点击"加载模型"按钮""" + print(model_status) return history + [[None, model_status]] @@ -91,6 +101,7 @@ def get_vector_store(vs_id, files, history): else: file_status = "模型未完成加载，请先在加载模型后再导入文件" vs_path = None + print(file_status) return vs_path, None, history + [[None, file_status]] @@ -110,11 +121,12 @@ def change_mode(mode): def add_vs_name(vs_name, vs_list, chatbot): if vs_name in vs_list: - chatbot = chatbot + [[None, "与已有知识库名称冲突，请重新选择其他名称后提交"]] + vs_status = "与已有知识库名称冲突，请重新选择其他名称后提交" + chatbot = chatbot + [[None, vs_status]] return gr.update(visible=True), vs_list, chatbot else: - chatbot = chatbot + [ - [None, f"""已新增知识库"{vs_name}",将在上传文件并载入成功后进行存储。请在开始对话前，先完成文件上传。 """]] + vs_status = f"""已新增知识库"{vs_name}",将在上传文件并载入成功后进行存储。请在开始对话前，先完成文件上传。 """ + chatbot = chatbot + [[None, vs_status]] return gr.update(visible=True, choices=vs_list + [vs_name], value=vs_name), vs_list + [vs_name], chatbot