Skip to content

Commit b8e8457

Browse files
关于o1系列模型无法正常请求的修复,多模型轮询KeyError: 'finish_reason'的修复 (#1992)
* Update bridge_all.py * Update bridge_chatgpt.py * Update bridge_chatgpt.py * Update bridge_all.py * Update bridge_all.py
1 parent 2c93a24 commit b8e8457

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

request_llms/bridge_all.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,4 +1285,3 @@ def predict(inputs:str, llm_kwargs:dict, plugin_kwargs:dict, chatbot,
12851285

12861286
# 更新一下llm_kwargs的参数,否则会出现参数不匹配的问题
12871287
yield from method(inputs, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, stream, additional_fn)
1288-

request_llms/bridge_chatgpt.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,10 @@ def predict_no_ui_long_connection(inputs:str, llm_kwargs:dict, history:list=[],
202202
if (time.time()-observe_window[1]) > watch_dog_patience:
203203
raise RuntimeError("用户取消了程序。")
204204
else: raise RuntimeError("意外Json结构:"+delta)
205-
if json_data and json_data['finish_reason'] == 'content_filter':
206-
raise RuntimeError("由于提问含不合规内容被Azure过滤。")
207-
if json_data and json_data['finish_reason'] == 'length':
205+
finish_reason = json_data.get('finish_reason') if json_data else None
206+
if finish_reason == 'content_filter':
207+
raise RuntimeError("由于提问含不合规内容被过滤。")
208+
if finish_reason == 'length':
208209
raise ConnectionAbortedError("正常结束,但显示Token不足,导致输出不完整,请削减单次输入的文本量。")
209210
return result
210211

@@ -536,4 +537,3 @@ def generate_payload(inputs:str, llm_kwargs:dict, history:list, system_prompt:st
536537

537538
return headers,payload
538539

539-

0 commit comments

Comments
 (0)