@leikeduntech/leiai-js 2.3.6 → 2.4.0

package/build/index.d.ts

@@ -510,7 +510,6 @@ declare class ChatGPTAPI {
     set apiOrg(apiOrg: string);
     protected _buildMessages(text: string, opts: SendMessageOptions): Promise<{
         messages: openai.ChatCompletionRequestMessage[];
-        aliyunMessage: any;
         maxTokens: number;
         numTokens: number;
         errorMessage: string;

package/build/index.js

@@ -155,12 +155,6 @@ var ChatGPTAPI = class {
       ...completionParams
     };
     this._systemMessage = systemMessage;
-    if (this._systemMessage === void 0) {
-      const currentDate = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
-      this._systemMessage = `You are ChatGPT, a large language model trained by ${this._manufacturer}. Answer as concisely as possible.
-Knowledge cutoff: 2021-09-01
-Current date: ${currentDate}`;
-    }
     this._maxModelTokens = maxModelTokens;
     this._maxResponseTokens = maxResponseTokens;
     this._getMessageById = getMessageById ?? this._defaultGetMessageById;
@@ -205,6 +199,13 @@ Current date: ${currentDate}`;
    * @returns The response from ChatGPT
    */
   async sendMessage(text, opts = {}) {
+    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];
+      this._systemMessage = `You are ChatGPT, a large language model trained by ${this._manufacturer}. Answer as concisely as possible.
+Knowledge cutoff: 2021-09-01
+Current date: ${currentDate}`;
+    }
     const {
       parentMessageId,
       messageId = uuidv4(),
@@ -228,7 +229,7 @@ Current date: ${currentDate}`;
       text
     };
     const latestQuestion = message;
-    const { messages, aliyunMessage, maxTokens, numTokens, errorMessage } = await this._buildMessages(
+    const { messages, maxTokens, numTokens, errorMessage } = await this._buildMessages(
       text,
       opts
     );
@@ -255,7 +256,7 @@ Current date: ${currentDate}`;
     };
     const responseP = new Promise(
       async (resolve, reject) => {
-        var _a, _b, _c, _d, _e;
+        var _a2, _b, _c, _d, _e;
         let url = `${this._apiBaseUrl}/chat/completions`;
         const headers = {
           "Content-Type": "application/json",
@@ -289,8 +290,8 @@ Current date: ${currentDate}`;
           stream
         };
         if (this._manufacturer.toLowerCase() === "aliyun") {
+          body = Object.assign(body, { parameters: { result_format: "message" }, input: { messages } });
           delete body.messages;
-          body = Object.assign(body, { input: aliyunMessage });
         } else if (this._manufacturer.toLowerCase() === "zhipu") {
           delete body.messages;
           body = Object.assign(body, { prompt: messages });
@@ -302,7 +303,7 @@ Current date: ${currentDate}`;
           console.log(`api url (${url}`);
           console.log(`api header (${JSON.stringify(headers)}`);
           console.log(`sendMessage (${numTokens} tokens) body: `, body);
-          console.log(`sendMessage (${numTokens} tokens) message : `, aliyunMessage || messages);
+          console.log(`sendMessage (${numTokens} tokens) message : `, messages);
         }
         if (this._manufacturer.toLowerCase() === "xunfei") {
           const self = this;
@@ -351,7 +352,7 @@ Current date: ${currentDate}`;
                 body: JSON.stringify(body),
                 signal: abortSignal,
                 onMessage: (data) => {
-                  var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j, _k;
+                  var _a3, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
                   if (this._debug) {
                   }
                   if (data === "[DONE]") {
@@ -367,13 +368,13 @@ Current date: ${currentDate}`;
                         return resolve(result);
                       }
                     } else if (this._manufacturer.toLowerCase() === "azure") {
-                      if (((_a2 = response.choices[0]) == null ? void 0 : _a2.finish_reason) === "stop") {
+                      if (((_a3 = response.choices[0]) == null ? void 0 : _a3.finish_reason) === "stop") {
                         result.text = result.text.trim();
                         return resolve(result);
                       }
                     } else if (this._manufacturer.toLowerCase() === "aliyun") {
-                      if (((_b2 = response == null ? void 0 : response.output) == null ? void 0 : _b2.finish_reason) === "stop") {
-                        result.text = response == null ? void 0 : response.output.text.trim();
+                      if (["stop", "length"].indexOf((_c2 = (_b2 = response == null ? void 0 : response.output) == null ? void 0 : _b2.choices[0]) == null ? void 0 : _c2.finish_reason) > -1) {
+                        result.text = (_f = (_e2 = (_d2 = response == null ? void 0 : response.output) == null ? void 0 : _d2.choices[0]) == null ? void 0 : _e2.message) == null ? void 0 : _f.content.trim();
                         return resolve(result);
                       }
                     } else if (this._manufacturer.toLowerCase() === "zhipu") {
@@ -391,7 +392,7 @@ Current date: ${currentDate}`;
                         result.id = response.id;
                       }
                     }
-                    if (((_c2 = response.choices) == null ? void 0 : _c2.length) && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+                    if (((_g = response.choices) == null ? void 0 : _g.length) && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
                       const delta = response.choices[0].delta;
                       result.delta = delta.content;
                       if (delta == null ? void 0 : delta.content)
@@ -409,17 +410,17 @@ Current date: ${currentDate}`;
                       result.detail = response;
                       onProgress == null ? void 0 : onProgress(result);
                     } else if ((response == null ? void 0 : response.output) && this._manufacturer.toLowerCase() === "aliyun") {
-                      response.usage = Object.assign(response.usage, { prompt_tokens: (_d2 = response.usage) == null ? void 0 : _d2.input_tokens, completion_tokens: (_e2 = response.usage) == null ? void 0 : _e2.output_tokens, total_tokens: ((_f = response.usage) == null ? void 0 : _f.input_tokens) + ((_g = response.usage) == null ? void 0 : _g.output_tokens) });
+                      response.usage = Object.assign(response.usage, { prompt_tokens: (_h = response.usage) == null ? void 0 : _h.input_tokens, completion_tokens: (_i = response.usage) == null ? void 0 : _i.output_tokens, total_tokens: ((_j = response.usage) == null ? void 0 : _j.input_tokens) + ((_k = response.usage) == null ? void 0 : _k.output_tokens) });
                       result.delta = "";
-                      if ((_h = response == null ? void 0 : response.output) == null ? void 0 : _h.text)
-                        result.text = (_i = response == null ? void 0 : response.output) == null ? void 0 : _i.text;
+                      if ((_n = (_m = (_l = response == null ? void 0 : response.output) == null ? void 0 : _l.choices[0]) == null ? void 0 : _m.message) == null ? void 0 : _n.content)
+                        result.text = (_q = (_p = (_o = response == null ? void 0 : response.output) == null ? void 0 : _o.choices[0]) == null ? void 0 : _p.message) == null ? void 0 : _q.content;
                       result.role = "assistant";
                       result.detail = response;
                       onProgress == null ? void 0 : onProgress(result);
                     } else if ((response == null ? void 0 : response.data) && this._manufacturer.toLowerCase() === "zhipu") {
                       if (response.event === "finish") {
-                        if ((_j = response == null ? void 0 : response.meta) == null ? void 0 : _j.usage) {
-                          response.usage = (_k = response == null ? void 0 : response.meta) == null ? void 0 : _k.usage;
+                        if ((_r = response == null ? void 0 : response.meta) == null ? void 0 : _r.usage) {
+                          response.usage = (_s = response == null ? void 0 : response.meta) == null ? void 0 : _s.usage;
                         } else {
                           response.usage = { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 };
                         }
@@ -469,7 +470,7 @@ Current date: ${currentDate}`;
                   result.id = response.id;
                 }
               }
-              if (((_a = response == null ? void 0 : response.choices) == null ? void 0 : _a.length) && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+              if (((_a2 = response == null ? void 0 : response.choices) == null ? void 0 : _a2.length) && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
                 const message2 = response.choices[0].message;
                 result.text = message2.content;
                 if (message2.role) {
@@ -498,13 +499,13 @@ Current date: ${currentDate}`;
         }
       }
     ).then(async (message2) => {
-      var _a, _b;
+      var _a2, _b;
       if (message2.detail && !message2.detail.usage) {
         try {
           const promptTokens = numTokens;
           let completionTokens = 0;
           if (["baidu", "aliyun"].indexOf(this._manufacturer.toLowerCase()) > -1) {
-            completionTokens = (_b = (_a = message2.detail) == null ? void 0 : _a.usage) == null ? void 0 : _b.total_tokens;
+            completionTokens = (_b = (_a2 = message2.detail) == null ? void 0 : _a2.usage) == null ? void 0 : _b.total_tokens;
           } else {
             completionTokens = await this._getTokenCount(message2.text);
           }
@@ -581,14 +582,14 @@ Current date: ${currentDate}`;
     const assistantLabel = ASSISTANT_LABEL_DEFAULT;
     const maxNumTokens = this._maxModelTokens - this._maxResponseTokens;
     let messages = [];
-    if (systemMessage && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+    if (systemMessage && ["openai", "azure", "aliyun"].indexOf(this._manufacturer.toLowerCase()) > -1) {
       messages.push({
         role: "system",
         content: systemMessage
       });
     }
     const systemMessageOffset = messages.length;
-    const userMessage = ["baidu", "azure", "zhipu", "xunfei"].indexOf(this._manufacturer.toLowerCase()) > -1 ? [{ role: "user", content: text }] : [{ role: "user", content: text, name: opts.name }];
+    const userMessage = ["baidu", "azure", "zhipu", "xunfei", "aliyun"].indexOf(this._manufacturer.toLowerCase()) > -1 ? [{ role: "user", content: text }] : [{ role: "user", content: text, name: opts.name }];
     let nextMessages = text ? messages.concat(userMessage) : messages;
     let numTokens = 0;
     do {
@@ -647,28 +648,7 @@ ${message.content}`]);
       maxTokens = this._maxModelTokens;
       errorMessage = `${this._manufacturer}\uFF1A\u5F53\u524D\u63D0\u95EE\u4E0A\u4E0B\u6587\u5185\u5BB9\u957F\u5EA6${numTokens}tokns\u8D85\u957F\uFF0C\u8BE5\u6A21\u578B\u6700\u5927\u63D0\u95EE\u957F\u5EA6\u4E3A${this._maxModelTokens}tokens\uFF0C\u8BF7\u5207\u6362\u5176\u4ED6\u589E\u5F3AAI\u6A21\u578B\u6216\u51CF\u5C11\u5B57\u6570\u6216\u8005\u5173\u95ED\u4E0A\u4E0B\u6587\u5386\u53F2\u63D0\u9AD8\u5355\u6B21\u63D0\u95EE\u957F\u5EA6\uFF01`;
     }
-    let aliyunMessage;
-    if (this._manufacturer.toLowerCase() === "aliyun") {
-      aliyunMessage = { prompt: "", history: [] };
-      let onceMessage = { user: "", bot: "" };
-      messages.forEach((item, index) => {
-        if (index < messages.length - 1 && index > 1) {
-          if (!onceMessage.user || !onceMessage.bot) {
-            if (item.role === "user")
-              onceMessage.user = item.content;
-            if (item.role === "assistant")
-              onceMessage.bot = item.content;
-          }
-          if (onceMessage.user && onceMessage.bot) {
-            aliyunMessage.history.push(onceMessage);
-            onceMessage = { user: "", bot: "" };
-          }
-        } else {
-          aliyunMessage.prompt = item.content;
-        }
-      });
-    }
-    return { messages, aliyunMessage, maxTokens, numTokens, errorMessage };
+    return { messages, maxTokens, numTokens, errorMessage };
   }
   async _getTokenCount(text) {
     text = text.replace(/<\|endoftext\|>/g, "");

package/package.json

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