From 25d14a09cc272b9eb2f9ac5552b2b5ad7808f3c8 Mon Sep 17 00:00:00 2001 From: unknown <2916963017@qq.com> Date: Wed, 25 Feb 2026 20:50:38 +0800 Subject: [PATCH 1/3] fix:fix the issue where incomplete cleanup of residual plugins occurs in the failed loading of plugins --- astrbot/core/star/star_manager.py | 48 ++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py index 815b306aae..6d0238c41f 100644 --- a/astrbot/core/star/star_manager.py +++ b/astrbot/core/star/star_manager.py @@ -398,17 +398,45 @@ async def reload_failed_plugin(self, dir_name): - success (bool): 重载是否成功 - error_message (str|None): 错误信息，成功时为 None """ + async with self._pm_lock: - if dir_name in self.failed_plugin_dict: - success, error = await self.load(specified_dir_name=dir_name) - if success: - self.failed_plugin_dict.pop(dir_name, None) - if not self.failed_plugin_dict: - self.failed_plugin_info = "" - return success, None - else: - return False, error - return False, "插件不存在于失败列表中" + if not dir_name in self.failed_plugin_dict: + return False, "插件不存在于失败列表中" + #''' + plugin_root_name = "data.plugins." + # 清理 sys.modules + for key in list(sys.modules.keys()): + if key.startswith(f"{plugin_root_name}{dir_name}"): + logger.info(f"清除了插件{dir_name}中的{key}模块") + del sys.modules[key] + + possible_paths = [ + f"{plugin_root_name}{dir_name}.main", + f"{plugin_root_name}{dir_name}.{dir_name}", + ] + + # 清理 handlers + for path in possible_paths: + handlers = star_handlers_registry.get_handlers_by_module_name(path) + for handler in handlers: + star_handlers_registry.remove(handler) + logger.info(f"清理处理器: {handler.handler_name}") + + # 清理工具 + for tool in list(llm_tools.func_list): + if tool.handler_module_path in possible_paths: + llm_tools.func_list.remove(tool) + logger.info(f"清理工具: {tool.name}") + #''' + + success, error = await self.load(specified_dir_name=dir_name) + if success: + self.failed_plugin_dict.pop(dir_name, None) + if not self.failed_plugin_dict: + self.failed_plugin_info = "" + return success, None + else: + return False, error async def reload(self, specified_plugin_name=None): """重新加载插件 From 0ca7674a0090fbe644ad33188d1fd40537e66f9b Mon Sep 17 00:00:00 2001 From: unknown <2916963017@qq.com> Date: Wed, 25 Feb 2026 21:18:58 +0800 Subject: [PATCH 2/3] fix:ruff format,apply bot suggestions --- astrbot/core/star/star_manager.py | 55 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py index 6d0238c41f..bdd35ca8e1 100644 --- a/astrbot/core/star/star_manager.py +++ b/astrbot/core/star/star_manager.py @@ -388,6 +388,33 @@ def _purge_modules( except KeyError: logger.warning(f"模块 {module_name} 未载入") + def _cleanup_plugin_state(self, dir_name: str) -> None: + plugin_root_name = "data.plugins." + + # 清理 sys.modules + for key in list(sys.modules.keys()): + if key.startswith(f"{plugin_root_name}{dir_name}"): + logger.info(f"清除了插件{dir_name}中的{key}模块") + del sys.modules[key] + + possible_paths = [ + f"{plugin_root_name}{dir_name}.main", + f"{plugin_root_name}{dir_name}.{dir_name}", + ] + + # 清理 handlers + for path in possible_paths: + handlers = star_handlers_registry.get_handlers_by_module_name(path) + for handler in handlers: + star_handlers_registry.remove(handler) + logger.info(f"清理处理器: {handler.handler_name}") + + # 清理工具 + for tool in list(llm_tools.func_list): + if tool.handler_module_path in possible_paths: + llm_tools.func_list.remove(tool) + logger.info(f"清理工具: {tool.name}") + async def reload_failed_plugin(self, dir_name): """ 重新加载未注册（加载失败）的插件 @@ -402,32 +429,8 @@ async def reload_failed_plugin(self, dir_name): async with self._pm_lock: if not dir_name in self.failed_plugin_dict: return False, "插件不存在于失败列表中" - #''' - plugin_root_name = "data.plugins." - # 清理 sys.modules - for key in list(sys.modules.keys()): - if key.startswith(f"{plugin_root_name}{dir_name}"): - logger.info(f"清除了插件{dir_name}中的{key}模块") - del sys.modules[key] - - possible_paths = [ - f"{plugin_root_name}{dir_name}.main", - f"{plugin_root_name}{dir_name}.{dir_name}", - ] - - # 清理 handlers - for path in possible_paths: - handlers = star_handlers_registry.get_handlers_by_module_name(path) - for handler in handlers: - star_handlers_registry.remove(handler) - logger.info(f"清理处理器: {handler.handler_name}") - - # 清理工具 - for tool in list(llm_tools.func_list): - if tool.handler_module_path in possible_paths: - llm_tools.func_list.remove(tool) - logger.info(f"清理工具: {tool.name}") - #''' + + self._cleanup_plugin_state(dir_name) success, error = await self.load(specified_dir_name=dir_name) if success: From 2d5f12cf5bc7a6243bdc6306754e4a6f167e3d25 Mon Sep 17 00:00:00 2001 From: Waterwzy <2916963017@qq.com> Date: Wed, 25 Feb 2026 21:24:27 +0800 Subject: [PATCH 3/3] Apply suggestion from @gemini-code-assist[bot] Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- astrbot/core/star/star_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py index bdd35ca8e1..13251d2ba4 100644 --- a/astrbot/core/star/star_manager.py +++ b/astrbot/core/star/star_manager.py @@ -427,7 +427,7 @@ async def reload_failed_plugin(self, dir_name): """ async with self._pm_lock: - if not dir_name in self.failed_plugin_dict: + if dir_name not in self.failed_plugin_dict: return False, "插件不存在于失败列表中" self._cleanup_plugin_state(dir_name)