koishi-plugin-chatluna 1.1.2 → 1.1.3

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

@@ -594,42 +594,44 @@ __name(apply2, "apply");
 
 // src/commands/memory.ts
 function apply3(ctx, config, chain) {
-  ctx.command("chatluna.memory", { authority: 1 });
-  ctx.command("chatluna.memory.search <query:string>").option("type", "-t <type:string>").option("limit", "-l <limit:number>").option("page", "-p <page:number>").option("view", "-v <view:string>").action(async ({ options, session }, query) => {
-    await chain.receiveCommand(session, "search_memory", {
-      type: options.type,
-      page: options.page ?? 1,
-      limit: options.limit ?? 6,
-      view: options.view,
-      query
+  ctx.inject(["chatluna_long_memory"], (ctx2) => {
+    ctx2.command("chatluna.memory", { authority: 1 });
+    ctx2.command("chatluna.memory.search <query:string>").option("type", "-t <type:string>").option("limit", "-l <limit:number>").option("page", "-p <page:number>").option("view", "-v <view:string>").action(async ({ options, session }, query) => {
+      await chain.receiveCommand(session, "search_memory", {
+        type: options.type,
+        page: options.page ?? 1,
+        limit: options.limit ?? 6,
+        view: options.view,
+        query
+      });
     });
-  });
-  ctx.command("chatluna.memory.delete <...ids>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, ...ids) => {
-    await chain.receiveCommand(session, "delete_memory", {
-      ids,
-      type: options.type,
-      view: options.view
+    ctx2.command("chatluna.memory.delete <...ids>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, ...ids) => {
+      await chain.receiveCommand(session, "delete_memory", {
+        ids,
+        type: options.type,
+        view: options.view
+      });
     });
-  });
-  ctx.command("chatluna.memory.clear").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }) => {
-    await chain.receiveCommand(session, "clear_memory", {
-      type: options.type,
-      view: options.view
+    ctx2.command("chatluna.memory.clear").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }) => {
+      await chain.receiveCommand(session, "clear_memory", {
+        type: options.type,
+        view: options.view
+      });
     });
-  });
-  ctx.command("chatluna.memory.add <content:text>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, content) => {
-    await chain.receiveCommand(session, "add_memory", {
-      type: options.type,
-      view: options.view,
-      content
+    ctx2.command("chatluna.memory.add <content:text>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, content) => {
+      await chain.receiveCommand(session, "add_memory", {
+        type: options.type,
+        view: options.view,
+        content
+      });
     });
-  });
-  ctx.command("chatluna.memory.edit <id:string>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, id, content) => {
-    await chain.receiveCommand(session, "edit_memory", {
-      memoryId: id,
-      content,
-      type: options.type,
-      view: options.view
+    ctx2.command("chatluna.memory.edit <id:string>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, id, content) => {
+      await chain.receiveCommand(session, "edit_memory", {
+        memoryId: id,
+        content,
+        type: options.type,
+        view: options.view
+      });
     });
   });
 }
@@ -6018,7 +6020,7 @@ var TextRenderer = class extends Renderer {
         return (0, import_koishi12.h)("message", element);
       });
     }
-    if (transformed[0].type === "p") {
+    if (transformed[0]?.type === "p") {
       const pElement = transformed.shift();
       const pElementContent = pElement.attrs["content"];
       if (pElementContent) {

package/lib/index.mjs

@@ -563,42 +563,44 @@ __name(apply2, "apply");
 
 // src/commands/memory.ts
 function apply3(ctx, config, chain) {
-  ctx.command("chatluna.memory", { authority: 1 });
-  ctx.command("chatluna.memory.search <query:string>").option("type", "-t <type:string>").option("limit", "-l <limit:number>").option("page", "-p <page:number>").option("view", "-v <view:string>").action(async ({ options, session }, query) => {
-    await chain.receiveCommand(session, "search_memory", {
-      type: options.type,
-      page: options.page ?? 1,
-      limit: options.limit ?? 6,
-      view: options.view,
-      query
+  ctx.inject(["chatluna_long_memory"], (ctx2) => {
+    ctx2.command("chatluna.memory", { authority: 1 });
+    ctx2.command("chatluna.memory.search <query:string>").option("type", "-t <type:string>").option("limit", "-l <limit:number>").option("page", "-p <page:number>").option("view", "-v <view:string>").action(async ({ options, session }, query) => {
+      await chain.receiveCommand(session, "search_memory", {
+        type: options.type,
+        page: options.page ?? 1,
+        limit: options.limit ?? 6,
+        view: options.view,
+        query
+      });
     });
-  });
-  ctx.command("chatluna.memory.delete <...ids>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, ...ids) => {
-    await chain.receiveCommand(session, "delete_memory", {
-      ids,
-      type: options.type,
-      view: options.view
+    ctx2.command("chatluna.memory.delete <...ids>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, ...ids) => {
+      await chain.receiveCommand(session, "delete_memory", {
+        ids,
+        type: options.type,
+        view: options.view
+      });
     });
-  });
-  ctx.command("chatluna.memory.clear").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }) => {
-    await chain.receiveCommand(session, "clear_memory", {
-      type: options.type,
-      view: options.view
+    ctx2.command("chatluna.memory.clear").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }) => {
+      await chain.receiveCommand(session, "clear_memory", {
+        type: options.type,
+        view: options.view
+      });
     });
-  });
-  ctx.command("chatluna.memory.add <content:text>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, content) => {
-    await chain.receiveCommand(session, "add_memory", {
-      type: options.type,
-      view: options.view,
-      content
+    ctx2.command("chatluna.memory.add <content:text>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, content) => {
+      await chain.receiveCommand(session, "add_memory", {
+        type: options.type,
+        view: options.view,
+        content
+      });
     });
-  });
-  ctx.command("chatluna.memory.edit <id:string>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, id, content) => {
-    await chain.receiveCommand(session, "edit_memory", {
-      memoryId: id,
-      content,
-      type: options.type,
-      view: options.view
+    ctx2.command("chatluna.memory.edit <id:string>").option("type", "-t <type:string>").option("view", "-v <view:string>").action(async ({ session, options }, id, content) => {
+      await chain.receiveCommand(session, "edit_memory", {
+        memoryId: id,
+        content,
+        type: options.type,
+        view: options.view
+      });
     });
   });
 }
@@ -6027,7 +6029,7 @@ var TextRenderer = class extends Renderer {
         return h5("message", element);
       });
     }
-    if (transformed[0].type === "p") {
+    if (transformed[0]?.type === "p") {
       const pElement = transformed.shift();
       const pElementContent = pElement.attrs["content"];
       if (pElementContent) {

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 | AgentAction[] | AgentFinish>;
+}, AgentAction | AgentFinish | AgentAction[]>;

package/lib/llm-core/chain/prompt.cjs

@@ -62,7 +62,12 @@ var ChatLunaChatPrompt = class _ChatLunaChatPrompt extends import_prompts.BaseCh
     return "chatluna_chat";
   }
   async _countMessageTokens(message) {
-    let result = await this.tokenCounter(message.content) + await this.tokenCounter(
+    let content = (0, import_string.getMessageContent)(message.content);
+    if (content.includes("![image]") && content.includes("base64") && message.additional_kwargs?.["images"]) {
+      content = content.replaceAll(/!\[.*?\]\(.*?\)/g, "");
+      message.content = content;
+    }
+    let result = await this.tokenCounter((0, import_string.getMessageContent)(message.content)) + await this.tokenCounter(
       (0, import_count_tokens.messageTypeToOpenAIRole)(message.getType())
     );
     if (message.name) {
@@ -144,6 +149,7 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
         usedTokens += await this._countMessageTokens(agentScratchpad);
       }
     }
+    console.log(chatHistory.length);
     const formatResult = await this._formatWithMessagesPlaceholder(
       chatHistory,
       [longHistory, knowledge].concat(

package/lib/llm-core/chain/prompt.mjs

@@ -53,7 +53,12 @@ var ChatLunaChatPrompt = class _ChatLunaChatPrompt extends BaseChatPromptTemplat
     return "chatluna_chat";
   }
   async _countMessageTokens(message) {
-    let result = await this.tokenCounter(message.content) + await this.tokenCounter(
+    let content = getMessageContent(message.content);
+    if (content.includes("![image]") && content.includes("base64") && message.additional_kwargs?.["images"]) {
+      content = content.replaceAll(/!\[.*?\]\(.*?\)/g, "");
+      message.content = content;
+    }
+    let result = await this.tokenCounter(getMessageContent(message.content)) + await this.tokenCounter(
       messageTypeToOpenAIRole(message.getType())
     );
     if (message.name) {
@@ -135,6 +140,7 @@ Your goal is to craft an insightful, engaging response that seamlessly integrate
         usedTokens += await this._countMessageTokens(agentScratchpad);
       }
     }
+    console.log(chatHistory.length);
     const formatResult = await this._formatWithMessagesPlaceholder(
       chatHistory,
       [longHistory, knowledge].concat(

package/lib/llm-core/memory/message/database_history.d.ts

@@ -48,6 +48,7 @@ export interface ChatLunaMessage {
     role: MessageType;
     conversation: string;
     additional_kwargs?: string;
+    additional_kwargs_binary?: ArrayBuffer;
     parent?: string;
 }
 export interface ChatLunaConversation {

package/lib/llm-core/memory/message/index.cjs

@@ -28,6 +28,7 @@ module.exports = __toCommonJS(message_exports);
 var import_messages = require("@langchain/core/messages");
 var import_uuid = require("uuid");
 var import_chat_history = require("@langchain/core/chat_history");
+var import_string = require("koishi-plugin-chatluna/utils/string");
 var KoishiChatMessageHistory = class extends import_chat_history.BaseChatMessageHistory {
   constructor(ctx, conversationId, _maxMessagesCount) {
     super();
@@ -155,14 +156,16 @@ var KoishiChatMessageHistory = class extends import_chat_history.BaseChatMessage
       await this.clear();
     }
     this._serializedChatHistory = sorted;
-    return sorted.map((item) => {
-      const kw_args = JSON.parse(item.additional_kwargs ?? "{}");
+    const promises = sorted.map(async (item) => {
+      const args = JSON.parse(
+        item.additional_kwargs_binary ? await (0, import_string.gzipDecode)(item.additional_kwargs_binary) : item.additional_kwargs ?? "{}"
+      );
       const content = JSON.parse(item.text);
       const fields = {
         content,
         id: item.rawId ?? void 0,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        additional_kwargs: kw_args
+        additional_kwargs: args
       };
       if (item.role === "system") {
         return new import_messages.SystemMessage(fields);
@@ -174,6 +177,7 @@ var KoishiChatMessageHistory = class extends import_chat_history.BaseChatMessage
         throw new Error("Unknown role");
       }
     });
+    return await Promise.all(promises);
   }
   async _loadConversation() {
     const conversation = (await this._ctx.database.get("chathub_conversation", {
@@ -213,7 +217,9 @@ var KoishiChatMessageHistory = class extends import_chat_history.BaseChatMessage
       text: JSON.stringify(message.content),
       parent: lastedMessage?.id ?? null,
       role: message.getType(),
-      additional_kwargs: additionalArgs ? JSON.stringify(additionalArgs) : null,
+      additional_kwargs_binary: additionalArgs ? await (0, import_string.gzipEncode)(JSON.stringify(additionalArgs)).then(
+        (buf) => (0, import_string.bufferToArrayBuffer)(buf)
+      ) : null,
       rawId: message.id ?? null,
       conversation: this.conversationId
     };

package/lib/llm-core/memory/message/index.mjs

@@ -9,6 +9,11 @@ import {
 } from "@langchain/core/messages";
 import { v4 as uuidv4 } from "uuid";
 import { BaseChatMessageHistory } from "@langchain/core/chat_history";
+import {
+  bufferToArrayBuffer,
+  gzipDecode,
+  gzipEncode
+} from "koishi-plugin-chatluna/utils/string";
 var KoishiChatMessageHistory = class extends BaseChatMessageHistory {
   constructor(ctx, conversationId, _maxMessagesCount) {
     super();
@@ -136,14 +141,16 @@ var KoishiChatMessageHistory = class extends BaseChatMessageHistory {
       await this.clear();
     }
     this._serializedChatHistory = sorted;
-    return sorted.map((item) => {
-      const kw_args = JSON.parse(item.additional_kwargs ?? "{}");
+    const promises = sorted.map(async (item) => {
+      const args = JSON.parse(
+        item.additional_kwargs_binary ? await gzipDecode(item.additional_kwargs_binary) : item.additional_kwargs ?? "{}"
+      );
       const content = JSON.parse(item.text);
       const fields = {
         content,
         id: item.rawId ?? void 0,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        additional_kwargs: kw_args
+        additional_kwargs: args
       };
       if (item.role === "system") {
         return new SystemMessage(fields);
@@ -155,6 +162,7 @@ var KoishiChatMessageHistory = class extends BaseChatMessageHistory {
         throw new Error("Unknown role");
       }
     });
+    return await Promise.all(promises);
   }
   async _loadConversation() {
     const conversation = (await this._ctx.database.get("chathub_conversation", {
@@ -194,7 +202,9 @@ var KoishiChatMessageHistory = class extends BaseChatMessageHistory {
       text: JSON.stringify(message.content),
       parent: lastedMessage?.id ?? null,
       role: message.getType(),
-      additional_kwargs: additionalArgs ? JSON.stringify(additionalArgs) : null,
+      additional_kwargs_binary: additionalArgs ? await gzipEncode(JSON.stringify(additionalArgs)).then(
+        (buf) => bufferToArrayBuffer(buf)
+      ) : null,
       rawId: message.id ?? null,
       conversation: this.conversationId
     };

package/lib/services/chat.cjs

@@ -711,6 +711,14 @@ var MessageTransformer = class {
             model
           );
         }
+      } else if (element.children) {
+        await this.transform(
+          session,
+          element.children,
+          message,
+          quote,
+          model
+        );
       }
     }
     if (session.quote && !quote && this._config.includeQuoteReply) {
@@ -747,7 +755,7 @@ Please consider this quote when generating your response. User's message: ${mess
         new Error("text transform function already exists")
       );
     }
-    if (this._transformFunctions[type] != null && !["image"].includes(type)) {
+    if (this._transformFunctions[type] != null && !["img"].includes(type)) {
       import_koishi_plugin_chatluna.logger?.warn(
         `transform function for ${type} already exists. Check your installed plugins.`
       );
@@ -808,7 +816,7 @@ var TextRenderer = class extends Renderer {
         return (0, import_koishi3.h)("message", element);
       });
     }
-    if (transformed[0].type === "p") {
+    if (transformed[0]?.type === "p") {
       const pElement = transformed.shift();
       const pElementContent = pElement.attrs["content"];
       if (pElementContent) {
@@ -1366,6 +1374,10 @@ var ChatLunaService = class extends import_koishi9.Service {
           type: "text",
           nullable: true
         },
+        additional_kwargs_binary: {
+          type: "binary",
+          nullable: true
+        },
         rawId: {
           type: "char",
           length: 255,

package/lib/services/chat.mjs

@@ -700,6 +700,14 @@ var MessageTransformer = class {
             model
           );
         }
+      } else if (element.children) {
+        await this.transform(
+          session,
+          element.children,
+          message,
+          quote,
+          model
+        );
       }
     }
     if (session.quote && !quote && this._config.includeQuoteReply) {
@@ -736,7 +744,7 @@ Please consider this quote when generating your response. User's message: ${mess
         new Error("text transform function already exists")
       );
     }
-    if (this._transformFunctions[type] != null && !["image"].includes(type)) {
+    if (this._transformFunctions[type] != null && !["img"].includes(type)) {
       logger2?.warn(
         `transform function for ${type} already exists. Check your installed plugins.`
       );
@@ -800,7 +808,7 @@ var TextRenderer = class extends Renderer {
         return h2("message", element);
       });
     }
-    if (transformed[0].type === "p") {
+    if (transformed[0]?.type === "p") {
       const pElement = transformed.shift();
       const pElementContent = pElement.attrs["content"];
       if (pElementContent) {
@@ -1358,6 +1366,10 @@ var ChatLunaService = class extends Service {
           type: "text",
           nullable: true
         },
+        additional_kwargs_binary: {
+          type: "binary",
+          nullable: true
+        },
         rawId: {
           type: "char",
           length: 255,

package/lib/utils/string.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var string_exports = {};
 __export(string_exports, {
   PresetPostHandler: () => PresetPostHandler,
+  bufferToArrayBuffer: () => bufferToArrayBuffer,
   fuzzyQuery: () => fuzzyQuery,
   getCurrentWeekday: () => getCurrentWeekday,
   getMessageContent: () => getMessageContent,
@@ -28,11 +29,17 @@ __export(string_exports, {
   getTimeDiff: () => getTimeDiff,
   getTimeDiffFormat: () => getTimeDiffFormat,
   getTimeInUTC: () => getTimeInUTC,
+  gzipDecode: () => gzipDecode,
+  gzipEncode: () => gzipEncode,
   rollDice: () => rollDice,
   selectFromList: () => selectFromList
 });
 module.exports = __toCommonJS(string_exports);
 var import_koishi = require("koishi");
+var import_zlib = require("zlib");
+var import_util = require("util");
+var gzipAsync = (0, import_util.promisify)(import_zlib.gzip);
+var gunzipAsync = (0, import_util.promisify)(import_zlib.gunzip);
 function fuzzyQuery(source, keywords) {
   for (const keyword of keywords) {
     const match = source.includes(keyword);
@@ -185,9 +192,29 @@ var PresetPostHandler = class {
     }
   }
 };
+async function gzipEncode(text, encoding = "buffer") {
+  const buffer = await gzipAsync(text);
+  return encoding === "buffer" ? buffer : buffer.toString(encoding);
+}
+__name(gzipEncode, "gzipEncode");
+async function gzipDecode(data, inputEncoding = "base64") {
+  const buffer = typeof data === "string" ? Buffer.from(data, inputEncoding) : data;
+  return (await gunzipAsync(buffer)).toString("utf8");
+}
+__name(gzipDecode, "gzipDecode");
+function bufferToArrayBuffer(buffer) {
+  const arrayBuffer = new ArrayBuffer(buffer.length);
+  const view = new Uint8Array(arrayBuffer);
+  for (let i = 0; i < buffer.length; i++) {
+    view[i] = buffer[i];
+  }
+  return arrayBuffer;
+}
+__name(bufferToArrayBuffer, "bufferToArrayBuffer");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PresetPostHandler,
+  bufferToArrayBuffer,
   fuzzyQuery,
   getCurrentWeekday,
   getMessageContent,
@@ -195,6 +222,8 @@ var PresetPostHandler = class {
   getTimeDiff,
   getTimeDiffFormat,
   getTimeInUTC,
+  gzipDecode,
+  gzipEncode,
   rollDice,
   selectFromList
 });

package/lib/utils/string.d.ts

@@ -2,6 +2,8 @@ import { BaseMessage } from '@langchain/core/messages';
 import type { HandlerResult, PostHandler } from './types';
 import { Context, Session } from 'koishi';
 import { Config } from 'koishi-plugin-chatluna';
+type Encoding = 'buffer' | 'base64' | 'hex';
+type BufferType<T extends Encoding> = T extends 'buffer' ? Buffer : T extends 'base64' ? string : T extends 'hex' ? string : never;
 export declare function fuzzyQuery(source: string, keywords: string[]): boolean;
 export declare function getMessageContent(message: BaseMessage['content']): string;
 export declare function getNotEmptyString(...texts: (string | undefined)[]): string;
@@ -23,3 +25,7 @@ export declare class PresetPostHandler implements PostHandler {
     handler(session: Session, data: string): Promise<HandlerResult>;
     private _compileVariables;
 }
+export declare function gzipEncode<T extends Encoding = 'buffer'>(text: string, encoding?: T): Promise<BufferType<T>>;
+export declare function gzipDecode(data: ArrayBuffer | Buffer | string, inputEncoding?: Encoding): Promise<string>;
+export declare function bufferToArrayBuffer(buffer: Buffer): ArrayBuffer;
+export {};

package/lib/utils/string.mjs

@@ -3,6 +3,10 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/utils/string.ts
 import { h } from "koishi";
+import { gunzip, gzip } from "zlib";
+import { promisify } from "util";
+var gzipAsync = promisify(gzip);
+var gunzipAsync = promisify(gunzip);
 function fuzzyQuery(source, keywords) {
   for (const keyword of keywords) {
     const match = source.includes(keyword);
@@ -155,8 +159,28 @@ var PresetPostHandler = class {
     }
   }
 };
+async function gzipEncode(text, encoding = "buffer") {
+  const buffer = await gzipAsync(text);
+  return encoding === "buffer" ? buffer : buffer.toString(encoding);
+}
+__name(gzipEncode, "gzipEncode");
+async function gzipDecode(data, inputEncoding = "base64") {
+  const buffer = typeof data === "string" ? Buffer.from(data, inputEncoding) : data;
+  return (await gunzipAsync(buffer)).toString("utf8");
+}
+__name(gzipDecode, "gzipDecode");
+function bufferToArrayBuffer(buffer) {
+  const arrayBuffer = new ArrayBuffer(buffer.length);
+  const view = new Uint8Array(arrayBuffer);
+  for (let i = 0; i < buffer.length; i++) {
+    view[i] = buffer[i];
+  }
+  return arrayBuffer;
+}
+__name(bufferToArrayBuffer, "bufferToArrayBuffer");
 export {
   PresetPostHandler,
+  bufferToArrayBuffer,
   fuzzyQuery,
   getCurrentWeekday,
   getMessageContent,
@@ -164,6 +188,8 @@ export {
   getTimeDiff,
   getTimeDiffFormat,
   getTimeInUTC,
+  gzipDecode,
+  gzipEncode,
   rollDice,
   selectFromList
 };

package/package.json

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