AstrBot 4.6.1__py3-none-any.whl → 4.7.1__py3-none-any.whl

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/core/umop_config_router.py

@@ -85,3 +85,22 @@ class UmopConfigRouter:
 
         self.umop_to_conf_id[umo] = conf_id
         await self.sp.global_put("umop_config_routing", self.umop_to_conf_id)
+
+    async def delete_route(self, umo: str):
+        """删除一条路由
+
+        Args:
+            umo (str): 需要删除的 UMO 字符串
+
+        Raises:
+            ValueError: 当 umo 格式不正确时抛出
+        """
+
+        if not isinstance(umo, str) or len(umo.split(":")) != 3:
+            raise ValueError(
+                "umop must be a string in the format [platform_id]:[message_type]:[session_id], with optional wildcards * or empty for all",
+            )
+
+        if umo in self.umop_to_conf_id:
+            del self.umop_to_conf_id[umo]
+            await self.sp.global_put("umop_config_routing", self.umop_to_conf_id)

astrbot/core/utils/migra_helper.py

@@ -0,0 +1,73 @@
+import traceback
+
+from astrbot.core import astrbot_config, logger
+from astrbot.core.astrbot_config_mgr import AstrBotConfig, AstrBotConfigManager
+from astrbot.core.db.migration.migra_45_to_46 import migrate_45_to_46
+from astrbot.core.db.migration.migra_webchat_session import migrate_webchat_session
+
+
+def _migra_agent_runner_configs(conf: AstrBotConfig, ids_map: dict) -> None:
+    """
+    Migra agent runner configs from provider configs.
+    """
+    try:
+        default_prov_id = conf["provider_settings"]["default_provider_id"]
+        if default_prov_id in ids_map:
+            conf["provider_settings"]["default_provider_id"] = ""
+            p = ids_map[default_prov_id]
+            if p["type"] == "dify":
+                conf["provider_settings"]["dify_agent_runner_provider_id"] = p["id"]
+                conf["provider_settings"]["agent_runner_type"] = "dify"
+            elif p["type"] == "coze":
+                conf["provider_settings"]["coze_agent_runner_provider_id"] = p["id"]
+                conf["provider_settings"]["agent_runner_type"] = "coze"
+            elif p["type"] == "dashscope":
+                conf["provider_settings"]["dashscope_agent_runner_provider_id"] = p[
+                    "id"
+                ]
+                conf["provider_settings"]["agent_runner_type"] = "dashscope"
+            conf.save_config()
+    except Exception as e:
+        logger.error(f"Migration for third party agent runner configs failed: {e!s}")
+        logger.error(traceback.format_exc())
+
+
+async def migra(
+    db, astrbot_config_mgr, umop_config_router, acm: AstrBotConfigManager
+) -> None:
+    """
+    Stores the migration logic here.
+    btw, i really don't like migration :(
+    """
+    # 4.5 to 4.6 migration for umop_config_router
+    try:
+        await migrate_45_to_46(astrbot_config_mgr, umop_config_router)
+    except Exception as e:
+        logger.error(f"Migration from version 4.5 to 4.6 failed: {e!s}")
+        logger.error(traceback.format_exc())
+
+    # migration for webchat session
+    try:
+        await migrate_webchat_session(db)
+    except Exception as e:
+        logger.error(f"Migration for webchat session failed: {e!s}")
+        logger.error(traceback.format_exc())
+
+    # migra third party agent runner configs
+    _c = False
+    providers = astrbot_config["provider"]
+    ids_map = {}
+    for prov in providers:
+        type_ = prov.get("type")
+        if type_ in ["dify", "coze", "dashscope"]:
+            prov["provider_type"] = "agent_runner"
+            ids_map[prov["id"]] = {
+                "type": type_,
+                "id": prov["id"],
+            }
+            _c = True
+    if _c:
+        astrbot_config.save_config()
+
+    for conf in acm.confs.values():
+        _migra_agent_runner_configs(conf, ids_map)

astrbot/core/utils/shared_preferences.py

@@ -40,9 +40,6 @@ class SharedPreferences:
             else:
                 ret = default
             return ret
-        raise ValueError(
-            "scope_id and key cannot be None when getting a specific preference.",
-        )
 
     async def range_get_async(
         self,
@@ -56,30 +53,6 @@ class SharedPreferences:
         ret = await self.db_helper.get_preferences(scope, scope_id, key)
         return ret
 
-    @overload
-    async def session_get(
-        self,
-        umo: None,
-        key: str,
-        default: Any = None,
-    ) -> list[Preference]: ...
-
-    @overload
-    async def session_get(
-        self,
-        umo: str,
-        key: None,
-        default: Any = None,
-    ) -> list[Preference]: ...
-
-    @overload
-    async def session_get(
-        self,
-        umo: None,
-        key: None,
-        default: Any = None,
-    ) -> list[Preference]: ...
-
     async def session_get(
         self,
         umo: str | None,
@@ -88,7 +61,7 @@ class SharedPreferences:
     ) -> _VT | list[Preference]:
         """获取会话范围的偏好设置
 
-        Note: 当 scope_id 或者 key 为 None，时，返回 Preference 列表，其中的 value 属性是一个 dict，value["val"] 为值。
+        Note: 当 umo 或者 key 为 None，时，返回 Preference 列表，其中的 value 属性是一个 dict，value["val"] 为值。
         """
         if umo is None or key is None:
             return await self.range_get_async("umo", umo, key)

astrbot/dashboard/routes/chat.py

@@ -56,6 +56,7 @@ class ChatRoute(Route):
         self.conv_mgr = core_lifecycle.conversation_manager
         self.platform_history_mgr = core_lifecycle.platform_message_history_manager
         self.db = db
+        self.umop_config_router = core_lifecycle.umop_config_router
 
         self.running_convs: dict[str, bool] = {}
 
@@ -266,7 +267,8 @@ class ChatRoute(Route):
             return Response().error("Permission denied").__dict__
 
         # 删除该会话下的所有对话
-        unified_msg_origin = f"{session.platform_id}:FriendMessage:{session.platform_id}!{username}!{session_id}"
+        message_type = "GroupMessage" if session.is_group else "FriendMessage"
+        unified_msg_origin = f"{session.platform_id}:{message_type}:{session.platform_id}!{username}!{session_id}"
         await self.conv_mgr.delete_conversations_by_user_id(unified_msg_origin)
 
         # 删除消息历史
@@ -276,6 +278,16 @@ class ChatRoute(Route):
             offset_sec=99999999,
         )
 
+        # 删除与会话关联的配置路由
+        try:
+            await self.umop_config_router.delete_route(unified_msg_origin)
+        except ValueError as exc:
+            logger.warning(
+                "Failed to delete UMO route %s during session cleanup: %s",
+                unified_msg_origin,
+                exc,
+            )
+
         # 清理队列（仅对 webchat）
         if session.platform_id == "webchat":
             webchat_queue_mgr.remove_queues(session_id)

astrbot/dashboard/routes/config.py

@@ -14,6 +14,7 @@ from astrbot.core.config.default import (
     DEFAULT_CONFIG,
     DEFAULT_VALUE_MAP,
 )
+from astrbot.core.config.i18n_utils import ConfigMetadataI18n
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.platform.register import platform_cls_map, platform_registry
 from astrbot.core.provider import Provider
@@ -133,7 +134,9 @@ def save_config(post_config: dict, config: AstrBotConfig, is_core: bool = False)
                 is_core,
             )
         else:
-            errors, post_config = validate_config(post_config, config.schema, is_core)
+            errors, post_config = validate_config(
+                post_config, getattr(config, "schema", {}), is_core
+            )
     except BaseException as e:
         logger.error(traceback.format_exc())
         logger.warning(f"验证配置时出现异常: {e}")
@@ -247,11 +250,8 @@ class ConfigRoute(Route):
 
     async def get_default_config(self):
         """获取默认配置文件"""
-        return (
-            Response()
-            .ok({"config": DEFAULT_CONFIG, "metadata": CONFIG_METADATA_3})
-            .__dict__
-        )
+        metadata = ConfigMetadataI18n.convert_to_i18n_keys(CONFIG_METADATA_3)
+        return Response().ok({"config": DEFAULT_CONFIG, "metadata": metadata}).__dict__
 
     async def get_abconf_list(self):
         """获取所有 AstrBot 配置文件的列表"""
@@ -282,17 +282,15 @@ class ConfigRoute(Route):
         try:
             if system_config:
                 abconf = self.acm.confs["default"]
-                return (
-                    Response()
-                    .ok({"config": abconf, "metadata": CONFIG_METADATA_3_SYSTEM})
-                    .__dict__
+                metadata = ConfigMetadataI18n.convert_to_i18n_keys(
+                    CONFIG_METADATA_3_SYSTEM
                 )
+                return Response().ok({"config": abconf, "metadata": metadata}).__dict__
+            if abconf_id is None:
+                raise ValueError("abconf_id cannot be None")
             abconf = self.acm.confs[abconf_id]
-            return (
-                Response()
-                .ok({"config": abconf, "metadata": CONFIG_METADATA_3})
-                .__dict__
-            )
+            metadata = ConfigMetadataI18n.convert_to_i18n_keys(CONFIG_METADATA_3)
+            return Response().ok({"config": abconf, "metadata": metadata}).__dict__
         except ValueError as e:
             return Response().error(str(e)).__dict__
 
@@ -598,9 +596,15 @@ class ConfigRoute(Route):
             return Response().error("缺少参数 provider_id").__dict__
 
         prov_mgr = self.core_lifecycle.provider_manager
-        provider: Provider | None = prov_mgr.inst_map.get(provider_id, None)
+        provider = prov_mgr.inst_map.get(provider_id, None)
         if not provider:
             return Response().error(f"未找到 ID 为 {provider_id} 的提供商").__dict__
+        if not isinstance(provider, Provider):
+            return (
+                Response()
+                .error(f"提供商 {provider_id} 类型不支持获取模型列表")
+                .__dict__
+            )
 
         try:
             models = await provider.get_models()

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 上传文档