@leikeduntech/leiai-js 2.9.0 → 3.1.0

package/build/index.d.ts

@@ -467,7 +467,6 @@ 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.
      *
@@ -485,7 +484,6 @@ declare class ChatGPTAPI {
      */
     constructor(opts: ChatGPTAPIOptions);
     pluginListMap(pluginList: any): any;
-    DallE3Fun(): any;
     /**
      * Sends a message to the OpenAI chat completions endpoint, waits for the response
      * to resolve, and returns the response.

package/build/index.js

@@ -229,15 +229,15 @@ var ChatGPTAPI = class {
     const list = {
       "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"
+        description: "\u4F7F\u7528DALL-E3\u6A21\u578B\u6839\u636E\u7528\u6237\u63CF\u8FF0\u63D0\u793A\u521B\u4F5C\u4E00\u5F20\u65B0\u7684\u56FE\u7247"
+      },
+      "dall-e-2": {
+        name: "DallE2Fun",
+        description: "\u4F7F\u7528DALL-E2\u6A21\u578B\u628A\u7528\u6237\u63D0\u4F9B\u7684\u56FE\u7247\u548C\u6839\u636E\u63D0\u793A\u8BCD\u91CD\u65B0\u753B\u56FE\u4FEE\u6539\u56FE\u7247\u7F16\u8F91\u56FE\u7247\u66FF\u6362\u56FE\u7247\u90E8\u4EFD\u5185\u5BB9\u6362\u6539\u91CD\u753B\u56FE\u7247"
       }
     };
     return list[pluginList];
   }
-  // DallE3文生图插件
-  DallE3Fun() {
-    return this._DallE3FunData;
-  }
   /**
    * Sends a message to the OpenAI chat completions endpoint, waits for the response
    * to resolve, and returns the response.
@@ -295,6 +295,8 @@ Current date: ${currentDate}`;
       parentMessageId,
       text
     };
+    if (this._debug)
+      console.log("\u8DDF\u8E2A1, \u8D85\u65F6\u65F6\u95F4ms", timeoutMs);
     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];
@@ -318,8 +320,9 @@ Current date: ${currentDate}`;
       };
       await this._upsertMessage(last_assistant_res);
       latestQuestion = last_plugin_res;
-      this[`_${last_plugin_res.name}Data`] = pluginParams.plugin_res;
     }
+    if (this._debug)
+      console.log("\u8DDF\u8E2A2");
     const { messages, maxTokens, numTokens, errorMessage } = await this._buildMessages(
       text,
       opts,
@@ -391,10 +394,28 @@ Current date: ${currentDate}`;
         };
         if (["openai"].indexOf(this._manufacturer.toLowerCase()) > -1) {
           switch (pluginList) {
-            case "plugin1":
-              break;
             case "dall-e-3":
               body = Object.assign(body, { tools: [{
+                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"
+                      }
+                    },
+                    "required": ["prompt", "image_url"]
+                  }
+                }
+              }, {
                 type: "function",
                 function: {
                   "name": "DallE3Fun",
@@ -404,7 +425,7 @@ Current date: ${currentDate}`;
                     "properties": {
                       "prompt": {
                         "type": "string",
-                        "description": "\u7528\u6237\u7684\u63D0\u793A\u8BCD"
+                        "description": "\u7ED8\u56FE\u7684\u63D0\u793A\u8BCD"
                       }
                     },
                     "required": ["prompt"]
@@ -587,12 +608,16 @@ Current date: ${currentDate}`;
             ).catch(reject);
           } else {
             try {
+              if (this._debug)
+                console.log("\u8DDF\u8E2A3");
               const res = await this._fetch(url, {
                 method: "POST",
                 headers,
                 body: JSON.stringify(body),
                 signal: abortSignal
               });
+              if (this._debug)
+                console.log("\u8DDF\u8E2A4");
               if (!res.ok) {
                 const reason = await res.text();
                 const msg = `${this._manufacturer} error ${res.status || res.statusText}: ${reason}`;
@@ -635,8 +660,12 @@ Current date: ${currentDate}`;
                 );
               }
               result.detail = response;
+              if (this._debug)
+                console.log("\u8DDF\u8E2A5");
               return resolve(result);
             } catch (err) {
+              if (this._debug)
+                console.log("\u8DDF\u8E2A6");
               return reject(err);
             }
           }
@@ -644,6 +673,8 @@ Current date: ${currentDate}`;
       }
     ).then(async (message2) => {
       var _a2, _b;
+      if (this._debug)
+        console.log("\u8DDF\u8E2A7", JSON.stringify(message2));
       if (message2.detail && !message2.detail.usage) {
         try {
           const promptTokens = numTokens;
@@ -668,7 +699,11 @@ Current date: ${currentDate}`;
       ]).then(() => message2);
       return pRes;
     });
+    if (this._debug)
+      console.log("\u8DDF\u8E2A8");
     if (timeoutMs) {
+      if (this._debug)
+        console.log("\u8DDF\u8E2A9");
       if (abortController) {
         ;
         responseP.cancel = () => {
@@ -680,6 +715,8 @@ Current date: ${currentDate}`;
         message: `${this._manufacturer} timed out waiting for response`
       });
     } else {
+      if (this._debug)
+        console.log("\u8DDF\u8E2A10");
       return responseP;
     }
   }

package/package.json

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