@leikeduntech/leiai-js 2.7.1 → 2.9.0

package/build/index.d.ts

@@ -1,6 +1,6 @@
 import Keyv from 'keyv';
 
-type Role = 'user' | 'assistant' | 'system' | 'function';
+type Role = 'user' | 'assistant' | 'system' | 'function' | 'tool';
 type FetchFn = typeof fetch;
 type ChatGPTAPIOptions = {
     /** 模型厂商公司 **/
@@ -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,9 +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;
@@ -226,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];
     /**
@@ -337,6 +345,7 @@ declare namespace openai {
          */
         user?: string;
         pluginList?: string | object;
+        fileList?: Array<any>;
     }
     /**
      * @type CreateChatCompletionRequestStop
@@ -458,6 +467,7 @@ declare class ChatGPTAPI {
     protected _getMessageById: GetMessageByIdFunction;
     protected _upsertMessage: UpsertMessageFunction;
     protected _messageStore: Keyv<ChatMessage>;
+    protected _DallE3FunData: any;
     /**
      * Creates a new client wrapper around OpenAI's chat completion API, mimicing the official ChatGPT webapp's functionality as closely as possible.
      *
@@ -475,10 +485,7 @@ declare class ChatGPTAPI {
      */
     constructor(opts: ChatGPTAPIOptions);
     pluginListMap(pluginList: any): any;
-    DallE3Fun(): {
-        pluginList: string;
-        description: string;
-    };
+    DallE3Fun(): any;
     /**
      * Sends a message to the OpenAI chat completions endpoint, waits for the response
      * to resolve, and returns the response.
@@ -501,7 +508,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;
@@ -514,7 +521,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;
@@ -575,4 +582,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,13 +227,16 @@ 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\u7ED8\u56FE\u753B\u753B\u4F5C\u56FE"
+      }
     };
     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" };
+    return this._DallE3FunData;
   }
   /**
    * Sends a message to the OpenAI chat completions endpoint, waits for 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,42 @@ Current date: ${currentDate}`;
       abortController = new AbortController();
       abortSignal = abortController.signal;
     }
-    const message = {
+    let message = {
       role: "user",
       id: messageId,
       conversationId,
       parentMessageId,
       text
     };
-    const latestQuestion = message;
+    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;
+      this[`_${last_plugin_res.name}Data`] = pluginParams.plugin_res;
+    }
     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}`);
@@ -347,6 +380,8 @@ Current date: ${currentDate}`;
         }
         if (typeof completionParams.pluginList !== "undefined")
           delete completionParams.pluginList;
+        if (typeof completionParams.fileList !== "undefined")
+          delete completionParams.fileList;
         let body = {
           max_tokens: maxTokens,
           ...this._completionParams,
@@ -363,7 +398,7 @@ Current date: ${currentDate}`;
                 type: "function",
                 function: {
                   "name": "DallE3Fun",
-                  "description": this.DallE3Fun().description,
+                  "description": this.pluginListMap(pluginList).description,
                   "parameters": {
                     "type": "object",
                     "properties": {
@@ -452,16 +487,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();
@@ -510,8 +541,6 @@ Current date: ${currentDate}`;
                         result.text += result.delta;
                       result.role = "assistant";
                       if (response.choices[0].finish_reason === "tool_calls") {
-                        result.role = "function";
-                        result.name = this.pluginListMap(pluginList);
                       } else if (delta.role) {
                         result.role = delta.role;
                       }
@@ -574,7 +603,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) {
@@ -633,10 +662,11 @@ Current date: ${currentDate}`;
         } catch (err) {
         }
       }
-      return Promise.all([
+      const pRes = Promise.all([
         this._upsertMessage(latestQuestion),
         this._upsertMessage(message2)
       ]).then(() => message2);
+      return pRes;
     });
     if (timeoutMs) {
       if (abortController) {
@@ -689,8 +719,9 @@ Current date: ${currentDate}`;
   set apiOrg(apiOrg) {
     this._apiOrg = apiOrg;
   }
-  async _buildMessages(text, opts) {
-    const { systemMessage = this._systemMessage } = opts;
+  async _buildMessages(text, opts, pluginData) {
+    var _a;
+    const { systemMessage = this._systemMessage, completionParams } = opts;
     let { parentMessageId } = opts;
     let errorMessage = "";
     const userLabel = USER_LABEL_DEFAULT;
@@ -703,13 +734,45 @@ Current date: ${currentDate}`;
         content: systemMessage
       });
     }
+    let objText = [{ type: "text", text }];
+    if (completionParams.fileList && completionParams.fileList.length > 0 && completionParams.model === "gpt-4-vision-preview") {
+      completionParams.fileList.forEach((item) => {
+        objText.push({
+          type: "image_url",
+          image_url: {
+            url: item.imgUrl
+          }
+        });
+      });
+      if (["openai"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+        text = objText;
+      }
+    }
     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}`]);
@@ -739,14 +802,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.7.1",
+  "version": "2.9.0",
   "author": "liuhean",
   "repository": {
     "type": "git",