@leikeduntech/leiai-js 3.5.1 → 3.5.2

package/build/index.js

@@ -1,4 +1,5 @@
 // src/chatgpt-api.ts
+import { Spark } from "@leikeduntech/spark-nodejs";
 import Keyv from "keyv";
 import pTimeout from "p-timeout";
 import QuickLRU from "quick-lru";
@@ -106,9 +107,6 @@ async function fetchSSE(url, options, fetch2 = fetch, manufacturer = "OpenAI") {
   }
 }
 
-// src/chatgpt-api.ts
-import { Spark } from "@leikeduntech/spark-nodejs";
-
 // src/utils.ts
 import CryptoJS from "crypto-js";
 var uuidv4Re = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
@@ -320,13 +318,11 @@ var ChatGPTAPI = class {
     }
     if (this._debug)
       console.log("\u8DDF\u8E2A2");
-    const { messages, maxTokens, numTokens, errorMessage } = await this._buildMessages(
-      text,
-      opts,
-      last_plugin_res
-    );
+    const { messages, maxTokens, numTokens, errorMessage } = await this._buildMessages(text, opts, last_plugin_res);
     if (this._debug)
-      console.log(`typeof errorMessage ${typeof errorMessage},numTokens:${numTokens}, _maxModelTokens:${this._maxModelTokens},errorMessage: ${errorMessage}`);
+      console.log(
+        `typeof errorMessage ${typeof errorMessage},numTokens:${numTokens}, _maxModelTokens:${this._maxModelTokens},errorMessage: ${errorMessage}`
+      );
     if (errorMessage !== "" && errorMessage !== null && errorMessage.length > 0) {
       return new Promise((resolve, reject) => {
         const errMsg = {
@@ -408,76 +404,101 @@ var ChatGPTAPI = class {
               let tools_key = "tools", tool_choice_key = "tool_choice", funArr = null;
               if (this._manufacturer.toLowerCase() === "azure")
                 tools_key = "functions", tool_choice_key = "function_call";
-              funArr = [{
-                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"
+              funArr = [
+                {
+                  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"
+                        }
                       },
-                      "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"]
+                      required: ["prompt", "image_url"]
+                    }
                   }
-                }
-              }, {
-                type: "function",
-                function: {
-                  "name": "DallE3Fun",
-                  "description": this.pluginListMap(pluginList).description,
-                  "parameters": {
-                    "type": "object",
-                    "properties": {
-                      "prompt": {
-                        "type": "string",
-                        "description": "\u7ED8\u56FE\u7684\u63D0\u793A\u8BCD"
-                      }
-                    },
-                    "required": ["prompt"]
+                },
+                {
+                  type: "function",
+                  function: {
+                    name: "DallE3Fun",
+                    description: this.pluginListMap(pluginList).description,
+                    parameters: {
+                      type: "object",
+                      properties: {
+                        prompt: {
+                          type: "string",
+                          description: "\u7ED8\u56FE\u7684\u63D0\u793A\u8BCD"
+                        }
+                      },
+                      required: ["prompt"]
+                    }
                   }
                 }
-              }];
+              ];
               if (this._manufacturer.toLowerCase() === "azure") {
                 funArr = funArr.map((item) => {
                   return item.function;
                 });
               }
-              body = Object.assign(body, { [tools_key]: funArr, [tool_choice_key]: "auto" });
+              body = Object.assign(body, {
+                [tools_key]: funArr,
+                [tool_choice_key]: "auto"
+              });
               break;
             default:
               break;
           }
         } else if (this._manufacturer.toLowerCase() === "aliyun") {
-          body = Object.assign(body, { parameters: { result_format: "message" }, input: { messages } });
+          body = Object.assign(body, {
+            parameters: { result_format: "message" },
+            input: { messages }
+          });
           delete body.messages;
         } else if (this._manufacturer.toLowerCase() === "zhipu") {
-          delete body.messages;
-          body = Object.assign(body, { prompt: messages });
+          if (completionParams.model === "glm-4") {
+          } else {
+            delete body.messages;
+            body = Object.assign(body, { prompt: messages });
+          }
         } else if (this._manufacturer.toLowerCase() === "tencent") {
           url = this._apiBaseUrl;
           const timestamp = Math.ceil((/* @__PURE__ */ new Date()).getTime() / 1e3) + 1;
           const keyList = this._apiKey.split(".");
-          body = Object.assign(body, { app_id: parseInt(keyList[0]), secret_id: keyList[1], timestamp, expired: timestamp + 24 * 60 * 60, stream: stream ? 1 : 0 });
+          body = Object.assign(body, {
+            app_id: parseInt(keyList[0]),
+            secret_id: keyList[1],
+            timestamp,
+            expired: timestamp + 24 * 60 * 60,
+            stream: stream ? 1 : 0
+          });
           delete body.model;
           delete body.max_tokens;
           headers["Authorization"] = signTencentHunyuan(body, url, keyList);
         } else if (this._manufacturer.toLowerCase() === "baidu") {
           if (pluginList && pluginList.indexOf("zhishiku") > -1) {
             let query = messages.splice(messages.length - 1, 1);
-            body = Object.assign(body, { query: (_a = query[0]) == null ? void 0 : _a.content, history: messages });
+            body = Object.assign(body, {
+              query: (_a = query[0]) == null ? void 0 : _a.content,
+              history: messages
+            });
             delete body.messages;
           }
         } else if (this._manufacturer.toLowerCase() === "chatdoc") {
           let query = messages.splice(messages.length - 1, 1);
-          body = Object.assign(body, { upload_id: (_b = completionParams == null ? void 0 : completionParams.extParams) == null ? void 0 : _b.upload_id, question: (_c = query[0]) == null ? void 0 : _c.content, history: messages });
+          body = Object.assign(body, {
+            upload_id: (_b = completionParams == null ? void 0 : completionParams.extParams) == null ? void 0 : _b.upload_id,
+            question: (_c = query[0]) == null ? void 0 : _c.content,
+            history: messages
+          });
           if (body.extParams)
             delete body.extParams;
           if (body.model)
@@ -496,7 +517,11 @@ var ChatGPTAPI = class {
           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 : `, messages, typeof messages);
+          console.log(
+            `sendMessage (${numTokens} tokens) message : `,
+            messages,
+            typeof messages
+          );
         }
         if (this._manufacturer.toLowerCase() === "xunfei") {
           const self = this;
@@ -520,7 +545,9 @@ var ChatGPTAPI = class {
             onData({ content, start, end, seq }) {
               if (self._debug)
                 console.log("onData", content, start, end, seq);
-              result.id = `xunfei-${Math.floor(Math.random() * 1e7)}${(/* @__PURE__ */ new Date()).getTime()}`;
+              result.id = `xunfei-${Math.floor(
+                Math.random() * 1e7
+              )}${(/* @__PURE__ */ new Date()).getTime()}`;
               result.delta = content;
               if (content)
                 result.text += content;
@@ -530,7 +557,13 @@ var ChatGPTAPI = class {
             onEnd({ content, tokens, questionTokens }) {
               if (self._debug)
                 console.log("onEnd", content, tokens, questionTokens);
-              result.detail = { usage: { prompt_tokens: questionTokens, completion_tokens: tokens, total_tokens: questionTokens + tokens } };
+              result.detail = {
+                usage: {
+                  prompt_tokens: questionTokens,
+                  completion_tokens: tokens,
+                  total_tokens: questionTokens + tokens
+                }
+              };
               result.text = content.trim();
               return resolve(result);
             }
@@ -545,7 +578,7 @@ var ChatGPTAPI = class {
                 body: JSON.stringify(body),
                 signal: abortSignal,
                 onMessage: (data) => {
-                  var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
+                  var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
                   if (data === "[DONE]") {
                     result.text = result.text.trim();
                     return resolve(result);
@@ -553,7 +586,11 @@ var ChatGPTAPI = class {
                   try {
                     const response = JSON.parse(data);
                     if (this._debug) {
-                      console.log(`row data ${typeof response} : `, response, response == null ? void 0 : response.choices);
+                      console.log(
+                        `row data ${typeof response} : `,
+                        response,
+                        response == null ? void 0 : response.choices
+                      );
                     }
                     if (this._manufacturer.toLowerCase() === "baidu") {
                       if ((response == null ? void 0 : response.is_end) === true) {
@@ -567,22 +604,34 @@ var ChatGPTAPI = class {
                         return resolve(result);
                       }
                     } else if (this._manufacturer.toLowerCase() === "aliyun") {
-                      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) {
+                      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 = (_f2 = (_e2 = (_d2 = response == null ? void 0 : response.output) == null ? void 0 : _d2.choices[0]) == null ? void 0 : _e2.message) == null ? void 0 : _f2.content.trim();
                         return resolve(result);
                       }
                     } else if (this._manufacturer.toLowerCase() === "zhipu") {
-                      if ((response == null ? void 0 : response.event) === "finish") {
-                        result.text += response == null ? void 0 : response.data.trim();
-                        return resolve(result);
+                      if (completionParams.model === "glm-4") {
+                        const gelResponse = JSON.parse(response.data);
+                        if (((_h2 = (_g2 = gelResponse == null ? void 0 : gelResponse.choices) == null ? void 0 : _g2[0]) == null ? void 0 : _h2.finish_reason) === "stop") {
+                          result.text = result.text.trim();
+                          return resolve(result);
+                        }
+                      } else {
+                        if ((response == null ? void 0 : response.event) === "finish") {
+                          result.text += response == null ? void 0 : response.data.trim();
+                          return resolve(result);
+                        }
                       }
                     } else if (this._manufacturer.toLowerCase() === "tencent") {
-                      if (((_g2 = response.choices[0]) == null ? void 0 : _g2.finish_reason) === "stop") {
-                        result.text += (_i2 = (_h2 = response == null ? void 0 : response.choices[0]) == null ? void 0 : _h2.delta) == null ? void 0 : _i2.content.trim();
+                      if (((_i2 = response.choices[0]) == null ? void 0 : _i2.finish_reason) === "stop") {
+                        result.text += (_k = (_j = response == null ? void 0 : response.choices[0]) == null ? void 0 : _j.delta) == null ? void 0 : _k.content.trim();
                         return resolve(result);
                       }
                     } else if (this._manufacturer.toLowerCase() === "chatdoc") {
-                      result.id = `chatdoc-${Math.floor(Math.random() * 1e7)}${(/* @__PURE__ */ new Date()).getTime()}`;
+                      result.id = `chatdoc-${Math.floor(
+                        Math.random() * 1e7
+                      )}${(/* @__PURE__ */ new Date()).getTime()}`;
                       if (response == null ? void 0 : response.source_info) {
                         result.text += response == null ? void 0 : response.answer;
                         return resolve(result);
@@ -597,7 +646,9 @@ var ChatGPTAPI = class {
                         result.id = response.id;
                       }
                     }
-                    if (((_j = response.choices) == null ? void 0 : _j.length) && ["openai", "azure", "tencent"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+                    if (((_l = response.choices) == null ? void 0 : _l.length) && ["openai", "azure", "tencent"].indexOf(
+                      this._manufacturer.toLowerCase()
+                    ) > -1) {
                       const delta = response.choices[0].delta;
                       result.delta = "";
                       if (response.choices[0].finish_reason === "tool_calls") {
@@ -622,27 +673,50 @@ var ChatGPTAPI = class {
                       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: (_k = response.usage) == null ? void 0 : _k.input_tokens, completion_tokens: (_l = response.usage) == null ? void 0 : _l.output_tokens, total_tokens: ((_m = response.usage) == null ? void 0 : _m.input_tokens) + ((_n = response.usage) == null ? void 0 : _n.output_tokens) });
+                      response.usage = Object.assign(response.usage, {
+                        prompt_tokens: (_m = response.usage) == null ? void 0 : _m.input_tokens,
+                        completion_tokens: (_n = response.usage) == null ? void 0 : _n.output_tokens,
+                        total_tokens: ((_o = response.usage) == null ? void 0 : _o.input_tokens) + ((_p = response.usage) == null ? void 0 : _p.output_tokens)
+                      });
                       result.delta = "";
-                      if ((_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.text = (_t = (_s = (_r = response == null ? void 0 : response.output) == null ? void 0 : _r.choices[0]) == null ? void 0 : _s.message) == null ? void 0 : _t.content;
+                      if ((_s = (_r = (_q = response == null ? void 0 : response.output) == null ? void 0 : _q.choices[0]) == null ? void 0 : _r.message) == null ? void 0 : _s.content)
+                        result.text = (_v = (_u = (_t = response == null ? void 0 : response.output) == null ? void 0 : _t.choices[0]) == null ? void 0 : _u.message) == null ? void 0 : _v.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 ((_u = response == null ? void 0 : response.meta) == null ? void 0 : _u.usage) {
-                          response.usage = (_v = response == null ? void 0 : response.meta) == null ? void 0 : _v.usage;
-                        } else {
-                          response.usage = { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 };
+                      if (completionParams.model === "glm-4") {
+                        const glmResponse = JSON.parse(response.data);
+                        if (((_x = (_w = glmResponse == null ? void 0 : glmResponse.choices) == null ? void 0 : _w[0]) == null ? void 0 : _x.finish_reason) === "stop") {
+                          response.usage = glmResponse.usage;
+                        }
+                        let data2 = (_z = (_y = glmResponse == null ? void 0 : glmResponse.choices) == null ? void 0 : _y[0]) == null ? void 0 : _z.delta.content;
+                        result.delta = data2;
+                        if (data2) {
+                          result.text += data2;
+                        }
+                        result.role = "assistant";
+                        result.detail = response;
+                        onProgress == null ? void 0 : onProgress(result);
+                      } else {
+                        if (response.event === "finish") {
+                          if ((_A = response == null ? void 0 : response.meta) == null ? void 0 : _A.usage) {
+                            response.usage = (_B = response == null ? void 0 : response.meta) == null ? void 0 : _B.usage;
+                          } else {
+                            response.usage = {
+                              prompt_tokens: 1,
+                              completion_tokens: 1,
+                              total_tokens: 2
+                            };
+                          }
                         }
+                        result.delta = response.data;
+                        if (response == null ? void 0 : response.data)
+                          result.text += response == null ? void 0 : response.data;
+                        result.role = "assistant";
+                        result.detail = response;
+                        onProgress == null ? void 0 : onProgress(result);
                       }
-                      result.delta = response.data;
-                      if (response == null ? void 0 : response.data)
-                        result.text += response == null ? void 0 : response.data;
-                      result.role = "assistant";
-                      result.detail = response;
-                      onProgress == null ? void 0 : onProgress(result);
                     } else if ((response == null ? void 0 : response.answer) && this._manufacturer.toLowerCase() === "chatdoc") {
                       result.delta = response.answer;
                       if (response == null ? void 0 : response.answer)
@@ -652,7 +726,10 @@ var ChatGPTAPI = class {
                       onProgress == null ? void 0 : onProgress(result);
                     }
                   } catch (err) {
-                    console.warn(`${this._manufacturer} stream SEE event unexpected error`, err);
+                    console.warn(
+                      `${this._manufacturer} stream SEE event unexpected error`,
+                      err
+                    );
                     return reject(err);
                   }
                 }
@@ -682,7 +759,11 @@ var ChatGPTAPI = class {
               }
               const response = await res.json();
               if (this._debug) {
-                console.log(`row data ${typeof response} : `, response, (response == null ? void 0 : response.choices) && ((_d = response == null ? void 0 : response.choices[0]) == null ? void 0 : _d.message));
+                console.log(
+                  `row data ${typeof response} : `,
+                  response,
+                  (response == null ? void 0 : response.choices) && ((_d = response == null ? void 0 : response.choices[0]) == null ? void 0 : _d.message)
+                );
               }
               if (this._manufacturer.toLowerCase() === "aliyun") {
                 if (response == null ? void 0 : response.request_id) {
@@ -753,11 +834,13 @@ var ChatGPTAPI = class {
             message2.detail.choices[0].finish_reason = "tool_calls";
             message2.detail.choices[0].message = {
               role: message2.detail.choices[0].message.role,
-              tool_calls: [{
-                id: `call_${uuidv4()}`,
-                type: "function",
-                function: (_e = message2.detail.choices[0].message) == null ? void 0 : _e.function_call
-              }]
+              tool_calls: [
+                {
+                  id: `call_${uuidv4()}`,
+                  type: "function",
+                  function: (_e = message2.detail.choices[0].message) == null ? void 0 : _e.function_call
+                }
+              ]
             };
           }
         }
@@ -856,7 +939,9 @@ var ChatGPTAPI = class {
     }
     const systemMessageOffset = messages.length;
     let userMessage = null;
-    if (["baidu", "zhipu", "xunfei", "aliyun", "tencent", "chatdoc"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+    if (["baidu", "zhipu", "xunfei", "aliyun", "tencent", "chatdoc"].indexOf(
+      this._manufacturer.toLowerCase()
+    ) > -1) {
       userMessage = [{ role: "user", content: text }];
     } else if (pluginData) {
       userMessage = {
@@ -912,8 +997,13 @@ ${message.content}`]);
       }
       const parentMessageRole = parentMessage.role || "user";
       let parentMessageItem = null;
-      if (["baidu", "zhipu", "xunfei", "aliyun", "tencent", "chatdoc"].indexOf(this._manufacturer.toLowerCase()) > -1) {
-        parentMessageItem = { role: parentMessageRole, content: parentMessage.text };
+      if (["baidu", "zhipu", "xunfei", "aliyun", "tencent", "chatdoc"].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") {
         if (["azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
           parentMessageItem = Object.assign(parentMessage.content.message, {
@@ -933,10 +1023,7 @@ ${message.content}`]);
         if (parentMessage.tool_call_id)
           parentMessageItem.tool_call_id = parentMessage.tool_call_id;
       }
-      nextMessages = nextMessages.slice(0, systemMessageOffset).concat([
-        parentMessageItem,
-        ...nextMessages.slice(systemMessageOffset)
-      ]);
+      nextMessages = nextMessages.slice(0, systemMessageOffset).concat([parentMessageItem, ...nextMessages.slice(systemMessageOffset)]);
       if (nextMessages.length >= contextRestriction)
         break;
       parentMessageId = parentMessage.parentMessageId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leikeduntech/leiai-js",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "author": "liuhean",
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@leikeduntech/spark-nodejs": "1.0.1",
+    "@leikeduntech/spark-nodejs": "1.0.3",
     "cac": "^6.7.14",
     "conf": "^11.0.1",
     "crypto-js": "^4.1.1",