AstrBot 4.10.6__py3-none-any.whl → 4.11.1__py3-none-any.whl

astrbot/core/pipeline/waking_check/stage.py

@@ -227,7 +227,7 @@ class WakingCheckStage(Stage):
             event._extras.pop("parsed_params", None)
 
         # 根据会话配置过滤插件处理器
-        activated_handlers = SessionPluginManager.filter_handlers_by_session(
+        activated_handlers = await SessionPluginManager.filter_handlers_by_session(
             event,
             activated_handlers,
         )

astrbot/core/platform/sources/weixin_official_account/weixin_offacc_adapter.py

@@ -191,7 +191,7 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
                 if self.active_send_mode:
                     await self.convert_message(msg, None)
                 else:
-                    if msg.id in self.wexin_event_workers:
+                    if str(msg.id) in self.wexin_event_workers:
                         future = self.wexin_event_workers[str(cast(str | int, msg.id))]
                         logger.debug(f"duplicate message id checked: {msg.id}")
                     else:

astrbot/core/provider/entities.py

@@ -344,6 +344,11 @@ class LLMResponse:
         self.raw_completion = raw_completion
         self.is_chunk = is_chunk
 
+        if id is not None:
+            self.id = id
+        if usage is not None:
+            self.usage = usage
+
     @property
     def completion_text(self):
         if self.result_chain:

astrbot/core/provider/manager.py

@@ -119,19 +119,34 @@ class ProviderManager:
             TTSProvider,
         ):
             self.curr_tts_provider_inst = prov
-            sp.put("curr_provider_tts", provider_id, scope="global", scope_id="global")
+            await sp.put_async(
+                key="curr_provider_tts",
+                value=provider_id,
+                scope="global",
+                scope_id="global",
+            )
         elif provider_type == ProviderType.SPEECH_TO_TEXT and isinstance(
             prov,
             STTProvider,
         ):
             self.curr_stt_provider_inst = prov
-            sp.put("curr_provider_stt", provider_id, scope="global", scope_id="global")
+            await sp.put_async(
+                key="curr_provider_stt",
+                value=provider_id,
+                scope="global",
+                scope_id="global",
+            )
         elif provider_type == ProviderType.CHAT_COMPLETION and isinstance(
             prov,
             Provider,
         ):
             self.curr_provider_inst = prov
-            sp.put("curr_provider", provider_id, scope="global", scope_id="global")
+            await sp.put_async(
+                key="curr_provider",
+                value=provider_id,
+                scope="global",
+                scope_id="global",
+            )
 
     async def get_provider_by_id(self, provider_id: str) -> Providers | None:
         """根据提供商 ID 获取提供商实例"""
@@ -206,21 +221,21 @@ class ProviderManager:
                 logger.error(traceback.format_exc())
                 logger.error(e)
 
-        selected_provider_id = sp.get(
-            "curr_provider",
-            self.provider_settings.get("default_provider_id"),
+        selected_provider_id = await sp.get_async(
+            key="curr_provider",
+            default=self.provider_settings.get("default_provider_id"),
             scope="global",
             scope_id="global",
         )
-        selected_stt_provider_id = sp.get(
-            "curr_provider_stt",
-            self.provider_stt_settings.get("provider_id"),
+        selected_stt_provider_id = await sp.get_async(
+            key="curr_provider_stt",
+            default=self.provider_stt_settings.get("provider_id"),
             scope="global",
             scope_id="global",
         )
-        selected_tts_provider_id = sp.get(
-            "curr_provider_tts",
-            self.provider_tts_settings.get("provider_id"),
+        selected_tts_provider_id = await sp.get_async(
+            key="curr_provider_tts",
+            default=self.provider_tts_settings.get("provider_id"),
             scope="global",
             scope_id="global",
         )

astrbot/core/star/context.py

@@ -149,9 +149,12 @@ class Context:
             contexts: context messages for the LLM
             max_steps: Maximum number of tool calls before stopping the loop
             **kwargs: Additional keyword arguments. The kwargs will not be passed to the LLM directly for now, but can include:
+                stream: bool - whether to stream the LLM response
                 agent_hooks: BaseAgentRunHooks[AstrAgentContext] - hooks to run during agent execution
                 agent_context: AstrAgentContext - context to use for the agent
 
+                other kwargs will be DIRECTLY passed to the runner.reset() method
+
         Returns:
             The final LLMResponse after tool calls are completed.
 
@@ -194,6 +197,15 @@ class Context:
             )
         agent_runner = ToolLoopAgentRunner()
         tool_executor = FunctionToolExecutor()
+
+        streaming = kwargs.get("stream", False)
+
+        other_kwargs = {
+            k: v
+            for k, v in kwargs.items()
+            if k not in ["stream", "agent_hooks", "agent_context"]
+        }
+
         await agent_runner.reset(
             provider=prov,
             request=request,
@@ -203,7 +215,8 @@ class Context:
             ),
             tool_executor=tool_executor,
             agent_hooks=agent_hooks,
-            streaming=kwargs.get("stream", False),
+            streaming=streaming,
+            **other_kwargs,
         )
         async for _ in agent_runner.step_until_done(max_steps):
             pass

astrbot/core/star/register/__init__.py

@@ -12,6 +12,7 @@ from .star_handler import (
     register_on_llm_request,
     register_on_llm_response,
     register_on_platform_loaded,
+    register_on_waiting_llm_request,
     register_permission_type,
     register_platform_adapter_type,
     register_regex,
@@ -30,6 +31,7 @@ __all__ = [
     "register_on_llm_request",
     "register_on_llm_response",
     "register_on_platform_loaded",
+    "register_on_waiting_llm_request",
     "register_permission_type",
     "register_platform_adapter_type",
     "register_regex",

astrbot/core/star/register/star_handler.py

@@ -339,6 +339,30 @@ def register_on_platform_loaded(**kwargs):
     return decorator
 
 
+def register_on_waiting_llm_request(**kwargs):
+    """当等待调用 LLM 时的通知事件（在获取锁之前）
+
+    此钩子在消息确定要调用 LLM 但还未开始排队等锁时触发，
+    适合用于发送"正在思考中..."等用户反馈提示。
+
+    Examples:
+    ```py
+    @on_waiting_llm_request()
+    async def on_waiting_llm(self, event: AstrMessageEvent) -> None:
+        await event.send("🤔 正在思考中...")
+    ```
+
+    """
+
+    def decorator(awaitable):
+        _ = get_handler_or_create(
+            awaitable, EventType.OnWaitingLLMRequestEvent, **kwargs
+        )
+        return awaitable
+
+    return decorator
+
+
 def register_on_llm_request(**kwargs):
     """当有 LLM 请求时的事件
 

astrbot/core/star/session_llm_manager.py

@@ -12,7 +12,7 @@ class SessionServiceManager:
     # =============================================================================
 
     @staticmethod
-    def is_llm_enabled_for_session(session_id: str) -> bool:
+    async def is_llm_enabled_for_session(session_id: str) -> bool:
         """检查LLM是否在指定会话中启用
 
         Args:
@@ -23,11 +23,11 @@ class SessionServiceManager:
 
         """
         # 获取会话服务配置
-        session_services = sp.get(
-            "session_service_config",
-            {},
+        session_services = await sp.get_async(
             scope="umo",
             scope_id=session_id,
+            key="session_service_config",
+            default={},
         )
 
         # 如果配置了该会话的LLM状态，返回该状态
@@ -39,7 +39,7 @@ class SessionServiceManager:
         return True
 
     @staticmethod
-    def set_llm_status_for_session(session_id: str, enabled: bool) -> None:
+    async def set_llm_status_for_session(session_id: str, enabled: bool) -> None:
         """设置LLM在指定会话中的启停状态
 
         Args:
@@ -48,18 +48,24 @@ class SessionServiceManager:
 
         """
         session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
+            await sp.get_async(
+                scope="umo",
+                scope_id=session_id,
+                key="session_service_config",
+                default={},
+            )
+            or {}
         )
         session_config["llm_enabled"] = enabled
-        sp.put(
-            "session_service_config",
-            session_config,
+        await sp.put_async(
             scope="umo",
             scope_id=session_id,
+            key="session_service_config",
+            value=session_config,
         )
 
     @staticmethod
-    def should_process_llm_request(event: AstrMessageEvent) -> bool:
+    async def should_process_llm_request(event: AstrMessageEvent) -> bool:
         """检查是否应该处理LLM请求
 
         Args:
@@ -70,14 +76,14 @@ class SessionServiceManager:
 
         """
         session_id = event.unified_msg_origin
-        return SessionServiceManager.is_llm_enabled_for_session(session_id)
+        return await SessionServiceManager.is_llm_enabled_for_session(session_id)
 
     # =============================================================================
     # TTS 相关方法
     # =============================================================================
 
     @staticmethod
-    def is_tts_enabled_for_session(session_id: str) -> bool:
+    async def is_tts_enabled_for_session(session_id: str) -> bool:
         """检查TTS是否在指定会话中启用
 
         Args:
@@ -88,11 +94,11 @@ class SessionServiceManager:
 
         """
         # 获取会话服务配置
-        session_services = sp.get(
-            "session_service_config",
-            {},
+        session_services = await sp.get_async(
             scope="umo",
             scope_id=session_id,
+            key="session_service_config",
+            default={},
         )
 
         # 如果配置了该会话的TTS状态，返回该状态
@@ -104,7 +110,7 @@ class SessionServiceManager:
         return True
 
     @staticmethod
-    def set_tts_status_for_session(session_id: str, enabled: bool) -> None:
+    async def set_tts_status_for_session(session_id: str, enabled: bool) -> None:
         """设置TTS在指定会话中的启停状态
 
         Args:
@@ -113,14 +119,20 @@ class SessionServiceManager:
 
         """
         session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
+            await sp.get_async(
+                scope="umo",
+                scope_id=session_id,
+                key="session_service_config",
+                default={},
+            )
+            or {}
         )
         session_config["tts_enabled"] = enabled
-        sp.put(
-            "session_service_config",
-            session_config,
+        await sp.put_async(
             scope="umo",
             scope_id=session_id,
+            key="session_service_config",
+            value=session_config,
         )
 
         logger.info(
@@ -128,7 +140,7 @@ class SessionServiceManager:
         )
 
     @staticmethod
-    def should_process_tts_request(event: AstrMessageEvent) -> bool:
+    async def should_process_tts_request(event: AstrMessageEvent) -> bool:
         """检查是否应该处理TTS请求
 
         Args:
@@ -139,14 +151,14 @@ class SessionServiceManager:
 
         """
         session_id = event.unified_msg_origin
-        return SessionServiceManager.is_tts_enabled_for_session(session_id)
+        return await SessionServiceManager.is_tts_enabled_for_session(session_id)
 
     # =============================================================================
     # 会话整体启停相关方法
     # =============================================================================
 
     @staticmethod
-    def is_session_enabled(session_id: str) -> bool:
+    async def is_session_enabled(session_id: str) -> bool:
         """检查会话是否整体启用
 
         Args:
@@ -157,11 +169,11 @@ class SessionServiceManager:
 
         """
         # 获取会话服务配置
-        session_services = sp.get(
-            "session_service_config",
-            {},
+        session_services = await sp.get_async(
             scope="umo",
             scope_id=session_id,
+            key="session_service_config",
+            default={},
         )
 
         # 如果配置了该会话的整体状态，返回该状态

astrbot/core/star/session_plugin_manager.py

@@ -8,7 +8,10 @@ class SessionPluginManager:
     """管理会话级别的插件启停状态"""
 
     @staticmethod
-    def is_plugin_enabled_for_session(session_id: str, plugin_name: str) -> bool:
+    async def is_plugin_enabled_for_session(
+        session_id: str,
+        plugin_name: str,
+    ) -> bool:
         """检查插件是否在指定会话中启用
 
         Args:
@@ -20,11 +23,11 @@ class SessionPluginManager:
 
         """
         # 获取会话插件配置
-        session_plugin_config = sp.get(
-            "session_plugin_config",
-            {},
+        session_plugin_config = await sp.get_async(
             scope="umo",
             scope_id=session_id,
+            key="session_plugin_config",
+            default={},
         )
         session_config = session_plugin_config.get(session_id, {})
 
@@ -43,7 +46,10 @@ class SessionPluginManager:
         return True
 
     @staticmethod
-    def filter_handlers_by_session(event: AstrMessageEvent, handlers: list) -> list:
+    async def filter_handlers_by_session(
+        event: AstrMessageEvent,
+        handlers: list,
+    ) -> list:
         """根据会话配置过滤处理器列表
 
         Args:
@@ -59,6 +65,15 @@ class SessionPluginManager:
         session_id = event.unified_msg_origin
         filtered_handlers = []
 
+        session_plugin_config = await sp.get_async(
+            scope="umo",
+            scope_id=session_id,
+            key="session_plugin_config",
+            default={},
+        )
+        session_config = session_plugin_config.get(session_id, {})
+        disabled_plugins = session_config.get("disabled_plugins", [])
+
         for handler in handlers:
             # 获取处理器对应的插件
             plugin = star_map.get(handler.handler_module_path)
@@ -76,14 +91,11 @@ class SessionPluginManager:
                 continue
 
             # 检查插件是否在当前会话中启用
-            if SessionPluginManager.is_plugin_enabled_for_session(
-                session_id,
-                plugin.name,
-            ):
-                filtered_handlers.append(handler)
-            else:
+            if plugin.name in disabled_plugins:
                 logger.debug(
                     f"插件 {plugin.name} 在会话 {session_id} 中被禁用，跳过处理器 {handler.handler_name}",
                 )
+            else:
+                filtered_handlers.append(handler)
 
         return filtered_handlers

astrbot/core/star/star_handler.py

@@ -184,6 +184,7 @@ class EventType(enum.Enum):
     OnPlatformLoadedEvent = enum.auto()  # 平台加载完成
 
     AdapterMessageEvent = enum.auto()  # 收到适配器发来的消息
+    OnWaitingLLMRequestEvent = enum.auto()  # 等待调用 LLM（在获取锁之前，仅通知）
     OnLLMRequestEvent = enum.auto()  # 收到 LLM 请求（可以是用户也可以是插件）
     OnLLMResponseEvent = enum.auto()  # LLM 响应后
     OnDecoratingResultEvent = enum.auto()  # 发送消息前

astrbot/core/umop_config_router.py

@@ -11,14 +11,15 @@ class UmopConfigRouter:
         """UMOP 到配置文件 ID 的映射"""
         self.sp = sp
 
-        self._load_routing_table()
+    async def initialize(self):
+        await self._load_routing_table()
 
-    def _load_routing_table(self):
+    async def _load_routing_table(self):
         """加载路由表"""
         # 从 SharedPreferences 中加载 umop_to_conf_id 映射
-        sp_data = self.sp.get(
-            "umop_config_routing",
-            {},
+        sp_data = await self.sp.get_async(
+            key="umop_config_routing",
+            default={},
             scope="global",
             scope_id="global",
         )

astrbot/core/utils/migra_helper.py

@@ -3,6 +3,7 @@ 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_token_usage import migrate_token_usage
 from astrbot.core.db.migration.migra_webchat_session import migrate_webchat_session
 
 
@@ -139,6 +140,13 @@ async def migra(
         logger.error(f"Migration for webchat session failed: {e!s}")
         logger.error(traceback.format_exc())
 
+    # migration for token_usage column
+    try:
+        await migrate_token_usage(db)
+    except Exception as e:
+        logger.error(f"Migration for token_usage column failed: {e!s}")
+        logger.error(traceback.format_exc())
+
     # migra third party agent runner configs
     _c = False
     providers = astrbot_config["provider"]

astrbot/dashboard/routes/backup.py

@@ -993,6 +993,7 @@ class BackupRoute(Route):
                 file_path,
                 as_attachment=True,
                 attachment_filename=filename,
+                conditional=True,  # 启用 Range 请求支持（断点续传）
             )
         except Exception as e:
             logger.error(f"下载备份失败: {e}")

astrbot/dashboard/routes/config.py

@@ -625,7 +625,7 @@ class ConfigRoute(Route):
         provider_list = []
         ps = self.core_lifecycle.provider_manager.providers_config
         p_source_pt = {
-            psrc["id"]: psrc["provider_type"]
+            psrc["id"]: psrc.get("provider_type", "chat_completion")
             for psrc in self.core_lifecycle.provider_manager.provider_sources_config
         }
         for provider in ps:
@@ -640,7 +640,7 @@ class ConfigRoute(Route):
                     provider
                 )
                 provider_list.append(prov)
-            elif not ps_id and provider.get("provider_type", None) in provider_type_ls:
+            elif not ps_id and provider.get("provider_type", "") in provider_type_ls:
                 # agent runner, embedding, etc
                 provider_list.append(provider)
         return Response().ok(provider_list).__dict__

{astrbot-4.10.6.dist-info → astrbot-4.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.10.6
+Version: 4.11.1
 Summary: Easy-to-use multi-platform LLM chatbot and development framework
 License-File: LICENSE
 Keywords: Astrbot,Astrbot Module,Astrbot Plugin
@@ -193,6 +193,7 @@ uv run main.py
 
 **社区维护**
 
+- [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter)
 - [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)
 - [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)
 - [Bilibili 私信](https://github.com/Hina-Chat/astrbot_plugin_bilibili_adapter)
@@ -269,6 +270,7 @@ pre-commit install
 - 5 群：822130018
 - 6 群：753075035
 - 7 群：743746109
+- 8 群：1030353265
 - 开发者群：975206796
 
 ### Telegram 群组