@leikeduntech/leiai-js 3.2.0 → 3.3.0

package/build/index.js

@@ -308,8 +308,12 @@ Current date: ${currentDate}`;
         text,
         content: last_assistant_res_message
       };
+      let r = "tool";
+      if (this._manufacturer.toLowerCase() === "azure") {
+        r = "function";
+      }
       last_plugin_res = {
-        role: "tool",
+        role: r,
         id: messageId,
         name: last_assistant_res_message.message.tool_calls[0].function.name,
         conversationId,
@@ -395,7 +399,10 @@ Current date: ${currentDate}`;
         if (["openai", "azure"].indexOf(this._manufacturer.toLowerCase()) > -1) {
           switch (pluginList) {
             case "dall-e-3":
-              body = Object.assign(body, { tools: [{
+              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",
@@ -431,7 +438,13 @@ Current date: ${currentDate}`;
                     "required": ["prompt"]
                   }
                 }
-              }], tool_choice: "auto" });
+              }];
+              if (this._manufacturer.toLowerCase() === "azure") {
+                funArr = funArr.map((item) => {
+                  return item.function;
+                });
+              }
+              body = Object.assign(body, { [tools_key]: funArr, [tool_choice_key]: "auto" });
               break;
             default:
               break;
@@ -672,25 +685,40 @@ Current date: ${currentDate}`;
         }
       }
     ).then(async (message2) => {
-      var _a2, _b;
+      var _a2, _b, _c, _d, _e;
       if (this._debug)
         console.log("\u8DDF\u8E2A7", JSON.stringify(message2));
-      if (message2.detail && !message2.detail.usage) {
-        try {
-          const promptTokens = numTokens;
-          let completionTokens = 0;
-          if (["baidu", "aliyun"].indexOf(this._manufacturer.toLowerCase()) > -1) {
-            completionTokens = (_b = (_a2 = message2.detail) == null ? void 0 : _a2.usage) == null ? void 0 : _b.total_tokens;
-          } else {
-            completionTokens = await this._getTokenCount(message2.text);
+      if (message2.detail) {
+        if (!message2.detail.usage) {
+          try {
+            const promptTokens = numTokens;
+            let completionTokens = 0;
+            if (["baidu", "aliyun"].indexOf(this._manufacturer.toLowerCase()) > -1) {
+              completionTokens = (_b = (_a2 = message2.detail) == null ? void 0 : _a2.usage) == null ? void 0 : _b.total_tokens;
+            } else {
+              completionTokens = await this._getTokenCount(message2.text);
+            }
+            message2.detail.usage = {
+              prompt_tokens: promptTokens,
+              completion_tokens: completionTokens,
+              total_tokens: promptTokens + completionTokens,
+              estimated: true
+            };
+          } catch (err) {
+          }
+        }
+        if (this._manufacturer.toLowerCase() === "azure") {
+          if (((_d = (_c = message2.detail) == null ? void 0 : _c.choices[0]) == null ? void 0 : _d.finish_reason) === "function_call") {
+            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
+              }]
+            };
           }
-          message2.detail.usage = {
-            prompt_tokens: promptTokens,
-            completion_tokens: completionTokens,
-            total_tokens: promptTokens + completionTokens,
-            estimated: true
-          };
-        } catch (err) {
         }
       }
       const pRes = Promise.all([
@@ -757,7 +785,7 @@ Current date: ${currentDate}`;
     this._apiOrg = apiOrg;
   }
   async _buildMessages(text, opts, pluginData) {
-    var _a;
+    var _a, _b;
     const { systemMessage = this._systemMessage, completionParams } = opts;
     let { parentMessageId } = opts;
     let errorMessage = "";
@@ -796,6 +824,9 @@ Current date: ${currentDate}`;
         content: JSON.stringify(pluginData.content),
         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 }];
     }
@@ -844,7 +875,11 @@ ${message.content}`]);
         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, { content: parentMessage.text || parentMessage.content });
+          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;
         }

package/package.json

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