AstrBot 4.7.4__py3-none-any.whl → 4.8.0__py3-none-any.whl

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.7.4"
+__version__ = "4.8.0"

astrbot/core/astr_agent_run_util.py

@@ -9,6 +9,7 @@ from astrbot.core.message.message_event_result import (
     MessageEventResult,
     ResultContentType,
 )
+from astrbot.core.provider.entities import LLMResponse
 
 AgentRunner = ToolLoopAgentRunner[AstrAgentContext]
 
@@ -72,7 +73,20 @@ async def run_agent(
 
         except Exception as e:
             logger.error(traceback.format_exc())
-            err_msg = f"\n\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {e!s}\n\n请在控制台查看和分享错误详情。\n"
+
+            err_msg = f"\n\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {e!s}\n\n请在平台日志查看和分享错误详情。\n"
+
+            error_llm_response = LLMResponse(
+                role="err",
+                completion_text=err_msg,
+            )
+            try:
+                await agent_runner.agent_hooks.on_agent_done(
+                    agent_runner.run_context, error_llm_response
+                )
+            except Exception:
+                logger.exception("Error in on_agent_done hook")
+
             if agent_runner.streaming:
                 yield MessageChain().message(err_msg)
             else:

astrbot/core/config/default.py

@@ -4,9 +4,17 @@ import os
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.7.4"
+VERSION = "4.8.0"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
+WEBHOOK_SUPPORTED_PLATFORMS = [
+    "qq_official_webhook",
+    "weixin_official_account",
+    "wecom",
+    "wecom_ai_bot",
+    "slack",
+]
+
 # 默认配置
 DEFAULT_CONFIG = {
     "config_version": 2,
@@ -185,6 +193,8 @@ CONFIG_METADATA_2 = {
                         "appid": "",
                         "secret": "",
                         "is_sandbox": False,
+                        "unified_webhook_mode": True,
+                        "webhook_uuid": "",
                         "callback_server_host": "0.0.0.0",
                         "port": 6196,
                     },
@@ -215,6 +225,8 @@ CONFIG_METADATA_2 = {
                         "token": "",
                         "encoding_aes_key": "",
                         "api_base_url": "https://api.weixin.qq.com/cgi-bin/",
+                        "unified_webhook_mode": True,
+                        "webhook_uuid": "",
                         "callback_server_host": "0.0.0.0",
                         "port": 6194,
                         "active_send_mode": False,
@@ -229,6 +241,8 @@ CONFIG_METADATA_2 = {
                         "encoding_aes_key": "",
                         "kf_name": "",
                         "api_base_url": "https://qyapi.weixin.qq.com/cgi-bin/",
+                        "unified_webhook_mode": True,
+                        "webhook_uuid": "",
                         "callback_server_host": "0.0.0.0",
                         "port": 6195,
                     },
@@ -241,6 +255,8 @@ CONFIG_METADATA_2 = {
                         "wecom_ai_bot_name": "",
                         "token": "",
                         "encoding_aes_key": "",
+                        "unified_webhook_mode": True,
+                        "webhook_uuid": "",
                         "callback_server_host": "0.0.0.0",
                         "port": 6198,
                     },
@@ -308,6 +324,8 @@ CONFIG_METADATA_2 = {
                         "app_token": "",
                         "signing_secret": "",
                         "slack_connection_mode": "socket",  # webhook, socket
+                        "unified_webhook_mode": True,
+                        "webhook_uuid": "",
                         "slack_webhook_host": "0.0.0.0",
                         "slack_webhook_port": 6197,
                         "slack_webhook_path": "/astrbot-slack-webhook/callback",
@@ -387,16 +405,28 @@ CONFIG_METADATA_2 = {
                         "description": "Slack Webhook Host",
                         "type": "string",
                         "hint": "Only valid when Slack connection mode is `webhook`.",
+                        "condition": {
+                            "slack_connection_mode": "webhook",
+                            "unified_webhook_mode": False,
+                        },
                     },
                     "slack_webhook_port": {
                         "description": "Slack Webhook Port",
                         "type": "int",
                         "hint": "Only valid when Slack connection mode is `webhook`.",
+                        "condition": {
+                            "slack_connection_mode": "webhook",
+                            "unified_webhook_mode": False,
+                        },
                     },
                     "slack_webhook_path": {
                         "description": "Slack Webhook Path",
                         "type": "string",
                         "hint": "Only valid when Slack connection mode is `webhook`.",
+                        "condition": {
+                            "slack_connection_mode": "webhook",
+                            "unified_webhook_mode": False,
+                        },
                     },
                     "active_send_mode": {
                         "description": "是否换用主动发送接口",
@@ -587,6 +617,33 @@ CONFIG_METADATA_2 = {
                         "type": "string",
                         "hint": "可选的 Discord 活动名称。留空则不设置活动。",
                     },
+                    "port": {
+                        "description": "回调服务器端口",
+                        "type": "int",
+                        "hint": "回调服务器端口。留空则不启用回调服务器。",
+                        "condition": {
+                            "unified_webhook_mode": False,
+                        },
+                    },
+                    "callback_server_host": {
+                        "description": "回调服务器主机",
+                        "type": "string",
+                        "hint": "回调服务器主机。留空则不启用回调服务器。",
+                        "condition": {
+                            "unified_webhook_mode": False,
+                        },
+                    },
+                    "unified_webhook_mode": {
+                        "description": "统一 Webhook 模式",
+                        "type": "bool",
+                        "hint": "启用后，将使用 AstrBot 统一 Webhook 入口，无需单独开启端口。回调地址为 /api/platform/webhook/{webhook_uuid}。",
+                    },
+                    "webhook_uuid": {
+                        "invisible": True,
+                        "description": "Webhook UUID",
+                        "type": "string",
+                        "hint": "统一 Webhook 模式下的唯一标识符，创建平台时自动生成。",
+                    },
                 },
             },
             "platform_settings": {

astrbot/core/db/__init__.py

@@ -173,7 +173,7 @@ class BaseDatabase(abc.ABC):
         content: dict,
         sender_id: str | None = None,
         sender_name: str | None = None,
-    ) -> None:
+    ) -> PlatformMessageHistory:
         """Insert a new platform message history record."""
         ...
 
@@ -198,6 +198,14 @@ class BaseDatabase(abc.ABC):
         """Get platform message history for a specific user."""
         ...
 
+    @abc.abstractmethod
+    async def get_platform_message_history_by_id(
+        self,
+        message_id: int,
+    ) -> PlatformMessageHistory | None:
+        """Get a platform message history record by its ID."""
+        ...
+
     @abc.abstractmethod
     async def insert_attachment(
         self,
@@ -213,6 +221,27 @@ class BaseDatabase(abc.ABC):
         """Get an attachment by its ID."""
         ...
 
+    @abc.abstractmethod
+    async def get_attachments(self, attachment_ids: list[str]) -> list[Attachment]:
+        """Get multiple attachments by their IDs."""
+        ...
+
+    @abc.abstractmethod
+    async def delete_attachment(self, attachment_id: str) -> bool:
+        """Delete an attachment by its ID.
+
+        Returns True if the attachment was deleted, False if it was not found.
+        """
+        ...
+
+    @abc.abstractmethod
+    async def delete_attachments(self, attachment_ids: list[str]) -> int:
+        """Delete multiple attachments by their IDs.
+
+        Returns the number of attachments deleted.
+        """
+        ...
+
     @abc.abstractmethod
     async def insert_persona(
         self,

astrbot/core/db/sqlite.py

@@ -105,8 +105,8 @@ class SQLiteDatabase(BaseDatabase):
                 text("""
                 SELECT * FROM platform_stats
                 WHERE timestamp >= :start_time
-                ORDER BY timestamp DESC
                 GROUP BY platform_id
+                ORDER BY timestamp DESC
                 """),
                 {"start_time": start_time},
             )
@@ -449,6 +449,18 @@ class SQLiteDatabase(BaseDatabase):
             result = await session.execute(query.offset(offset).limit(page_size))
             return result.scalars().all()
 
+    async def get_platform_message_history_by_id(
+        self, message_id: int
+    ) -> PlatformMessageHistory | None:
+        """Get a platform message history record by its ID."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            query = select(PlatformMessageHistory).where(
+                PlatformMessageHistory.id == message_id
+            )
+            result = await session.execute(query)
+            return result.scalar_one_or_none()
+
     async def insert_attachment(self, path, type, mime_type):
         """Insert a new attachment record."""
         async with self.get_db() as session:
@@ -470,6 +482,48 @@ class SQLiteDatabase(BaseDatabase):
             result = await session.execute(query)
             return result.scalar_one_or_none()
 
+    async def get_attachments(self, attachment_ids: list[str]) -> list:
+        """Get multiple attachments by their IDs."""
+        if not attachment_ids:
+            return []
+        async with self.get_db() as session:
+            session: AsyncSession
+            query = select(Attachment).where(
+                Attachment.attachment_id.in_(attachment_ids)
+            )
+            result = await session.execute(query)
+            return list(result.scalars().all())
+
+    async def delete_attachment(self, attachment_id: str) -> bool:
+        """Delete an attachment by its ID.
+
+        Returns True if the attachment was deleted, False if it was not found.
+        """
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                query = delete(Attachment).where(
+                    col(Attachment.attachment_id) == attachment_id
+                )
+                result = await session.execute(query)
+                return result.rowcount > 0
+
+    async def delete_attachments(self, attachment_ids: list[str]) -> int:
+        """Delete multiple attachments by their IDs.
+
+        Returns the number of attachments deleted.
+        """
+        if not attachment_ids:
+            return 0
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                query = delete(Attachment).where(
+                    col(Attachment.attachment_id).in_(attachment_ids)
+                )
+                result = await session.execute(query)
+                return result.rowcount
+
     async def insert_persona(
         self,
         persona_id,

astrbot/core/pipeline/process_stage/method/agent_sub_stages/third_party.py

@@ -57,7 +57,7 @@ async def run_third_party_agent(
         logger.error(f"Third party agent runner error: {e}")
         err_msg = (
             f"\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n"
-            f"错误信息: {e!s}\n\n请在控制台查看和分享错误详情。\n"
+            f"错误信息: {e!s}\n\n请在平台日志查看和分享错误详情。\n"
         )
         yield MessageChain().message(err_msg)
 

astrbot/core/platform/manager.py

@@ -6,7 +6,7 @@ from astrbot.core import logger
 from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot.core.star.star_handler import EventType, star_handlers_registry, star_map
 
-from .platform import Platform
+from .platform import Platform, PlatformStatus
 from .register import platform_cls_map
 from .sources.webchat.webchat_adapter import WebChatAdapter
 
@@ -16,7 +16,7 @@ class PlatformManager:
         self.platform_insts: list[Platform] = []
         """加载的 Platform 的实例"""
 
-        self._inst_map = {}
+        self._inst_map: dict[str, dict] = {}
 
         self.platforms_config = config["platform"]
         self.settings = config["platform_settings"]
@@ -37,7 +37,10 @@ class PlatformManager:
         webchat_inst = WebChatAdapter({}, self.settings, self.event_queue)
         self.platform_insts.append(webchat_inst)
         asyncio.create_task(
-            self._task_wrapper(asyncio.create_task(webchat_inst.run(), name="webchat")),
+            self._task_wrapper(
+                asyncio.create_task(webchat_inst.run(), name="webchat"),
+                platform=webchat_inst,
+            ),
         )
 
     async def load_platform(self, platform_config: dict):
@@ -107,7 +110,7 @@ class PlatformManager:
                     )
         except (ImportError, ModuleNotFoundError) as e:
             logger.error(
-                f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。请检查依赖库是否安装。提示：可以在 管理面板->控制台->安装Pip库 中安装依赖库。",
+                f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。请检查依赖库是否安装。提示：可以在 管理面板->平台日志->安装Pip库 中安装依赖库。",
             )
         except Exception as e:
             logger.error(f"加载平台适配器 {platform_config['type']} 失败，原因：{e}。")
@@ -131,6 +134,7 @@ class PlatformManager:
                     inst.run(),
                     name=f"platform_{platform_config['type']}_{platform_config['id']}",
                 ),
+                platform=inst,
             ),
         )
         handlers = star_handlers_registry.get_handlers_by_event_type(
@@ -145,17 +149,28 @@ class PlatformManager:
             except Exception:
                 logger.error(traceback.format_exc())
 
-    async def _task_wrapper(self, task: asyncio.Task):
+    async def _task_wrapper(self, task: asyncio.Task, platform: Platform | None = None):
+        # 设置平台状态为运行中
+        if platform:
+            platform.status = PlatformStatus.RUNNING
+
         try:
             await task
         except asyncio.CancelledError:
-            pass
+            if platform:
+                platform.status = PlatformStatus.STOPPED
         except Exception as e:
+            error_msg = str(e)
+            tb_str = traceback.format_exc()
             logger.error(f"------- 任务 {task.get_name()} 发生错误: {e}")
-            for line in traceback.format_exc().split("\n"):
+            for line in tb_str.split("\n"):
                 logger.error(f"|    {line}")
             logger.error("-------")
 
+            # 记录错误到平台实例
+            if platform:
+                platform.record_error(error_msg, tb_str)
+
     async def reload(self, platform_config: dict):
         await self.terminate_platform(platform_config["id"])
         if platform_config["enable"]:
@@ -172,9 +187,9 @@ class PlatformManager:
             logger.info(f"正在尝试终止 {platform_id} 平台适配器 ...")
 
             # client_id = self._inst_map.pop(platform_id, None)
-            info = self._inst_map.pop(platform_id, None)
+            info = self._inst_map.pop(platform_id)
             client_id = info["client_id"]
-            inst = info["inst"]
+            inst: Platform = info["inst"]
             try:
                 self.platform_insts.remove(
                     next(
@@ -196,3 +211,46 @@ class PlatformManager:
 
     def get_insts(self):
         return self.platform_insts
+
+    def get_all_stats(self) -> dict:
+        """获取所有平台的统计信息
+
+        Returns:
+            包含所有平台统计信息的字典
+        """
+        stats_list = []
+        total_errors = 0
+        running_count = 0
+        error_count = 0
+
+        for inst in self.platform_insts:
+            try:
+                stat = inst.get_stats()
+                stats_list.append(stat)
+                total_errors += stat.get("error_count", 0)
+                if stat.get("status") == PlatformStatus.RUNNING.value:
+                    running_count += 1
+                elif stat.get("status") == PlatformStatus.ERROR.value:
+                    error_count += 1
+            except Exception as e:
+                # 如果获取统计信息失败，记录基本信息
+                logger.warning(f"获取平台统计信息失败: {e}")
+                stats_list.append(
+                    {
+                        "id": getattr(inst, "config", {}).get("id", "unknown"),
+                        "type": "unknown",
+                        "status": "unknown",
+                        "error_count": 0,
+                        "last_error": None,
+                    }
+                )
+
+        return {
+            "platforms": stats_list,
+            "summary": {
+                "total": len(stats_list),
+                "running": running_count,
+                "error": error_count,
+                "total_errors": total_errors,
+            },
+        }

astrbot/core/platform/platform.py

@@ -2,6 +2,9 @@ import abc
 import uuid
 from asyncio import Queue
 from collections.abc import Awaitable
+from dataclasses import dataclass, field
+from datetime import datetime
+from enum import Enum
 from typing import Any
 
 from astrbot.core.message.message_event_result import MessageChain
@@ -12,13 +15,90 @@ from .message_session import MessageSesion
 from .platform_metadata import PlatformMetadata
 
 
+class PlatformStatus(Enum):
+    """平台运行状态"""
+
+    PENDING = "pending"  # 待启动
+    RUNNING = "running"  # 运行中
+    ERROR = "error"  # 发生错误
+    STOPPED = "stopped"  # 已停止
+
+
+@dataclass
+class PlatformError:
+    """平台错误信息"""
+
+    message: str
+    timestamp: datetime = field(default_factory=datetime.now)
+    traceback: str | None = None
+
+
 class Platform(abc.ABC):
-    def __init__(self, event_queue: Queue):
+    def __init__(self, config: dict, event_queue: Queue):
         super().__init__()
+        # 平台配置
+        self.config = config
         # 维护了消息平台的事件队列，EventBus 会从这里取出事件并处理。
         self._event_queue = event_queue
         self.client_self_id = uuid.uuid4().hex
 
+        # 平台运行状态
+        self._status: PlatformStatus = PlatformStatus.PENDING
+        self._errors: list[PlatformError] = []
+        self._started_at: datetime | None = None
+
+    @property
+    def status(self) -> PlatformStatus:
+        """获取平台运行状态"""
+        return self._status
+
+    @status.setter
+    def status(self, value: PlatformStatus):
+        """设置平台运行状态"""
+        self._status = value
+        if value == PlatformStatus.RUNNING and self._started_at is None:
+            self._started_at = datetime.now()
+
+    @property
+    def errors(self) -> list[PlatformError]:
+        """获取错误列表"""
+        return self._errors
+
+    @property
+    def last_error(self) -> PlatformError | None:
+        """获取最近的错误"""
+        return self._errors[-1] if self._errors else None
+
+    def record_error(self, message: str, traceback_str: str | None = None):
+        """记录一个错误"""
+        self._errors.append(PlatformError(message=message, traceback=traceback_str))
+        self._status = PlatformStatus.ERROR
+
+    def clear_errors(self):
+        """清除错误记录"""
+        self._errors.clear()
+        if self._status == PlatformStatus.ERROR:
+            self._status = PlatformStatus.RUNNING
+
+    def get_stats(self) -> dict:
+        """获取平台统计信息"""
+        meta = self.meta()
+        return {
+            "id": meta.id or self.config.get("id"),
+            "type": meta.name,
+            "display_name": meta.adapter_display_name or meta.name,
+            "status": self._status.value,
+            "started_at": self._started_at.isoformat() if self._started_at else None,
+            "error_count": len(self._errors),
+            "last_error": {
+                "message": self.last_error.message,
+                "timestamp": self.last_error.timestamp.isoformat(),
+                "traceback": self.last_error.traceback,
+            }
+            if self.last_error
+            else None,
+        }
+
     @abc.abstractmethod
     def run(self) -> Awaitable[Any]:
         """得到一个平台的运行实例，需要返回一个协程对象。"""
@@ -36,7 +116,7 @@ class Platform(abc.ABC):
         self,
         session: MessageSesion,
         message_chain: MessageChain,
-    ) -> Awaitable[Any]:
+    ):
         """通过会话发送消息。该方法旨在让插件能够直接通过**可持久化的会话数据**发送消息，而不需要保存 event 对象。
 
         异步方法。
@@ -49,3 +129,20 @@ class Platform(abc.ABC):
 
     def get_client(self):
         """获取平台的客户端对象。"""
+
+    async def webhook_callback(self, request: Any) -> Any:
+        """统一 Webhook 回调入口。
+
+        支持统一 Webhook 模式的平台需要实现此方法。
+        当 Dashboard 收到 /api/platform/webhook/{uuid} 请求时，会调用此方法。
+
+        Args:
+            request: Quart 请求对象
+
+        Returns:
+            响应内容，格式取决于具体平台的要求
+
+        Raises:
+            NotImplementedError: 平台未实现统一 Webhook 模式
+        """
+        raise NotImplementedError(f"平台 {self.meta().name} 未实现统一 Webhook 模式")

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py

@@ -38,9 +38,8 @@ class AiocqhttpAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(event_queue)
+        super().__init__(platform_config, event_queue)
 
-        self.config = platform_config
         self.settings = platform_settings
         self.unique_session = platform_settings["unique_session"]
         self.host = platform_config["ws_reverse_host"]
@@ -154,7 +153,9 @@ class AiocqhttpAdapter(Platform):
         """OneBot V11 通知类事件"""
         abm = AstrBotMessage()
         abm.self_id = str(event.self_id)
-        abm.sender = MessageMember(user_id=str(event.user_id), nickname=event.user_id)
+        abm.sender = MessageMember(
+            user_id=str(event.user_id), nickname=str(event.user_id)
+        )
         abm.type = MessageType.OTHER_MESSAGE
         if event.get("group_id"):
             abm.group_id = str(event.group_id)

astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py

@@ -47,9 +47,7 @@ class DingtalkPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(event_queue)
-
-        self.config = platform_config
+        super().__init__(platform_config, event_queue)
 
         self.unique_session = platform_settings["unique_session"]
 
@@ -76,13 +74,13 @@ class DingtalkPlatformAdapter(Platform):
         )
         self.client_ = client  # 用于 websockets 的 client
 
-    def _id_to_sid(self, dingtalk_id: str | None) -> str | None:
+    def _id_to_sid(self, dingtalk_id: str | None) -> str:
         if not dingtalk_id:
-            return dingtalk_id
+            return dingtalk_id or "unknown"
         prefix = "$:LWCP_v1:$"
         if dingtalk_id.startswith(prefix):
             return dingtalk_id[len(prefix) :]
-        return dingtalk_id
+        return dingtalk_id or "unknown"
 
     async def send_by_session(
         self,

astrbot/core/platform/sources/discord/discord_platform_adapter.py

@@ -44,8 +44,7 @@ class DiscordPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(event_queue)
-        self.config = platform_config
+        super().__init__(platform_config, event_queue)
         self.settings = platform_settings
         self.client_self_id = None
         self.registered_handlers = []

astrbot/core/platform/sources/lark/lark_adapter.py

@@ -33,9 +33,7 @@ class LarkPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(event_queue)
-
-        self.config = platform_config
+        super().__init__(platform_config, event_queue)
 
         self.unique_session = platform_settings["unique_session"]
 

astrbot/core/platform/sources/misskey/misskey_adapter.py

@@ -55,8 +55,7 @@ class MisskeyPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(event_queue)
-        self.config = platform_config or {}
+        super().__init__(platform_config or {}, event_queue)
         self.settings = platform_settings or {}
         self.instance_url = self.config.get("misskey_instance_url", "")
         self.access_token = self.config.get("misskey_token", "")

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -69,6 +69,8 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                 # 结束流式对话，并且传输 buffer 中剩余的消息
                 stream_payload["state"] = 10
                 ret = await self._post_send(stream=stream_payload)
+            else:
+                ret = await self._post_send()
 
         except Exception as e:
             logger.error(f"发送流式消息时出错: {e}", exc_info=True)

astrbot/core/platform/sources/qqofficial/qqofficial_platform_adapter.py

@@ -97,9 +97,7 @@ class QQOfficialPlatformAdapter(Platform):
         platform_settings: dict,
         event_queue: asyncio.Queue,
     ) -> None:
-        super().__init__(event_queue)
-
-        self.config = platform_config
+        super().__init__(platform_config, event_queue)
 
         self.appid = platform_config["appid"]
         self.secret = platform_config["secret"]