koishi-plugin-chatluna 1.0.0-beta.77 → 1.0.0-beta.78

package/lib/chains/chain.d.ts

@@ -39,7 +39,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 | ChainMiddlewareRunStatus | h[] | h[][]>;
+    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | ChainMiddlewareRunStatus | h[][]>;
 }
 export interface ChainMiddlewareContext {
     config: Config;

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

@@ -25,7 +25,7 @@ export declare class OpenAIFunctionsAgentOutputParser extends AgentActionOutputP
     lc_namespace: string[];
     static lc_name(): string;
     parse(text: string): Promise<AgentAction | AgentFinish>;
-    parseResult(generations: ChatGeneration[]): Promise<FunctionsAgentAction | AgentFinish>;
+    parseResult(generations: ChatGeneration[]): Promise<AgentFinish | FunctionsAgentAction>;
     /**
      * Parses the output message into a FunctionsAgentAction or AgentFinish
      * object.

package/lib/llm-core/chat/app.cjs

@@ -346,7 +346,7 @@ var ChatInterface = class {
   _vectorStoreRetrieverMemory;
   _chatHistory;
   _chains = {};
-  _errorCount = {};
+  _errorCountsMap = {};
   _chatCount = 0;
   _random = new import_koishi.Random();
   async chat(arg) {
@@ -361,11 +361,16 @@ var ChatInterface = class {
       }
       return response;
     } catch (e) {
-      this._errorCount[configMD5] = this._errorCount[config.md5()] ?? 0;
-      this._errorCount[configMD5] += 1;
-      if (this._errorCount[configMD5] > config.value.maxRetries) {
+      this._errorCountsMap[configMD5] = this._errorCountsMap[configMD5] ?? [];
+      const errorCountsArray = this._errorCountsMap[configMD5];
+      errorCountsArray.push(Date.now());
+      if (errorCountsArray.length > config.value.maxRetries && // 20 mins
+      checkRange(
+        errorCountsArray.splice(-config.value.maxRetries),
+        1e3 * 60 * 20
+      )) {
         delete this._chains[configMD5];
-        delete this._errorCount[configMD5];
+        delete this._errorCountsMap[configMD5];
         const service = this.ctx.chatluna.platform;
         await service.makeConfigStatus(config.value, false);
       }
@@ -691,6 +696,12 @@ var ChatInterface = class {
     });
   }
 };
+function checkRange(times, delayTime) {
+  const first = times[0];
+  const last = times[times.length - 1];
+  return last - first < delayTime;
+}
+__name(checkRange, "checkRange");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ChatInterface

package/lib/llm-core/chat/app.d.ts

@@ -11,7 +11,7 @@ export declare class ChatInterface {
     private _vectorStoreRetrieverMemory;
     private _chatHistory;
     private _chains;
-    private _errorCount;
+    private _errorCountsMap;
     private _chatCount;
     private _random;
     constructor(ctx: Context, input: ChatInterfaceInput);

package/lib/llm-core/chat/app.mjs

@@ -349,7 +349,7 @@ var ChatInterface = class {
   _vectorStoreRetrieverMemory;
   _chatHistory;
   _chains = {};
-  _errorCount = {};
+  _errorCountsMap = {};
   _chatCount = 0;
   _random = new Random();
   async chat(arg) {
@@ -364,11 +364,16 @@ var ChatInterface = class {
       }
       return response;
     } catch (e) {
-      this._errorCount[configMD5] = this._errorCount[config.md5()] ?? 0;
-      this._errorCount[configMD5] += 1;
-      if (this._errorCount[configMD5] > config.value.maxRetries) {
+      this._errorCountsMap[configMD5] = this._errorCountsMap[configMD5] ?? [];
+      const errorCountsArray = this._errorCountsMap[configMD5];
+      errorCountsArray.push(Date.now());
+      if (errorCountsArray.length > config.value.maxRetries && // 20 mins
+      checkRange(
+        errorCountsArray.splice(-config.value.maxRetries),
+        1e3 * 60 * 20
+      )) {
         delete this._chains[configMD5];
-        delete this._errorCount[configMD5];
+        delete this._errorCountsMap[configMD5];
         const service = this.ctx.chatluna.platform;
         await service.makeConfigStatus(config.value, false);
       }
@@ -694,6 +699,12 @@ var ChatInterface = class {
     });
   }
 };
+function checkRange(times, delayTime) {
+  const first = times[0];
+  const last = times[times.length - 1];
+  return last - first < delayTime;
+}
+__name(checkRange, "checkRange");
 export {
   ChatInterface
 };

package/package.json

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