@aidejs/core 0.1.0-alpha.3 → 0.1.0-beta.0

package/README.md

@@ -39,7 +39,7 @@
     <tbody>
         <tr>
             <td>@aidejs/core</td>
-            <td>必选项，基础库，提供了最核心的LLM交互功能和插件系统</td>
+            <td>必选项，核心库，提供了最核心的LLM交互功能和插件系统</td>
             <td>
                 <a href="https://zxl20070701.github.io/toolbox/#/npm-download?packages=@aidejs/core&interval=7">
                     <img src="https://img.shields.io/npm/dm/@aidejs/core.svg" alt="downloads">

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aidejs/core",
-    "version": "0.1.0-alpha.3",
+    "version": "0.1.0-beta.0",
     "description": "@aidejs/core",
     "main": "./src/index.js",
     "typings": "./types/index.d.ts",

package/src/Memory.js

@@ -0,0 +1,41 @@
+module.exports = class Memory {
+
+    constructor(messages = []) {
+        this.messages = messages;
+        this.message_value = ""; // 当前流缓存值
+        this.message_type = ""; // 当前流类型
+    }
+
+    // 直接添加一次新信息
+    // 前置的流会关闭，开始一次新的待整理流
+    push(value) {
+        this.generate("");
+        this.messages.push(value);
+    }
+
+    // 完结或整理一次流信息
+    generate(newType) {
+        if (this.message_value) {
+            this.messages.push({
+                role: this.message_type,
+                content: this.message_value
+            });
+        }
+
+        this.message_type = newType;
+        this.message_value = "";
+    }
+
+    // 输入一个词元的助手信息
+    assistant(lexeme) {
+        if (this.message_type !== "assistant") this.generate("assistant");
+        this.message_value += lexeme;
+    }
+
+    // 获取记忆内容
+    valueOf() {
+        this.generate("");
+        return this.messages;
+    }
+
+}

package/src/{utils/OpenAI.js → OpenAI.js}

@@ -1,6 +1,6 @@
 const https = require('https');
 const http = require('http');
-const toJSON = require("./toJSON");
+const { toJSON } = require("./utils");
 
 module.exports = function (url, options = {}, databack, callback, errorback) {
 

package/src/Tool.js

@@ -1,4 +1,4 @@
-const debug = require("./utils/debug");
+const { debug } = require("./utils");
 
 module.exports = class Tool {
 

package/src/index.js

@@ -1,12 +1,13 @@
 const { initOption } = require("oipage/nodejs/option/index");
-const OpenAI = require("./utils/OpenAI");
+const OpenAI = require("./OpenAI");
 const Tool = require("./Tool");
-const debug = require("./utils/debug");
+const Memory = require("./Memory");
+const { debug } = require("./utils");
 
 module.exports = class Aidejs {
 
-    // 工具管理对象
-    static tool = new Tool();
+    static tool = new Tool(); // 工具管理对象
+    static messages = [];
 
     constructor(options = {}) {
         this.options = initOption(options, {
@@ -36,22 +37,15 @@ module.exports = class Aidejs {
 
     // 执行任务
     task(message, logback, inputback, thinkback) {
-        let _this = this;
+        let _this = this, toolCalls = false;
 
-        let messages = [..._this.options.messages], lastIndex = -1, toolCalls = false;
-
-        let resetLastIndex = () => {
-            messages.push({
-                role: "assistant",
-                content: ""
-            });
-            lastIndex = messages.length - 1;
-        };
+        // 记忆管理对象
+        let memory = new Memory([...Aidejs.messages, ..._this.options.messages]);
 
         let runInputback = () => {
             if (inputback) {
                 inputback().then(message => {
-                    messages.push({
+                    memory.push({
                         role: "user",
                         content: message
                     });
@@ -67,21 +61,21 @@ module.exports = class Aidejs {
         let runChat = () => {
             let tools = Aidejs.tool.valueOf();
 
-            if (this.options.debug) {
-                debug("OpenAI messages", messages);
+            if (_this.options.debug) {
+                debug("OpenAI messages", memory.valueOf());
                 debug("OpenAI tools", tools.map(function (funItem) {
                     return funItem.function.name + " " + funItem.function.description;
                 }));
             }
 
-            OpenAI(this.options.url + "/chat/completions", {
+            OpenAI(_this.options.url + "/chat/completions", {
                 header: {
-                    Authorization: `Bearer ${this.options.apiKey}`
+                    Authorization: `Bearer ${_this.options.apiKey}`
                 },
                 params: {
 
                     // 必需，模型ID，也就是你选择的具体哪个模型
-                    model: this.options.model,
+                    model: _this.options.model,
 
                     // 必需，提供的array类型的消息列表，包含从头到尾的对话历史
                     // 比如值是一个数组，每个条目可以是下列类型之一：
@@ -124,7 +118,7 @@ module.exports = class Aidejs {
                     // content：必须提供的string类型，表示工具消息的内容，一般是把函数调用的结果描述在这里
                     // role：必须提供的string类型，表示消息作者的角色，对于tool message应该是"tool"
                     // tool_call_id：必须提供的string类型，表示本次消息是对哪个函数调用的结果反馈
-                    messages,
+                    messages: memory.valueOf(),
 
                     // 用户可选的一个字段，是array类型，表示可供模型选择的一个工具列表
                     // 列表中最多支持 128 个tool
@@ -151,11 +145,14 @@ module.exports = class Aidejs {
 
                         if (choice.delta.content) {
                             if (logback) logback(choice.delta.content);
+                            memory.assistant(choice.delta.content);
                         } else if (choice.delta.reasoning) {
                             if (thinkback) thinkback(choice.delta.reasoning);
                         }
 
                         if (choice.delta.tool_calls) {
+                            memory.push(choice.delta);
+
                             if (_this.options.debug) debug("tool_calls", choice.delta.tool_calls);
 
                             // 执行一次工具
@@ -168,7 +165,7 @@ module.exports = class Aidejs {
                                     let result = Aidejs.tool.invoke(_this, tool_call.function.name, JSON.parse(tool_call.function.arguments));
 
                                     let toolback = function (value) {
-                                        messages.push({
+                                        memory.push({
                                             role: "tool",
                                             tool_call_id: tool_call.id,
                                             tool_name: tool_call.function.name,
@@ -181,7 +178,7 @@ module.exports = class Aidejs {
                                         result.then(function (value) {
                                             toolback(value);
                                         }).catch(function (error) {
-                                            toolback(error + "");
+                                            toolback(error || "失败");
                                         });
                                     } else {
                                         toolback(result);
@@ -190,8 +187,6 @@ module.exports = class Aidejs {
                             };
                             runTool(0);
                         } else {
-                            if (messages[lastIndex].role !== "assistant") resetLastIndex();
-                            messages[lastIndex].content += choice.delta.content || "";
                             runChoice(choiceIndex + 1);
                         }
 
@@ -212,12 +207,10 @@ module.exports = class Aidejs {
                 toolCalls = false;
                 runInputback();
             });
-
-            resetLastIndex();
         };
 
         if (message) {
-            messages.push({
+            memory.push({
                 role: "user",
                 content: message
             });
@@ -225,8 +218,6 @@ module.exports = class Aidejs {
         } else {
             runInputback();
         }
-
-        return this;
     }
 
 };

package/src/utils.js

@@ -0,0 +1,17 @@
+// 打印调试语句
+exports.debug = function (name, content) {
+    console.log("\n\x1b[33m【" + name + "】 " + new Date().toString() + "\x1b[0m");
+    console.log(content);
+    console.log("\x1b[33m[DONE]\x1b[0m\n");
+};
+
+// 字符串转JSON
+// 适配LLM返回数据格式
+exports.toJSON = function (value) {
+    try {
+        value = value.trim().replace(/data: \[DONE\]$/, "");
+        return JSON.parse(value);
+    } catch (e) {
+        return value;
+    }
+};

package/types/index.d.ts

@@ -16,7 +16,7 @@ export default class Aidejs {
      * @param name 
      * @param value 
      */
-    static registerTool(name: string, value: any): void
+    static registerTool(name: string, value: any): Aidejs
 
     /**
      * 安装插件
@@ -28,6 +28,6 @@ export default class Aidejs {
      * 执行任务
      * @param message 
      */
-    task(message?: string, logback?: (message: string) => void, inputback?: () => Promise<string>, thinkback?: (think: string) => void): this
+    task(message?: string, logback?: (message: string) => void, inputback?: () => Promise<string>, thinkback?: (think: string) => void): void
 
 }

package/src/utils/debug.js

@@ -1,5 +0,0 @@
-module.exports = function (name, content) {
-    console.log("\n\x1b[33m【" + name + "】 " + new Date().toString() + "\x1b[0m");
-    console.log(content);
-    console.log("\x1b[33m---------------------------------------------------------------------\x1b[0m\n");
-}

package/src/utils/toJSON.js

@@ -1,8 +0,0 @@
-module.exports = function (value) {
-    try {
-        value = value.trim().replace(/data: \[DONE\]$/, "");
-        return JSON.parse(value);
-    } catch (e) {
-        return value;
-    }
-}