fix: add plugin set and knowledge bases selection in custom rules page (#3813)

fixes: #3806

astrbot/core/star/session_llm_manager.py

@@ -171,110 +171,3 @@ class SessionServiceManager:
 
         # 如果没有配置，默认为启用（兼容性考虑）
         return True
-
-    @staticmethod
-    def set_session_status(session_id: str, enabled: bool) -> None:
-        """设置会话的整体启停状态
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-            enabled: True表示启用，False表示禁用
-
-        """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
-        session_config["session_enabled"] = enabled
-        sp.put(
-            "session_service_config",
-            session_config,
-            scope="umo",
-            scope_id=session_id,
-        )
-
-        logger.info(
-            f"会话 {session_id} 的整体状态已更新为: {'启用' if enabled else '禁用'}",
-        )
-
-    @staticmethod
-    def should_process_session_request(event: AstrMessageEvent) -> bool:
-        """检查是否应该处理会话请求（会话整体启停检查）
-
-        Args:
-            event: 消息事件
-
-        Returns:
-            bool: True表示应该处理，False表示跳过
-
-        """
-        session_id = event.unified_msg_origin
-        return SessionServiceManager.is_session_enabled(session_id)
-
-    # =============================================================================
-    # 会话命名相关方法
-    # =============================================================================
-
-    @staticmethod
-    def get_session_custom_name(session_id: str) -> str | None:
-        """获取会话的自定义名称
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-
-        Returns:
-            str: 自定义名称，如果没有设置则返回None
-
-        """
-        session_services = sp.get(
-            "session_service_config",
-            {},
-            scope="umo",
-            scope_id=session_id,
-        )
-        return session_services.get("custom_name")
-
-    @staticmethod
-    def set_session_custom_name(session_id: str, custom_name: str) -> None:
-        """设置会话的自定义名称
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-            custom_name: 自定义名称，可以为空字符串来清除名称
-
-        """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
-        if custom_name and custom_name.strip():
-            session_config["custom_name"] = custom_name.strip()
-        else:
-            # 如果传入空名称，则删除自定义名称
-            session_config.pop("custom_name", None)
-        sp.put(
-            "session_service_config",
-            session_config,
-            scope="umo",
-            scope_id=session_id,
-        )
-
-        logger.info(
-            f"会话 {session_id} 的自定义名称已更新为: {custom_name.strip() if custom_name and custom_name.strip() else '已清除'}",
-        )
-
-    @staticmethod
-    def get_session_display_name(session_id: str) -> str:
-        """获取会话的显示名称（优先显示自定义名称，否则显示原始session_id的最后一段）
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-
-        Returns:
-            str: 显示名称
-
-        """
-        custom_name = SessionServiceManager.get_session_custom_name(session_id)
-        if custom_name:
-            return custom_name
-
-        # 如果没有自定义名称，返回session_id的最后一段
-        return session_id.split(":")[2] if session_id.count(":") >= 2 else session_id

astrbot/core/star/session_plugin_manager.py

@@ -42,87 +42,6 @@ class SessionPluginManager:
         # 如果都没有配置，默认为启用（兼容性考虑）
         return True
 
-    @staticmethod
-    def set_plugin_status_for_session(
-        session_id: str,
-        plugin_name: str,
-        enabled: bool,
-    ) -> None:
-        """设置插件在指定会话中的启停状态
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-            plugin_name: 插件名称
-            enabled: True表示启用，False表示禁用
-
-        """
-        # 获取当前配置
-        session_plugin_config = sp.get(
-            "session_plugin_config",
-            {},
-            scope="umo",
-            scope_id=session_id,
-        )
-        if session_id not in session_plugin_config:
-            session_plugin_config[session_id] = {
-                "enabled_plugins": [],
-                "disabled_plugins": [],
-            }
-
-        session_config = session_plugin_config[session_id]
-        enabled_plugins = session_config.get("enabled_plugins", [])
-        disabled_plugins = session_config.get("disabled_plugins", [])
-
-        if enabled:
-            # 启用插件
-            if plugin_name in disabled_plugins:
-                disabled_plugins.remove(plugin_name)
-            if plugin_name not in enabled_plugins:
-                enabled_plugins.append(plugin_name)
-        else:
-            # 禁用插件
-            if plugin_name in enabled_plugins:
-                enabled_plugins.remove(plugin_name)
-            if plugin_name not in disabled_plugins:
-                disabled_plugins.append(plugin_name)
-
-        # 保存配置
-        session_config["enabled_plugins"] = enabled_plugins
-        session_config["disabled_plugins"] = disabled_plugins
-        session_plugin_config[session_id] = session_config
-        sp.put(
-            "session_plugin_config",
-            session_plugin_config,
-            scope="umo",
-            scope_id=session_id,
-        )
-
-        logger.info(
-            f"会话 {session_id} 的插件 {plugin_name} 状态已更新为: {'启用' if enabled else '禁用'}",
-        )
-
-    @staticmethod
-    def get_session_plugin_config(session_id: str) -> dict[str, list[str]]:
-        """获取指定会话的插件配置
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-
-        Returns:
-            Dict[str, List[str]]: 包含enabled_plugins和disabled_plugins的字典
-
-        """
-        session_plugin_config = sp.get(
-            "session_plugin_config",
-            {},
-            scope="umo",
-            scope_id=session_id,
-        )
-        return session_plugin_config.get(
-            session_id,
-            {"enabled_plugins": [], "disabled_plugins": []},
-        )
-
     @staticmethod
     def filter_handlers_by_session(event: AstrMessageEvent, handlers: list) -> list:
         """根据会话配置过滤处理器列表

astrbot/dashboard/routes/knowledge_base.py

@@ -60,10 +60,6 @@ class KnowledgeBaseRoute(Route):
             # "/kb/media/delete": ("POST", self.delete_media),
             # 检索
             "/kb/retrieve": ("POST", self.retrieve),
-            # 会话知识库配置
-            "/kb/session/config/get": ("GET", self.get_session_kb_config),
-            "/kb/session/config/set": ("POST", self.set_session_kb_config),
-            "/kb/session/config/delete": ("POST", self.delete_session_kb_config),
         }
         self.register_routes()
 
@@ -920,158 +916,6 @@ class KnowledgeBaseRoute(Route):
             logger.error(traceback.format_exc())
             return Response().error(f"检索失败: {e!s}").__dict__
 
-    # ===== 会话知识库配置 API =====
-
-    async def get_session_kb_config(self):
-        """获取会话的知识库配置
-
-        Query 参数:
-        - session_id: 会话 ID (必填)
-
-        返回:
-        - kb_ids: 知识库 ID 列表
-        - top_k: 返回结果数量
-        - enable_rerank: 是否启用重排序
-        """
-        try:
-            from astrbot.core import sp
-
-            session_id = request.args.get("session_id")
-
-            if not session_id:
-                return Response().error("缺少参数 session_id").__dict__
-
-            # 从 SharedPreferences 获取配置
-            config = await sp.session_get(session_id, "kb_config", default={})
-
-            logger.debug(f"[KB配置] 读取到配置: session_id={session_id}")
-
-            # 如果没有配置，返回默认值
-            if not config:
-                config = {"kb_ids": [], "top_k": 5, "enable_rerank": True}
-
-            return Response().ok(config).__dict__
-
-        except Exception as e:
-            logger.error(f"[KB配置] 获取配置时出错: {e}", exc_info=True)
-            return Response().error(f"获取会话知识库配置失败: {e!s}").__dict__
-
-    async def set_session_kb_config(self):
-        """设置会话的知识库配置
-
-        Body:
-        - scope: 配置范围 (目前只支持 "session")
-        - scope_id: 会话 ID (必填)
-        - kb_ids: 知识库 ID 列表 (必填)
-        - top_k: 返回结果数量 (可选, 默认 5)
-        - enable_rerank: 是否启用重排序 (可选, 默认 true)
-        """
-        try:
-            from astrbot.core import sp
-
-            data = await request.json
-
-            scope = data.get("scope")
-            scope_id = data.get("scope_id")
-            kb_ids = data.get("kb_ids", [])
-            top_k = data.get("top_k", 5)
-            enable_rerank = data.get("enable_rerank", True)
-
-            # 验证参数
-            if scope != "session":
-                return Response().error("目前仅支持 session 范围的配置").__dict__
-
-            if not scope_id:
-                return Response().error("缺少参数 scope_id").__dict__
-
-            if not isinstance(kb_ids, list):
-                return Response().error("kb_ids 必须是列表").__dict__
-
-            # 验证知识库是否存在
-            kb_mgr = self._get_kb_manager()
-            invalid_ids = []
-            valid_ids = []
-            for kb_id in kb_ids:
-                kb_helper = await kb_mgr.get_kb(kb_id)
-                if kb_helper:
-                    valid_ids.append(kb_id)
-                else:
-                    invalid_ids.append(kb_id)
-                    logger.warning(f"[KB配置] 知识库不存在: {kb_id}")
-
-            if invalid_ids:
-                logger.warning(f"[KB配置] 以下知识库ID无效: {invalid_ids}")
-
-            # 允许保存空列表，表示明确不使用任何知识库
-            if kb_ids and not valid_ids:
-                # 只有当用户提供了 kb_ids 但全部无效时才报错
-                return Response().error(f"所有提供的知识库ID都无效: {kb_ids}").__dict__
-
-            # 如果 kb_ids 为空列表，表示用户想清空配置
-            if not kb_ids:
-                valid_ids = []
-
-            # 构建配置对象（只保存有效的ID）
-            config = {
-                "kb_ids": valid_ids,
-                "top_k": top_k,
-                "enable_rerank": enable_rerank,
-            }
-
-            # 保存到 SharedPreferences
-            await sp.session_put(scope_id, "kb_config", config)
-
-            # 立即验证是否保存成功
-            verify_config = await sp.session_get(scope_id, "kb_config", default={})
-
-            if verify_config == config:
-                return (
-                    Response()
-                    .ok(
-                        {"valid_ids": valid_ids, "invalid_ids": invalid_ids},
-                        "保存知识库配置成功",
-                    )
-                    .__dict__
-                )
-            logger.error("[KB配置] 配置保存失败，验证不匹配")
-            return Response().error("配置保存失败").__dict__
-
-        except Exception as e:
-            logger.error(f"[KB配置] 设置配置时出错: {e}", exc_info=True)
-            return Response().error(f"设置会话知识库配置失败: {e!s}").__dict__
-
-    async def delete_session_kb_config(self):
-        """删除会话的知识库配置
-
-        Body:
-        - scope: 配置范围 (目前只支持 "session")
-        - scope_id: 会话 ID (必填)
-        """
-        try:
-            from astrbot.core import sp
-
-            data = await request.json
-
-            scope = data.get("scope")
-            scope_id = data.get("scope_id")
-
-            # 验证参数
-            if scope != "session":
-                return Response().error("目前仅支持 session 范围的配置").__dict__
-
-            if not scope_id:
-                return Response().error("缺少参数 scope_id").__dict__
-
-            # 从 SharedPreferences 删除配置
-            await sp.session_remove(scope_id, "kb_config")
-
-            return Response().ok(message="删除知识库配置成功").__dict__
-
-        except Exception as e:
-            logger.error(f"删除会话知识库配置失败: {e}")
-            logger.error(traceback.format_exc())
-            return Response().error(f"删除会话知识库配置失败: {e!s}").__dict__
-
     async def upload_document_from_url(self):
         """从 URL 上传文档
 

astrbot/dashboard/routes/session_management.py

@@ -74,7 +74,10 @@ class SessionManagementRoute(Route):
                 umo_id = pref.scope_id
                 if umo_id not in umo_rules:
                     umo_rules[umo_id] = {}
-                umo_rules[umo_id][pref.key] = pref.value["val"]
+                if pref.key == "session_plugin_config" and umo_id in pref.value["val"]:
+                    umo_rules[umo_id][pref.key] = pref.value["val"][umo_id]
+                else:
+                    umo_rules[umo_id][pref.key] = pref.value["val"]
 
         # 搜索过滤
         if search:
@@ -185,6 +188,35 @@ class SessionManagementRoute(Route):
                 for p in provider_manager.tts_provider_insts
             ]
 
+            # 获取可用的插件列表（排除 reserved 的系统插件）
+            plugin_manager = self.core_lifecycle.plugin_manager
+            available_plugins = [
+                {
+                    "name": p.name,
+                    "display_name": p.display_name or p.name,
+                    "desc": p.desc,
+                }
+                for p in plugin_manager.context.get_all_stars()
+                if not p.reserved and p.name
+            ]
+
+            # 获取可用的知识库列表
+            available_kbs = []
+            kb_manager = self.core_lifecycle.kb_manager
+            if kb_manager:
+                try:
+                    kbs = await kb_manager.list_kbs()
+                    available_kbs = [
+                        {
+                            "kb_id": kb.kb_id,
+                            "kb_name": kb.kb_name,
+                            "emoji": kb.emoji,
+                        }
+                        for kb in kbs
+                    ]
+                except Exception as e:
+                    logger.warning(f"获取知识库列表失败: {e!s}")
+
             return (
                 Response()
                 .ok(
@@ -197,6 +229,8 @@ class SessionManagementRoute(Route):
                         "available_chat_providers": available_chat_providers,
                         "available_stt_providers": available_stt_providers,
                         "available_tts_providers": available_tts_providers,
+                        "available_plugins": available_plugins,
+                        "available_kbs": available_kbs,
                         "available_rule_keys": AVAILABLE_SESSION_RULE_KEYS,
                     }
                 )
@@ -229,6 +263,11 @@ class SessionManagementRoute(Route):
             if rule_key not in AVAILABLE_SESSION_RULE_KEYS:
                 return Response().error(f"不支持的规则键: {rule_key}").__dict__
 
+            if rule_key == "session_plugin_config":
+                rule_value = {
+                    umo: rule_value,
+                }
+
             # 使用 shared preferences 更新规则
             await sp.session_put(umo, rule_key, rule_value)