Skip to content

Commit e68fc2b

Browse files
committed
Merge branch 'master' of github.com:binary-husky/chatgpt_academic
2 parents f695d7f + 679352d commit e68fc2b

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
> [!IMPORTANT]
2-
> 2024.6.1: 版本3.80加入插件二级菜单功能(详见wiki)
2+
> 2024.10.10: 突发停电,紧急恢复了提供[whl包](https://drive.google.com/file/d/19U_hsLoMrjOlQSzYS3pzWX9fTzyusArP/view?usp=sharing)的文件服务器
3+
> 2024.10.8: 版本3.90加入对llama-index的初步支持,版本3.80加入插件二级菜单功能(详见wiki)
34
> 2024.5.1: 加入Doc2x翻译PDF论文的功能,[查看详情](https://github.com/binary-husky/gpt_academic/wiki/Doc2x)
45
> 2024.3.11: 全力支持Qwen、GLM、DeepseekCoder等中文大语言模型! SoVits语音克隆模块,[查看详情](https://www.bilibili.com/video/BV1Rp421S7tF/)
56
> 2024.1.17: 安装依赖时,请选择`requirements.txt`**指定的版本**。 安装命令:`pip install -r requirements.txt`。本项目完全开源免费,您可通过订阅[在线服务](https://github.com/binary-husky/gpt_academic/wiki/online)的方式鼓励本项目的发展。

crazy_functions/Rag_Interface.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,24 @@
22
from crazy_functions.crazy_utils import input_clipping
33
from crazy_functions.crazy_utils import request_gpt_model_in_new_thread_with_ui_alive
44

5-
VECTOR_STORE_TYPE = "Milvus"
6-
7-
if VECTOR_STORE_TYPE == "Milvus":
8-
try:
9-
from crazy_functions.rag_fns.milvus_worker import MilvusRagWorker as LlamaIndexRagWorker
10-
except:
11-
VECTOR_STORE_TYPE = "Simple"
12-
13-
if VECTOR_STORE_TYPE == "Simple":
14-
from crazy_functions.rag_fns.llama_index_worker import LlamaIndexRagWorker
15-
16-
175
RAG_WORKER_REGISTER = {}
18-
196
MAX_HISTORY_ROUND = 5
207
MAX_CONTEXT_TOKEN_LIMIT = 4096
218
REMEMBER_PREVIEW = 1000
229

2310
@CatchException
2411
def Rag问答(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request):
2512

13+
# import vector store lib
14+
VECTOR_STORE_TYPE = "Milvus"
15+
if VECTOR_STORE_TYPE == "Milvus":
16+
try:
17+
from crazy_functions.rag_fns.milvus_worker import MilvusRagWorker as LlamaIndexRagWorker
18+
except:
19+
VECTOR_STORE_TYPE = "Simple"
20+
if VECTOR_STORE_TYPE == "Simple":
21+
from crazy_functions.rag_fns.llama_index_worker import LlamaIndexRagWorker
22+
2623
# 1. we retrieve rag worker from global context
2724
user_name = chatbot.get_user()
2825
checkpoint_dir = get_log_folder(user_name, plugin_name='experimental_rag')

0 commit comments

Comments
 (0)