chunzhi/chatgpt_academic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change dash scope api key check behavior

Browse Source
This commit is contained in:
binary-husky 2023-12-23 21:35:42 +08:00
parent e22f0226d5
commit 2c7bba5c63
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@ -108,7 +108,7 @@ QWEN_LOCAL_MODEL_SELECTION = "Qwen/Qwen-1_8B-Chat-Int8"
# 接入通义千问在线大模型 https://dashscope.console.aliyun.com/ # 接入通义千问在线大模型 https://dashscope.console.aliyun.com/
DASHSCOPE_API_KEY = "此处填阿里灵积云API秘钥" # 阿里灵积云API_KEY DASHSCOPE_API_KEY = "" # 阿里灵积云API_KEY
# 百度千帆（LLM_MODEL="qianfan"） # 百度千帆（LLM_MODEL="qianfan"）

16
request_llms/bridge_qwen.py
View File

@ -5,16 +5,6 @@ from toolbox import check_packages, report_exception
model_name = 'Qwen' model_name = 'Qwen'
def validate_key():
DASHSCOPE_API_KEY = get_conf("DASHSCOPE_API_KEY")
if DASHSCOPE_API_KEY == '': return False
return True
if not validate_key():
raise RuntimeError('请配置DASHSCOPE_API_KEY')
os.environ['DASHSCOPE_API_KEY'] = get_conf("DASHSCOPE_API_KEY")
def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False): def predict_no_ui_long_connection(inputs, llm_kwargs, history=[], sys_prompt="", observe_window=[], console_slience=False):
""" """
⭐多线程方法 ⭐多线程方法
@ -48,6 +38,12 @@ def predict(inputs, llm_kwargs, plugin_kwargs, chatbot, history=[], system_promp
chatbot=chatbot, history=history, delay=0) chatbot=chatbot, history=history, delay=0)
return return
# 检查DASHSCOPE_API_KEY
if get_conf("DASHSCOPE_API_KEY") == "":
yield from update_ui_lastest_msg(f"请配置 DASHSCOPE_API_KEY。",
chatbot=chatbot, history=history, delay=0)
return
if additional_fn is not None: if additional_fn is not None:
from core_functional import handle_core_functionality from core_functional import handle_core_functionality
inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot) inputs, history = handle_core_functionality(additional_fn, inputs, history, chatbot)

13
request_llms/com_qwenapi.py
View File

@ -7,12 +7,21 @@ timeout_bot_msg = '[Local Message] Request timeout. Network error.'
class QwenRequestInstance(): class QwenRequestInstance():
def __init__(self): def __init__(self):
import dashscope
self.time_to_yield_event = threading.Event() self.time_to_yield_event = threading.Event()
self.time_to_exit_event = threading.Event() self.time_to_exit_event = threading.Event()
self.result_buf = "" self.result_buf = ""
def validate_key():
DASHSCOPE_API_KEY = get_conf("DASHSCOPE_API_KEY")
if DASHSCOPE_API_KEY == '': return False
return True
if not validate_key():
raise RuntimeError('请配置 DASHSCOPE_API_KEY')
dashscope.api_key = get_conf("DASHSCOPE_API_KEY")
def generate(self, inputs, llm_kwargs, history, system_prompt): def generate(self, inputs, llm_kwargs, history, system_prompt):
# import _thread as thread # import _thread as thread
from dashscope import Generation from dashscope import Generation