修改错误工具调用时候的提示词
This commit is contained in:
@@ -75,10 +75,10 @@ function loadHistory(sessionId) {
|
|||||||
|
|
||||||
function saveMessage(sessionId, msg) {
|
function saveMessage(sessionId, msg) {
|
||||||
const info = db.prepare(
|
const info = db.prepare(
|
||||||
'INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, name, type, created_at) VALUES (?,?,?,?,?,?,?,?,?)'
|
'INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, name, type, is_error, created_at) VALUES (?,?,?,?,?,?,?,?,?,?)'
|
||||||
).run(sessionId, msg.role, msg.content || null, msg.reasoning || null,
|
).run(sessionId, msg.role, msg.content || null, msg.reasoning || null,
|
||||||
msg.tool_calls ? JSON.stringify(msg.tool_calls) : null,
|
msg.tool_calls ? JSON.stringify(msg.tool_calls) : null,
|
||||||
msg.tool_call_id || null, msg.name || null, msg.type || null, now());
|
msg.tool_call_id || null, msg.name || null, msg.type || null, msg.is_error ? 1 : 0, now());
|
||||||
// 关键动作日志:AI 每轮回复落库(含纯工具调用轮)
|
// 关键动作日志:AI 每轮回复落库(含纯工具调用轮)
|
||||||
if (msg.role === 'assistant') {
|
if (msg.role === 'assistant') {
|
||||||
const calls = msg.tool_calls || [];
|
const calls = msg.tool_calls || [];
|
||||||
@@ -541,7 +541,7 @@ async function runLoopInner(sessionId, run) {
|
|||||||
])
|
])
|
||||||
: outText;
|
: outText;
|
||||||
// 先落库再广播:回执带上消息行 id(msg_id),前端工具卡据此挂「删除本条」按钮
|
// 先落库再广播:回执带上消息行 id(msg_id),前端工具卡据此挂「删除本条」按钮
|
||||||
const toolMsgId = saveMessage(sessionId, { role: 'tool', tool_call_id: id, name: tc.function.name, content: toolContent });
|
const toolMsgId = saveMessage(sessionId, { role: 'tool', tool_call_id: id, name: tc.function.name, content: toolContent, is_error: isError });
|
||||||
bus.emit(sessionId, 'tool_result', {
|
bus.emit(sessionId, 'tool_result', {
|
||||||
tool_call_id: id, name: tc.function.name, content: outText.slice(0, 20000),
|
tool_call_id: id, name: tc.function.name, content: outText.slice(0, 20000),
|
||||||
is_error: isError, image_url: imageDataUrl || undefined, msg_id: toolMsgId,
|
is_error: isError, image_url: imageDataUrl || undefined, msg_id: toolMsgId,
|
||||||
@@ -636,14 +636,14 @@ function checkToolArgs(tools, name, raw) {
|
|||||||
else {
|
else {
|
||||||
try { args = JSON.parse(s); }
|
try { args = JSON.parse(s); }
|
||||||
catch (_) {
|
catch (_) {
|
||||||
return { args: null, error: 'Error: ToolCall Args Invalid:arguments 不是合法 JSON,请重新生成该调用。原文:' + s.slice(0, 300) };
|
return { args: null, error: 'Error: Invalid tool call arguments (not valid JSON).' };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const def = (tools || []).find(t => t && t.function && t.function.name === name);
|
const def = (tools || []).find(t => t && t.function && t.function.name === name);
|
||||||
const required = def && def.function.parameters && def.function.parameters.required;
|
const required = def && def.function.parameters && def.function.parameters.required;
|
||||||
const missing = required && required.length
|
const missing = required && required.length
|
||||||
? required.filter(k => args[k] === undefined || args[k] === '') : [];
|
? required.filter(k => args[k] === undefined || args[k] === '') : [];
|
||||||
if (missing.length) return { args: null, error: 'Error: ToolCall Missing Params:' + missing.join('、') };
|
if (missing.length) return { args: null, error: 'Error: ToolCall Missing Params: ' + missing.join('、') };
|
||||||
return { args, error: null };
|
return { args, error: null };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -71,7 +71,7 @@ function buildMessages(session, language) {
|
|||||||
}
|
}
|
||||||
messages.push({
|
messages.push({
|
||||||
role: 'user',
|
role: 'user',
|
||||||
content: '[系统] 你上一轮的 tool call 参数有误,未执行并已从对话历史中移除。错误详情:\n' +
|
content: '[系统] 你上一轮的 tool call 参数有误,未正确执行并已从对话历史中移除。错误详情:\n' +
|
||||||
(errs.join('\n') || 'Error: ToolCall Invalid Params') +
|
(errs.join('\n') || 'Error: ToolCall Invalid Params') +
|
||||||
'\n请严格按工具参数定义重新生成正确的调用。',
|
'\n请严格按工具参数定义重新生成正确的调用。',
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user