koishi-plugin-chatluna-long-memory 1.2.6 → 1.2.8

package/lib/index.cjs

@@ -57,7 +57,7 @@ __export(index_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(index_exports);
-var import_koishi3 = require("koishi");
+var import_koishi2 = require("koishi");
 var import_chat = require("koishi-plugin-chatluna/services/chat");
 var import_logger = require("koishi-plugin-chatluna/utils/logger");
 
@@ -66,7 +66,7 @@ var import_koishi_plugin_chatluna2 = require("koishi-plugin-chatluna");
 var import_chains = require("koishi-plugin-chatluna/chains");
 
 // src/utils/layer.ts
-var import_base = require("koishi-plugin-chatluna/llm-core/model/base");
+var import_vectorstores = require("koishi-plugin-chatluna/llm-core/vectorstores");
 
 // src/utils/similarity.ts
 var import_jieba_wasm = require("jieba-wasm");
@@ -522,6 +522,13 @@ var VectorStoreMemoryLayer = class extends BaseMemoryRetrievalLayer {
     this.vectorStore = this.retriever.vectorStore;
   }
   async retrieveMemory(searchContent) {
+    if (!this.vectorStore) {
+      logger2?.warn("Vector store not initialized");
+      return;
+    }
+    if (!this.vectorStore.checkActive(false)) {
+      await this.initialize();
+    }
     let memory = await this.retriever.invoke(searchContent);
     if (this.config.longMemoryTFIDFThreshold > 0) {
       memory = filterSimilarMemoryByBM25(
@@ -548,7 +555,7 @@ var VectorStoreMemoryLayer = class extends BaseMemoryRetrievalLayer {
     await this.vectorStore.addDocuments(
       memories.map(enhancedMemoryToDocument)
     );
-    if (this.vectorStore instanceof import_base.ChatLunaSaveableVectorStore) {
+    if (this.vectorStore instanceof import_vectorstores.ChatLunaSaveableVectorStore) {
       logger2?.debug("saving vector store");
       try {
         await this.vectorStore.save();
@@ -561,12 +568,15 @@ var VectorStoreMemoryLayer = class extends BaseMemoryRetrievalLayer {
     if (!this.vectorStore) {
       return;
     }
+    if (!this.vectorStore.checkActive(false)) {
+      await this.initialize();
+    }
     await this.vectorStore.delete({ deleteAll: true });
   }
   async deleteMemories(memoryIds) {
     if (typeof this.vectorStore.delete === "function") {
       await this.vectorStore.delete({ ids: memoryIds });
-      if (this.vectorStore instanceof import_base.ChatLunaSaveableVectorStore) {
+      if (this.vectorStore instanceof import_vectorstores.ChatLunaSaveableVectorStore) {
         await this.vectorStore.save();
       }
       logger2?.debug(`Deleted ${memoryIds.length} expired memories`);
@@ -608,7 +618,7 @@ async function createVectorStoreRetriever(ctx, config, longMemoryId) {
   const [platform, model] = (0, import_count_tokens.parseRawModelName)(
     ctx.chatluna.config.defaultEmbeddings
   );
-  const embeddingModel = await ctx.chatluna.createEmbeddings(platform, model);
+  const embeddingModel = await ctx.chatluna.createEmbeddings(platform, model).then((model2) => model2.value);
   const vectorStore = await ctx.chatluna.platform.createVectorStore(
     ctx.chatluna.config.defaultVectorStore,
     {
@@ -907,7 +917,7 @@ async function generateNewQuestion(ctx, config, chatHistory, question) {
   const [platform, modelName] = (0, import_count_tokens2.parseRawModelName)(
     config.longMemoryExtractModel
   );
-  const model = await ctx.chatluna.createChatModel(platform, modelName);
+  const model = await ctx.chatluna.createChatModel(platform, modelName).then((model2) => model2.value);
   const prompt = `
 Given the following conversation history and the user's question, generate a new search query that will help retrieve relevant information from a long-term memory database. The search query should be concise and focused on the key information needs.
 
@@ -943,10 +953,7 @@ async function extractMemoriesFromChat(ctx, config, chatInterface, chatHistory)
   const [platform, modelName] = (0, import_count_tokens2.parseRawModelName)(
     config.longMemoryExtractModel
   );
-  const model = await ctx.chatluna.createChatModel(
-    platform,
-    modelName
-  );
+  const model = await ctx.chatluna.createChatModel(platform, modelName).then((model2) => model2.value);
   const extractMemory = /* @__PURE__ */ __name(async () => {
     const result = await model.invoke(input);
     logger2?.debug(`Long memory extract model result: ${result.content}`);
@@ -1166,26 +1173,11 @@ function apply3(ctx, config) {
 __name(apply3, "apply");
 
 // src/plugins/config.ts
-var import_koishi = require("koishi");
-var import_types4 = require("koishi-plugin-chatluna/llm-core/platform/types");
+var import_schema = require("koishi-plugin-chatluna/utils/schema");
 async function apply4(ctx, config) {
-  ctx.on("chatluna/model-added", (service) => {
-    ctx.schema.set("model", import_koishi.Schema.union(getModelNames(service)));
-  });
-  ctx.on("chatluna/model-removed", (service) => {
-    ctx.schema.set("model", import_koishi.Schema.union(getModelNames(service)));
-  });
-  ctx.schema.set("model", import_koishi.Schema.union(getModelNames(ctx.chatluna.platform)));
+  (0, import_schema.modelSchema)(ctx);
 }
 __name(apply4, "apply");
-function getModelNames(service) {
-  const models = service.getAllModels(import_types4.ModelType.llm).map((m) => import_koishi.Schema.const(m));
-  if (models.length < 1) {
-    models.push(import_koishi.Schema.const("无"));
-  }
-  return models;
-}
-__name(getModelNames, "getModelNames");
 
 // src/plugins/delete_memory.ts
 var import_koishi_plugin_chatluna4 = require("koishi-plugin-chatluna");
@@ -1377,7 +1369,7 @@ async function apply8(ctx, config, plugin) {
     selector(history) {
       return true;
     },
-    async createTool(params) {
+    createTool(params) {
       return new MemorySearchTool(ctx, params);
     }
   });
@@ -1385,7 +1377,7 @@ async function apply8(ctx, config, plugin) {
     selector(history) {
       return true;
     },
-    async createTool(params) {
+    createTool(params) {
       return new MemoryAddTool(ctx, params);
     }
   });
@@ -1393,7 +1385,7 @@ async function apply8(ctx, config, plugin) {
     selector(history) {
       return true;
     },
-    async createTool(params) {
+    createTool(params) {
       return new MemoryDeleteTool(ctx, params);
     }
   });
@@ -1424,7 +1416,7 @@ var MemorySearchTool = class extends import_tools.StructuredTool {
   async _call(input, _, config) {
     try {
       const result = await this.ctx.chatluna_long_memory.retrieveMemory(
-        config.metadata.conversationId,
+        config.configurable.conversationId,
         input.content,
         input.layer != null ? input.layer.map(
           (layer) => MemoryRetrievalLayerType[layer.toUpperCase()]
@@ -1489,7 +1481,7 @@ var MemoryAddTool = class extends import_tools.StructuredTool {
         };
       });
       await this.ctx.chatluna_long_memory.addMemories(
-        config.metadata.conversationId,
+        config.configurable.conversationId,
         enhancedMemories,
         input.layer != null ? input.layer.map(
           (layer) => MemoryRetrievalLayerType[layer.toUpperCase()]
@@ -1544,7 +1536,7 @@ var MemoryDeleteTool = class extends import_tools.StructuredTool {
   async _call(input, _, config) {
     try {
       await this.ctx.chatluna_long_memory.deleteMemories(
-        config.metadata.conversationId,
+        config.configurable.conversationId,
         input.memoryIds,
         input.layer != null ? input.layer.map(
           (layer) => MemoryRetrievalLayerType[layer.toUpperCase()]
@@ -1592,8 +1584,8 @@ async function plugins(ctx, parent, plugin) {
 __name(plugins, "plugins");
 
 // src/service/memory.ts
-var import_koishi2 = require("koishi");
-var ChatLunaLongMemoryService = class extends import_koishi2.Service {
+var import_koishi = require("koishi");
+var ChatLunaLongMemoryService = class extends import_koishi.Service {
   constructor(ctx, config) {
     super(ctx, "chatluna_long_memory", true);
     this.ctx = ctx;
@@ -1703,7 +1695,6 @@ function apply9(ctx, config) {
     false
   );
   ctx.on("ready", async () => {
-    plugin.registerToService();
     ctx.plugin(ChatLunaLongMemoryService, config);
     ctx.inject(["chatluna_long_memory"], (ctx2) => {
       ctx2.on("ready", async () => {
@@ -1713,23 +1704,23 @@ function apply9(ctx, config) {
   });
 }
 __name(apply9, "apply");
-var Config7 = import_koishi3.Schema.intersect([
-  import_koishi3.Schema.object({
-    longMemoryInterval: import_koishi3.Schema.number().default(3).min(1).max(10),
-    longMemoryNewQuestionSearch: import_koishi3.Schema.boolean().default(false),
-    longMemorySimilarity: import_koishi3.Schema.percent().min(0).max(1).step(0.01).default(0.3),
-    longMemoryTFIDFThreshold: import_koishi3.Schema.percent().min(0).max(1).step(0.01).default(0),
-    longMemoryDuplicateCheck: import_koishi3.Schema.boolean().default(true),
-    longMemoryDuplicateThreshold: import_koishi3.Schema.percent().min(0).max(1).step(0.01).default(0.8),
-    longMemoryLayer: import_koishi3.Schema.array(
-      import_koishi3.Schema.union([
-        import_koishi3.Schema.const("Global"),
-        import_koishi3.Schema.const("Preset"),
-        import_koishi3.Schema.const("Preset_User"),
-        import_koishi3.Schema.const("User")
+var Config7 = import_koishi2.Schema.intersect([
+  import_koishi2.Schema.object({
+    longMemoryInterval: import_koishi2.Schema.number().default(3).min(1).max(10),
+    longMemoryNewQuestionSearch: import_koishi2.Schema.boolean().default(false),
+    longMemorySimilarity: import_koishi2.Schema.percent().min(0).max(1).step(0.01).default(0.3),
+    longMemoryTFIDFThreshold: import_koishi2.Schema.percent().min(0).max(1).step(0.01).default(0),
+    longMemoryDuplicateCheck: import_koishi2.Schema.boolean().default(true),
+    longMemoryDuplicateThreshold: import_koishi2.Schema.percent().min(0).max(1).step(0.01).default(0.8),
+    longMemoryLayer: import_koishi2.Schema.array(
+      import_koishi2.Schema.union([
+        import_koishi2.Schema.const("Global"),
+        import_koishi2.Schema.const("Preset"),
+        import_koishi2.Schema.const("Preset_User"),
+        import_koishi2.Schema.const("User")
       ])
     ).role("checkbox").default(["Preset_User"]),
-    longMemoryExtractModel: import_koishi3.Schema.dynamic("model").default("无")
+    longMemoryExtractModel: import_koishi2.Schema.dynamic("model").default("无")
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/index.mjs

@@ -20,7 +20,7 @@ var require_en_US_schema = __commonJS({
 });
 
 // src/index.ts
-import { Schema as Schema2 } from "koishi";
+import { Schema } from "koishi";
 import { ChatLunaPlugin } from "koishi-plugin-chatluna/services/chat";
 import { createLogger } from "koishi-plugin-chatluna/utils/logger";
 
@@ -29,7 +29,7 @@ import { logger as logger3 } from "koishi-plugin-chatluna";
 import { ChainMiddlewareRunStatus } from "koishi-plugin-chatluna/chains";
 
 // src/utils/layer.ts
-import { ChatLunaSaveableVectorStore } from "koishi-plugin-chatluna/llm-core/model/base";
+import { ChatLunaSaveableVectorStore } from "koishi-plugin-chatluna/llm-core/vectorstores";
 
 // src/utils/similarity.ts
 import { cut } from "jieba-wasm";
@@ -485,6 +485,13 @@ var VectorStoreMemoryLayer = class extends BaseMemoryRetrievalLayer {
     this.vectorStore = this.retriever.vectorStore;
   }
   async retrieveMemory(searchContent) {
+    if (!this.vectorStore) {
+      logger2?.warn("Vector store not initialized");
+      return;
+    }
+    if (!this.vectorStore.checkActive(false)) {
+      await this.initialize();
+    }
     let memory = await this.retriever.invoke(searchContent);
     if (this.config.longMemoryTFIDFThreshold > 0) {
       memory = filterSimilarMemoryByBM25(
@@ -524,6 +531,9 @@ var VectorStoreMemoryLayer = class extends BaseMemoryRetrievalLayer {
     if (!this.vectorStore) {
       return;
     }
+    if (!this.vectorStore.checkActive(false)) {
+      await this.initialize();
+    }
     await this.vectorStore.delete({ deleteAll: true });
   }
   async deleteMemories(memoryIds) {
@@ -571,7 +581,7 @@ async function createVectorStoreRetriever(ctx, config, longMemoryId) {
   const [platform, model] = parseRawModelName(
     ctx.chatluna.config.defaultEmbeddings
   );
-  const embeddingModel = await ctx.chatluna.createEmbeddings(platform, model);
+  const embeddingModel = await ctx.chatluna.createEmbeddings(platform, model).then((model2) => model2.value);
   const vectorStore = await ctx.chatluna.platform.createVectorStore(
     ctx.chatluna.config.defaultVectorStore,
     {
@@ -873,7 +883,7 @@ async function generateNewQuestion(ctx, config, chatHistory, question) {
   const [platform, modelName] = parseRawModelName2(
     config.longMemoryExtractModel
   );
-  const model = await ctx.chatluna.createChatModel(platform, modelName);
+  const model = await ctx.chatluna.createChatModel(platform, modelName).then((model2) => model2.value);
   const prompt = `
 Given the following conversation history and the user's question, generate a new search query that will help retrieve relevant information from a long-term memory database. The search query should be concise and focused on the key information needs.
 
@@ -909,10 +919,7 @@ async function extractMemoriesFromChat(ctx, config, chatInterface, chatHistory)
   const [platform, modelName] = parseRawModelName2(
     config.longMemoryExtractModel
   );
-  const model = await ctx.chatluna.createChatModel(
-    platform,
-    modelName
-  );
+  const model = await ctx.chatluna.createChatModel(platform, modelName).then((model2) => model2.value);
   const extractMemory = /* @__PURE__ */ __name(async () => {
     const result = await model.invoke(input);
     logger2?.debug(`Long memory extract model result: ${result.content}`);
@@ -1132,26 +1139,11 @@ function apply3(ctx, config) {
 __name(apply3, "apply");
 
 // src/plugins/config.ts
-import { Schema } from "koishi";
-import { ModelType } from "koishi-plugin-chatluna/llm-core/platform/types";
+import { modelSchema } from "koishi-plugin-chatluna/utils/schema";
 async function apply4(ctx, config) {
-  ctx.on("chatluna/model-added", (service) => {
-    ctx.schema.set("model", Schema.union(getModelNames(service)));
-  });
-  ctx.on("chatluna/model-removed", (service) => {
-    ctx.schema.set("model", Schema.union(getModelNames(service)));
-  });
-  ctx.schema.set("model", Schema.union(getModelNames(ctx.chatluna.platform)));
+  modelSchema(ctx);
 }
 __name(apply4, "apply");
-function getModelNames(service) {
-  const models = service.getAllModels(ModelType.llm).map((m) => Schema.const(m));
-  if (models.length < 1) {
-    models.push(Schema.const("无"));
-  }
-  return models;
-}
-__name(getModelNames, "getModelNames");
 
 // src/plugins/delete_memory.ts
 import { logger as logger6 } from "koishi-plugin-chatluna";
@@ -1343,7 +1335,7 @@ async function apply8(ctx, config, plugin) {
     selector(history) {
       return true;
     },
-    async createTool(params) {
+    createTool(params) {
       return new MemorySearchTool(ctx, params);
     }
   });
@@ -1351,7 +1343,7 @@ async function apply8(ctx, config, plugin) {
     selector(history) {
       return true;
     },
-    async createTool(params) {
+    createTool(params) {
       return new MemoryAddTool(ctx, params);
     }
   });
@@ -1359,7 +1351,7 @@ async function apply8(ctx, config, plugin) {
     selector(history) {
       return true;
     },
-    async createTool(params) {
+    createTool(params) {
       return new MemoryDeleteTool(ctx, params);
     }
   });
@@ -1390,7 +1382,7 @@ var MemorySearchTool = class extends StructuredTool {
   async _call(input, _, config) {
     try {
       const result = await this.ctx.chatluna_long_memory.retrieveMemory(
-        config.metadata.conversationId,
+        config.configurable.conversationId,
         input.content,
         input.layer != null ? input.layer.map(
           (layer) => MemoryRetrievalLayerType[layer.toUpperCase()]
@@ -1455,7 +1447,7 @@ var MemoryAddTool = class extends StructuredTool {
         };
       });
       await this.ctx.chatluna_long_memory.addMemories(
-        config.metadata.conversationId,
+        config.configurable.conversationId,
         enhancedMemories,
         input.layer != null ? input.layer.map(
           (layer) => MemoryRetrievalLayerType[layer.toUpperCase()]
@@ -1510,7 +1502,7 @@ var MemoryDeleteTool = class extends StructuredTool {
   async _call(input, _, config) {
     try {
       await this.ctx.chatluna_long_memory.deleteMemories(
-        config.metadata.conversationId,
+        config.configurable.conversationId,
         input.memoryIds,
         input.layer != null ? input.layer.map(
           (layer) => MemoryRetrievalLayerType[layer.toUpperCase()]
@@ -1669,7 +1661,6 @@ function apply9(ctx, config) {
     false
   );
   ctx.on("ready", async () => {
-    plugin.registerToService();
     ctx.plugin(ChatLunaLongMemoryService, config);
     ctx.inject(["chatluna_long_memory"], (ctx2) => {
       ctx2.on("ready", async () => {
@@ -1679,23 +1670,23 @@ function apply9(ctx, config) {
   });
 }
 __name(apply9, "apply");
-var Config7 = Schema2.intersect([
-  Schema2.object({
-    longMemoryInterval: Schema2.number().default(3).min(1).max(10),
-    longMemoryNewQuestionSearch: Schema2.boolean().default(false),
-    longMemorySimilarity: Schema2.percent().min(0).max(1).step(0.01).default(0.3),
-    longMemoryTFIDFThreshold: Schema2.percent().min(0).max(1).step(0.01).default(0),
-    longMemoryDuplicateCheck: Schema2.boolean().default(true),
-    longMemoryDuplicateThreshold: Schema2.percent().min(0).max(1).step(0.01).default(0.8),
-    longMemoryLayer: Schema2.array(
-      Schema2.union([
-        Schema2.const("Global"),
-        Schema2.const("Preset"),
-        Schema2.const("Preset_User"),
-        Schema2.const("User")
+var Config7 = Schema.intersect([
+  Schema.object({
+    longMemoryInterval: Schema.number().default(3).min(1).max(10),
+    longMemoryNewQuestionSearch: Schema.boolean().default(false),
+    longMemorySimilarity: Schema.percent().min(0).max(1).step(0.01).default(0.3),
+    longMemoryTFIDFThreshold: Schema.percent().min(0).max(1).step(0.01).default(0),
+    longMemoryDuplicateCheck: Schema.boolean().default(true),
+    longMemoryDuplicateThreshold: Schema.percent().min(0).max(1).step(0.01).default(0.8),
+    longMemoryLayer: Schema.array(
+      Schema.union([
+        Schema.const("Global"),
+        Schema.const("Preset"),
+        Schema.const("Preset_User"),
+        Schema.const("User")
       ])
     ).role("checkbox").default(["Preset_User"]),
-    longMemoryExtractModel: Schema2.dynamic("model").default("无")
+    longMemoryExtractModel: Schema.dynamic("model").default("无")
   })
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),

package/lib/plugins/tool.d.ts

@@ -15,10 +15,10 @@ export declare class MemorySearchTool extends StructuredTool {
         layer: z.ZodArray<z.ZodUnion<[z.ZodLiteral<"user">, z.ZodLiteral<"preset_user">, z.ZodLiteral<"preset">, z.ZodLiteral<"global">]>, "many">;
     }, "strip", z.ZodTypeAny, {
         content?: string;
-        layer?: ("global" | "preset" | "user" | "preset_user")[];
+        layer?: ("user" | "preset_user" | "preset" | "global")[];
     }, {
         content?: string;
-        layer?: ("global" | "preset" | "user" | "preset_user")[];
+        layer?: ("user" | "preset_user" | "preset" | "global")[];
     }>;
     constructor(ctx: Context, params: CreateToolParams);
     /** @ignore */
@@ -35,28 +35,28 @@ export declare class MemoryAddTool extends StructuredTool {
             type: z.ZodNativeEnum<typeof MemoryType>;
             importance: z.ZodNumber;
         }, "strip", z.ZodTypeAny, {
-            importance?: number;
-            type?: MemoryType;
             content?: string;
-        }, {
-            importance?: number;
             type?: MemoryType;
+            importance?: number;
+        }, {
             content?: string;
+            type?: MemoryType;
+            importance?: number;
         }>, "many">;
         layer: z.ZodArray<z.ZodUnion<[z.ZodLiteral<"user">, z.ZodLiteral<"preset_user">, z.ZodLiteral<"preset">, z.ZodLiteral<"global">]>, "many">;
     }, "strip", z.ZodTypeAny, {
-        layer?: ("global" | "preset" | "user" | "preset_user")[];
+        layer?: ("user" | "preset_user" | "preset" | "global")[];
         memories?: {
-            importance?: number;
-            type?: MemoryType;
             content?: string;
+            type?: MemoryType;
+            importance?: number;
         }[];
     }, {
-        layer?: ("global" | "preset" | "user" | "preset_user")[];
+        layer?: ("user" | "preset_user" | "preset" | "global")[];
         memories?: {
-            importance?: number;
-            type?: MemoryType;
             content?: string;
+            type?: MemoryType;
+            importance?: number;
         }[];
     }>;
     constructor(ctx: Context, params: CreateToolParams);

package/lib/utils/layer.d.ts

@@ -1,6 +1,6 @@
 import { Config } from '..';
 import { VectorStoreRetriever } from '@langchain/core/vectorstores';
-import { ChatLunaSaveableVectorStore } from 'koishi-plugin-chatluna/llm-core/model/base';
+import { ChatLunaSaveableVectorStore } from 'koishi-plugin-chatluna/llm-core/vectorstores';
 import { Context } from 'koishi';
 import { EnhancedMemory, MemoryRetrievalLayerInfo, MemoryRetrievalLayerType } from '../types';
 interface MemoryRetrievalLayer {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-long-memory",
   "description": "long memory for chatluna",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -63,20 +63,20 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.7",
-    "koishi-plugin-chatluna": "^1.3.0-alpha.28"
+    "koishi-plugin-chatluna": "^1.3.0-alpha.42"
   },
   "resolutions": {
     "@langchain/core": "0.3.62",
-    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.19"
+    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.21"
   },
   "overrides": {
     "@langchain/core": "0.3.62",
-    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.19"
+    "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.21"
   },
   "pnpm": {
     "overrides": {
       "@langchain/core": "0.3.62",
-      "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.19"
+      "js-tiktoken": "npm:@dingyi222666/js-tiktoken@^1.0.21"
     }
   },
   "koishi": {