AstrBot 4.5.1__py3-none-any.whl → 4.5.3__py3-none-any.whl

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

@@ -1,30 +1,31 @@
 from __future__ import annotations
 
-import botpy
+import asyncio
 import logging
+import os
 import time
-import asyncio
+
+import botpy
 import botpy.message
 import botpy.types
 import botpy.types.message
-import os
-
 from botpy import Client
+
+from astrbot import logger
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import At, Image, Plain
 from astrbot.api.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
 )
-from astrbot import logger
-from astrbot.api.event import MessageChain
-from typing import Union, List
-from astrbot.api.message_components import Image, Plain, At
+from astrbot.core.message.components import BaseMessageComponent
 from astrbot.core.platform.astr_message_event import MessageSesion
-from .qqofficial_message_event import QQOfficialMessageEvent
+
 from ...register import register_platform_adapter
-from astrbot.core.message.components import BaseMessageComponent
+from .qqofficial_message_event import QQOfficialMessageEvent
 
 # remove logger handler
 for handler in logging.root.handlers[:]:
@@ -33,13 +34,14 @@ for handler in logging.root.handlers[:]:
 
 # QQ 机器人官方框架
 class botClient(Client):
-    def set_platform(self, platform: "QQOfficialPlatformAdapter"):
+    def set_platform(self, platform: QQOfficialPlatformAdapter):
         self.platform = platform
 
     # 收到群消息
     async def on_group_at_message_create(self, message: botpy.message.GroupMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.group_openid
@@ -49,7 +51,8 @@ class botClient(Client):
     # 收到频道消息
     async def on_at_message_create(self, message: botpy.message.Message):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.channel_id
@@ -59,7 +62,8 @@ class botClient(Client):
     # 收到私聊消息
     async def on_direct_message_create(self, message: botpy.message.DirectMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -67,7 +71,8 @@ class botClient(Client):
     # 收到 C2C 消息
     async def on_c2c_message_create(self, message: botpy.message.C2CMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -80,14 +85,17 @@ class botClient(Client):
                 self.platform.meta(),
                 abm.session_id,
                 self.platform.client,
-            )
+            ),
         )
 
 
 @register_platform_adapter("qq_official", "QQ 机器人官方 API 适配器")
 class QQOfficialPlatformAdapter(Platform):
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
 
@@ -107,7 +115,8 @@ class QQOfficialPlatformAdapter(Platform):
             )
         else:
             self.intents = botpy.Intents(
-                public_guild_messages=True, direct_message=guild_dm
+                public_guild_messages=True,
+                direct_message=guild_dm,
             )
         self.client = botClient(
             intents=self.intents,
@@ -120,7 +129,9 @@ class QQOfficialPlatformAdapter(Platform):
         self.test_mode = os.environ.get("TEST_MODE", "off") == "on"
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         raise NotImplementedError("QQ 机器人官方 API 适配器不支持 send_by_session")
 
@@ -133,7 +144,7 @@ class QQOfficialPlatformAdapter(Platform):
 
     @staticmethod
     def _parse_from_qqofficial(
-        message: Union[botpy.message.Message, botpy.message.GroupMessage],
+        message: botpy.message.Message | botpy.message.GroupMessage,
         message_type: MessageType,
     ):
         abm = AstrBotMessage()
@@ -142,10 +153,11 @@ class QQOfficialPlatformAdapter(Platform):
         abm.raw_message = message
         abm.message_id = message.id
         abm.tag = "qq_official"
-        msg: List[BaseMessageComponent] = []
+        msg: list[BaseMessageComponent] = []
 
         if isinstance(message, botpy.message.GroupMessage) or isinstance(
-            message, botpy.message.C2CMessage
+            message,
+            botpy.message.C2CMessage,
         ):
             if isinstance(message, botpy.message.GroupMessage):
                 abm.sender = MessageMember(message.author.member_openid, "")
@@ -167,7 +179,8 @@ class QQOfficialPlatformAdapter(Platform):
             abm.message = msg
 
         elif isinstance(message, botpy.message.Message) or isinstance(
-            message, botpy.message.DirectMessage
+            message,
+            botpy.message.DirectMessage,
         ):
             try:
                 abm.self_id = str(message.mentions[0].id)
@@ -175,7 +188,8 @@ class QQOfficialPlatformAdapter(Platform):
                 abm.self_id = ""
 
             plain_content = message.content.replace(
-                "<@!" + str(abm.self_id) + ">", ""
+                "<@!" + str(abm.self_id) + ">",
+                "",
             ).strip()
 
             if message.attachments:
@@ -189,7 +203,8 @@ class QQOfficialPlatformAdapter(Platform):
             abm.message = msg
             abm.message_str = plain_content
             abm.sender = MessageMember(
-                str(message.author.id), str(message.author.username)
+                str(message.author.id),
+                str(message.author.username),
             )
             msg.append(At(qq="qq_official"))
             msg.append(Plain(plain_content))

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_adapter.py

@@ -1,19 +1,21 @@
-import botpy
-import logging
 import asyncio
+import logging
+
+import botpy
 import botpy.message
 import botpy.types
 import botpy.types.message
-
 from botpy import Client
-from astrbot.api.platform import Platform, AstrBotMessage, MessageType, PlatformMetadata
+
+from astrbot import logger
 from astrbot.api.event import MessageChain
+from astrbot.api.platform import AstrBotMessage, MessageType, Platform, PlatformMetadata
 from astrbot.core.platform.astr_message_event import MessageSesion
-from .qo_webhook_event import QQOfficialWebhookMessageEvent
+
 from ...register import register_platform_adapter
-from .qo_webhook_server import QQOfficialWebhook
 from ..qqofficial.qqofficial_platform_adapter import QQOfficialPlatformAdapter
-from astrbot import logger
+from .qo_webhook_event import QQOfficialWebhookMessageEvent
+from .qo_webhook_server import QQOfficialWebhook
 
 # remove logger handler
 for handler in logging.root.handlers[:]:
@@ -28,7 +30,8 @@ class botClient(Client):
     # 收到群消息
     async def on_group_at_message_create(self, message: botpy.message.GroupMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.group_openid
@@ -38,7 +41,8 @@ class botClient(Client):
     # 收到频道消息
     async def on_at_message_create(self, message: botpy.message.Message):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.GROUP_MESSAGE
+            message,
+            MessageType.GROUP_MESSAGE,
         )
         abm.session_id = (
             abm.sender.user_id if self.platform.unique_session else message.channel_id
@@ -48,7 +52,8 @@ class botClient(Client):
     # 收到私聊消息
     async def on_direct_message_create(self, message: botpy.message.DirectMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -56,7 +61,8 @@ class botClient(Client):
     # 收到 C2C 消息
     async def on_c2c_message_create(self, message: botpy.message.C2CMessage):
         abm = QQOfficialPlatformAdapter._parse_from_qqofficial(
-            message, MessageType.FRIEND_MESSAGE
+            message,
+            MessageType.FRIEND_MESSAGE,
         )
         abm.session_id = abm.sender.user_id
         self._commit(abm)
@@ -64,15 +70,22 @@ class botClient(Client):
     def _commit(self, abm: AstrBotMessage):
         self.platform.commit_event(
             QQOfficialWebhookMessageEvent(
-                abm.message_str, abm, self.platform.meta(), abm.session_id, self
-            )
+                abm.message_str,
+                abm,
+                self.platform.meta(),
+                abm.session_id,
+                self,
+            ),
         )
 
 
 @register_platform_adapter("qq_official_webhook", "QQ 机器人官方 API 适配器(Webhook)")
 class QQOfficialWebhookPlatformAdapter(Platform):
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
 
@@ -83,7 +96,9 @@ class QQOfficialWebhookPlatformAdapter(Platform):
         self.unique_session = platform_settings["unique_session"]
 
         intents = botpy.Intents(
-            public_messages=True, public_guild_messages=True, direct_message=True
+            public_messages=True,
+            public_guild_messages=True,
+            direct_message=True,
         )
         self.client = botClient(
             intents=intents,  # 已经无用
@@ -93,7 +108,9 @@ class QQOfficialWebhookPlatformAdapter(Platform):
         self.client.set_platform(self)
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         raise NotImplementedError("QQ 机器人官方 API 适配器不支持 send_by_session")
 
@@ -106,7 +123,9 @@ class QQOfficialWebhookPlatformAdapter(Platform):
 
     async def run(self):
         self.webhook_helper = QQOfficialWebhook(
-            self.config, self._event_queue, self.client
+            self.config,
+            self._event_queue,
+            self.client,
         )
         await self.webhook_helper.initialize()
         await self.webhook_helper.start_polling()

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_event.py

@@ -1,5 +1,7 @@
-from astrbot.api.platform import AstrBotMessage, PlatformMetadata
 from botpy import Client
+
+from astrbot.api.platform import AstrBotMessage, PlatformMetadata
+
 from ..qqofficial.qqofficial_message_event import QQOfficialMessageEvent
 
 

astrbot/core/platform/sources/qqofficial_webhook/qo_webhook_server.py

@@ -1,10 +1,12 @@
-import quart
-import logging
 import asyncio
-from botpy import BotAPI, BotHttp, Client, Token, BotWebSocket, ConnectionSession
-from astrbot.api import logger
+import logging
+
+import quart
+from botpy import BotAPI, BotHttp, BotWebSocket, Client, ConnectionSession, Token
 from cryptography.hazmat.primitives.asymmetric import ed25519
 
+from astrbot.api import logger
+
 # remove logger handler
 for handler in logging.root.handlers[:]:
     logging.root.removeHandler(handler)
@@ -27,7 +29,9 @@ class QQOfficialWebhook:
 
         self.server = quart.Quart(__name__)
         self.server.add_url_rule(
-            "/astrbot-qo-webhook/callback", view_func=self.callback, methods=["POST"]
+            "/astrbot-qo-webhook/callback",
+            view_func=self.callback,
+            methods=["POST"],
         )
         self.client = botpy_client
         self.event_queue = event_queue
@@ -62,7 +66,8 @@ class QQOfficialWebhook:
         seed = await self.repeat_seed(self.secret)
         private_key = ed25519.Ed25519PrivateKey.from_private_bytes(seed)
         msg = validation_payload.get("event_ts", "") + validation_payload.get(
-            "plain_token", ""
+            "plain_token",
+            "",
         )
         # sign
         signature = private_key.sign(msg.encode()).hex()
@@ -99,7 +104,7 @@ class QQOfficialWebhook:
 
     async def start_polling(self):
         logger.info(
-            f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。"
+            f"将在 {self.callback_server_host}:{self.port} 端口启动 QQ 官方机器人 webhook 适配器。",
         )
         await self.server.run_task(
             host=self.callback_server_host,

astrbot/core/platform/sources/satori/satori_adapter.py

@@ -1,13 +1,22 @@
 import asyncio
 import json
 import time
+from xml.etree import ElementTree as ET
+
 import websockets
-from websockets.asyncio.client import connect
-from typing import Optional
 from aiohttp import ClientSession, ClientTimeout
-from websockets.asyncio.client import ClientConnection
+from websockets.asyncio.client import ClientConnection, connect
+
 from astrbot.api import logger
 from astrbot.api.event import MessageChain
+from astrbot.api.message_components import (
+    At,
+    File,
+    Image,
+    Plain,
+    Record,
+    Reply,
+)
 from astrbot.api.platform import (
     AstrBotMessage,
     MessageMember,
@@ -17,15 +26,6 @@ from astrbot.api.platform import (
     register_platform_adapter,
 )
 from astrbot.core.platform.astr_message_event import MessageSession
-from astrbot.api.message_components import (
-    Plain,
-    Image,
-    At,
-    File,
-    Record,
-    Reply,
-)
-from xml.etree import ElementTree as ET
 
 
 @register_platform_adapter(
@@ -34,18 +34,23 @@ from xml.etree import ElementTree as ET
 )
 class SatoriPlatformAdapter(Platform):
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
         self.config = platform_config
         self.settings = platform_settings
 
         self.api_base_url = self.config.get(
-            "satori_api_base_url", "http://localhost:5140/satori/v1"
+            "satori_api_base_url",
+            "http://localhost:5140/satori/v1",
         )
         self.token = self.config.get("satori_token", "")
         self.endpoint = self.config.get(
-            "satori_endpoint", "ws://localhost:5140/satori/v1/events"
+            "satori_endpoint",
+            "ws://localhost:5140/satori/v1/events",
         )
         self.auto_reconnect = self.config.get("satori_auto_reconnect", True)
         self.heartbeat_interval = self.config.get("satori_heartbeat_interval", 10)
@@ -57,21 +62,25 @@ class SatoriPlatformAdapter(Platform):
             id=self.config["id"],
         )
 
-        self.ws: Optional[ClientConnection] = None
-        self.session: Optional[ClientSession] = None
+        self.ws: ClientConnection | None = None
+        self.session: ClientSession | None = None
         self.sequence = 0
         self.logins = []
         self.running = False
-        self.heartbeat_task: Optional[asyncio.Task] = None
+        self.heartbeat_task: asyncio.Task | None = None
         self.ready_received = False
 
     async def send_by_session(
-        self, session: MessageSession, message_chain: MessageChain
+        self,
+        session: MessageSession,
+        message_chain: MessageChain,
     ):
         from .satori_event import SatoriPlatformEvent
 
         await SatoriPlatformEvent.send_with_adapter(
-            self, message_chain, session.session_id
+            self,
+            message_chain,
+            session.session_id,
         )
         await super().send_by_session(session, message_chain)
 
@@ -85,10 +94,9 @@ class SatoriPlatformAdapter(Platform):
         try:
             if hasattr(ws, "closed"):
                 return ws.closed
-            elif hasattr(ws, "close_code"):
+            if hasattr(ws, "close_code"):
                 return ws.close_code is not None
-            else:
-                return False
+            return False
         except AttributeError:
             return False
 
@@ -240,7 +248,7 @@ class SatoriPlatformAdapter(Platform):
                         user_id = user.get("id", "")
                         user_name = user.get("name", "")
                         logger.info(
-                            f"Satori 连接成功 - Bot {i + 1}: platform={platform}, user_id={user_id}, user_name={user_name}"
+                            f"Satori 连接成功 - Bot {i + 1}: platform={platform}, user_id={user_id}, user_name={user_name}",
                         )
 
                 if "sn" in body:
@@ -282,7 +290,12 @@ class SatoriPlatformAdapter(Platform):
                     return
 
                 abm = await self.convert_satori_message(
-                    message, user, channel, guild, login, timestamp
+                    message,
+                    user,
+                    channel,
+                    guild,
+                    login,
+                    timestamp,
                 )
                 if abm:
                     await self.handle_msg(abm)
@@ -295,10 +308,10 @@ class SatoriPlatformAdapter(Platform):
         message: dict,
         user: dict,
         channel: dict,
-        guild: Optional[dict],
+        guild: dict | None,
         login: dict,
-        timestamp: Optional[int] = None,
-    ) -> Optional[AstrBotMessage]:
+        timestamp: int | None = None,
+    ) -> AstrBotMessage | None:
         try:
             abm = AstrBotMessage()
             abm.message_id = message.get("id", "")
@@ -438,7 +451,7 @@ class SatoriPlatformAdapter(Platform):
 
         return prefixes
 
-    async def _extract_quote_element(self, content: str) -> Optional[dict]:
+    async def _extract_quote_element(self, content: str) -> dict | None:
         """提取<quote>标签信息"""
         try:
             # 处理命名空间前缀问题
@@ -451,7 +464,7 @@ class SatoriPlatformAdapter(Platform):
                     [
                         f'xmlns:{prefix}="http://temp.uri/{prefix}"'
                         for prefix in prefixes
-                    ]
+                    ],
                 )
 
                 # 包装内容
@@ -483,14 +496,17 @@ class SatoriPlatformAdapter(Platform):
                     inner_content += quote_element.text
                 for child in quote_element:
                     inner_content += ET.tostring(
-                        child, encoding="unicode", method="xml"
+                        child,
+                        encoding="unicode",
+                        method="xml",
                     )
                     if child.tail:
                         inner_content += child.tail
 
                 # 构造移除了<quote>标签的内容
                 content_without_quote = content.replace(
-                    ET.tostring(quote_element, encoding="unicode", method="xml"), ""
+                    ET.tostring(quote_element, encoding="unicode", method="xml"),
+                    "",
                 )
 
                 return {
@@ -506,7 +522,7 @@ class SatoriPlatformAdapter(Platform):
             logger.error(f"提取<quote>标签时发生错误: {e}")
             return None
 
-    async def _extract_quote_with_regex(self, content: str) -> Optional[dict]:
+    async def _extract_quote_with_regex(self, content: str) -> dict | None:
         """使用正则表达式提取quote标签信息"""
         import re
 
@@ -529,7 +545,7 @@ class SatoriPlatformAdapter(Platform):
             "content_without_quote": content_without_quote,
         }
 
-    async def _convert_quote_message(self, quote: dict) -> Optional[AstrBotMessage]:
+    async def _convert_quote_message(self, quote: dict) -> AstrBotMessage | None:
         """转换引用消息"""
         try:
             quote_abm = AstrBotMessage()
@@ -587,7 +603,7 @@ class SatoriPlatformAdapter(Platform):
                     [
                         f'xmlns:{prefix}="http://temp.uri/{prefix}"'
                         for prefix in prefixes
-                    ]
+                    ],
                 )
 
                 # 包装内容
@@ -747,13 +763,15 @@ class SatoriPlatformAdapter(Platform):
 
         try:
             async with self.session.request(
-                method, url, json=data, headers=headers
+                method,
+                url,
+                json=data,
+                headers=headers,
             ) as response:
                 if response.status == 200:
                     result = await response.json()
                     return result
-                else:
-                    return {}
+                return {}
         except Exception as e:
             logger.error(f"Satori HTTP 请求异常: {e}")
             return {}