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

astrbot/core/platform/sources/telegram/tg_adapter.py

@@ -37,7 +37,10 @@ else:
 @register_platform_adapter("telegram", "telegram 适配器")
 class TelegramPlatformAdapter(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
@@ -45,13 +48,15 @@ class TelegramPlatformAdapter(Platform):
         self.client_self_id = uuid.uuid4().hex[:8]
 
         base_url = self.config.get(
-            "telegram_api_base_url", "https://api.telegram.org/bot"
+            "telegram_api_base_url",
+            "https://api.telegram.org/bot",
         )
         if not base_url:
             base_url = "https://api.telegram.org/bot"
 
         file_base_url = self.config.get(
-            "telegram_file_base_url", "https://api.telegram.org/file/bot"
+            "telegram_file_base_url",
+            "https://api.telegram.org/file/bot",
         )
         if not file_base_url:
             file_base_url = "https://api.telegram.org/file/bot"
@@ -59,10 +64,12 @@ class TelegramPlatformAdapter(Platform):
         self.base_url = base_url
 
         self.enable_command_register = self.config.get(
-            "telegram_command_register", True
+            "telegram_command_register",
+            True,
         )
         self.enable_command_refresh = self.config.get(
-            "telegram_command_auto_refresh", True
+            "telegram_command_auto_refresh",
+            True,
         )
         self.last_command_hash = None
 
@@ -85,11 +92,15 @@ class TelegramPlatformAdapter(Platform):
 
     @override
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         from_username = session.session_id
         await TelegramPlatformEvent.send_with_client(
-            self.client, message_chain, from_username
+            self.client,
+            message_chain,
+            from_username,
         )
         await super().send_by_session(session, message_chain)
 
@@ -131,7 +142,7 @@ class TelegramPlatformAdapter(Platform):
 
             if commands:
                 current_hash = hash(
-                    tuple((cmd.command, cmd.description) for cmd in commands)
+                    tuple((cmd.command, cmd.description) for cmd in commands),
                 )
                 if current_hash == self.last_command_hash:
                     return
@@ -153,7 +164,9 @@ class TelegramPlatformAdapter(Platform):
                 continue
             for event_filter in handler_metadata.event_filters:
                 cmd_info = self._extract_command_info(
-                    event_filter, handler_metadata, skip_commands
+                    event_filter,
+                    handler_metadata,
+                    skip_commands,
                 )
                 if cmd_info:
                     cmd_name, description = cmd_info
@@ -164,7 +177,9 @@ class TelegramPlatformAdapter(Platform):
 
     @staticmethod
     def _extract_command_info(
-        event_filter, handler_metadata, skip_commands: set
+        event_filter,
+        handler_metadata,
+        skip_commands: set,
     ) -> tuple[str, str] | None:
         """从事件过滤器中提取指令信息"""
         cmd_name = None
@@ -199,11 +214,12 @@ class TelegramPlatformAdapter(Platform):
     async def start(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
         if not update.effective_chat:
             logger.warning(
-                "Received a start command without an effective chat, skipping /start reply."
+                "Received a start command without an effective chat, skipping /start reply.",
             )
             return
         await context.bot.send_message(
-            chat_id=update.effective_chat.id, text=self.config["start_message"]
+            chat_id=update.effective_chat.id,
+            text=self.config["start_message"],
         )
 
     async def message_handler(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
@@ -213,7 +229,10 @@ class TelegramPlatformAdapter(Platform):
             await self.handle_msg(abm)
 
     async def convert_message(
-        self, update: Update, context: ContextTypes.DEFAULT_TYPE, get_reply=True
+        self,
+        update: Update,
+        context: ContextTypes.DEFAULT_TYPE,
+        get_reply=True,
     ) -> AstrBotMessage | None:
         """转换 Telegram 的消息对象为 AstrBotMessage 对象。
 
@@ -244,7 +263,8 @@ class TelegramPlatformAdapter(Platform):
             logger.warning("[Telegram] Received a message without a from_user.")
             return None
         message.sender = MessageMember(
-            str(_from_user.id), _from_user.username or "Unknown"
+            str(_from_user.id),
+            _from_user.username or "Unknown",
         )
         message.self_id = str(context.bot.username)
         message.raw_message = update
@@ -274,7 +294,7 @@ class TelegramPlatformAdapter(Platform):
                         message_str=reply_abm.message_str,
                         text=reply_abm.message_str,
                         qq=reply_abm.sender.user_id,
-                    )
+                    ),
                 )
 
         if update.message.text:
@@ -320,7 +340,7 @@ class TelegramPlatformAdapter(Platform):
 
             if message.message_str.strip() == "/start":
                 await self.start(update, context)
-                return
+                return None
 
         elif update.message.voice:
             file = await update.message.voice.get_file()
@@ -358,7 +378,7 @@ class TelegramPlatformAdapter(Platform):
             file_path = file.file_path
             if file_path is None:
                 logger.warning(
-                    f"Telegram document file_path is None, cannot save the file {file_name}."
+                    f"Telegram document file_path is None, cannot save the file {file_name}.",
                 )
             else:
                 message.message.append(Comp.File(file=file_path, name=file_name))
@@ -369,7 +389,7 @@ class TelegramPlatformAdapter(Platform):
             file_path = file.file_path
             if file_path is None:
                 logger.warning(
-                    f"Telegram video file_path is None, cannot save the file {file_name}."
+                    f"Telegram video file_path is None, cannot save the file {file_name}.",
                 )
             else:
                 message.message.append(Comp.Video(file=file_path, path=file.file_path))

astrbot/core/platform/sources/telegram/tg_event.py

@@ -1,22 +1,24 @@
+import asyncio
 import os
 import re
-import asyncio
+
 import telegramify_markdown
+from telegram import ReactionTypeCustomEmoji, ReactionTypeEmoji
+from telegram.ext import ExtBot
+
+from astrbot import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.platform import AstrBotMessage, PlatformMetadata, MessageType
 from astrbot.api.message_components import (
-    Plain,
-    Image,
-    Reply,
     At,
     File,
+    Image,
+    Plain,
     Record,
+    Reply,
 )
-from telegram.ext import ExtBot
-from astrbot.core.utils.io import download_file
-from astrbot import logger
+from astrbot.api.platform import AstrBotMessage, MessageType, PlatformMetadata
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
-from telegram import ReactionTypeEmoji, ReactionTypeCustomEmoji
+from astrbot.core.utils.io import download_file
 
 
 class TelegramPlatformEvent(AstrMessageEvent):
@@ -68,7 +70,10 @@ class TelegramPlatformEvent(AstrMessageEvent):
 
     @classmethod
     async def send_with_client(
-        cls, client: ExtBot, message: MessageChain, user_name: str
+        cls,
+        client: ExtBot,
+        message: MessageChain,
+        user_name: str,
     ):
         image_path = None
 
@@ -104,14 +109,18 @@ class TelegramPlatformEvent(AstrMessageEvent):
                 for chunk in chunks:
                     try:
                         md_text = telegramify_markdown.markdownify(
-                            chunk, max_line_length=None, normalize_whitespace=False
+                            chunk,
+                            max_line_length=None,
+                            normalize_whitespace=False,
                         )
                         await client.send_message(
-                            text=md_text, parse_mode="MarkdownV2", **payload
+                            text=md_text,
+                            parse_mode="MarkdownV2",
+                            **payload,
                         )
                     except Exception as e:
                         logger.warning(
-                            f"MarkdownV2 send failed: {e}. Using plain text instead."
+                            f"MarkdownV2 send failed: {e}. Using plain text instead.",
                         )
                         await client.send_message(text=chunk, **payload)
             elif isinstance(i, Image):
@@ -137,8 +146,7 @@ class TelegramPlatformEvent(AstrMessageEvent):
         await super().send(message)
 
     async def react(self, emoji: str | None, big: bool = False):
-        """
-        给原消息添加 Telegram 反应：
+        """给原消息添加 Telegram 反应：
         - 普通 emoji：传入 '👍'、'😂' 等
         - 自定义表情：传入其 custom_emoji_id（纯数字字符串）
         - 取消本机器人的反应：传入 None 或空字符串
@@ -216,7 +224,9 @@ class TelegramPlatformEvent(AstrMessageEvent):
                             i.file = path
 
                         await self.client.send_document(
-                            document=i.file, filename=i.name, **payload
+                            document=i.file,
+                            filename=i.name,
+                            **payload,
                         )
                         continue
                     elif isinstance(i, Record):
@@ -263,7 +273,9 @@ class TelegramPlatformEvent(AstrMessageEvent):
             if delta and current_content != delta:
                 try:
                     markdown_text = telegramify_markdown.markdownify(
-                        delta, max_line_length=None, normalize_whitespace=False
+                        delta,
+                        max_line_length=None,
+                        normalize_whitespace=False,
                     )
                     await self.client.edit_message_text(
                         text=markdown_text,
@@ -274,7 +286,9 @@ class TelegramPlatformEvent(AstrMessageEvent):
                 except Exception as e:
                     logger.warning(f"Markdown转换失败，使用普通文本: {e!s}")
                     await self.client.edit_message_text(
-                        text=delta, chat_id=payload["chat_id"], message_id=message_id
+                        text=delta,
+                        chat_id=payload["chat_id"],
+                        message_id=message_id,
                     )
         except Exception as e:
             logger.warning(f"编辑消息失败(streaming): {e!s}")

astrbot/core/platform/sources/webchat/webchat_adapter.py

@@ -1,24 +1,27 @@
-import time
 import asyncio
-import uuid
 import os
-from typing import Awaitable, Any, Callable
+import time
+import uuid
+from collections.abc import Awaitable, Callable
+from typing import Any
+
+from astrbot import logger
+from astrbot.core.message.components import Image, Plain, Record
+from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
 )
-from astrbot.core.message.message_event_result import MessageChain
-from astrbot.core.message.components import Plain, Image, Record  # noqa: F403
-from astrbot import logger
-from .webchat_queue_mgr import webchat_queue_mgr, WebChatQueueMgr
-from .webchat_event import WebChatMessageEvent
 from astrbot.core.platform.astr_message_event import MessageSesion
-from ...register import register_platform_adapter
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
+from ...register import register_platform_adapter
+from .webchat_event import WebChatMessageEvent
+from .webchat_queue_mgr import WebChatQueueMgr, webchat_queue_mgr
+
 
 class QueueListener:
     def __init__(self, webchat_queue_mgr: WebChatQueueMgr, callback: Callable) -> None:
@@ -35,7 +38,7 @@ class QueueListener:
                 await self.callback(data)
             except Exception as e:
                 logger.error(
-                    f"Error processing message from conversation {conversation_id}: {e}"
+                    f"Error processing message from conversation {conversation_id}: {e}",
                 )
                 break
 
@@ -66,7 +69,10 @@ class QueueListener:
 @register_platform_adapter("webchat", "webchat")
 class WebChatAdapter(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)
 
@@ -77,11 +83,15 @@ class WebChatAdapter(Platform):
         os.makedirs(self.imgs_dir, exist_ok=True)
 
         self.metadata = PlatformMetadata(
-            name="webchat", description="webchat", id="webchat"
+            name="webchat",
+            description="webchat",
+            id="webchat",
         )
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         await WebChatMessageEvent._send(message_chain, session.session_id)
         await super().send_by_session(session, message_chain)
@@ -106,13 +116,13 @@ class WebChatAdapter(Platform):
             if isinstance(payload["image_url"], list):
                 for img in payload["image_url"]:
                     abm.message.append(
-                        Image.fromFileSystem(os.path.join(self.imgs_dir, img))
+                        Image.fromFileSystem(os.path.join(self.imgs_dir, img)),
                     )
             else:
                 abm.message.append(
                     Image.fromFileSystem(
-                        os.path.join(self.imgs_dir, payload["image_url"])
-                    )
+                        os.path.join(self.imgs_dir, payload["image_url"]),
+                    ),
                 )
         if payload["audio_url"]:
             if isinstance(payload["audio_url"], list):

astrbot/core/platform/sources/webchat/webchat_event.py

@@ -1,11 +1,13 @@
+import base64
 import os
 import uuid
-import base64
+
 from astrbot.api import logger
 from astrbot.api.event import AstrMessageEvent, MessageChain
-from astrbot.api.message_components import Plain, Image, Record
-from astrbot.core.utils.io import download_image_by_url
+from astrbot.api.message_components import Image, Plain, Record
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+from astrbot.core.utils.io import download_image_by_url
+
 from .webchat_queue_mgr import webchat_queue_mgr
 
 imgs_dir = os.path.join(get_astrbot_data_path(), "webchat", "imgs")
@@ -26,7 +28,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                     "type": "end",
                     "data": "",
                     "streaming": False,
-                }  # end means this request is finished
+                },  # end means this request is finished
             )
             return ""
 
@@ -41,7 +43,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                         "data": data,
                         "streaming": streaming,
                         "chain_type": message.type,
-                    }
+                    },
                 )
             elif isinstance(comp, Image):
                 # save image to local
@@ -70,7 +72,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                         "cid": cid,
                         "data": data,
                         "streaming": streaming,
-                    }
+                    },
                 )
             elif isinstance(comp, Record):
                 # save record to local
@@ -94,7 +96,7 @@ class WebChatMessageEvent(AstrMessageEvent):
                         "cid": cid,
                         "data": data,
                         "streaming": streaming,
-                    }
+                    },
                 )
             else:
                 logger.debug(f"webchat 忽略: {comp.type}")
@@ -118,12 +120,14 @@ class WebChatMessageEvent(AstrMessageEvent):
                         "data": final_data,
                         "streaming": True,
                         "cid": cid,
-                    }
+                    },
                 )
                 final_data = ""
                 continue
             final_data += await WebChatMessageEvent._send(
-                chain, session_id=self.session_id, streaming=True
+                chain,
+                session_id=self.session_id,
+                streaming=True,
             )
 
         await web_chat_back_queue.put(
@@ -132,6 +136,6 @@ class WebChatMessageEvent(AstrMessageEvent):
                 "data": final_data,
                 "streaming": True,
                 "cid": cid,
-            }
+            },
         )
         await super().send_streaming(generator, use_fallback)