diff --git a/request_llms/bridge_all.py b/request_llms/bridge_all.py index 2355485f..f953f8f9 100644 --- a/request_llms/bridge_all.py +++ b/request_llms/bridge_all.py @@ -1285,4 +1285,3 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot, # 更新一下llm_kwargs的参数,否则会出现参数不匹配的问题 yield from method(inputs, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, stream, additional_fn) - diff --git a/request_llms/bridge_chatgpt.py b/request_llms/bridge_chatgpt.py index d4cf1ef5..75ac4dcf 100644 --- a/request_llms/bridge_chatgpt.py +++ b/request_llms/bridge_chatgpt.py @@ -202,9 +202,10 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[], if (time.time()-observe_window[1]) > watch_dog_patience: raise RuntimeError("用户取消了程序。") else: raise RuntimeError("意外Json结构:"+delta) - if json_data and json_data['finish_reason'] == 'content_filter': - raise RuntimeError("由于提问含不合规内容被Azure过滤。") - if json_data and json_data['finish_reason'] == 'length': + finish_reason = json_data.get('finish_reason') if json_data else None + if finish_reason == 'content_filter': + raise RuntimeError("由于提问含不合规内容被过滤。") + if finish_reason == 'length': raise ConnectionAbortedError("正常结束,但显示Token不足,导致输出不完整,请削减单次输入的文本量。") return result @@ -536,4 +537,3 @@ def generate_payload(inputs:str, llm_kwargs:dict, history:list, system_prompt:st return headers,payload -