Skip to content

Commit 2ec9c52

Browse files
committed
fix: fix toolcall error
1 parent 77c433b commit 2ec9c52

File tree

1 file changed

+23
-18
lines changed
  • apps/miniprogram-agent-ui/miniprogram/components/agent-ui

1 file changed

+23
-18
lines changed

apps/miniprogram-agent-ui/miniprogram/components/agent-ui/index.js

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Component({
218218
? reqid
219219
? `${content}|reqId:${reqid}`
220220
: content
221-
: JSON.stringify({ content, reqid });
221+
: JSON.stringify({ err: content, reqid });
222222
wx.showModal({
223223
title: "错误原因",
224224
content: transformContent,
@@ -463,24 +463,29 @@ Component({
463463
fileSize: item.bytes,
464464
}));
465465
}
466-
if (item.role === "assistant" && item.content === "") {
467-
transformItem.content = this.data.defaultErrorMsg;
468-
}
469-
if (item.role === "assistant" && item.origin_msg) {
470-
// console.log("toolcall origin_msg", JSON.parse(item.origin_msg));
471-
const origin_msg_obj = JSON.parse(item.origin_msg);
472-
if (origin_msg_obj.aiResHistory) {
473-
const transformToolCallList = this.transformToolCallHistoryList(origin_msg_obj.aiResHistory);
474-
transformItem.toolCallList = transformToolCallList;
475-
const toolCallErr = transformToolCallList.find((item) => item.error)?.error;
476-
// console.log("toolCallErr", toolCallErr);
477-
if (toolCallErr?.error?.message) {
478-
transformItem.error = toolCallErr.error.message;
479-
transformItem.reqId = item.trace_id || "";
466+
if (item.role === "assistant") {
467+
if (item.content === "") {
468+
transformItem.content = this.data.defaultErrorMsg;
469+
transformItem.error = {};
470+
transformItem.reqId = item.trace_id || "";
471+
}
472+
473+
if (item.origin_msg) {
474+
// console.log("toolcall origin_msg", JSON.parse(item.origin_msg));
475+
const origin_msg_obj = JSON.parse(item.origin_msg);
476+
if (origin_msg_obj.aiResHistory) {
477+
const transformToolCallList = this.transformToolCallHistoryList(origin_msg_obj.aiResHistory);
478+
transformItem.toolCallList = transformToolCallList;
479+
const toolCallErr = transformToolCallList.find((item) => item.error)?.error;
480+
// console.log("toolCallErr", toolCallErr);
481+
if (toolCallErr?.error?.message) {
482+
transformItem.error = toolCallErr.error.message;
483+
transformItem.reqId = item.trace_id || "";
484+
}
485+
} else {
486+
// 之前异常的返回
487+
// return null
480488
}
481-
} else {
482-
// 之前异常的返回
483-
// return null
484489
}
485490
}
486491
return transformItem;

0 commit comments

Comments
 (0)