Austin/QChatGPT
1
0
Fork 0
mirror of https://github.com/RockChinQ/QChatGPT.git synced 2024-11-16 11:42:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(chatcmpl): 对函数调用进行异常捕获 (#749)

Browse Source
This commit is contained in:
Junyan Qin 2024-03-30 09:45:30 +00:00
parent cac5a5adff
commit fdd7c1864d
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/provider/modelmgr/apis/chatcmpl.py
View File

@ -98,6 +98,7 @@ class OpenAIChatCompletions(api.LLMAPIRequester):
# req_messages.append({"role": "user", "content": str(query.message_chain)}) # req_messages.append({"role": "user", "content": str(query.message_chain)})
# 首次请求
msg = await self._closure(req_messages, query.use_model, query.use_funcs) msg = await self._closure(req_messages, query.use_model, query.use_funcs)
yield msg yield msg
@ -106,23 +107,36 @@ class OpenAIChatCompletions(api.LLMAPIRequester):
req_messages.append(msg.dict(exclude_none=True)) req_messages.append(msg.dict(exclude_none=True))
# 持续请求，只要还有待处理的工具调用就继续处理调用
while pending_tool_calls: while pending_tool_calls:
for tool_call in pending_tool_calls: for tool_call in pending_tool_calls:
func = tool_call.function try:
func = tool_call.function
parameters = json.loads(func.arguments) parameters = json.loads(func.arguments)
func_ret = await self.ap.tool_mgr.execute_func_call( func_ret = await self.ap.tool_mgr.execute_func_call(
query, func.name, parameters query, func.name, parameters
) )
msg = llm_entities.Message( msg = llm_entities.Message(
role="tool", content=json.dumps(func_ret, ensure_ascii=False), tool_call_id=tool_call.id role="tool", content=json.dumps(func_ret, ensure_ascii=False), tool_call_id=tool_call.id
) )
yield msg yield msg
req_messages.append(msg.dict(exclude_none=True)) req_messages.append(msg.dict(exclude_none=True))
except Exception as e:
# 出错，添加一个报错信息到 req_messages
err_msg = llm_entities.Message(
role="tool", content=f"err: {e}", tool_call_id=tool_call.id
)
yield err_msg
req_messages.append(
err_msg.dict(exclude_none=True)
)
# 处理完所有调用，继续请求 # 处理完所有调用，继续请求
msg = await self._closure(req_messages, query.use_model, query.use_funcs) msg = await self._closure(req_messages, query.use_model, query.use_funcs)