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

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

@@ -1,19 +1,20 @@
 from typing import TYPE_CHECKING
+
 from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.platform import AstrBotMessage, PlatformMetadata
 from astrbot.api.message_components import (
-    Plain,
-    Image,
     At,
     File,
-    Record,
-    Video,
-    Reply,
     Forward,
+    Image,
     Node,
     Nodes,
+    Plain,
+    Record,
+    Reply,
+    Video,
 )
+from astrbot.api.platform import AstrBotMessage, PlatformMetadata
 
 if TYPE_CHECKING:
     from .satori_adapter import SatoriPlatformAdapter
@@ -53,14 +54,17 @@ class SatoriPlatformEvent(AstrMessageEvent):
 
     @classmethod
     async def send_with_adapter(
-        cls, adapter: "SatoriPlatformAdapter", message: MessageChain, session_id: str
+        cls,
+        adapter: "SatoriPlatformAdapter",
+        message: MessageChain,
+        session_id: str,
     ):
         try:
             content_parts = []
 
             for component in message.chain:
                 component_content = await cls._convert_component_to_satori_static(
-                    component
+                    component,
                 )
                 if component_content:
                     content_parts.append(component_content)
@@ -92,12 +96,15 @@ class SatoriPlatformEvent(AstrMessageEvent):
                 user_id = user.get("id", "") if user else ""
 
             result = await adapter.send_http_request(
-                "POST", "/message.create", data, platform, user_id
+                "POST",
+                "/message.create",
+                data,
+                platform,
+                user_id,
             )
             if result:
                 return result
-            else:
-                return None
+            return None
 
         except Exception as e:
             logger.error(f"Satori 消息发送异常: {e}")
@@ -140,7 +147,11 @@ class SatoriPlatformEvent(AstrMessageEvent):
             data = {"channel_id": channel_id, "content": content}
 
             result = await self.adapter.send_http_request(
-                "POST", "/message.create", data, platform, user_id
+                "POST",
+                "/message.create",
+                data,
+                platform,
+                user_id,
             )
             if not result:
                 logger.error("Satori 消息发送失败")
@@ -178,9 +189,9 @@ class SatoriPlatformEvent(AstrMessageEvent):
                                     img_chain = MessageChain(
                                         [
                                             Plain(
-                                                text=f'<img src="data:image/jpeg;base64,{image_base64}"/>'
-                                            )
-                                        ]
+                                                text=f'<img src="data:image/jpeg;base64,{image_base64}"/>',
+                                            ),
+                                        ],
                                     )
                                     await self.send(img_chain)
                             except Exception as e:
@@ -209,10 +220,10 @@ class SatoriPlatformEvent(AstrMessageEvent):
                 )
                 return text
 
-            elif isinstance(component, At):
+            if isinstance(component, At):
                 if component.qq:
                     return f'<at id="{component.qq}"/>'
-                elif component.name:
+                if component.name:
                     return f'<at name="{component.name}"/>'
 
             elif isinstance(component, Image):
@@ -264,7 +275,7 @@ class SatoriPlatformEvent(AstrMessageEvent):
             if node.content:
                 for content_component in node.content:
                     component_content = await self._convert_component_to_satori(
-                        content_component
+                        content_component,
                     )
                     if component_content:
                         content_parts.append(component_content)
@@ -302,10 +313,10 @@ class SatoriPlatformEvent(AstrMessageEvent):
                 )
                 return text
 
-            elif isinstance(component, At):
+            if isinstance(component, At):
                 if component.qq:
                     return f'<at id="{component.qq}"/>'
-                elif component.name:
+                if component.name:
                     return f'<at name="{component.name}"/>'
 
             elif isinstance(component, Image):
@@ -358,7 +369,7 @@ class SatoriPlatformEvent(AstrMessageEvent):
             if node.content:
                 for content_component in node.content:
                     component_content = await cls._convert_component_to_satori_static(
-                        content_component
+                        content_component,
                     )
                     if component_content:
                         content_parts.append(component_content)
@@ -395,8 +406,7 @@ class SatoriPlatformEvent(AstrMessageEvent):
 
             if node_parts:
                 return f"<message forward>{''.join(node_parts)}</message>"
-            else:
-                return ""
+            return ""
 
         except Exception as e:
             logger.error(f"转换合并转发消息失败: {e}")
@@ -415,8 +425,7 @@ class SatoriPlatformEvent(AstrMessageEvent):
 
             if node_parts:
                 return f"<message forward>{''.join(node_parts)}</message>"
-            else:
-                return ""
+            return ""
 
         except Exception as e:
             logger.error(f"转换合并转发消息失败: {e}")

astrbot/core/platform/sources/slack/client.py

@@ -1,14 +1,16 @@
-import json
-import hmac
-import hashlib
 import asyncio
+import hashlib
+import hmac
+import json
 import logging
-from typing import Callable, Optional
-from quart import Quart, request, Response
-from slack_sdk.web.async_client import AsyncWebClient
+from collections.abc import Callable
+
+from quart import Quart, Response, request
 from slack_sdk.socket_mode.aiohttp import SocketModeClient
 from slack_sdk.socket_mode.request import SocketModeRequest
 from slack_sdk.socket_mode.response import SocketModeResponse
+from slack_sdk.web.async_client import AsyncWebClient
+
 from astrbot.api import logger
 
 
@@ -22,7 +24,7 @@ class SlackWebhookClient:
         host: str = "0.0.0.0",
         port: int = 3000,
         path: str = "/slack/events",
-        event_handler: Optional[Callable] = None,
+        event_handler: Callable | None = None,
     ):
         self.web_client = web_client
         self.signing_secret = signing_secret
@@ -93,7 +95,7 @@ class SlackWebhookClient:
     async def start(self):
         """启动 Webhook 服务器"""
         logger.info(
-            f"Slack Webhook 服务器启动中，监听 {self.host}:{self.port}{self.path}..."
+            f"Slack Webhook 服务器启动中，监听 {self.host}:{self.port}{self.path}...",
         )
 
         await self.app.run_task(
@@ -119,7 +121,7 @@ class SlackSocketClient:
         self,
         web_client: AsyncWebClient,
         app_token: str,
-        event_handler: Optional[Callable] = None,
+        event_handler: Callable | None = None,
     ):
         self.web_client = web_client
         self.app_token = app_token

astrbot/core/platform/sources/slack/slack_adapter.py

@@ -1,34 +1,42 @@
-import time
 import asyncio
+import base64
+import re
+import time
 import uuid
+from collections.abc import Awaitable
+from typing import Any
+
 import aiohttp
-import re
-import base64
-from typing import Awaitable, Any
-from slack_sdk.web.async_client import AsyncWebClient
 from slack_sdk.socket_mode.request import SocketModeRequest
+from slack_sdk.web.async_client import AsyncWebClient
+
+from astrbot.api import logger
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import *
 from astrbot.api.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
 )
-from astrbot.api.event import MessageChain
-from .slack_event import SlackMessageEvent
-from .client import SlackWebhookClient, SlackSocketClient
-from astrbot.api.message_components import *  # noqa: F403
-from astrbot.api import logger
 from astrbot.core.platform.astr_message_event import MessageSesion
+
 from ...register import register_platform_adapter
+from .client import SlackSocketClient, SlackWebhookClient
+from .slack_event import SlackMessageEvent
 
 
 @register_platform_adapter(
-    "slack", "适用于 Slack 的消息平台适配器，支持 Socket Mode 和 Webhook Mode。"
+    "slack",
+    "适用于 Slack 的消息平台适配器，支持 Socket Mode 和 Webhook Mode。",
 )
 class SlackAdapter(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)
 
@@ -43,7 +51,8 @@ class SlackAdapter(Platform):
         self.webhook_host = platform_config.get("slack_webhook_host", "0.0.0.0")
         self.webhook_port = platform_config.get("slack_webhook_port", 3000)
         self.webhook_path = platform_config.get(
-            "slack_webhook_path", "/astrbot-slack-webhook/callback"
+            "slack_webhook_path",
+            "/astrbot-slack-webhook/callback",
         )
 
         if not self.bot_token:
@@ -69,10 +78,13 @@ class SlackAdapter(Platform):
         self.bot_self_id = None
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
-        blocks, text = SlackMessageEvent._parse_slack_blocks(
-            message_chain=message_chain, web_client=self.web_client
+        blocks, text = await SlackMessageEvent._parse_slack_blocks(
+            message_chain=message_chain,
+            web_client=self.web_client,
         )
 
         try:
@@ -150,7 +162,7 @@ class SlackAdapter(Platform):
         abm.message = []
 
         # 优先使用 blocks 字段解析消息
-        if "blocks" in event and event["blocks"]:
+        if event.get("blocks"):
             abm.message = self._parse_blocks(event["blocks"])
             # 更新 message_str
             abm.message_str = ""
@@ -166,7 +178,8 @@ class SlackAdapter(Platform):
                         mentioned_user = await self.web_client.users_info(user=mention)
                         user_data = mentioned_user["user"]
                         user_name = user_data.get("real_name") or user_data.get(
-                            "name", mention
+                            "name",
+                            mention,
                         )
                         abm.message.append(At(qq=mention, name=user_name))
                     except Exception:
@@ -189,7 +202,7 @@ class SlackAdapter(Platform):
                 else:
                     # TODO: 下载鉴权
                     abm.message.append(
-                        File(name=file_name, file=file_url, url=file_url)
+                        File(name=file_name, file=file_url, url=file_url),
                     )
 
         abm.raw_message = event
@@ -209,39 +222,41 @@ class SlackAdapter(Platform):
                     if element.get("type") == "rich_text_section":
                         # 处理富文本段落
                         section_elements = element.get("elements", [])
-                        text_content = ""
-
+                        text_parts = []
                         for section_element in section_elements:
                             element_type = section_element.get("type", "")
 
                             if element_type == "text":
                                 # 普通文本
-                                text_content += section_element.get("text", "")
+                                text_parts.append(section_element.get("text", ""))
                             elif element_type == "user":
                                 # @用户提及
                                 user_id = section_element.get("user_id", "")
                                 if user_id:
                                     # 将之前的文本内容先添加到组件中
+                                    text_content = "".join(text_parts)
                                     if text_content.strip():
                                         message_components.append(
-                                            Plain(text=text_content)
+                                            Plain(text=text_content),
                                         )
-                                        text_content = ""
+                                    text_parts = []
                                     # 添加@提及组件
                                     message_components.append(At(qq=user_id, name=""))
                             elif element_type == "channel":
                                 # #频道提及
                                 channel_id = section_element.get("channel_id", "")
-                                text_content += f"#{channel_id}"
+                                text_parts.append(f"#{channel_id}")
                             elif element_type == "link":
                                 # 链接
                                 url = section_element.get("url", "")
                                 link_text = section_element.get("text", url)
-                                text_content += f"[{link_text}]({url})"
+                                text_parts.append(f"[{link_text}]({url})")
                             elif element_type == "emoji":
                                 # 表情符号
                                 emoji_name = section_element.get("name", "")
-                                text_content += f":{emoji_name}:"
+                                text_parts.append(f":{emoji_name}:")
+
+                        text_content = "".join(text_parts)
 
                         if text_content.strip():
                             message_components.append(Plain(text=text_content))
@@ -307,11 +322,10 @@ class SlackAdapter(Platform):
                     content = await resp.read()
                     base64_content = base64.b64encode(content).decode("utf-8")
                     return base64_content
-                else:
-                    logger.error(
-                        f"Failed to download slack file: {resp.status} {await resp.text()}"
-                    )
-                    raise Exception(f"下载文件失败: {resp.status}")
+                logger.error(
+                    f"Failed to download slack file: {resp.status} {await resp.text()}",
+                )
+                raise Exception(f"下载文件失败: {resp.status}")
 
     async def run(self) -> Awaitable[Any]:
         self.bot_self_id = await self.get_bot_user_id()
@@ -323,7 +337,9 @@ class SlackAdapter(Platform):
 
             # 创建 Socket 客户端
             self.socket_client = SlackSocketClient(
-                self.web_client, self.app_token, self._handle_socket_event
+                self.web_client,
+                self.app_token,
+                self._handle_socket_event,
             )
 
             logger.info("Slack 适配器 (Socket Mode) 启动中...")
@@ -344,13 +360,13 @@ class SlackAdapter(Platform):
             )
 
             logger.info(
-                f"Slack 适配器 (Webhook Mode) 启动中，监听 {self.webhook_host}:{self.webhook_port}{self.webhook_path}..."
+                f"Slack 适配器 (Webhook Mode) 启动中，监听 {self.webhook_host}:{self.webhook_port}{self.webhook_path}...",
             )
             await self.webhook_client.start()
 
         else:
             raise ValueError(
-                f"不支持的连接模式: {self.connection_mode}，请使用 'socket' 或 'webhook'"
+                f"不支持的连接模式: {self.connection_mode}，请使用 'socket' 或 'webhook'",
             )
 
     async def _handle_webhook_event(self, event_data: dict):

astrbot/core/platform/sources/slack/slack_event.py

@@ -1,16 +1,18 @@
 import asyncio
 import re
-from typing import AsyncGenerator
+from collections.abc import AsyncGenerator
+
 from slack_sdk.web.async_client import AsyncWebClient
+
+from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.api.message_components import (
+    BaseMessageComponent,
+    File,
     Image,
     Plain,
-    File,
-    BaseMessageComponent,
 )
 from astrbot.api.platform import Group, MessageMember
-from astrbot.api import logger
 
 
 class SlackMessageEvent(AstrMessageEvent):
@@ -27,12 +29,13 @@ class SlackMessageEvent(AstrMessageEvent):
 
     @staticmethod
     async def _from_segment_to_slack_block(
-        segment: BaseMessageComponent, web_client: AsyncWebClient
+        segment: BaseMessageComponent,
+        web_client: AsyncWebClient,
     ) -> dict:
         """将消息段转换为 Slack 块格式"""
         if isinstance(segment, Plain):
             return {"type": "section", "text": {"type": "mrkdwn", "text": segment.text}}
-        elif isinstance(segment, Image):
+        if isinstance(segment, Image):
             # upload file
             url = segment.url or segment.file
             if url.startswith("http"):
@@ -61,7 +64,7 @@ class SlackMessageEvent(AstrMessageEvent):
                 },
                 "alt_text": "图片",
             }
-        elif isinstance(segment, File):
+        if isinstance(segment, File):
             # upload file
             url = segment.url or segment.file
             response = await web_client.files_upload_v2(
@@ -82,12 +85,12 @@ class SlackMessageEvent(AstrMessageEvent):
                     "text": f"文件: <{file_url}|{segment.name or '文件'}>",
                 },
             }
-        else:
-            return {"type": "section", "text": {"type": "mrkdwn", "text": str(segment)}}
+        return {"type": "section", "text": {"type": "mrkdwn", "text": str(segment)}}
 
     @staticmethod
     async def _parse_slack_blocks(
-        message_chain: MessageChain, web_client: AsyncWebClient
+        message_chain: MessageChain,
+        web_client: AsyncWebClient,
     ):
         """解析成 Slack 块格式"""
         blocks = []
@@ -103,27 +106,29 @@ class SlackMessageEvent(AstrMessageEvent):
                         {
                             "type": "section",
                             "text": {"type": "mrkdwn", "text": text_content},
-                        }
+                        },
                     )
                     text_content = ""
 
                 # 添加其他类型的块
                 block = await SlackMessageEvent._from_segment_to_slack_block(
-                    segment, web_client
+                    segment,
+                    web_client,
                 )
                 blocks.append(block)
 
         # 如果最后还有文本内容
         if text_content.strip():
             blocks.append(
-                {"type": "section", "text": {"type": "mrkdwn", "text": text_content}}
+                {"type": "section", "text": {"type": "mrkdwn", "text": text_content}},
             )
 
         return blocks, "" if blocks else text_content
 
     async def send(self, message: MessageChain):
         blocks, text = await SlackMessageEvent._parse_slack_blocks(
-            message, self.web_client
+            message,
+            self.web_client,
         )
 
         try:
@@ -143,28 +148,33 @@ class SlackMessageEvent(AstrMessageEvent):
                 )
         except Exception:
             # 如果块发送失败，尝试只发送文本
-            fallback_text = ""
+            parts = []
             for segment in message.chain:
                 if isinstance(segment, Plain):
-                    fallback_text += segment.text
+                    parts.append(segment.text)
                 elif isinstance(segment, File):
-                    fallback_text += f" [文件: {segment.name}] "
+                    parts.append(f" [文件: {segment.name}] ")
                 elif isinstance(segment, Image):
-                    fallback_text += " [图片] "
+                    parts.append(" [图片] ")
+            fallback_text = "".join(parts)
 
             if self.get_group_id():
                 await self.web_client.chat_postMessage(
-                    channel=self.get_group_id(), text=fallback_text
+                    channel=self.get_group_id(),
+                    text=fallback_text,
                 )
             else:
                 await self.web_client.chat_postMessage(
-                    channel=self.get_sender_id(), text=fallback_text
+                    channel=self.get_sender_id(),
+                    text=fallback_text,
                 )
 
         await super().send(message)
 
     async def send_streaming(
-        self, generator: AsyncGenerator, use_fallback: bool = False
+        self,
+        generator: AsyncGenerator,
+        use_fallback: bool = False,
     ):
         if not use_fallback:
             buffer = None
@@ -174,7 +184,7 @@ class SlackMessageEvent(AstrMessageEvent):
                 else:
                     buffer.chain.extend(chain.chain)
             if not buffer:
-                return
+                return None
             buffer.squash_plain()
             await self.send(buffer)
             return await super().send_streaming(generator, use_fallback)
@@ -211,7 +221,7 @@ class SlackMessageEvent(AstrMessageEvent):
 
             # 获取频道成员
             members_response = await self.web_client.conversations_members(
-                channel=channel_id
+                channel=channel_id,
             )
 
             members = []
@@ -224,7 +234,7 @@ class SlackMessageEvent(AstrMessageEvent):
                             user_id=member_id,
                             nickname=user_data.get("real_name")
                             or user_data.get("name", member_id),
-                        )
+                        ),
                     )
                 except Exception:
                     # 如果获取用户信息失败，使用默认信息