From b8e8457a017d3478f5f69195c0b18f756a62a12d Mon Sep 17 00:00:00 2001 From: Nextstrain <140483081+Nextstrain9000@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8Eo1=E7=B3=BB=E5=88=97=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=A4=9A=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=BD=AE=E8=AF=A2KeyError:=20'finish=5Freason'=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20(#1992)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update bridge_all.py * Update bridge_chatgpt.py * Update bridge_chatgpt.py * Update bridge_all.py * Update bridge_all.py --- request_llms/bridge_all.py | 1 - request_llms/bridge_chatgpt.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) 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 -