@leikeduntech/leiai-js 2.8.0 → 3.0.0

package/build/index.d.ts

@@ -35,6 +35,10 @@ type SendMessageOptions = {
     abortSignal?: AbortSignal;
     completionParams?: Partial<Omit<openai.CreateChatCompletionRequest, 'messages' | 'n' | 'stream'>>;
 };
+type PluginParams = {
+    plugin_res: object;
+    assistant_res: ChatMessage | any;
+};
 type MessageActionType = 'next' | 'variant';
 type SendMessageBrowserOptions = {
     conversationId?: string;
@@ -51,7 +55,7 @@ interface ChatMessage {
     role?: Role;
     name?: string;
     delta?: string;
-    detail?: openai.CreateChatCompletionResponse | CreateChatCompletionStreamResponse;
+    detail?: openai.CreateChatCompletionResponse | CreateChatCompletionStreamResponse | any;
     parentMessageId?: string;
     conversationId?: string;
     object?: string;
@@ -59,10 +63,11 @@ interface ChatMessage {
     sentence_id?: number;
     is_end?: boolean;
     is_truncated?: boolean;
-    result?: string;
+    result?: string | object;
     need_clear_history?: boolean;
     usage?: object;
     tool_call_id?: string;
+    content?: string | object | any;
 }
 declare class ChatGPTError extends Error {
     statusCode?: number;
@@ -227,11 +232,13 @@ declare namespace openai {
          * ]}
          */
         input?: object;
+        tool_call_id?: string;
     }
     const ChatCompletionRequestMessageRoleEnum: {
         readonly System: 'system';
         readonly User: 'user';
         readonly Assistant: 'assistant';
+        readonly Tool: 'tool';
     };
     type ChatCompletionRequestMessageRoleEnum = (typeof ChatCompletionRequestMessageRoleEnum)[keyof typeof ChatCompletionRequestMessageRoleEnum];
     /**
@@ -477,10 +484,6 @@ declare class ChatGPTAPI {
      */
     constructor(opts: ChatGPTAPIOptions);
     pluginListMap(pluginList: any): any;
-    DallE3Fun(): {
-        pluginList: string;
-        description: string;
-    };
     /**
      * Sends a message to the OpenAI chat completions endpoint, waits for the response
      * to resolve, and returns the response.
@@ -503,7 +506,7 @@ declare class ChatGPTAPI {
      *
      * @returns The response from ChatGPT
      */
-    sendMessage(text: string, opts?: SendMessageOptions): Promise<ChatMessage>;
+    sendMessage(text: string, opts: SendMessageOptions, pluginParams: PluginParams): Promise<ChatMessage>;
     get manufacturer(): string;
     set manufacturer(manufacturer: string);
     get maxModelTokens(): number;
@@ -516,7 +519,7 @@ declare class ChatGPTAPI {
     set apiKey(apiKey: string);
     get apiOrg(): string;
     set apiOrg(apiOrg: string);
-    protected _buildMessages(text: string, opts: SendMessageOptions): Promise<{
+    protected _buildMessages(text: string, opts: SendMessageOptions, pluginData: ChatMessage): Promise<{
         messages: openai.ChatCompletionRequestMessage[];
         maxTokens: number;
         numTokens: number;
@@ -577,4 +580,4 @@ declare class ChatGPTUnofficialProxyAPI {
     sendMessage(text: string, opts?: SendMessageBrowserOptions): Promise<ChatMessage>;
 }
 
-export { ChatGPTAPI, ChatGPTAPIOptions, ChatGPTError, ChatGPTUnofficialProxyAPI, ChatMessage, ContentType, ConversationJSONBody, ConversationResponseEvent, CreateChatCompletionStreamResponse, CreateCompletionStreamResponseUsage, FetchFn, GetMessageByIdFunction, Message, MessageActionType, MessageContent, MessageMetadata, Prompt, PromptContent, Role, SendMessageBrowserOptions, SendMessageOptions, UpsertMessageFunction, openai };
+export { ChatGPTAPI, ChatGPTAPIOptions, ChatGPTError, ChatGPTUnofficialProxyAPI, ChatMessage, ContentType, ConversationJSONBody, ConversationResponseEvent, CreateChatCompletionStreamResponse, CreateCompletionStreamResponseUsage, FetchFn, GetMessageByIdFunction, Message, MessageActionType, MessageContent, MessageMetadata, PluginParams, Prompt, PromptContent, Role, SendMessageBrowserOptions, SendMessageOptions, UpsertMessageFunction, openai };

package/build/index.js

@@ -227,14 +227,17 @@ var ChatGPTAPI = class {
   }
   pluginListMap(pluginList) {
     const list = {
-      "dall-e-3": "DallE3Fun"
+      "dall-e-3": {
+        name: "DallE3Fun",
+        description: "\u4F7F\u7528DALL-E3\u6A21\u578B\u6839\u636E\u7528\u6237\u63CF\u8FF0\u63D0\u793A\u521B\u4F5C\u4E00\u5F20\u65B0\u7684\u56FE\u7247"
+      },
+      "dall-e-2": {
+        name: "DallE2Fun",
+        description: "\u4F7F\u7528DALL-E2\u6A21\u578B\u57FA\u4E8E\u7528\u6237\u63D0\u4F9B\u7684\u56FE\u7247\u5730\u5740url\u548C\u63D0\u793A\u8BCD\u91CD\u65B0\u4FEE\u6539\u56FE\u7247\u7F16\u8F91\u56FE\u7247\u66FF\u6362\u56FE\u7247\u5220\u9664\u56FE\u7247\u90E8\u4EFD\u5185\u5BB9"
+      }
     };
     return list[pluginList];
   }
-  // DallE3文生图插件
-  DallE3Fun() {
-    return { pluginList: "dall-e-3", description: "\u4F7F\u7528DALL-E3\u6A21\u578B\u6839\u636E\u7528\u6237\u63CF\u8FF0\u63D0\u793A\u7ED8\u56FE\u753B\u753B\u4F5C\u56FE" };
-  }
   /**
    * Sends a message to the OpenAI chat completions endpoint, waits for the response
    * to resolve, and returns the response.
@@ -257,7 +260,7 @@ var ChatGPTAPI = class {
    *
    * @returns The response from ChatGPT
    */
-  async sendMessage(text, opts = {}) {
+  async sendMessage(text, opts = {}, pluginParams) {
     var _a;
     if (this._systemMessage === void 0 && ["openai", "azure"].indexOf((_a = this._manufacturer) == null ? void 0 : _a.toLowerCase()) > -1) {
       const currentDate = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
@@ -265,7 +268,12 @@ var ChatGPTAPI = class {
 Knowledge cutoff: 2021-09-01
 Current date: ${currentDate}`;
     }
-    const {
+    let parentMsg;
+    if (pluginParams) {
+      parentMsg = await this._getMessageById(pluginParams.assistant_res.id);
+      opts.parentMessageId = parentMsg.id;
+    }
+    let {
       parentMessageId,
       messageId = uuidv4(),
       timeoutMs,
@@ -280,17 +288,45 @@ Current date: ${currentDate}`;
       abortController = new AbortController();
       abortSignal = abortController.signal;
     }
-    const message = {
+    let message = {
       role: "user",
       id: messageId,
       conversationId,
       parentMessageId,
       text
     };
-    const latestQuestion = message;
+    if (this._debug)
+      console.log("\u8DDF\u8E2A1, \u8D85\u65F6\u65F6\u95F4ms", timeoutMs);
+    let latestQuestion = message, last_assistant_res_message = null, last_assistant_res = null, last_plugin_res = null;
+    if (pluginParams) {
+      last_assistant_res_message = pluginParams.assistant_res.detail.choices[0];
+      last_assistant_res = {
+        role: last_assistant_res_message.message.role,
+        id: parentMsg.id,
+        conversationId,
+        parentMessageId: parentMsg.parentMessageId,
+        text,
+        content: last_assistant_res_message
+      };
+      last_plugin_res = {
+        role: "tool",
+        id: messageId,
+        name: last_assistant_res_message.message.tool_calls[0].function.name,
+        conversationId,
+        parentMessageId: pluginParams.assistant_res.id,
+        text,
+        content: pluginParams.plugin_res,
+        tool_call_id: last_assistant_res_message.message.tool_calls[0].id
+      };
+      await this._upsertMessage(last_assistant_res);
+      latestQuestion = last_plugin_res;
+    }
+    if (this._debug)
+      console.log("\u8DDF\u8E2A2");
     const { messages, maxTokens, numTokens, errorMessage } = await this._buildMessages(
       text,
-      opts
+      opts,
+      last_plugin_res
     );
     if (this._debug)
       console.log(`typeof errorMessage ${typeof errorMessage},numTokens:${numTokens}, _maxModelTokens:${this._maxModelTokens},errorMessage: ${errorMessage}`);
@@ -358,20 +394,38 @@ Current date: ${currentDate}`;
         };
         if (["openai"].indexOf(this._manufacturer.toLowerCase()) > -1) {
           switch (pluginList) {
-            case "plugin1":
-              break;
             case "dall-e-3":
               body = Object.assign(body, { tools: [{
+                type: "function",
+                function: {
+                  "name": "DallE2Fun",
+                  "description": this.pluginListMap(pluginList).description,
+                  "parameters": {
+                    "type": "object",
+                    "properties": {
+                      "prompt": {
+                        "type": "string",
+                        "description": "\u7528\u6237\u5BF9\u9700\u8981\u7F16\u8F91\u7684\u56FE\u7247\u4FEE\u6539\u7684\u63D0\u793A\u5185\u5BB9"
+                      },
+                      "image_url": {
+                        "type": "string",
+                        "description": "\u4ECE\u5BF9\u8BDD\u5386\u53F2\u8BB0\u5F55\u548C\u7528\u6237\u63D0\u793A\u8BCD\u91CC\u5339\u914D\u6700\u8FD1\u4E00\u6B21\u51FA\u73B0\u7684\u4EE5http\u5F00\u5934\u7684\u56FE\u7247\u7684\u94FE\u63A5\u5730\u5740"
+                      }
+                    },
+                    "required": ["prompt", "image_url"]
+                  }
+                }
+              }, {
                 type: "function",
                 function: {
                   "name": "DallE3Fun",
-                  "description": this.DallE3Fun().description,
+                  "description": this.pluginListMap(pluginList).description,
                   "parameters": {
                     "type": "object",
                     "properties": {
                       "prompt": {
                         "type": "string",
-                        "description": "\u7528\u6237\u7684\u63D0\u793A\u8BCD"
+                        "description": "\u7ED8\u56FE\u7684\u63D0\u793A\u8BCD"
                       }
                     },
                     "required": ["prompt"]
@@ -454,16 +508,12 @@ Current date: ${currentDate}`;
                 signal: abortSignal,
                 onMessage: (data) => {
                   var _a3, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
-                  if (this._debug) {
-                  }
                   if (data === "[DONE]") {
                     result.text = result.text.trim();
                     return resolve(result);
                   }
                   try {
                     const response = JSON.parse(data);
-                    if (this._debug) {
-                    }
                     if (this._manufacturer.toLowerCase() === "baidu") {
                       if ((response == null ? void 0 : response.is_end) === true) {
                         result.text += response.result.trim();
@@ -512,7 +562,6 @@ Current date: ${currentDate}`;
                         result.text += result.delta;
                       result.role = "assistant";
                       if (response.choices[0].finish_reason === "tool_calls") {
-                        result.name = this.pluginListMap(pluginList);
                       } else if (delta.role) {
                         result.role = delta.role;
                       }
@@ -559,12 +608,16 @@ Current date: ${currentDate}`;
             ).catch(reject);
           } else {
             try {
+              if (this._debug)
+                console.log("\u8DDF\u8E2A3");
               const res = await this._fetch(url, {
                 method: "POST",
                 headers,
                 body: JSON.stringify(body),
                 signal: abortSignal
               });
+              if (this._debug)
+                console.log("\u8DDF\u8E2A4");
               if (!res.ok) {
                 const reason = await res.text();
                 const msg = `${this._manufacturer} error ${res.status || res.statusText}: ${reason}`;
@@ -575,7 +628,7 @@ Current date: ${currentDate}`;
               }
               const response = await res.json();
               if (this._debug) {
-                console.log(response);
+                console.log(`row data ${typeof response} : `, response, response == null ? void 0 : response.choices);
               }
               if (this._manufacturer.toLowerCase() === "aliyun") {
                 if (response == null ? void 0 : response.request_id) {
@@ -607,8 +660,12 @@ Current date: ${currentDate}`;
                 );
               }
               result.detail = response;
+              if (this._debug)
+                console.log("\u8DDF\u8E2A5");
               return resolve(result);
             } catch (err) {
+              if (this._debug)
+                console.log("\u8DDF\u8E2A6");
               return reject(err);
             }
           }
@@ -616,6 +673,8 @@ Current date: ${currentDate}`;
       }
     ).then(async (message2) => {
       var _a2, _b;
+      if (this._debug)
+        console.log("\u8DDF\u8E2A7", JSON.stringify(message2));
       if (message2.detail && !message2.detail.usage) {
         try {
           const promptTokens = numTokens;
@@ -634,12 +693,17 @@ Current date: ${currentDate}`;
         } catch (err) {
         }
       }
-      return Promise.all([
+      const pRes = Promise.all([
         this._upsertMessage(latestQuestion),
         this._upsertMessage(message2)
       ]).then(() => message2);
+      return pRes;
     });
+    if (this._debug)
+      console.log("\u8DDF\u8E2A8");
     if (timeoutMs) {
+      if (this._debug)
+        console.log("\u8DDF\u8E2A9");
       if (abortController) {
         ;
         responseP.cancel = () => {
@@ -651,6 +715,8 @@ Current date: ${currentDate}`;
         message: `${this._manufacturer} timed out waiting for response`
       });
     } else {
+      if (this._debug)
+        console.log("\u8DDF\u8E2A10");
       return responseP;
     }
   }
@@ -690,7 +756,8 @@ Current date: ${currentDate}`;
   set apiOrg(apiOrg) {
     this._apiOrg = apiOrg;
   }
-  async _buildMessages(text, opts) {
+  async _buildMessages(text, opts, pluginData) {
+    var _a;
     const { systemMessage = this._systemMessage, completionParams } = opts;
     let { parentMessageId } = opts;
     let errorMessage = "";
@@ -719,12 +786,30 @@ Current date: ${currentDate}`;
       }
     }
     const systemMessageOffset = messages.length;
-    const userMessage = ["baidu", "azure", "zhipu", "xunfei", "aliyun", "tencent"].indexOf(this._manufacturer.toLowerCase()) > -1 ? [{ role: "user", content: text }] : [{ role: "user", content: text, name: opts.name }];
-    let nextMessages = text ? messages.concat(userMessage) : messages;
+    let userMessage = null;
+    if (["baidu", "azure", "zhipu", "xunfei", "aliyun", "tencent"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+      userMessage = [{ role: "user", content: text }];
+    } else if (pluginData) {
+      userMessage = {
+        role: pluginData.role,
+        name: pluginData.name,
+        content: JSON.stringify(pluginData.content),
+        tool_call_id: pluginData.tool_call_id
+      };
+    } else {
+      userMessage = [{ role: "user", content: text, name: opts.name }];
+    }
+    let nextMessages = messages;
+    if (pluginData || text) {
+      nextMessages = nextMessages.concat(userMessage);
+    }
     let numTokens = 0;
     do {
       const prompt = nextMessages.reduce((prompt2, message) => {
         switch (message.role) {
+          case "tool":
+            return prompt2.concat([`Tool:
+ function call`]);
           case "system":
             return prompt2.concat([`Instructions:
 ${message.content}`]);
@@ -754,14 +839,20 @@ ${message.content}`]);
         break;
       }
       const parentMessageRole = parentMessage.role || "user";
-      const parentMessageItem = ["baidu", "azure", "zhipu", "xunfei", "aliyun", "tencent"].indexOf(this._manufacturer.toLowerCase()) > -1 ? {
-        role: parentMessageRole,
-        content: parentMessage.text
-      } : {
-        role: parentMessageRole,
-        content: parentMessage.text,
-        name: parentMessage.name
-      };
+      let parentMessageItem = null;
+      if (["baidu", "azure", "zhipu", "xunfei", "aliyun", "tencent"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+        parentMessageItem = { role: parentMessageRole, content: parentMessage.text };
+      } else if (parentMessage.content && ((_a = parentMessage.content) == null ? void 0 : _a.finish_reason) === "tool_calls") {
+        parentMessageItem = parentMessage.content.message;
+      } else {
+        parentMessageItem = {
+          role: parentMessageRole,
+          content: parentMessage.text || parentMessage.content,
+          name: parentMessage.name
+        };
+        if (parentMessage.tool_call_id)
+          parentMessageItem.tool_call_id = parentMessage.tool_call_id;
+      }
       nextMessages = nextMessages.slice(0, systemMessageOffset).concat([
         parentMessageItem,
         ...nextMessages.slice(systemMessageOffset)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leikeduntech/leiai-js",
-  "version": "2.8.0",
+  "version": "3.0.0",
   "author": "liuhean",
   "repository": {
     "type": "git",