koishi-plugin-chatluna 1.1.0 → 1.1.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[] | h[][] | ChainMiddlewareRunStatus>;
+    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | ChainMiddlewareRunStatus | h[][]>;
 }
 export interface ChainMiddlewareContext {
     config: Config;

package/lib/chains/index.cjs

@@ -732,11 +732,7 @@ async function getTemplateConversationRoom(ctx, config) {
 }
 __name(getTemplateConversationRoom, "getTemplateConversationRoom");
 async function getConversationRoomCount(ctx) {
-  const count = await ctx.database.eval(
-    "chathub_room",
-    (row) => import_koishi2.$.max(row.roomId),
-    {}
-  );
+  const count = await ctx.database.select("chathub_room").execute((row) => import_koishi2.$.max(row.roomId));
   return count;
 }
 __name(getConversationRoomCount, "getConversationRoomCount");

package/lib/chains/index.mjs

@@ -690,11 +690,7 @@ async function getTemplateConversationRoom(ctx, config) {
 }
 __name(getTemplateConversationRoom, "getTemplateConversationRoom");
 async function getConversationRoomCount(ctx) {
-  const count = await ctx.database.eval(
-    "chathub_room",
-    (row) => $.max(row.roomId),
-    {}
-  );
+  const count = await ctx.database.select("chathub_room").execute((row) => $.max(row.roomId));
   return count;
 }
 __name(getConversationRoomCount, "getConversationRoomCount");

package/lib/index.cjs

@@ -1746,11 +1746,7 @@ async function getTemplateConversationRoom(ctx, config) {
 }
 __name(getTemplateConversationRoom, "getTemplateConversationRoom");
 async function getConversationRoomCount(ctx) {
-  const count = await ctx.database.eval(
-    "chathub_room",
-    (row) => import_koishi4.$.max(row.roomId),
-    {}
-  );
+  const count = await ctx.database.select("chathub_room").execute((row) => import_koishi4.$.max(row.roomId));
   return count;
 }
 __name(getConversationRoomCount, "getConversationRoomCount");
@@ -3070,7 +3066,6 @@ function apply24(ctx, config, chain) {
       } else {
         await context.send(
           session.text(".change_or_keep", [
-            session.text(".action.select"),
             session.text(".field.chat_mode"),
             chatMode
           ])
@@ -3905,7 +3900,10 @@ function apply41(ctx, config, chain) {
         try {
           await readImage(url);
         } catch (error) {
-          logger.warn(`read image error: ${error}`);
+          logger.warn(
+            `read image ${url} error, check your chat adapter`,
+            error
+          );
           return;
         }
       }
@@ -5501,7 +5499,6 @@ function apply57(ctx, config, chain) {
       } else {
         await context.send(
           session.text(".change_or_keep", [
-            session.text(".action.select"),
             session.text(".field.chat_mode"),
             chatMode
           ])
@@ -5523,7 +5520,7 @@ function apply57(ctx, config, chain) {
         break;
       }
       await context.send(
-        session.text(".chat_mode_not_recognized", [
+        session.text(".invalid_chat_mode", [
           visibility,
           availableChatModes.join(", ")
         ])

package/lib/index.mjs

@@ -1737,11 +1737,7 @@ async function getTemplateConversationRoom(ctx, config) {
 }
 __name(getTemplateConversationRoom, "getTemplateConversationRoom");
 async function getConversationRoomCount(ctx) {
-  const count = await ctx.database.eval(
-    "chathub_room",
-    (row) => $.max(row.roomId),
-    {}
-  );
+  const count = await ctx.database.select("chathub_room").execute((row) => $.max(row.roomId));
   return count;
 }
 __name(getConversationRoomCount, "getConversationRoomCount");
@@ -3064,7 +3060,6 @@ function apply24(ctx, config, chain) {
       } else {
         await context.send(
           session.text(".change_or_keep", [
-            session.text(".action.select"),
             session.text(".field.chat_mode"),
             chatMode
           ])
@@ -3899,7 +3894,10 @@ function apply41(ctx, config, chain) {
         try {
           await readImage(url);
         } catch (error) {
-          logger.warn(`read image error: ${error}`);
+          logger.warn(
+            `read image ${url} error, check your chat adapter`,
+            error
+          );
           return;
         }
       }
@@ -5507,7 +5505,6 @@ function apply57(ctx, config, chain) {
       } else {
         await context.send(
           session.text(".change_or_keep", [
-            session.text(".action.select"),
             session.text(".field.chat_mode"),
             chatMode
           ])
@@ -5529,7 +5526,7 @@ function apply57(ctx, config, chain) {
         break;
       }
       await context.send(
-        session.text(".chat_mode_not_recognized", [
+        session.text(".invalid_chat_mode", [
           visibility,
           availableChatModes.join(", ")
         ])

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

@@ -65,15 +65,15 @@ var ChatLunaSaveableVectorStore = class extends import_vectorstores.VectorStore
   }
   similaritySearchVectorWithScore(...args) {
     this.checkActive();
+    if (args[0].length === 0) {
+      throw new Error("Embedding dismension is 0");
+    }
     if (this.similaritySearchVectorWithScoreFunction) {
       return this.similaritySearchVectorWithScoreFunction(
         this._store,
         ...args
       );
     }
-    if (args[0].length === 0) {
-      throw new Error("Embedding dismension is 0");
-    }
     return this._store.similaritySearchVectorWithScore(
       args[0],
       args[1],

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

@@ -44,15 +44,15 @@ var ChatLunaSaveableVectorStore = class extends VectorStore {
   }
   similaritySearchVectorWithScore(...args) {
     this.checkActive();
+    if (args[0].length === 0) {
+      throw new Error("Embedding dismension is 0");
+    }
     if (this.similaritySearchVectorWithScoreFunction) {
       return this.similaritySearchVectorWithScoreFunction(
         this._store,
         ...args
       );
     }
-    if (args[0].length === 0) {
-      throw new Error("Embedding dismension is 0");
-    }
     return this._store.similaritySearchVectorWithScore(
       args[0],
       args[1],

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

@@ -175,6 +175,7 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
     this._modelName = _options.model ?? _options.modelInfo.name;
     this._maxModelContextSize = _options.modelMaxContextSize;
     this._modelInfo = _options.modelInfo;
+    this._isThinkModel = _options.isThinkModel ?? false;
   }
   static {
     __name(this, "ChatLunaChatModel");
@@ -185,6 +186,7 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
   _modelName;
   _maxModelContextSize;
   _modelInfo;
+  _isThinkModel;
   // eslint-disable-next-line @typescript-eslint/naming-convention
   lc_serializable = false;
   get callKeys() {
@@ -511,6 +513,9 @@ var ChatLunaChatModel = class extends import_chat_models.BaseChatModel {
   get modelInfo() {
     return this._modelInfo;
   }
+  get isThinkModel() {
+    return this._isThinkModel;
+  }
   _modelType() {
     return "base_chat_model";
   }

package/lib/llm-core/platform/model.d.ts

@@ -43,6 +43,7 @@ export interface ChatLunaModelInput extends ChatLunaModelCallOptions {
     requester: ModelRequester;
     maxConcurrency?: number;
     maxRetries?: number;
+    isThinkModel?: boolean;
 }
 export declare class ChatLunaChatModel extends BaseChatModel<ChatLunaModelCallOptions> {
     private _options;
@@ -51,6 +52,7 @@ export declare class ChatLunaChatModel extends BaseChatModel<ChatLunaModelCallOp
     private _modelName;
     private _maxModelContextSize;
     private _modelInfo;
+    private _isThinkModel;
     lc_serializable: boolean;
     constructor(_options: ChatLunaModelInput);
     get callKeys(): (keyof ChatLunaModelCallOptions)[];
@@ -78,6 +80,7 @@ export declare class ChatLunaChatModel extends BaseChatModel<ChatLunaModelCallOp
     _llmType(): string;
     get modelName(): string;
     get modelInfo(): ModelInfo;
+    get isThinkModel(): boolean;
     _modelType(): string;
     /** @ignore */
     _combineLLMOutput(...llmOutputs: any[]): any;

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

@@ -157,6 +157,7 @@ var ChatLunaChatModel = class extends BaseChatModel {
     this._modelName = _options.model ?? _options.modelInfo.name;
     this._maxModelContextSize = _options.modelMaxContextSize;
     this._modelInfo = _options.modelInfo;
+    this._isThinkModel = _options.isThinkModel ?? false;
   }
   static {
     __name(this, "ChatLunaChatModel");
@@ -167,6 +168,7 @@ var ChatLunaChatModel = class extends BaseChatModel {
   _modelName;
   _maxModelContextSize;
   _modelInfo;
+  _isThinkModel;
   // eslint-disable-next-line @typescript-eslint/naming-convention
   lc_serializable = false;
   get callKeys() {
@@ -493,6 +495,9 @@ var ChatLunaChatModel = class extends BaseChatModel {
   get modelInfo() {
     return this._modelInfo;
   }
+  get isThinkModel() {
+    return this._isThinkModel;
+  }
   _modelType() {
     return "base_chat_model";
   }

package/lib/services/chat.cjs

@@ -692,17 +692,24 @@ var MessageTransformer = class {
   async transform(session, elements, message = {
     content: "",
     additional_kwargs: {}
-  }, quote = false) {
+  }, quote = false, model) {
     for (const element of elements) {
       const transformFunction = this._transformFunctions[element.type];
       if (transformFunction != null) {
         const result = await transformFunction(
           session,
           element,
-          message
+          message,
+          model
         );
         if (result === false && element.children) {
-          await this.transform(session, element.children, message);
+          await this.transform(
+            session,
+            element.children,
+            message,
+            false,
+            model
+          );
         }
       }
     }
@@ -714,7 +721,8 @@ var MessageTransformer = class {
           content: "",
           additional_kwargs: {}
         },
-        true
+        true,
+        model
       );
       if (quoteMessage.content.length > 0 && quoteMessage.content !== "[image]") {
         message.additional_kwargs["raw_content"] = message.content;
@@ -749,6 +757,23 @@ Please consider this quote when generating your response. User's message: ${mess
       delete this._transformFunctions[type];
     };
   }
+  replace(type, transformFunction) {
+    if (type === "text") {
+      throw new import_error2.ChatLunaError(
+        import_error2.ChatLunaErrorCode.UNKNOWN_ERROR,
+        new Error("text transform function already exists")
+      );
+    }
+    if (this._transformFunctions[type] == null) {
+      import_koishi_plugin_chatluna.logger?.warn(
+        `transform function for ${type} not exists. Check your installed plugins.`
+      );
+    }
+    this._transformFunctions[type] = transformFunction;
+    return () => {
+      delete this._transformFunctions[type];
+    };
+  }
 };
 
 // src/services/chat.ts

package/lib/services/chat.mjs

@@ -681,17 +681,24 @@ var MessageTransformer = class {
   async transform(session, elements, message = {
     content: "",
     additional_kwargs: {}
-  }, quote = false) {
+  }, quote = false, model) {
     for (const element of elements) {
       const transformFunction = this._transformFunctions[element.type];
       if (transformFunction != null) {
         const result = await transformFunction(
           session,
           element,
-          message
+          message,
+          model
         );
         if (result === false && element.children) {
-          await this.transform(session, element.children, message);
+          await this.transform(
+            session,
+            element.children,
+            message,
+            false,
+            model
+          );
         }
       }
     }
@@ -703,7 +710,8 @@ var MessageTransformer = class {
           content: "",
           additional_kwargs: {}
         },
-        true
+        true,
+        model
       );
       if (quoteMessage.content.length > 0 && quoteMessage.content !== "[image]") {
         message.additional_kwargs["raw_content"] = message.content;
@@ -738,6 +746,23 @@ Please consider this quote when generating your response. User's message: ${mess
       delete this._transformFunctions[type];
     };
   }
+  replace(type, transformFunction) {
+    if (type === "text") {
+      throw new ChatLunaError2(
+        ChatLunaErrorCode2.UNKNOWN_ERROR,
+        new Error("text transform function already exists")
+      );
+    }
+    if (this._transformFunctions[type] == null) {
+      logger2?.warn(
+        `transform function for ${type} not exists. Check your installed plugins.`
+      );
+    }
+    this._transformFunctions[type] = transformFunction;
+    return () => {
+      delete this._transformFunctions[type];
+    };
+  }
 };
 
 // src/services/chat.ts

package/lib/services/message_transform.d.ts

@@ -5,7 +5,8 @@ export declare class MessageTransformer {
     private _config;
     private _transformFunctions;
     constructor(_config: Config);
-    transform(session: Session, elements: h[], message?: Message, quote?: boolean): Promise<Message>;
+    transform(session: Session, elements: h[], message?: Message, quote?: boolean, model?: string): Promise<Message>;
     intercept(type: string, transformFunction: MessageTransformFunction): () => void;
+    replace(type: string, transformFunction: MessageTransformFunction): () => void;
 }
-export type MessageTransformFunction = (session: Session, element: h, message: Message) => Promise<boolean | void>;
+export type MessageTransformFunction = (session: Session, element: h, message: Message, model?: string) => Promise<boolean | void>;

package/package.json

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