@leikeduntech/leiai-js 4.0.4 → 4.1.1

package/build/index.js

@@ -1,3 +1,10 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/chatgpt-api.ts
 import { Spark } from "@leikeduntech/spark-nodejs";
 import Keyv from "keyv";
@@ -113,46 +120,6 @@ var uuidv4Re = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9
 function isValidUUIDv4(str) {
   return str && uuidv4Re.test(str);
 }
-function convertArrayToString(arr) {
-  let result = "[";
-  for (let i = 0; i < arr.length; i++) {
-    const obj = arr[i];
-    const keys = Object.keys(obj);
-    result += "{";
-    for (let j = 0; j < keys.length; j++) {
-      const key = keys[j];
-      const value = obj[key];
-      result += '"' + key + '":' + (typeof value === "string" ? '"' + value + '"' : value) + ",";
-    }
-    result = result.slice(0, -1);
-    result += "},";
-  }
-  result = result.slice(0, -1);
-  result += "]";
-  return result;
-}
-function signTencentHunyuan(bodyData, url, keyList) {
-  const sortedObj = {};
-  Object.keys(bodyData).sort().forEach((key) => {
-    sortedObj[key] = bodyData[key];
-  });
-  let signStr = "";
-  for (let key in sortedObj) {
-    if (signStr) {
-      if (typeof sortedObj[key] === "object") {
-        signStr += `&${key}=${convertArrayToString(sortedObj[key])}`;
-      } else {
-        signStr += `&${key}=${sortedObj[key]}`;
-      }
-    } else {
-      signStr += `${key}=${sortedObj[key]}`;
-    }
-  }
-  signStr = `${url.replace("https://", "")}?${signStr}`;
-  const hmac = CryptoJS.HmacSHA1(signStr, keyList[2]);
-  const signBase64 = CryptoJS.enc.Base64.stringify(hmac);
-  return signBase64;
-}
 function isPositiveNumber(str) {
   return /^[1-9]\d*$/.test(str);
 }
@@ -248,6 +215,7 @@ var ChatGPTAPI = class {
    * @returns The response from ChatGPT
    */
   async sendMessage(text, opts = {}, pluginParams) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     let parentMsg;
     if (pluginParams) {
       parentMsg = await this._getMessageById(pluginParams.assistant_res.id);
@@ -279,8 +247,42 @@ var ChatGPTAPI = class {
     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];
+      let toolCalls = ((_a = last_assistant_res_message == null ? void 0 : last_assistant_res_message.message) == null ? void 0 : _a.tool_calls) || [];
+      if (!toolCalls || toolCalls.length === 0) {
+        toolCalls = ((_b = last_assistant_res_message == null ? void 0 : last_assistant_res_message.delta) == null ? void 0 : _b.tool_calls) || [];
+      }
+      if (!toolCalls || toolCalls.length === 0) {
+        toolCalls = ((_f = (_e = (_d = (_c = pluginParams.assistant_res.detail) == null ? void 0 : _c.choices) == null ? void 0 : _d[0]) == null ? void 0 : _e.delta) == null ? void 0 : _f.tool_calls) || [];
+      }
+      if ((!toolCalls || toolCalls.length === 0) && pluginParams.plugin_res && Array.isArray(pluginParams.plugin_res) && pluginParams.plugin_res.length > 0) {
+        const firstPluginRes = pluginParams.plugin_res[0];
+        if (firstPluginRes == null ? void 0 : firstPluginRes.skill) {
+          toolCalls = [{
+            id: `call_${Date.now()}`,
+            type: "function",
+            function: {
+              name: firstPluginRes.skill,
+              arguments: "{}"
+            },
+            index: 0
+          }];
+        }
+      }
+      if (!toolCalls || toolCalls.length === 0) {
+        throw new Error("\u65E0\u6CD5\u4ECE assistant_res \u4E2D\u83B7\u53D6 tool_calls\uFF0C\u8BF7\u786E\u4FDD assistant_res.detail.choices[0].message.tool_calls \u6216 delta.tool_calls \u5B58\u5728");
+      }
+      if (!last_assistant_res_message.message) {
+        last_assistant_res_message.message = {
+          role: ((_g = last_assistant_res_message.message) == null ? void 0 : _g.role) || "assistant",
+          tool_calls: toolCalls
+        };
+      } else {
+        if (!last_assistant_res_message.message.tool_calls || last_assistant_res_message.message.tool_calls.length === 0) {
+          last_assistant_res_message.message.tool_calls = toolCalls;
+        }
+      }
       last_assistant_res = {
-        role: last_assistant_res_message.message.role,
+        role: last_assistant_res_message.message.role || "assistant",
         id: parentMsg.id,
         conversationId,
         parentMessageId: parentMsg.parentMessageId,
@@ -291,15 +293,23 @@ var ChatGPTAPI = class {
       if (this._manufacturer.toLowerCase() === "azure") {
         r = "function";
       }
+      let pluginContent = pluginParams.plugin_res;
+      if (Array.isArray(pluginContent) && pluginContent.length > 0) {
+        pluginContent = ((_h = pluginContent[0]) == null ? void 0 : _h.result) || pluginContent[0] || pluginContent;
+      }
+      if (typeof pluginContent !== "string") {
+        pluginContent = JSON.stringify(pluginContent);
+      }
       last_plugin_res = {
         role: r,
         id: messageId,
-        name: last_assistant_res_message.message.tool_calls[0].function.name,
+        name: toolCalls[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
+        // ChatMessage.content 类型是 object，这里显式转为 any 以兼容字符串内容
+        content: pluginContent,
+        tool_call_id: toolCalls[0].id
       };
       await this._upsertMessage(last_assistant_res);
       latestQuestion = last_plugin_res;
@@ -332,7 +342,7 @@ var ChatGPTAPI = class {
     };
     const responseP = new Promise(
       async (resolve, reject) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
         let url = `${this._apiBaseUrl}/chat/completions`;
         const headers = {
           "Content-Type": "application/json",
@@ -373,74 +383,7 @@ var ChatGPTAPI = class {
           delete body.max_tokens;
         }
         if (typeof body.plugins !== void 0) delete body.plugins;
-        if (["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
-          if (body.tools && Array.isArray(body.tools) && body.tools.length > 0) {
-            if (this._manufacturer.toLowerCase() === "azure") {
-              body.functions = body.tools.map((tool) => {
-                if (tool.type === "function" && tool.function) {
-                  return tool.function;
-                }
-                return tool;
-              });
-              delete body.tools;
-              if (body.tool_choice) {
-                if (typeof body.tool_choice === "string") {
-                  body.function_call = body.tool_choice === "none" ? "none" : "auto";
-                } else if (body.tool_choice && typeof body.tool_choice === "object" && body.tool_choice.function) {
-                  body.function_call = { name: body.tool_choice.function.name };
-                }
-                delete body.tool_choice;
-              }
-            }
-          }
-        }
-        if (["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) === -1) {
-          if (body.tools) delete body.tools;
-          if (body.tool_choice) delete body.tool_choice;
-          if (body.functions) delete body.functions;
-          if (body.function_call) delete body.function_call;
-          if (body.parallel_tool_calls) delete body.parallel_tool_calls;
-        }
-        if (this._manufacturer.toLowerCase() === "aliyun") {
-          body = Object.assign(body, {
-            parameters: { result_format: "message" },
-            input: { messages }
-          });
-          delete body.messages;
-        } else if (this._manufacturer.toLowerCase() === "zhipu") {
-          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
-          });
-          delete body.model;
-          delete body.max_tokens;
-          headers["Authorization"] = signTencentHunyuan(body, url, keyList);
-        } else if (this._manufacturer.toLowerCase() === "chatdoc") {
-          let query = messages.splice(messages.length - 1, 1);
-          body = Object.assign(body, {
-            upload_id: (_a = completionParams == null ? void 0 : completionParams.extParams) == null ? void 0 : _a.upload_id,
-            question: (_b = query[0]) == null ? void 0 : _b.content,
-            history: messages
-          });
-          if (body.extParams) delete body.extParams;
-          if (body.model) delete body.model;
-          if (body.max_tokens) delete body.max_tokens;
-          if (body.temperature) delete body.temperature;
-          if (body.messages) delete body.messages;
-        }
-        if (this._apiOrg && this._manufacturer.toLowerCase() === "openai") {
+        if (this._apiOrg) {
           headers["OpenAI-Organization"] = this._apiOrg;
         }
         if (this._debug) {
@@ -453,6 +396,32 @@ var ChatGPTAPI = class {
             typeof messages
           );
         }
+        if (pluginParams) {
+          const debugLog = {
+            location: "chatgpt-api.ts:430",
+            message: "Second sendMessage with pluginParams",
+            data: {
+              manufacturer: this._manufacturer,
+              messagesLength: messages.length,
+              messages: JSON.stringify(messages).substring(0, 2e3),
+              hasPluginRes: !!(pluginParams == null ? void 0 : pluginParams.plugin_res),
+              pluginResPreview: JSON.stringify(pluginParams == null ? void 0 : pluginParams.plugin_res).substring(0, 500),
+              bodyMessagesLength: (_a2 = body.messages) == null ? void 0 : _a2.length,
+              bodyMessages: JSON.stringify(body.messages).substring(0, 2e3),
+              stream,
+              url
+            },
+            timestamp: Date.now(),
+            sessionId: "debug-session",
+            runId: "run19",
+            hypothesisId: "T"
+          };
+          try {
+            const fs = __require("fs");
+            fs.appendFileSync("/Volumes/softdev2/gpt-project/LeiAI-Web-H5/.cursor/debug.log", JSON.stringify(debugLog) + "\n");
+          } catch (e) {
+          }
+        }
         if (this._manufacturer.toLowerCase() === "xunfei") {
           const self = this;
           const keyList = this._apiKey.split(".");
@@ -504,8 +473,30 @@ var ChatGPTAPI = class {
                 body: JSON.stringify(body),
                 signal: abortSignal,
                 onMessage: (data) => {
-                  var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
+                  var _a3, _b3, _c3, _d3, _e3, _f3, _g3, _h2, _i;
                   if (data === "[DONE]") {
+                    if (pluginParams) {
+                      const debugLog = {
+                        location: "chatgpt-api.ts:520",
+                        message: "Second sendMessage stream DONE",
+                        data: {
+                          manufacturer: this._manufacturer,
+                          finalTextLength: result.text.length,
+                          finalTextPreview: result.text.substring(0, 500),
+                          hasDetail: !!result.detail,
+                          resultKeys: Object.keys(result || {})
+                        },
+                        timestamp: Date.now(),
+                        sessionId: "debug-session",
+                        runId: "run19",
+                        hypothesisId: "T"
+                      };
+                      try {
+                        const fs = __require("fs");
+                        fs.appendFileSync("/Volumes/softdev2/gpt-project/LeiAI-Web-H5/.cursor/debug.log", JSON.stringify(debugLog) + "\n");
+                      } catch (e) {
+                      }
+                    }
                     result.text = result.text.trim();
                     return resolve(result);
                   }
@@ -518,134 +509,80 @@ var ChatGPTAPI = class {
                         response == null ? void 0 : response.choices
                       );
                     }
-                    if (this._manufacturer.toLowerCase() === "baidu") {
-                      if ((response == null ? void 0 : response.is_end) === true) {
-                        result.text += response.result.trim();
-                        result.detail = response;
-                        return resolve(result);
-                      }
-                    } else if (this._manufacturer.toLowerCase() === "azure") {
-                      if (((_a2 = response.choices[0]) == null ? void 0 : _a2.finish_reason) === "stop") {
-                        result.text = result.text.trim();
-                        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) {
-                        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 (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 (((_i = response.choices[0]) == null ? void 0 : _i.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()}`;
-                      if (response == null ? void 0 : response.source_info) {
-                        result.text += response == null ? void 0 : response.answer;
-                        return resolve(result);
-                      }
-                    }
-                    if (this._manufacturer.toLowerCase() === "aliyun") {
-                      if (response == null ? void 0 : response.request_id) {
-                        result.id = response.request_id;
-                      }
-                    } else {
-                      if (response == null ? void 0 : response.id) {
-                        result.id = response.id;
-                      }
-                    }
-                    if (((_l = response.choices) == null ? void 0 : _l.length) && ["openai", "azure", "tencent", "anthropic"].indexOf(
-                      this._manufacturer.toLowerCase()
-                    ) > -1) {
+                    if (((_a3 = response.choices) == null ? void 0 : _a3.length) && ((_b3 = response.choices[0]) == null ? void 0 : _b3.delta) !== void 0) {
                       const delta = response.choices[0].delta;
+                      const finishReason = response.choices[0].finish_reason;
                       result.delta = "";
-                      if (response.choices[0].finish_reason === "tool_calls") {
+                      if (finishReason === "tool_calls") {
                         result.delta = text;
                       } else if (delta.content) {
                         result.delta = delta.content;
                       }
-                      if (delta == null ? void 0 : delta.content) result.text += result.delta;
+                      if (delta == null ? void 0 : delta.content) {
+                        result.text += result.delta;
+                      }
                       result.role = "assistant";
-                      if (response.choices[0].finish_reason === "tool_calls") {
-                      } else if (delta.role) {
+                      if (finishReason !== "tool_calls" && delta.role) {
                         result.role = delta.role;
                       }
                       result.detail = response;
-                      onProgress == null ? void 0 : onProgress(result);
-                    } else if ((response == null ? void 0 : response.result) && this._manufacturer.toLowerCase() === "baidu") {
-                      result.delta = response.result;
-                      if (response == null ? void 0 : response.result) result.text += response.result;
-                      result.role = "assistant";
-                      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: (_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 ((_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 (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
-                            };
-                          }
+                      if (response == null ? void 0 : response.id) {
+                        result.id = response.id;
+                      }
+                      if (pluginParams) {
+                        const debugLog = {
+                          location: "chatgpt-api.ts:570",
+                          message: "Second sendMessage onMessage (streaming)",
+                          data: {
+                            manufacturer: this._manufacturer,
+                            hasDelta: !!delta,
+                            deltaContent: delta == null ? void 0 : delta.content,
+                            deltaContentLength: (_c3 = delta == null ? void 0 : delta.content) == null ? void 0 : _c3.length,
+                            finishReason,
+                            resultTextLength: result.text.length,
+                            resultTextPreview: result.text.substring(0, 200),
+                            responseChoicesLength: (_d3 = response.choices) == null ? void 0 : _d3.length
+                          },
+                          timestamp: Date.now(),
+                          sessionId: "debug-session",
+                          runId: "run19",
+                          hypothesisId: "T"
+                        };
+                        try {
+                          const fs = __require("fs");
+                          fs.appendFileSync("/Volumes/softdev2/gpt-project/LeiAI-Web-H5/.cursor/debug.log", JSON.stringify(debugLog) + "\n");
+                        } catch (e) {
                         }
-                        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) result.text += response.answer;
-                      result.role = "assistant";
-                      result.detail = response;
                       onProgress == null ? void 0 : onProgress(result);
+                      if (finishReason === "stop" || finishReason === "length") {
+                        result.text = result.text.trim();
+                        return resolve(result);
+                      }
+                    } else {
+                      if (pluginParams) {
+                        const debugLog = {
+                          location: "chatgpt-api.ts:605",
+                          message: "Second sendMessage onMessage (unexpected format)",
+                          data: {
+                            manufacturer: this._manufacturer,
+                            responseStructure: JSON.stringify(response).substring(0, 1e3),
+                            hasChoices: !!response.choices,
+                            choicesLength: (_e3 = response.choices) == null ? void 0 : _e3.length,
+                            firstChoiceDelta: (_g3 = (_f3 = response.choices) == null ? void 0 : _f3[0]) == null ? void 0 : _g3.delta,
+                            firstChoiceFinishReason: (_i = (_h2 = response.choices) == null ? void 0 : _h2[0]) == null ? void 0 : _i.finish_reason
+                          },
+                          timestamp: Date.now(),
+                          sessionId: "debug-session",
+                          runId: "run19",
+                          hypothesisId: "T"
+                        };
+                        try {
+                          const fs = __require("fs");
+                          fs.appendFileSync("/Volumes/softdev2/gpt-project/LeiAI-Web-H5/.cursor/debug.log", JSON.stringify(debugLog) + "\n");
+                        } catch (e) {
+                        }
+                      }
                     }
                   } catch (err) {
                     console.warn(
@@ -682,35 +619,21 @@ var ChatGPTAPI = class {
                 console.log(
                   `row data ${typeof response} : `,
                   response,
-                  (response == null ? void 0 : response.choices) && ((_c = response == null ? void 0 : response.choices[0]) == null ? void 0 : _c.message)
+                  (response == null ? void 0 : response.choices) && ((_b2 = response == null ? void 0 : response.choices[0]) == null ? void 0 : _b2.message)
                 );
               }
-              if (this._manufacturer.toLowerCase() === "aliyun") {
-                if (response == null ? void 0 : response.request_id) {
-                  result.id = response.request_id;
-                }
-              } else {
-                if (response == null ? void 0 : response.id) {
-                  result.id = response.id;
-                }
+              if (response == null ? void 0 : response.id) {
+                result.id = response.id;
               }
-              if (((_d = response == null ? void 0 : response.choices) == null ? void 0 : _d.length) && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+              if (((_c2 = response == null ? void 0 : response.choices) == null ? void 0 : _c2.length) && ((_d2 = response.choices[0]) == null ? void 0 : _d2.message)) {
                 const message2 = response.choices[0].message;
-                result.text = message2.content;
-                if (message2.role) {
-                  result.role = message2.role;
-                }
-              } else if ((response == null ? void 0 : response.result) && this._manufacturer.toLowerCase() === "baidu") {
-                result.text = response.result;
-                result.role = "assistant";
-              } else if (((_e = response == null ? void 0 : response.output) == null ? void 0 : _e.text) && this._manufacturer.toLowerCase() === "aliyun") {
-                result.text = (_f = response == null ? void 0 : response.output) == null ? void 0 : _f.text;
-                result.role = "assistant";
+                result.text = message2.content || "";
+                result.role = message2.role || "assistant";
               } else {
                 const res2 = response;
                 return reject(
                   new Error(
-                    `${this._manufacturer} error: ${((_g = res2 == null ? void 0 : res2.detail) == null ? void 0 : _g.message) || ((_h = res2 == null ? void 0 : res2.detail) == null ? void 0 : _h.error_msg) || (res2 == null ? void 0 : res2.detail) || "unknown"}`
+                    `API error: ${((_e2 = res2 == null ? void 0 : res2.detail) == null ? void 0 : _e2.message) || ((_f2 = res2 == null ? void 0 : res2.detail) == null ? void 0 : _f2.error_msg) || ((_g2 = res2 == null ? void 0 : res2.error) == null ? void 0 : _g2.message) || (res2 == null ? void 0 : res2.detail) || "unknown"}`
                   )
                 );
               }
@@ -725,7 +648,7 @@ var ChatGPTAPI = class {
         }
       }
     ).then(async (message2) => {
-      var _a, _b, _c, _d, _e;
+      var _a2, _b2, _c2, _d2, _e2;
       if (this._debug) console.log("\u8DDF\u8E2A7", JSON.stringify(message2));
       if (message2.detail) {
         if (!message2.detail.usage) {
@@ -733,7 +656,7 @@ var ChatGPTAPI = class {
             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 = (_b2 = (_a2 = message2.detail) == null ? void 0 : _a2.usage) == null ? void 0 : _b2.total_tokens;
             } else {
               completionTokens = await this._getTokenCount(message2.text);
             }
@@ -747,7 +670,7 @@ var ChatGPTAPI = class {
           }
         }
         if (this._manufacturer.toLowerCase() === "azure") {
-          if (((_d = (_c = message2.detail) == null ? void 0 : _c.choices[0]) == null ? void 0 : _d.finish_reason) === "function_call") {
+          if (((_d2 = (_c2 = message2.detail) == null ? void 0 : _c2.choices[0]) == null ? void 0 : _d2.finish_reason) === "function_call") {
             message2.detail.choices[0].finish_reason = "tool_calls";
             message2.detail.choices[0].message = {
               role: message2.detail.choices[0].message.role,
@@ -755,7 +678,7 @@ var ChatGPTAPI = class {
                 {
                   id: `call_${uuidv4()}`,
                   type: "function",
-                  function: (_e = message2.detail.choices[0].message) == null ? void 0 : _e.function_call
+                  function: (_e2 = message2.detail.choices[0].message) == null ? void 0 : _e2.function_call
                 }
               ]
             };
@@ -824,7 +747,7 @@ var ChatGPTAPI = class {
     this._apiOrg = apiOrg;
   }
   async _buildMessages(text, opts, pluginData) {
-    var _a, _b;
+    var _a;
     const { systemMessage = this._systemMessage, completionParams } = opts;
     let { parentMessageId, contextRestriction } = opts;
     let errorMessage = "";
@@ -856,59 +779,55 @@ var ChatGPTAPI = class {
     }
     const systemMessageOffset = messages.length;
     let userMessage = null;
-    if ([
-      "baidu",
-      "zhipu",
-      "xunfei",
-      "aliyun",
-      "tencent",
-      "chatdoc",
-      "anthropic"
-    ].indexOf(this._manufacturer.toLowerCase()) > -1) {
-      userMessage = [{ role: "user", content: text }];
-    } else if (pluginData) {
+    if (pluginData) {
+      let pluginContent = pluginData.content;
+      if (typeof pluginContent !== "string") {
+        pluginContent = JSON.stringify(pluginContent);
+      }
       userMessage = {
-        role: pluginData.role,
+        role: pluginData.role || "tool",
         name: pluginData.name,
-        content: JSON.stringify(pluginData.content),
+        content: pluginContent,
         tool_call_id: pluginData.tool_call_id
       };
-      if (["azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
-        delete userMessage.tool_call_id;
-      }
     } else {
       userMessage = [{ role: "user", content: text, name: opts.name }];
     }
     let nextMessages = messages;
     if (pluginData || text) {
-      nextMessages = nextMessages.concat(userMessage);
+      if (Array.isArray(userMessage)) {
+        nextMessages = nextMessages.concat(userMessage);
+      } else {
+        nextMessages = nextMessages.concat([userMessage]);
+      }
     }
     let numTokens = 0;
     do {
       const prompt = nextMessages.reduce((prompt2, message) => {
+        const content = typeof message === "object" && message.content !== void 0 ? typeof message.content === "string" ? message.content : JSON.stringify(message.content) : typeof message === "string" ? message : JSON.stringify(message);
         switch (message.role) {
           case "tool":
             return prompt2.concat([`Tool:
  function call`]);
           case "system":
             return prompt2.concat([`Instructions:
-${message.content}`]);
+${content}`]);
           case "user":
             return prompt2.concat([`${userLabel}:
-${message.content}`]);
+${content}`]);
           default:
             return prompt2.concat([`${assistantLabel}:
-${message.content}`]);
+${content}`]);
         }
       }, []).join("\n\n");
       const nextNumTokensEstimate = await this._getTokenCount(prompt);
       const isValidPrompt = nextNumTokensEstimate <= maxNumTokens;
-      if (prompt && !isValidPrompt && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+      if (prompt && !isValidPrompt) {
         break;
       }
       messages = nextMessages;
       numTokens = nextNumTokensEstimate;
-      if (!isValidPrompt && ["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+      if (!isValidPrompt) {
         break;
       }
       if (!parentMessageId) {
@@ -920,29 +839,8 @@ ${message.content}`]);
       }
       const parentMessageRole = parentMessage.role || "user";
       let parentMessageItem = null;
-      if ([
-        "baidu",
-        "zhipu",
-        "xunfei",
-        "aliyun",
-        "tencent",
-        "chatdoc",
-        "anthropic"
-      ].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, {
-            function_call: (_b = parentMessage.content.message.tool_calls[0]) == null ? void 0 : _b.function,
-            content: parentMessage.text || parentMessage.content
-          });
-          delete parentMessage.content.message.tool_calls;
-        } else {
-          parentMessageItem = parentMessage.content.message;
-        }
+      if (parentMessage.content && ((_a = parentMessage.content) == null ? void 0 : _a.finish_reason) === "tool_calls") {
+        parentMessageItem = parentMessage.content.message;
       } else {
         parentMessageItem = {
           role: parentMessageRole,
@@ -958,14 +856,13 @@ ${message.content}`]);
     } while (true);
     let maxTokens = this._maxModelTokens;
     if (isPositiveNumber(maxTokens)) {
-      if (["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
-        maxTokens = Math.max(
-          1,
-          Math.min(this._maxModelTokens - numTokens, this._maxResponseTokens)
-        );
-      } else if (numTokens > this._maxModelTokens) {
+      maxTokens = Math.max(
+        1,
+        Math.min(this._maxModelTokens - numTokens, this._maxResponseTokens)
+      );
+      if (numTokens > this._maxModelTokens) {
         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`;
+        errorMessage = `\u5F53\u524D\u63D0\u95EE\u4E0A\u4E0B\u6587\u5185\u5BB9\u957F\u5EA6${numTokens}tokens\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`;
       }
     }
     return { messages, maxTokens, numTokens, errorMessage, objText };

package/package.json

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