koishi-plugin-chatluna-character 0.0.30 → 0.0.32

package/lib/index.d.ts

@@ -1,13 +1,10 @@
-import { Context, Logger, Schema } from 'koishi';
+import { Context, Schema } from 'koishi';
 import { ChatLunaPlugin } from 'koishi-plugin-chatluna/lib/services/chat';
-import { MessageCollector } from './service/message';
-import { StickerService } from './service/sticker';
-import { Preset } from './preset';
-export declare let service: MessageCollector;
-export declare let stickerService: StickerService;
-export declare let preset: Preset;
-export declare let logger: Logger;
 export declare function apply(ctx: Context, config: Config): void;
+export declare const inject: {
+    required: string[];
+    optional: string[];
+};
 export interface Config extends ChatLunaPlugin.Config {
     model: string;
     maxMessages: number;
@@ -25,5 +22,4 @@ export interface Config extends ChatLunaPlugin.Config {
     disableChatHub: boolean;
 }
 export declare const Config: Schema<Config>;
-export declare const inject: string[];
 export declare const name = "chatluna-character";

package/lib/index.js

@@ -1,39 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.name = exports.inject = exports.Config = exports.apply = exports.logger = exports.preset = exports.stickerService = exports.service = void 0;
+exports.name = exports.Config = exports.inject = exports.apply = void 0;
 /* eslint-disable max-len */
 const koishi_1 = require("koishi");
 const plugin_1 = require("./plugin");
 const message_1 = require("./service/message");
-const sticker_1 = require("./service/sticker");
-const preset_1 = require("./preset");
-const logger_1 = require("koishi-plugin-chatluna/lib/utils/logger");
 function apply(ctx, config) {
-    exports.logger = (0, logger_1.createLogger)(ctx, 'chathub-character');
+    const disposables = [];
     ctx.on('ready', async () => {
-        exports.service = new message_1.MessageCollector(config);
-        exports.stickerService = new sticker_1.StickerService(ctx, config);
-        exports.preset = new preset_1.Preset(ctx);
-        await exports.stickerService.init();
-        await exports.preset.loadAllPreset();
-        await (0, plugin_1.plugins)(ctx, config);
+        ctx.plugin(message_1.MessageCollector, config);
     });
-    ctx.on('message', async (session) => {
-        if (!exports.service) {
+    ctx.plugin({
+        apply: async (ctx, config) => {
+            await ctx.chatluna_character.stickerService.init();
+            await ctx.chatluna_character.preset.loadAllPreset();
+            await (0, plugin_1.plugins)(ctx, config);
+        },
+        inject: {
+            required: exports.inject.required.concat('chatluna', 'chatluna_character')
+        },
+        name: 'chatluna_entry_point'
+    }, config);
+    disposables.push(ctx.on('message', async (session) => {
+        if (!ctx.chatluna_character) {
             return;
         }
         if (!session.isDirect &&
             config.applyGroup.some((group) => group === session.guildId)) {
-            await exports.service.broadcast(session);
+            await ctx.chatluna_character.broadcast(session);
         }
-    });
-    ctx.on('dispose', async () => {
-        exports.service = null;
-        exports.stickerService = null;
-        exports.preset = null;
+    }));
+    ctx.on('dispose', () => {
+        disposables.forEach((disposable) => disposable());
     });
 }
 exports.apply = apply;
+exports.inject = {
+    required: ['chatluna', 'cache'],
+    optional: ['chatluna_character']
+};
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
         applyGroup: koishi_1.Schema.array(koishi_1.Schema.string()).description('应用到的群组'),
@@ -98,5 +103,4 @@ exports.Config = koishi_1.Schema.intersect([
             .default('旧梦旧念')
     })
 ]);
-exports.inject = ['chatluna'];
 exports.name = 'chatluna-character';

package/lib/plugins/chat.js

@@ -2,30 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = void 0;
 const koishi_1 = require("koishi");
-const __1 = require("..");
 const count_tokens_1 = require("koishi-plugin-chatluna/lib/llm-core/utils/count_tokens");
 const schema_1 = require("langchain/schema");
+let logger;
 async function apply(ctx, config) {
+    const service = ctx.chatluna_character;
+    const preset = service.preset;
+    const stickerService = service.stickerService;
+    logger = service.logger;
     const [platform, modelName] = (0, count_tokens_1.parseRawModelName)(config.model);
+    await ctx.chatluna.awaitLoadPlatform(platform);
     const model = (await ctx.chatluna.createChatModel(platform, modelName));
-    const selectedPreset = await __1.preset.getPreset(config.defaultPreset);
+    logger.info('chatluna model loaded %c', config.model);
+    const selectedPreset = await preset.getPreset(config.defaultPreset);
     const systemPrompt = selectedPreset.system;
     const completionPrompt = selectedPreset.input;
-    __1.service.collect(async (session, messages) => {
+    service.collect(async (session, messages) => {
         const [recentMessage, lastMessage] = await formatMessage(messages, config, model, systemPrompt.template, completionPrompt.template);
-        const temp = await __1.service.getTemp(session);
+        const temp = await service.getTemp(session);
         const formattedSystemPrompt = await systemPrompt.format({
             time: new Date().toLocaleString()
         });
-        __1.logger.debug('messages_new: ' + JSON.stringify(recentMessage));
-        __1.logger.debug('messages_last: ' + JSON.stringify(lastMessage));
+        logger.debug('messages_new: ' + JSON.stringify(recentMessage));
+        logger.debug('messages_last: ' + JSON.stringify(lastMessage));
         const humanMessage = new schema_1.HumanMessage(await completionPrompt.format({
             history_new: recentMessage,
             history_last: lastMessage,
             time: new Date().toLocaleString()
         }));
         const completionMessages = await formatCompletionMessages([new schema_1.SystemMessage(formattedSystemPrompt)].concat(temp.completionMessages), humanMessage, config, model);
-        __1.logger.debug('completion message: ' +
+        logger.debug('completion message: ' +
             JSON.stringify(completionMessages.map((it) => it.content)));
         let responseMessage;
         for (let i = 0; i < 3; i++) {
@@ -34,12 +40,12 @@ async function apply(ctx, config) {
                 break;
             }
             catch (e) {
-                __1.logger.error(e);
+                logger.error(e);
                 await (0, koishi_1.sleep)(2000);
                 continue;
             }
         }
-        __1.logger.debug('model response: ' + responseMessage.content);
+        logger.debug('model response: ' + responseMessage.content);
         const response = parseResponse(responseMessage.content);
         temp.completionMessages.push(humanMessage, responseMessage);
         if (temp.completionMessages.length > 30) {
@@ -48,7 +54,7 @@ async function apply(ctx, config) {
             }
         }
         if (response.length < 1) {
-            __1.service.mute(session, config.muteTime);
+            service.mute(session, config.muteTime);
             return;
         }
         const random = new koishi_1.Random();
@@ -60,12 +66,12 @@ async function apply(ctx, config) {
             await (0, koishi_1.sleep)(random.int(maxTime / 2, maxTime));
             session.send(elements);
         }
-        const sticker = await __1.stickerService.randomStick();
+        const sticker = await stickerService.randomStick();
         if (sticker) {
             session.send(sticker);
         }
-        __1.service.mute(session, config.coolDownTime * 1000);
-        __1.service.broadcastOnBot(session, response.flat());
+        service.mute(session, config.coolDownTime * 1000);
+        service.broadcastOnBot(session, response.flat());
     });
 }
 exports.apply = apply;
@@ -74,25 +80,25 @@ function parseResponse(response) {
     try {
         const match = response.matchAll(/\[.*?\]/g);
         message = [...match].pop()?.[0] ?? '';
-        __1.logger.debug('message: ' + message);
+        logger.debug('message: ' + message);
         message = message.match(/\[.*(:|：).*(:|：)(.*)\]/)?.[3] ?? '';
         message = message.match(/"(.*)"/)?.[1] ?? message;
-        __1.logger.debug('message: ' + message);
+        logger.debug('message: ' + message);
         if (typeof message !== 'string') {
-            __1.logger.error('Failed to parse response: ' + response);
+            logger.error('Failed to parse response: ' + response);
             return [];
         }
     }
     catch (e) {
-        __1.logger.error(e);
-        __1.logger.error('Failed to parse response: ' + response);
+        logger.error(e);
+        logger.error('Failed to parse response: ' + response);
         return [];
     }
     const resultElements = [];
     const currentElements = [];
     // match [at:name:id] -> id
     const atMatch = matchAt(message);
-    __1.logger.debug('atMatch: ' + JSON.stringify(atMatch));
+    logger.debug('atMatch: ' + JSON.stringify(atMatch));
     if (atMatch.length > 0) {
         let lastAtIndex = 0;
         for (const at of atMatch) {
@@ -243,7 +249,7 @@ async function formatCompletionMessages(messages, humanMessage, config, model) {
         currentTokens += messageTokens;
         result.unshift(message);
     }
-    __1.logger.debug(`maxTokens: ${maxTokens}, currentTokens: ${currentTokens}`);
+    logger.debug(`maxTokens: ${maxTokens}, currentTokens: ${currentTokens}`);
     result.unshift(systemMessage);
     return result;
 }

package/lib/plugins/commands.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = void 0;
-const __1 = require("..");
 const filter_1 = require("./filter");
 function apply(ctx, config) {
-    ctx.command('chathub.character', '角色扮演相关命令');
-    ctx.command('chathub.character.clear [group]', '清除群组的聊天记录').action(async ({ session }, group) => {
+    ctx.command('chatluna.character', '角色扮演相关命令');
+    ctx.command('chatluna.character.clear [group]', '清除群组的聊天记录').action(async ({ session }, group) => {
         if (!session.isDirect) {
             return;
         }
@@ -19,7 +18,7 @@ function apply(ctx, config) {
         }
         groupInfo.messageCount = 0;
         groupInfo.messageSendProbability = 0;
-        __1.service.clear(groupId);
+        ctx.chatluna_character.clear(groupId);
         return `已清除群组 ${groupId} 的聊天记录`;
     });
 }

package/lib/plugins/config.d.ts

@@ -1,3 +1,3 @@
 import { Context } from 'koishi';
 import { Config } from '..';
-export declare function apply(ctx: Context, config: Config): void;
+export declare function apply(ctx: Context, config: Config): Promise<void>;

package/lib/plugins/config.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = void 0;
 const koishi_1 = require("koishi");
 const types_1 = require("koishi-plugin-chatluna/lib/llm-core/platform/types");
-function apply(ctx, config) {
+async function apply(ctx, config) {
     ctx.on('chatluna/model-added', async (service) => {
         ctx.schema.set('model', koishi_1.Schema.union(await getModelNames(service)));
     });
     ctx.on('chatluna/model-removed', async (service) => {
         ctx.schema.set('model', koishi_1.Schema.union(await getModelNames(service)));
     });
+    ctx.schema.set('model', koishi_1.Schema.union(await getModelNames(ctx.chatluna.platform)));
 }
 exports.apply = apply;
 async function getModelNames(service) {

package/lib/plugins/filter.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = exports.groupInfos = void 0;
-const __1 = require("..");
 exports.groupInfos = {};
 async function apply(ctx, config) {
     const maxMessages = config.messageInterval;
-    const selectedPreset = await __1.preset.getPreset(config.defaultPreset);
-    __1.service.addFilter((session, message) => {
+    const service = ctx.chatluna_character;
+    const preset = service.preset;
+    const logger = service.logger;
+    const selectedPreset = await preset.getPreset(config.defaultPreset);
+    service.addFilter((session, message) => {
         const info = exports.groupInfos[session.guildId] || {
             messageCount: 0,
             messageSendProbability: 1
@@ -16,8 +18,8 @@ async function apply(ctx, config) {
         if (config.isForceMute && selectedPreset.mute_keyword?.length > 0) {
             const needMute = selectedPreset.mute_keyword.some((value) => message.content.includes(value));
             if (needMute) {
-                __1.logger.debug(`mute content: ${message.content}`);
-                __1.service.mute(session, config.muteTime);
+                logger.debug(`mute content: ${message.content}`);
+                service.mute(session, config.muteTime);
             }
         }
         // 保底必出
@@ -26,7 +28,7 @@ async function apply(ctx, config) {
             session.stripped.appel ||
             (config.isNickname &&
                 selectedPreset.nick_name.some((value) => message.content.startsWith(value)))) &&
-            !__1.service.isMute(session)) {
+            !service.isMute(session)) {
             info.messageCount = 0;
             info.messageSendProbability = 1;
             exports.groupInfos[session.guildId] = info;
@@ -34,13 +36,13 @@ async function apply(ctx, config) {
         }
         // 按照概率出
         if (Math.random() > messageSendProbability &&
-            !__1.service.isMute(session)) {
+            !service.isMute(session)) {
             info.messageCount = 0;
             info.messageSendProbability = 1;
             exports.groupInfos[session.guildId] = info;
             return true;
         }
-        __1.logger.debug(`messageCount: ${messageCount}, messageSendProbability: ${messageSendProbability}. content: ${JSON.stringify(message)}`);
+        logger.debug(`messageCount: ${messageCount}, messageSendProbability: ${messageSendProbability}. content: ${JSON.stringify(message)}`);
         messageCount++;
         messageSendProbability -= (1 / maxMessages) * 0.15;
         info.messageCount = messageCount;

package/lib/preset.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPreset = exports.Preset = void 0;
 const koishi_1 = require("koishi");
 const error_1 = require("koishi-plugin-chatluna/lib/utils/error");
-const _1 = require(".");
 const promises_1 = __importDefault(require("fs/promises"));
 const js_yaml_1 = require("js-yaml");
 const prompts_1 = require("langchain/prompts");
@@ -101,7 +100,7 @@ class Preset {
             const fileStat = await promises_1.default.stat(filePath);
             if (fileStat.isFile()) {
                 await promises_1.default.mkdir(currentPresetDir, { recursive: true });
-                _1.logger.debug(`copy preset file ${filePath} to ${currentPresetDir}`);
+                this.ctx.chatluna_character.logger.debug(`copy preset file ${filePath} to ${currentPresetDir}`);
                 await promises_1.default.copyFile(filePath, path_1.default.join(currentPresetDir, file));
             }
         }

package/lib/service/message.d.ts

@@ -1,14 +1,20 @@
-import { h, Session } from 'koishi';
+import { Context, h, Logger, Service, Session } from 'koishi';
 import { GroupTemp, Message } from '../types';
 import { Config } from '..';
-export declare class MessageCollector {
-    private _config;
+import { StickerService } from './sticker';
+import { Preset } from '../preset';
+export declare class MessageCollector extends Service {
+    readonly ctx: Context;
+    _config: Config;
     private _messages;
     private _eventEmitter;
     private _filters;
     private _groupLocks;
     private _groupTemp;
-    constructor(_config: Config);
+    stickerService: StickerService;
+    preset: Preset;
+    logger: Logger;
+    constructor(ctx: Context, _config: Config);
     addFilter(filter: MessageCollectorFilter): void;
     mute(session: Session, time: number): void;
     collect(func: (session: Session, messages: Message[]) => Promise<void>): void;
@@ -24,4 +30,9 @@ export declare class MessageCollector {
     broadcast(session: Session): Promise<void>;
 }
 type MessageCollectorFilter = (session: Session, message: Message) => boolean;
+declare module 'koishi' {
+    interface Context {
+        chatluna_character: MessageCollector;
+    }
+}
 export {};

package/lib/service/message.js

@@ -6,14 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageCollector = void 0;
 const koishi_1 = require("koishi");
 const events_1 = __importDefault(require("events"));
-class MessageCollector {
-    constructor(_config) {
+const sticker_1 = require("./sticker");
+const preset_1 = require("../preset");
+const logger_1 = require("koishi-plugin-chatluna/lib/utils/logger");
+class MessageCollector extends koishi_1.Service {
+    constructor(ctx, _config) {
+        super(ctx, 'chatluna_character');
+        this.ctx = ctx;
         this._config = _config;
         this._messages = {};
         this._eventEmitter = new events_1.default();
         this._filters = [];
         this._groupLocks = {};
         this._groupTemp = {};
+        this.stickerService = new sticker_1.StickerService(ctx, _config);
+        this.logger = (0, logger_1.createLogger)(ctx, 'chatluna-character');
+        this.preset = new preset_1.Preset(ctx);
     }
     addFilter(filter) {
         this._filters.push(filter);

package/lib/service/sticker.js

@@ -30,7 +30,6 @@ exports.StickerService = void 0;
 const koishi_1 = require("koishi");
 const path_1 = __importDefault(require("path"));
 const promises_1 = __importStar(require("fs/promises"));
-const __1 = require("..");
 class StickerService {
     constructor(_ctx, _config) {
         this._ctx = _ctx;
@@ -64,7 +63,7 @@ class StickerService {
         if (!sticker) {
             return null;
         }
-        __1.logger.debug(`send sticker: ${sticker}`);
+        this._ctx.root.chatluna_character.logger.debug(`send sticker: ${sticker}`);
         return koishi_1.h.image(await (0, promises_1.readFile)(sticker), `image/${getFileType(sticker)}`);
     }
 }

package/package.json

@@ -1,76 +1,76 @@
 {
-    "name": "koishi-plugin-chatluna-character",
-    "description": "Let the large language model play a role, disguise as a group friend",
-    "version": "0.0.30",
-    "main": "lib/index.js",
-    "typings": "lib/index.d.ts",
-    "files": [
-        "lib",
-        "dist",
-        "resources"
-    ],
-    "license": "AGPL-3.0",
-    "keywords": [
-        "chatbot",
-        "koishi",
-        "plugin",
-        "service",
-        "chatgpt",
-        "chathub",
-        "preset",
-        "market"
-    ],
-    "author": "dingyi222666 <dingyi222666@foxmail.com>",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/ChatLunaLab/chatluna-character.git",
-        "directory": "."
+  "name": "koishi-plugin-chatluna-character",
+  "description": "Let the large language model play a role, disguise as a group friend",
+  "version": "0.0.32",
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
+  "files": [
+    "lib",
+    "dist",
+    "resources"
+  ],
+  "license": "AGPL-3.0",
+  "keywords": [
+    "chatbot",
+    "koishi",
+    "plugin",
+    "service",
+    "chatgpt",
+    "chatluna",
+    "preset",
+    "market"
+  ],
+  "author": "dingyi222666 <dingyi222666@foxmail.com>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ChatLunaLab/chatluna-character.git",
+    "directory": "."
+  },
+  "bugs": {
+    "url": "https://github.com/ChatLunaLab/chatluna-character/issues"
+  },
+  "homepage": "https://github.com/ChatLunaLab/chatluna-character#readme",
+  "dependencies": {
+    "js-yaml": "^4.1.0",
+    "langchain": "^0.0.176"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "atsc": "^1.2.2",
+    "esbuild": "^0.17.19",
+    "esbuild-register": "^3.5.0",
+    "eslint": "^8.53.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-n": "^16.3.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-promise": "^6.1.1",
+    "koishi": "^4.15.4"
+  },
+  "peerDependencies": {
+    "koishi-plugin-chatluna": "^1.0.0-beta.21",
+    "koishi": "^4.15.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "scripts": {
+    "build": "yakumo build",
+    "bump": "yakumo version",
+    "dep": "yakumo upgrade",
+    "pub": "yakumo publish"
+  },
+  "koishi": {
+    "description": {
+      "zh": "让大语言模型进行角色扮演，伪装成群友"
     },
-    "bugs": {
-        "url": "https://github.com/ChatLunaLab/chatluna-character/issues"
-    },
-    "homepage": "https://github.com/ChatLunaLab/chatluna-character#readme",
-    "dependencies": {
-        "js-yaml": "^4.1.0",
-        "langchain": "^0.0.176"
-    },
-    "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^6.9.1",
-        "@typescript-eslint/parser": "^6.9.1",
-        "atsc": "^1.2.2",
-        "esbuild": "^0.17.19",
-        "esbuild-register": "^3.5.0",
-        "eslint": "^8.53.0",
-        "eslint-config-prettier": "^9.0.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.0",
-        "eslint-plugin-n": "^16.2.0",
-        "eslint-plugin-prettier": "^5.0.1",
-        "eslint-plugin-promise": "^6.1.1",
-        "koishi": "^4.15.3"
-    },
-    "peerDependencies": {
-        "koishi-plugin-chatluna": "^1.0.0-beta.10",
-        "koishi": "^4.15.3"
-    },
-    "engines": {
-        "node": ">=18.0.0"
-    },
-    "scripts": {
-        "build": "yakumo build",
-        "bump": "yakumo version",
-        "dep": "yakumo upgrade",
-        "pub": "yakumo publish"
-    },
-    "koishi": {
-        "description": {
-            "zh": "让大语言模型进行角色扮演，伪装成群友"
-        },
-        "preview": true,
-        "service": {
-            "required": [
-                "chathub"
-            ]
-        }
+    "preview": true,
+    "service": {
+      "required": [
+        "chatluna"
+      ]
     }
-}
+  }
+}