koishi-plugin-chatluna 1.1.1 → 1.1.2

package/lib/llm-core/agent/openai/index.d.ts

@@ -2,8 +2,8 @@ import { BaseMessage } from '@langchain/core/messages';
 import { RunnableSequence } from '@langchain/core/runnables';
 import { StructuredTool } from '@langchain/core/tools';
 import { AgentAction, AgentFinish, AgentStep } from '@langchain/core/agents';
-import { ChatLunaChatPrompt } from 'koishi-plugin-chatluna/llm-core/chain/prompt';
 import type { ChatLunaChatModel } from '../../platform/model';
+import { BaseChatPromptTemplate } from '@langchain/core/prompts';
 export declare function _formatIntermediateSteps(intermediateSteps: AgentStep[]): BaseMessage[];
 /**
  * Params used by the createOpenAIFunctionsAgent function.
@@ -18,8 +18,8 @@ export type CreateOpenAIAgentParams = {
     /** Tools this agent has access to. */
     tools: StructuredTool[];
     /** The prompt to use, must have an input key for `agent_scratchpad`. */
-    prompt: ChatLunaChatPrompt;
+    prompt: BaseChatPromptTemplate;
 };
 export declare function createOpenAIAgent({ llm, tools, prompt }: CreateOpenAIAgentParams): RunnableSequence<{
     steps: AgentStep[];
-}, AgentAction | AgentFinish | AgentAction[]>;
+}, AgentAction | AgentAction[] | AgentFinish>;

package/lib/llm-core/agent/react/index.d.ts

@@ -1,7 +1,7 @@
 import type { ToolInterface } from '@langchain/core/tools';
+import { BasePromptTemplate } from '@langchain/core/prompts';
 import { AgentStep } from '@langchain/core/agents';
 import { AgentRunnableSequence } from 'koishi-plugin-chatluna/llm-core/agent';
-import { ChatLunaChatPrompt } from 'koishi-plugin-chatluna/llm-core/chain/prompt';
 import type { ChatLunaChatModel } from '../../platform/model';
 /**
  * Params used by the createXmlAgent function.
@@ -15,7 +15,7 @@ export type CreateReactAgentParams = {
      * The prompt to use. Must have input keys for
      * `tools`, `tool_names`, and `agent_scratchpad`.
      */
-    prompt: ChatLunaChatPrompt;
+    prompt: BasePromptTemplate;
     /**
      * Whether to invoke the underlying model in streaming mode,
      * allowing streaming of intermediate steps. Defaults to true.

package/lib/llm-core/platform/model.cjs

@@ -574,49 +574,60 @@ var ChatLunaEmbeddings = class extends ChatHubBaseEmbeddings {
     }
     return data;
   }
-  _embeddingWithRetry(request) {
+  async _embeddingWithRetry(request) {
     request.timeout = request.timeout ?? this.timeout;
-    return this.caller.call(async (request2) => {
-      const { promise, resolve, reject } = (0, import_promise.withResolver)();
-      const timeout = setTimeout(
-        () => {
-          reject(
-            Error(
-              `timeout when calling ${this.modelName} embeddings`
+    try {
+      return await this.caller.call(
+        (request2) => {
+          return Promise.race([
+            new Promise((resolve, reject) => {
+              setTimeout(() => {
+                reject(
+                  Error(
+                    `timeout when calling ${this.modelName} embeddings`
+                  )
+                );
+              }, request2.timeout);
+            }),
+            new Promise(
+              // eslint-disable-next-line no-async-promise-executor
+              async (resolve, reject) => {
+                let data;
+                try {
+                  data = await this._client.embeddings(request2);
+                } catch (e) {
+                  if (e instanceof import_error.ChatLunaError) {
+                    reject(e);
+                  } else {
+                    reject(
+                      new import_error.ChatLunaError(
+                        import_error.ChatLunaErrorCode.API_REQUEST_FAILED,
+                        e
+                      )
+                    );
+                  }
+                }
+                if (data) {
+                  resolve(data);
+                }
+                reject(
+                  Error(
+                    `error when calling ${this.modelName} embeddings, Result: ` + JSON.stringify(data)
+                  )
+                );
+              }
             )
-          );
+          ]);
         },
-        this.timeout ?? 1e3 * 30
+        request
       );
-      (0, import_promise.runAsync)(async () => {
-        let data;
-        try {
-          data = await this._client.embeddings(request2);
-        } catch (e) {
-          if (e instanceof import_error.ChatLunaError) {
-            reject(e);
-          } else {
-            reject(
-              new import_error.ChatLunaError(
-                import_error.ChatLunaErrorCode.API_REQUEST_FAILED,
-                e
-              )
-            );
-          }
-        }
-        clearTimeout(timeout);
-        if (data) {
-          resolve(data);
-          return;
-        }
-        reject(
-          Error(
-            `error when calling ${this.modelName} embeddings, Result: ` + JSON.stringify(data)
-          )
-        );
-      });
-      return promise;
-    }, request);
+    } catch (e) {
+      if (e instanceof import_error.ChatLunaError) {
+        throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
+      } else {
+        throw new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_FAILED, e);
+      }
+    }
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/llm-core/platform/model.mjs

@@ -556,49 +556,60 @@ var ChatLunaEmbeddings = class extends ChatHubBaseEmbeddings {
     }
     return data;
   }
-  _embeddingWithRetry(request) {
+  async _embeddingWithRetry(request) {
     request.timeout = request.timeout ?? this.timeout;
-    return this.caller.call(async (request2) => {
-      const { promise, resolve, reject } = withResolver();
-      const timeout = setTimeout(
-        () => {
-          reject(
-            Error(
-              `timeout when calling ${this.modelName} embeddings`
+    try {
+      return await this.caller.call(
+        (request2) => {
+          return Promise.race([
+            new Promise((resolve, reject) => {
+              setTimeout(() => {
+                reject(
+                  Error(
+                    `timeout when calling ${this.modelName} embeddings`
+                  )
+                );
+              }, request2.timeout);
+            }),
+            new Promise(
+              // eslint-disable-next-line no-async-promise-executor
+              async (resolve, reject) => {
+                let data;
+                try {
+                  data = await this._client.embeddings(request2);
+                } catch (e) {
+                  if (e instanceof ChatLunaError) {
+                    reject(e);
+                  } else {
+                    reject(
+                      new ChatLunaError(
+                        ChatLunaErrorCode.API_REQUEST_FAILED,
+                        e
+                      )
+                    );
+                  }
+                }
+                if (data) {
+                  resolve(data);
+                }
+                reject(
+                  Error(
+                    `error when calling ${this.modelName} embeddings, Result: ` + JSON.stringify(data)
+                  )
+                );
+              }
             )
-          );
+          ]);
         },
-        this.timeout ?? 1e3 * 30
+        request
       );
-      runAsync(async () => {
-        let data;
-        try {
-          data = await this._client.embeddings(request2);
-        } catch (e) {
-          if (e instanceof ChatLunaError) {
-            reject(e);
-          } else {
-            reject(
-              new ChatLunaError(
-                ChatLunaErrorCode.API_REQUEST_FAILED,
-                e
-              )
-            );
-          }
-        }
-        clearTimeout(timeout);
-        if (data) {
-          resolve(data);
-          return;
-        }
-        reject(
-          Error(
-            `error when calling ${this.modelName} embeddings, Result: ` + JSON.stringify(data)
-          )
-        );
-      });
-      return promise;
-    }, request);
+    } catch (e) {
+      if (e instanceof ChatLunaError) {
+        throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
+      } else {
+        throw new ChatLunaError(ChatLunaErrorCode.API_REQUEST_FAILED, e);
+      }
+    }
   }
 };
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna",
   "description": "chatluna for koishi",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",