alemonjs-aichat 1.0.19 → 1.0.21

package/lib/response/zreply/res.js

@@ -1,7 +1,7 @@
 import { API } from '@alemonjs/onebot';
 import { emojiMap } from '../../emoji.js';
 import { uploadImageToR2 } from '../../s3.js';
-import { useMessage, Mention, Text, getConfigValue, ImageFile, ImageURL, useClient } from 'alemonjs';
+import { useMessage, Text, Mention, getConfigValue, ImageFile, ImageURL, useClient } from 'alemonjs';
 import { log } from 'console';
 import OpenAi from 'openai';
 import { TTSClient } from '../../api/tts.js';
@@ -330,29 +330,64 @@ ${e.ClientError ? `当前错误信息:${e.ClientError}` : ""}
             messages.push(responseMessage);
             await redisClient.addAIChatHistory(e.guid, responseMessage);
             console.log("模型决定调用工具：", responseMessage.tool_calls);
+            const useToolsMessage = responseMessage.tool_calls.map((toolCall) => {
+                return `工具调用: ${toolCall.function.name}(${toolCall.function.arguments})`;
+            });
+            const msgId = await message.send(format(Text(useToolsMessage.join("\n"))));
+            // 30秒后撤回消息
+            setTimeout(() => {
+                message.delete({ messageId: msgId[0].data.message_id });
+            }, 30000);
             for (const toolCall of responseMessage.tool_calls) {
                 const functionName = toolCall.function.name;
-                const functionArgs = JSON.parse(toolCall.function.arguments);
+                let functionArgs = {};
+                try {
+                    functionArgs = toolCall.function.arguments
+                        ? JSON.parse(toolCall.function.arguments)
+                        : {};
+                }
+                catch (err) {
+                    console.error(`工具参数解析失败：${functionName}`, err);
+                    functionArgs = {};
+                }
                 const functionToCall = availableTools[functionName];
+                let functionResult;
                 if (!functionToCall) {
                     console.error(`未找到函数：${functionName}`);
-                    continue;
+                    functionResult = {
+                        ok: false,
+                        error: `未找到函数：${functionName}`,
+                    };
+                }
+                else {
+                    try {
+                        // 执行本地函数
+                        functionResult = await functionToCall(functionArgs);
+                    }
+                    catch (err) {
+                        console.error(`工具执行失败：${functionName}`, err);
+                        functionResult = {
+                            ok: false,
+                            error: err?.message || String(err) || "工具执行失败",
+                        };
+                    }
                 }
-                // 执行本地函数
-                const functionResult = await functionToCall(functionArgs);
+                const toolContent = JSON.stringify(typeof functionResult === "undefined"
+                    ? { ok: true, result: null }
+                    : functionResult);
                 // 把工具执行结果作为 tool role 消息加回对话
                 messages.push({
                     role: "tool",
                     tool_call_id: toolCall.id,
                     name: functionName,
-                    content: JSON.stringify(functionResult),
+                    content: toolContent,
                 });
                 // 记录工具调用结果
                 await redisClient.addAIChatHistory(e.guid, {
                     role: "tool",
                     tool_call_id: toolCall.id,
                     name: functionName,
-                    content: JSON.stringify(functionResult),
+                    content: toolContent,
                 });
             }
             // 重新请求

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs-aichat",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "alemonjs-aichat",
   "author": "suancaixianyu",
   "license": "MIT",