koishi-plugin-chatluna 1.2.2 → 1.3.0-alpha.1

package/lib/chains/chain.d.ts

@@ -43,7 +43,7 @@ export declare class ChainMiddleware {
     constructor(name: string, execute: ChainMiddlewareFunction, graph: ChatChainDependencyGraph);
     before<T extends keyof ChainMiddlewareName>(name: T): this;
     after<T extends keyof ChainMiddlewareName>(name: T): this;
-    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | ChainMiddlewareRunStatus | h[][]>;
+    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | h[][] | ChainMiddlewareRunStatus>;
 }
 export interface ChainMiddlewareContext {
     config: Config;

package/lib/index.cjs

@@ -1291,8 +1291,8 @@ async function defaultFactory(ctx, service) {
   service.registerChatChain(
     "plugin",
     {
-      "zh-CN": "插件模式（基于 LangChain 的 Agent）",
-      "en-US": "Plugin mode (based on LangChain Agent)"
+      "zh-CN": "Agent 模式",
+      "en-US": "Agent mode"
     },
     async (params) => {
       return ChatLunaPluginChain.fromLLMAndTools(
@@ -6517,7 +6517,7 @@ var inject2 = {
 };
 var logger;
 var usage = `
-## chatluna v1.1
+## chatluna v1.3 beta
 
 ChatLuna 插件交流 QQ 群：282381753 （有问题或出现 Bug 先加群问）
 

package/lib/index.d.ts

@@ -20,5 +20,5 @@ export declare const inject2: {
     };
 };
 export declare let logger: Logger;
-export declare const usage = "\n## chatluna v1.1\n\nChatLuna \u63D2\u4EF6\u4EA4\u6D41 QQ \u7FA4\uFF1A282381753 \uFF08\u6709\u95EE\u9898\u6216\u51FA\u73B0 Bug \u5148\u52A0\u7FA4\u95EE\uFF09\n\n\u7FA4\u91CC\u76EE\u524D\u6CA1\u6709\u642D\u8F7D\u8BE5\u63D2\u4EF6\u7684 bot\uFF0C\u52A0\u7FA4\u7684\u8BDD\u6700\u597D\u662F\u6765\u8BE2\u95EE\u95EE\u9898\u6216\u8005\u63D0\u51FA\u610F\u89C1\u7684\u3002\n\n\u8BBF\u95EE [https://chatluna.chat](https://chatluna.chat) \u6765\u4E86\u89E3\u5982\u4F55\u4F7F\u7528 Chatluna\u3002\n\u4E5F\u53EF\u4EE5\u8BBF\u95EE [https://preset.chatluna.chat](https://preset.chatluna.chat) \u8FDB\u5165\u5728\u7EBF\u9884\u8BBE\u7F16\u8F91\u5668\u3002\u66F4\u6709\u9884\u8BBE\u5E7F\u573A\u6765\u6D4F\u89C8\u548C\u4E0B\u8F7D\u4F60\u5FC3\u4EEA\u7684\u9884\u8BBE\u3002\n";
+export declare const usage = "\n## chatluna v1.3 beta\n\nChatLuna \u63D2\u4EF6\u4EA4\u6D41 QQ \u7FA4\uFF1A282381753 \uFF08\u6709\u95EE\u9898\u6216\u51FA\u73B0 Bug \u5148\u52A0\u7FA4\u95EE\uFF09\n\n\u7FA4\u91CC\u76EE\u524D\u6CA1\u6709\u642D\u8F7D\u8BE5\u63D2\u4EF6\u7684 bot\uFF0C\u52A0\u7FA4\u7684\u8BDD\u6700\u597D\u662F\u6765\u8BE2\u95EE\u95EE\u9898\u6216\u8005\u63D0\u51FA\u610F\u89C1\u7684\u3002\n\n\u8BBF\u95EE [https://chatluna.chat](https://chatluna.chat) \u6765\u4E86\u89E3\u5982\u4F55\u4F7F\u7528 Chatluna\u3002\n\u4E5F\u53EF\u4EE5\u8BBF\u95EE [https://preset.chatluna.chat](https://preset.chatluna.chat) \u8FDB\u5165\u5728\u7EBF\u9884\u8BBE\u7F16\u8F91\u5668\u3002\u66F4\u6709\u9884\u8BBE\u5E7F\u573A\u6765\u6D4F\u89C8\u548C\u4E0B\u8F7D\u4F60\u5FC3\u4EEA\u7684\u9884\u8BBE\u3002\n";
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.mjs

@@ -1275,8 +1275,8 @@ async function defaultFactory(ctx, service) {
   service.registerChatChain(
     "plugin",
     {
-      "zh-CN": "插件模式（基于 LangChain 的 Agent）",
-      "en-US": "Plugin mode (based on LangChain Agent)"
+      "zh-CN": "Agent 模式",
+      "en-US": "Agent mode"
     },
     async (params) => {
       return ChatLunaPluginChain.fromLLMAndTools(
@@ -6524,7 +6524,7 @@ var inject2 = {
 };
 var logger;
 var usage = `
-## chatluna v1.1
+## chatluna v1.3 beta
 
 ChatLuna 插件交流 QQ 群：282381753 （有问题或出现 Bug 先加群问）
 

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

@@ -22,4 +22,4 @@ export type CreateOpenAIAgentParams = {
 };
 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

@@ -72,7 +72,7 @@ export type CreateReactAgentParams = {
  */
 export declare function createReactAgent({ llm, tools, prompt, streamRunnable, instructions }: CreateReactAgentParams): Promise<AgentRunnableSequence<{
     steps: AgentStep[];
-}, import("@langchain/core/agents").AgentFinish | import("@langchain/core/agents").AgentAction[]>>;
+}, import("@langchain/core/agents").AgentAction[] | import("@langchain/core/agents").AgentFinish>>;
 /**
  * Construct the scratchpad that lets the agent continue its thought process.
  * @param intermediateSteps

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

@@ -41,7 +41,7 @@ var BasePlatformClient = class {
         await this.init();
         return true;
       } catch (e) {
-        this.ctx.chatluna["logger"].error(e);
+        this.ctx.logger.error(e);
         if (i === this.config.maxRetries - 1) {
           return false;
         }

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

@@ -17,7 +17,7 @@ var BasePlatformClient = class {
         await this.init();
         return true;
       } catch (e) {
-        this.ctx.chatluna["logger"].error(e);
+        this.ctx.logger.error(e);
         if (i === this.config.maxRetries - 1) {
           return false;
         }

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

@@ -343,8 +343,18 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
   }
   async _withTimeout(func, timeout) {
     const { promise, resolve, reject } = (0, import_promise.withResolver)();
+    let timeoutError = null;
+    try {
+      throw new import_error.ChatLunaError(
+        import_error.ChatLunaErrorCode.API_REQUEST_TIMEOUT,
+        null,
+        true
+      );
+    } catch (e) {
+      timeoutError = e;
+    }
     const timeoutId = setTimeout(() => {
-      reject(new import_error.ChatLunaError(import_error.ChatLunaErrorCode.API_REQUEST_TIMEOUT));
+      reject(timeoutError);
     }, timeout);
     (0, import_promise.runAsync)(async () => {
       let result;
@@ -577,16 +587,24 @@ var ChatLunaEmbeddings = class extends ChatHubBaseEmbeddings {
   async _embeddingWithRetry(request) {
     request.timeout = request.timeout ?? this.timeout;
     try {
+      let timeoutError = null;
+      try {
+        throw new import_error.ChatLunaError(
+          import_error.ChatLunaErrorCode.API_REQUEST_TIMEOUT,
+          new Error(
+            `timeout when calling ${this.modelName} embeddings`
+          ),
+          true
+        );
+      } catch (e) {
+        timeoutError = e;
+      }
       return await this.caller.call(
         (request2) => {
           return Promise.race([
             new Promise((resolve, reject) => {
               setTimeout(() => {
-                reject(
-                  Error(
-                    `timeout when calling ${this.modelName} embeddings`
-                  )
-                );
+                reject(timeoutError);
               }, request2.timeout);
             }),
             new Promise(

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

@@ -325,8 +325,18 @@ var ChatLunaChatModel = class extends BaseChatModel {
   }
   async _withTimeout(func, timeout) {
     const { promise, resolve, reject } = withResolver();
+    let timeoutError = null;
+    try {
+      throw new ChatLunaError(
+        ChatLunaErrorCode.API_REQUEST_TIMEOUT,
+        null,
+        true
+      );
+    } catch (e) {
+      timeoutError = e;
+    }
     const timeoutId = setTimeout(() => {
-      reject(new ChatLunaError(ChatLunaErrorCode.API_REQUEST_TIMEOUT));
+      reject(timeoutError);
     }, timeout);
     runAsync(async () => {
       let result;
@@ -559,16 +569,24 @@ var ChatLunaEmbeddings = class extends ChatHubBaseEmbeddings {
   async _embeddingWithRetry(request) {
     request.timeout = request.timeout ?? this.timeout;
     try {
+      let timeoutError = null;
+      try {
+        throw new ChatLunaError(
+          ChatLunaErrorCode.API_REQUEST_TIMEOUT,
+          new Error(
+            `timeout when calling ${this.modelName} embeddings`
+          ),
+          true
+        );
+      } catch (e) {
+        timeoutError = e;
+      }
       return await this.caller.call(
         (request2) => {
           return Promise.race([
             new Promise((resolve, reject) => {
               setTimeout(() => {
-                reject(
-                  Error(
-                    `timeout when calling ${this.modelName} embeddings`
-                  )
-                );
+                reject(timeoutError);
               }, request2.timeout);
             }),
             new Promise(

package/lib/preset.cjs

@@ -191,6 +191,12 @@ var PresetService = class {
     );
   }
   async addPreset(preset) {
+    if (this._presets.some(
+      (p) => p.triggerKeyword.join(",") === preset.triggerKeyword.join(",")
+    )) {
+      logger.warn(`preset ${preset.path} already exists`);
+      return;
+    }
     this._presets.push(preset);
     this._updateSchema();
   }

package/lib/preset.mjs

@@ -164,6 +164,12 @@ var PresetService = class {
     );
   }
   async addPreset(preset) {
+    if (this._presets.some(
+      (p) => p.triggerKeyword.join(",") === preset.triggerKeyword.join(",")
+    )) {
+      logger.warn(`preset ${preset.path} already exists`);
+      return;
+    }
     this._presets.push(preset);
     this._updateSchema();
   }

package/lib/services/chat.cjs

@@ -1564,11 +1564,17 @@ var ChatLunaService = class extends import_koishi11.Service {
       resolve();
       return promise;
     }
+    let timeoutError = null;
+    try {
+      throw new Error(
+        `Timeout waiting for platform ${pluginName} to load`
+      );
+    } catch (e) {
+      timeoutError = e;
+    }
     const timeoutId = setTimeout(() => {
       dispose();
-      reject(
-        new Error(`Timeout waiting for platform ${pluginName} to load`)
-      );
+      reject(timeoutError);
     }, timeout);
     const dispose = this.ctx.on(
       "chatluna/model-added",

package/lib/services/chat.mjs

@@ -1565,11 +1565,17 @@ var ChatLunaService = class extends Service {
       resolve();
       return promise;
     }
+    let timeoutError = null;
+    try {
+      throw new Error(
+        `Timeout waiting for platform ${pluginName} to load`
+      );
+    } catch (e) {
+      timeoutError = e;
+    }
     const timeoutId = setTimeout(() => {
       dispose();
-      reject(
-        new Error(`Timeout waiting for platform ${pluginName} to load`)
-      );
+      reject(timeoutError);
     }, timeout);
     const dispose = this.ctx.on(
       "chatluna/model-added",

package/lib/utils/error.cjs

@@ -34,21 +34,24 @@ var setErrorFormatTemplate = /* @__PURE__ */ __name((template) => {
   }
 }, "setErrorFormatTemplate");
 var ChatLunaError = class extends Error {
-  constructor(errorCode = 999 /* UNKNOWN_ERROR */, originError) {
+  constructor(errorCode = 999 /* UNKNOWN_ERROR */, originError, isTimeout = false) {
     super(ERROR_FORMAT_TEMPLATE.replace("%s", errorCode.toString()));
     this.errorCode = errorCode;
     this.originError = originError;
+    this.isTimeout = isTimeout;
     this.name = "ChatLunaError";
     const logger = import_koishi_plugin_chatluna.logger ?? console;
-    logger.error(
-      "=".repeat(20) + "ChatLunaError:" + errorCode + "=".repeat(20)
-    );
-    if (originError) {
+    if (!isTimeout) {
+      logger.error(
+        "=".repeat(20) + "ChatLunaError:" + errorCode + "=".repeat(20)
+      );
+    }
+    if (originError && !isTimeout) {
       logger.error(originError);
       if (originError.cause) {
         logger.error(originError.cause);
       }
-    } else {
+    } else if (!isTimeout) {
       logger.error(this);
     }
   }

package/lib/utils/error.d.ts

@@ -3,7 +3,8 @@ export declare const setErrorFormatTemplate: (template: string | null) => void;
 export declare class ChatLunaError extends Error {
     errorCode: ChatLunaErrorCode;
     originError?: Error;
-    constructor(errorCode?: ChatLunaErrorCode, originError?: Error);
+    isTimeout: boolean;
+    constructor(errorCode?: ChatLunaErrorCode, originError?: Error, isTimeout?: boolean);
     toString(): string;
 }
 export declare enum ChatLunaErrorCode {

package/lib/utils/error.mjs

@@ -10,21 +10,24 @@ var setErrorFormatTemplate = /* @__PURE__ */ __name((template) => {
   }
 }, "setErrorFormatTemplate");
 var ChatLunaError = class extends Error {
-  constructor(errorCode = 999 /* UNKNOWN_ERROR */, originError) {
+  constructor(errorCode = 999 /* UNKNOWN_ERROR */, originError, isTimeout = false) {
     super(ERROR_FORMAT_TEMPLATE.replace("%s", errorCode.toString()));
     this.errorCode = errorCode;
     this.originError = originError;
+    this.isTimeout = isTimeout;
     this.name = "ChatLunaError";
     const logger = koishiLogger ?? console;
-    logger.error(
-      "=".repeat(20) + "ChatLunaError:" + errorCode + "=".repeat(20)
-    );
-    if (originError) {
+    if (!isTimeout) {
+      logger.error(
+        "=".repeat(20) + "ChatLunaError:" + errorCode + "=".repeat(20)
+      );
+    }
+    if (originError && !isTimeout) {
       logger.error(originError);
       if (originError.cause) {
         logger.error(originError.cause);
       }
-    } else {
+    } else if (!isTimeout) {
       logger.error(this);
     }
   }

package/lib/utils/queue.cjs

@@ -142,14 +142,18 @@ var RequestIdQueue = class {
     }
     if (item) {
       let timeoutId;
+      let timeoutError = null;
+      try {
+        throw new Error(
+          `Queue wait timeout after ${this._queueTimeout}ms`
+        );
+      } catch (e) {
+        timeoutError = e;
+      }
       try {
         const timeoutPromise = new Promise((_, reject) => {
           timeoutId = setTimeout(() => {
-            reject(
-              new Error(
-                `Queue wait timeout after ${this._queueTimeout}ms`
-              )
-            );
+            reject(timeoutError);
           }, this._queueTimeout);
         });
         await Promise.race([item.notifyPromise.promise, timeoutPromise]);

package/lib/utils/queue.mjs

@@ -124,14 +124,18 @@ var RequestIdQueue = class {
     }
     if (item) {
       let timeoutId;
+      let timeoutError = null;
+      try {
+        throw new Error(
+          `Queue wait timeout after ${this._queueTimeout}ms`
+        );
+      } catch (e) {
+        timeoutError = e;
+      }
       try {
         const timeoutPromise = new Promise((_, reject) => {
           timeoutId = setTimeout(() => {
-            reject(
-              new Error(
-                `Queue wait timeout after ${this._queueTimeout}ms`
-              )
-            );
+            reject(timeoutError);
           }, this._queueTimeout);
         });
         await Promise.race([item.notifyPromise.promise, timeoutPromise]);

package/package.json

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

package/resources/presets/chatgpt.yml

@@ -5,7 +5,7 @@ keywords:
 prompts:
     - role: system
       content: |-
-          You are ChatGPT, a large language model trained by OpenAI, based on the GPT-4 architecture.
+          You are ChatGPT, a large language model trained by OpenAI.
           Knowledge cutoff: 2024-06 Current date: {date}
 
           Structure your responses with iterative thinking: