andre/gpt_academic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决一些合并冲突遗漏

Browse Source
This commit is contained in:
w_xiaolizu
2023-06-27 15:29:53 +08:00
parent 37ebab43d2
commit f2ee6c3d95
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
request_llm/bridge_all.py
View File

@ -16,16 +16,11 @@ from toolbox import get_conf, trimmed_format_exc
from request_llm.bridge_chatgpt import predict_no_ui_long_connection as chatgpt_noui
from request_llm.bridge_chatgpt import predict as chatgpt_ui
<<<<<<< HEAD
from request_llm.bridge_chatgpt import predict_no_ui_long_connection as chatglm_noui
from request_llm.bridge_chatgpt import predict as chatglm_ui
=======
from .bridge_azure_test import predict_no_ui_long_connection as azure_noui
from .bridge_azure_test import predict as azure_ui
from .bridge_chatglm import predict_no_ui_long_connection as chatglm_noui
from .bridge_chatglm import predict as chatglm_ui
>>>>>>> f320599 (增加azure openai api的支持)
from .bridge_newbing import predict_no_ui_long_connection as newbing_noui
from .bridge_newbing import predict as newbing_ui