koishi-plugin-chatluna-character 0.0.63 → 0.0.65

package/lib/index.cjs

@@ -75,8 +75,12 @@ async function apply(ctx, config) {
       })();
     }
   }
-  const globalPreset = await preset.getPreset(config.defaultPreset);
-  const presetPool = {};
+  let globalPreset = await preset.getPreset(config.defaultPreset);
+  let presetPool = {};
+  ctx.on("chatluna_character/preset_updated", async () => {
+    globalPreset = await preset.getPreset(config.defaultPreset);
+    presetPool = {};
+  });
   service.collect(async (session, messages) => {
     const guildId = session.event.guild?.id ?? session.guildId;
     const model = await (modelPool[guildId] ?? Promise.resolve(globalModel));
@@ -85,7 +89,7 @@ async function apply(ctx, config) {
     let currentPreset = globalPreset;
     if (currentGuildConfig != null) {
       copyOfConfig = Object.assign({}, copyOfConfig, currentGuildConfig);
-      currentPreset = presetPool[guildId] ?? (() => {
+      currentPreset = presetPool[guildId] ?? await (async () => {
         const template = preset.getPresetForCache(
           currentGuildConfig.preset
         );
@@ -184,7 +188,7 @@ async function apply(ctx, config) {
           logger.error(e);
           await session.send(elements);
         }
-        break;
+        continue;
       }
       try {
         await (0, import_koishi.sleep)(random.int(maxTime / 2, maxTime));
@@ -643,15 +647,20 @@ var import_koishi3 = require("koishi");
 var import_error = require("koishi-plugin-chatluna/utils/error");
 var import_path = __toESM(require("path"), 1);
 var import_url = require("url");
+var import_fs = require("fs");
 var import_meta = {};
 var Preset = class {
   constructor(ctx) {
     this.ctx = ctx;
+    ctx.on("dispose", () => {
+      this._aborter?.abort();
+    });
   }
   static {
     __name(this, "Preset");
   }
   _presets = [];
+  _aborter = null;
   async loadAllPreset() {
     await this._checkPresetDir();
     const presetDir = this.resolvePresetDir();
@@ -676,6 +685,7 @@ var Preset = class {
         this._presets.map((preset) => preset.name).concat("无").map((name2) => import_koishi3.Schema.const(name2))
       )
     );
+    this.ctx.emit("chatluna_character/preset_updated");
   }
   async getPreset(triggerKeyword, loadForDisk = true, throwError = true) {
     if (loadForDisk) {
@@ -683,6 +693,40 @@ var Preset = class {
     }
     return this.getPresetForCache(triggerKeyword, throwError);
   }
+  watchPreset() {
+    let fsWait = false;
+    if (this._aborter != null) {
+      this._aborter.abort();
+    }
+    this._aborter = new AbortController();
+    (0, import_fs.watch)(
+      this.resolvePresetDir(),
+      {
+        signal: this._aborter.signal
+      },
+      async (event, filename) => {
+        if (filename) {
+          if (fsWait) return;
+          fsWait = setTimeout(() => {
+            fsWait = false;
+          }, 100);
+          await this.loadAllPreset();
+          this.ctx.chatluna_character.logger.debug(
+            `trigger full reload preset ${filename}`
+          );
+          return;
+        }
+        await this.loadAllPreset();
+        this.ctx.chatluna_character.logger.debug(
+          `trigger full reload preset`
+        );
+      }
+    );
+  }
+  async init() {
+    await this.loadAllPreset();
+    this.watchPreset();
+  }
   getPresetForCache(triggerKeyword, throwError = true) {
     const preset = this._presets.find(
       (preset2) => preset2.name === triggerKeyword
@@ -1079,7 +1123,7 @@ function apply6(ctx, config) {
     {
       apply: /* @__PURE__ */ __name(async (ctx2, config2) => {
         await ctx2.chatluna_character.stickerService.init();
-        await ctx2.chatluna_character.preset.loadAllPreset();
+        await ctx2.chatluna_character.preset.init();
         await plugins(ctx2, config2);
       }, "apply"),
       inject: Object.assign({}, inject2, {
@@ -1148,7 +1192,7 @@ var Config = import_koishi6.Schema.intersect([
         model: import_koishi6.Schema.dynamic("model").description("模型")
       })
     ).description("针对某个群的模型设置，会覆盖上面的配置"),
-    maxTokens: import_koishi6.Schema.number().default(4e3).min(1024).max(16e3).description("使用聊天的最大 token 数")
+    maxTokens: import_koishi6.Schema.number().default(4e3).min(1024).max(24e3).description("使用聊天的最大 token 数")
   }).description("模型配置"),
   import_koishi6.Schema.object({
     isNickname: import_koishi6.Schema.boolean().description("允许 bot 配置中的昵称引发回复").default(true),

package/lib/index.d.ts

@@ -50,9 +50,12 @@ export function plugins(ctx: Context, parent: Config): Promise<void>;
 export class Preset {
     private readonly ctx;
     private readonly _presets;
+    private _aborter;
     constructor(ctx: Context);
     loadAllPreset(): Promise<void>;
     getPreset(triggerKeyword: string, loadForDisk?: boolean, throwError?: boolean): Promise<PresetTemplate>;
+    watchPreset(): void;
+    init(): Promise<void>;
     getPresetForCache(triggerKeyword: string, throwError?: boolean): PresetTemplate;
     getDefaultPreset(): Promise<PresetTemplate>;
     getAllPreset(): Promise<string[]>;
@@ -62,6 +65,11 @@ export class Preset {
     private _copyDefaultPresets;
 }
 export function loadPreset(text: string): PresetTemplate;
+declare module 'koishi' {
+    interface Events {
+        'chatluna_character/preset_updated': () => void;
+    }
+}
 export class StickerService {
     private _ctx;
     private _config;

package/lib/index.mjs

@@ -43,8 +43,12 @@ async function apply(ctx, config) {
       })();
     }
   }
-  const globalPreset = await preset.getPreset(config.defaultPreset);
-  const presetPool = {};
+  let globalPreset = await preset.getPreset(config.defaultPreset);
+  let presetPool = {};
+  ctx.on("chatluna_character/preset_updated", async () => {
+    globalPreset = await preset.getPreset(config.defaultPreset);
+    presetPool = {};
+  });
   service.collect(async (session, messages) => {
     const guildId = session.event.guild?.id ?? session.guildId;
     const model = await (modelPool[guildId] ?? Promise.resolve(globalModel));
@@ -53,7 +57,7 @@ async function apply(ctx, config) {
     let currentPreset = globalPreset;
     if (currentGuildConfig != null) {
       copyOfConfig = Object.assign({}, copyOfConfig, currentGuildConfig);
-      currentPreset = presetPool[guildId] ?? (() => {
+      currentPreset = presetPool[guildId] ?? await (async () => {
         const template = preset.getPresetForCache(
           currentGuildConfig.preset
         );
@@ -152,7 +156,7 @@ async function apply(ctx, config) {
           logger.error(e);
           await session.send(elements);
         }
-        break;
+        continue;
       }
       try {
         await sleep(random.int(maxTime / 2, maxTime));
@@ -614,14 +618,19 @@ import {
 } from "koishi-plugin-chatluna/utils/error";
 import path from "path";
 import { fileURLToPath } from "url";
+import { watch } from "fs";
 var Preset = class {
   constructor(ctx) {
     this.ctx = ctx;
+    ctx.on("dispose", () => {
+      this._aborter?.abort();
+    });
   }
   static {
     __name(this, "Preset");
   }
   _presets = [];
+  _aborter = null;
   async loadAllPreset() {
     await this._checkPresetDir();
     const presetDir = this.resolvePresetDir();
@@ -646,6 +655,7 @@ var Preset = class {
         this._presets.map((preset) => preset.name).concat("无").map((name2) => Schema2.const(name2))
       )
     );
+    this.ctx.emit("chatluna_character/preset_updated");
   }
   async getPreset(triggerKeyword, loadForDisk = true, throwError = true) {
     if (loadForDisk) {
@@ -653,6 +663,40 @@ var Preset = class {
     }
     return this.getPresetForCache(triggerKeyword, throwError);
   }
+  watchPreset() {
+    let fsWait = false;
+    if (this._aborter != null) {
+      this._aborter.abort();
+    }
+    this._aborter = new AbortController();
+    watch(
+      this.resolvePresetDir(),
+      {
+        signal: this._aborter.signal
+      },
+      async (event, filename) => {
+        if (filename) {
+          if (fsWait) return;
+          fsWait = setTimeout(() => {
+            fsWait = false;
+          }, 100);
+          await this.loadAllPreset();
+          this.ctx.chatluna_character.logger.debug(
+            `trigger full reload preset ${filename}`
+          );
+          return;
+        }
+        await this.loadAllPreset();
+        this.ctx.chatluna_character.logger.debug(
+          `trigger full reload preset`
+        );
+      }
+    );
+  }
+  async init() {
+    await this.loadAllPreset();
+    this.watchPreset();
+  }
   getPresetForCache(triggerKeyword, throwError = true) {
     const preset = this._presets.find(
       (preset2) => preset2.name === triggerKeyword
@@ -1048,7 +1092,7 @@ function apply6(ctx, config) {
     {
       apply: /* @__PURE__ */ __name(async (ctx2, config2) => {
         await ctx2.chatluna_character.stickerService.init();
-        await ctx2.chatluna_character.preset.loadAllPreset();
+        await ctx2.chatluna_character.preset.init();
         await plugins(ctx2, config2);
       }, "apply"),
       inject: Object.assign({}, inject2, {
@@ -1117,7 +1161,7 @@ var Config = Schema3.intersect([
         model: Schema3.dynamic("model").description("模型")
       })
     ).description("针对某个群的模型设置，会覆盖上面的配置"),
-    maxTokens: Schema3.number().default(4e3).min(1024).max(16e3).description("使用聊天的最大 token 数")
+    maxTokens: Schema3.number().default(4e3).min(1024).max(24e3).description("使用聊天的最大 token 数")
   }).description("模型配置"),
   Schema3.object({
     isNickname: Schema3.boolean().description("允许 bot 配置中的昵称引发回复").default(true),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-character",
   "description": "Let the large language model play a role, disguise as a group friend",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "type": "module",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/ChatLunaLab/chatluna-character#readme",
   "dependencies": {
-    "@langchain/core": "^0.1.63",
+    "@langchain/core": "^0.2.27",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {

package/resources/presets/default.yml

@@ -101,6 +101,7 @@ system: |
         233333：哈哈大笑的意思，来源猫扑的第233号表情包，是一张大笑的表情。
         xx使我快乐：比喻某件事让你感到开心。
         你礼貌吗：歌手耿斯汉和袁娅维第一次见面，耿刚打完招呼，就向袁娅维要微信，这种直男让周深直接就调侃说了一句“你礼貌吗”
+        笑点解析：令人忍俊不禁
 
 
         你需要在聊天中选择合适的时机去使用这些词汇。