koishi-plugin-satori-ai 1.2.0-beta.2 → 1.2.1

package/lib/api.d.ts

@@ -13,6 +13,10 @@ export declare class APIClient {
         content: string;
         error: boolean;
     }>;
+    generateUserPortrait(user: User, messages: Sat.Msg[]): Promise<{
+        content: string;
+        error: boolean;
+    }>;
     private createPayload;
     private createAuxiliaryPayload;
     private tryRequest;

package/lib/index.js

@@ -137,7 +137,7 @@ function processPrompt(prompt) {
 }
 __name(processPrompt, "processPrompt");
 function filterResponse(prompt, words) {
-  const parts = prompt.split(/[(（][^)）]*[)）]/g);
+  const parts = prompt.split(/([（(][^）)]*[）)])/g);
   const filtered = parts.map((part) => {
     if (part.startsWith("（") && part.endsWith("）") || part.startsWith("(") && part.endsWith(")")) {
       return words.some((word) => part.includes(word)) ? "" : part;
@@ -176,7 +176,7 @@ var APIClient = class {
   // 发送聊天请求
   async chat(user, messages) {
     if (user.userid == "Alice")
-      return { content: "(系统)（用户）测试", error: false };
+      return { content: "(系统)（abc）测试", error: false };
     const enableUserKey = user?.items?.["地灵殿通行证"]?.description && user.items["地灵殿通行证"].description == "on";
     let keys;
     let modle;
@@ -205,7 +205,7 @@ var APIClient = class {
   }
   // 发送辅助聊天请求
   async auxiliaryChat(messages) {
-    const AuxiliaryPayload = this.createAuxiliaryPayload(messages);
+    const AuxiliaryPayload = this.createAuxiliaryPayload(messages, this.config.auxiliary_LLM);
     for (let i = 0; i < this.config.keys.length; i++) {
       try {
         return await this.tryRequest(this.config.auxiliary_LLM_URL, AuxiliaryPayload, this.config.auxiliary_LLM_key);
@@ -217,6 +217,34 @@ var APIClient = class {
       }
     }
   }
+  // 发送生成用户画像请求
+  async generateUserPortrait(user, messages) {
+    const enableUserKey = user?.items?.["地灵殿通行证"]?.description && user.items["地灵殿通行证"].description == "on";
+    let keys;
+    let modle;
+    let baseURL;
+    if (enableUserKey) {
+      const key = user.items["地灵殿通行证"].metadata?.key;
+      keys = [key];
+      modle = user.items["地灵殿通行证"].metadata?.model;
+      baseURL = user.items["地灵殿通行证"].metadata?.baseURL;
+    } else {
+      keys = this.config.keys;
+      modle = this.config.appointModel;
+      baseURL = this.config.baseURL;
+    }
+    const payload = this.createAuxiliaryPayload(messages, modle);
+    for (let i = 0; i < keys.length; i++) {
+      try {
+        return await this.tryRequest(baseURL, payload, keys);
+      } catch (error) {
+        if (i == keys.length - 1) {
+          return this.handleAPIError(error);
+        }
+        this.rotateKey();
+      }
+    }
+  }
   // 生成请求体
   createPayload(messages, model) {
     return {
@@ -230,9 +258,9 @@ var APIClient = class {
     };
   }
   // 生成辅助请求体
-  createAuxiliaryPayload(messages) {
+  createAuxiliaryPayload(messages, model) {
     return {
-      model: this.config.auxiliary_LLM,
+      model,
       messages,
       temperature: 0.1
     };
@@ -360,7 +388,7 @@ var MemoryManager = class {
   }
   // 是否应当记忆
   shouldRemember(content) {
-    return content.length >= this.config.remember_min_length && !this.config.memory_block_words.some((word) => content.includes(word));
+    return (content.length >= this.config.remember_min_length || content.includes("记住")) && !this.config.memory_block_words.some((word) => content.includes(word));
   }
   // 更新频道对话
   async updateChannelDialogue(session, prompt, name) {
@@ -987,7 +1015,7 @@ var Sat = class extends import_koishi5.Service {
     import_koishi5.Schema.object({
       alias: import_koishi5.Schema.array(String).default(["ai"]).description("触发命令;别名"),
       authority: import_koishi5.Schema.number().role("slider").min(0).max(5).step(1).description("允许使用的最低权限").default(1),
-      no_system_prompt: import_koishi5.Schema.boolean().default(false).description("是否将系统提示的system替换为user（用于一些特殊的api格式，例如硅基流动）"),
+      no_system_prompt: import_koishi5.Schema.boolean().default(false).description("是否将系统提示的system替换为user（用于具有思维链的模型或一些特殊的api格式，例如硅基流动）"),
       max_tokens: import_koishi5.Schema.number().description("最大请求长度（字符数）").default(100),
       content_max_tokens: import_koishi5.Schema.number().description("最大回答长度（思维链+输出token）").default(4096),
       content_max_length: import_koishi5.Schema.number().description("最大回答长度（仅输出，字符数）").default(100),
@@ -1031,7 +1059,9 @@ var Sat = class extends import_koishi5.Service {
       randnum: import_koishi5.Schema.number().role("slider").min(0).max(1).step(0.01).default(0).description("在群聊中随机触发对话的概率，如需关闭可设置为 0"),
       sentences_divide: import_koishi5.Schema.boolean().default(true).description("是否分句发送"),
       time_interval: import_koishi5.Schema.number().default(1e3).description("每句话的时间间隔"),
-      reply_pointing: import_koishi5.Schema.boolean().default(true).description("是否在与多人同时对话时显示回复指向")
+      reply_pointing: import_koishi5.Schema.boolean().default(true).description("是否在与多人同时对话时显示回复指向"),
+      enable_user_portrait: import_koishi5.Schema.boolean().default(true).description("是否启用用户画像功能"),
+      portrait_min_dialogues: import_koishi5.Schema.number().default(100).description("触发画像生成的最小对话条数")
     }).description("对话设置"),
     import_koishi5.Schema.object({
       enable_favorability: import_koishi5.Schema.boolean().default(false).description("是否开启好感度系统(每次对话默认+1好感度)"),
@@ -1056,11 +1086,7 @@ var Sat = class extends import_koishi5.Service {
     import_koishi5.Schema.object({
       enable_game: import_koishi5.Schema.boolean().default(false).description("是否开启游戏模块"),
       enable_gobang: import_koishi5.Schema.boolean().default(false).description("是否开启五子棋游戏")
-    }).description("拓展模块-游戏设置(开发中)"),
-    import_koishi5.Schema.object({
-      blockuser: import_koishi5.Schema.array(String).default([]).description("屏蔽的用户"),
-      blockchannel: import_koishi5.Schema.array(String).default([]).description("屏蔽的频道")
-    }).description("过滤器")
+    }).description("拓展模块-游戏设置(开发中)")
   ]);
 })(Sat || (Sat = {}));
 
@@ -1084,6 +1110,7 @@ var SAT = class extends Sat {
   }
   apiClient;
   memoryManager;
+  //private portraitManager: UserPortraitManager
   ChannelParallelCount = /* @__PURE__ */ new Map();
   onlineUsers = [];
   getAPIConfig() {
@@ -1239,10 +1266,6 @@ var SAT = class extends Sat {
   }
   // 前置检查
   performPreChecks(session, prompt) {
-    if (this.config.blockuser.includes(session.userId))
-      return "";
-    if (this.config.blockchannel.includes(session.channelId))
-      return "";
     if (!prompt)
       return session.text("commands.sat.messages.no-prompt");
     if (prompt.length > this.config.max_tokens)
@@ -1286,9 +1309,9 @@ var SAT = class extends Sat {
   }
   // 对话次数检查
   async checkUserDialogueCount(session, user, adjustment = 1) {
+    const usage = await updateUserUsage(this.ctx, user, adjustment);
     if (user?.items?.["地灵殿通行证"]?.description && user.items["地灵殿通行证"].description === "on")
       return null;
-    const usage = await updateUserUsage(this.ctx, user, adjustment);
     const level = user.userlevel || 0;
     const usageLimit = this.config.max_usage[level] || 0;
     if (usage && usageLimit != 0 && usage > usageLimit) {
@@ -1380,7 +1403,7 @@ ${payload}`);
     if (this.config.enable_favorability) {
       systemPrompt += generateLevelPrompt(getFavorabilityLevel(user, this.getFavorabilityConfig()), this.getFavorabilityConfig(), user);
     }
-    if (this.config.personal_memory)
+    if (this.config.no_system_prompt)
       systemPrompt += "如果你明白以上内容，请回复“已明确对话要求”";
     return systemPrompt;
   }

package/lib/types.d.ts

@@ -189,6 +189,8 @@ export declare namespace Sat {
         time_interval: number;
         max_parallel_count: number;
         reply_pointing: boolean;
+        enable_user_portrait: boolean;
+        portrait_min_dialogues: number;
         enable_favorability: boolean;
         max_favorability_perday: number;
         input_censor_favorability: boolean;
@@ -207,8 +209,6 @@ export declare namespace Sat {
         prompt_3: string;
         favorability_div_4: number;
         prompt_4: string;
-        blockuser: string[];
-        blockchannel: string[];
         maxRetryTimes: number;
         retry_delay_time: number;
     }

package/lib/userportrait.d.ts

@@ -0,0 +1,16 @@
+import { Context, Session } from 'koishi';
+import { Sat, User } from './types';
+import { APIClient } from './api';
+export declare class UserPortraitManager {
+    private ctx;
+    private config;
+    constructor(ctx: Context, config: Sat.Config);
+    private getPortraitPath;
+    hasPortrait(userId: string): boolean;
+    readPortrait(userId: string): string;
+    private processDialogues;
+    private buildPrompt;
+    generatePortrait(session: Session, user: User, apiClient: APIClient): Promise<void>;
+    enhanceSystemPrompt(session: Session): string;
+    private getFavorabilityConfig;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-satori-ai",
   "description": "基于 Satori 适配器的智能对话插件，具备长期记忆、常识管理和好感度系统",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "types": "lib/index.d.ts",