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

astrbot/core/utils/t2i/local_strategy.py

@@ -20,7 +20,7 @@ class FontManager:
     _font_cache = {}
 
     @classmethod
-    def get_font(cls, size: int) -> ImageFont.FreeTypeFont:
+    def get_font(cls, size: int) -> ImageFont.FreeTypeFont|ImageFont.ImageFont:
         """获取指定大小的字体，优先从缓存获取"""
         if size in cls._font_cache:
             return cls._font_cache[size]
@@ -66,23 +66,17 @@ class TextMeasurer:
     """测量文本尺寸的工具类"""
 
     @staticmethod
-    def get_text_size(text: str, font: ImageFont.FreeTypeFont) -> Tuple[int, int]:
+    def get_text_size(text: str, font: ImageFont.FreeTypeFont|ImageFont.ImageFont) -> tuple[int, int]:
         """获取文本的尺寸"""
-        try:
-            # PIL 9.0.0 以上版本
-            return (
-                font.getbbox(text)[2:]
-                if hasattr(font, "getbbox")
-                else font.getsize(text)
-            )
-        except Exception:
-            # 兼容旧版本
-            return font.getsize(text)
+
+        # 依赖库Pillow>=11.2.1，不再需要考虑<9.0.0
+        left, top, right, bottom = font.getbbox("Hello world")
+        return int(right - left), int(bottom - top)
 
     @staticmethod
     def split_text_to_fit_width(
-        text: str, font: ImageFont.FreeTypeFont, max_width: int
-    ) -> List[str]:
+        text: str, font: ImageFont.FreeTypeFont|ImageFont.ImageFont, max_width: int
+    ) -> list[str]:
         """将文本拆分为多行，确保每行不超过指定宽度"""
         lines = []
         if not text:
@@ -126,7 +120,7 @@ class MarkdownElement(ABC):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -152,7 +146,7 @@ class TextElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -186,7 +180,7 @@ class BoldTextElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -251,7 +245,7 @@ class ItalicTextElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -299,7 +293,7 @@ class ItalicTextElement(MarkdownElement):
                     # 倾斜变换，使用仿射变换实现斜体效果
                     # 变换矩阵: [1, 0.2, 0, 0, 1, 0]
                     italic_img = text_img.transform(
-                        text_img.size, Image.AFFINE, (1, 0.2, 0, 0, 1, 0), Image.BICUBIC
+                        text_img.size, Image.Transform.AFFINE, (1, 0.2, 0, 0, 1, 0), Image.Resampling.BICUBIC
                     )
 
                     # 粘贴到原图像
@@ -331,7 +325,7 @@ class UnderlineTextElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -371,7 +365,7 @@ class StrikethroughTextElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -422,7 +416,7 @@ class HeaderElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -458,7 +452,7 @@ class QuoteElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -502,7 +496,7 @@ class ListItemElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -532,7 +526,7 @@ class ListItemElement(MarkdownElement):
 class CodeBlockElement(MarkdownElement):
     """代码块元素"""
 
-    def __init__(self, content: List[str]):
+    def __init__(self, content: list[str]):
         super().__init__("\n".join(content))
 
     def calculate_height(self, image_width: int, font_size: int) -> int:
@@ -552,7 +546,7 @@ class CodeBlockElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -595,7 +589,7 @@ class InlineCodeElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -667,7 +661,7 @@ class ImageElement(MarkdownElement):
     def render(
         self,
         image: Image.Image,
-        draw: ImageDraw.Draw,
+        draw: ImageDraw.ImageDraw,
         x: int,
         y: int,
         image_width: int,
@@ -686,7 +680,7 @@ class ImageElement(MarkdownElement):
         if pasted_image.width > max_width:
             ratio = max_width / pasted_image.width
             new_size = (int(max_width), int(pasted_image.height * ratio))
-            pasted_image = pasted_image.resize(new_size, Image.LANCZOS)
+            pasted_image = pasted_image.resize(new_size, Image.Resampling.LANCZOS)
 
         # 计算居中位置
         paste_x = x + (image_width - pasted_image.width) // 2 - 10
@@ -705,7 +699,7 @@ class MarkdownParser:
     """Markdown解析器，将文本解析为元素"""
 
     @staticmethod
-    async def parse(text: str) -> List[MarkdownElement]:
+    async def parse(text: str) -> list[MarkdownElement]:
         elements = []
         lines = text.split("\n")
 
@@ -847,7 +841,7 @@ class MarkdownRenderer:
         self,
         font_size: int = 26,
         width: int = 800,
-        bg_color: Tuple[int, int, int] = (255, 255, 255),
+        bg_color: tuple[int, int, int] = (255, 255, 255),
     ):
         self.font_size = font_size
         self.width = width

astrbot/core/utils/tencent_record_helper.py

@@ -36,7 +36,7 @@ async def wav_to_tencent_silk(wav_path: str, output_path: str) -> int:
         import pilk
     except (ImportError, ModuleNotFoundError) as _:
         raise Exception(
-            "pilk 模块未安装，请前往管理面板->控制台->安装pip库 安装 pilk 这个库",
+            "pilk 模块未安装，请前往管理面板->平台日志->安装pip库 安装 pilk 这个库",
         )
     # with wave.open(wav_path, 'rb') as wav:
     #     wav_data = wav.readframes(wav.getnframes())
@@ -68,7 +68,7 @@ async def convert_to_pcm_wav(input_path: str, output_path: str) -> str:
         from pyffmpeg import FFmpeg
 
         ff = FFmpeg()
-        ff.convert(input=input_path, output=output_path)
+        ff.convert(input_file=input_path, output_file=output_path)
     except Exception as e:
         logger.debug(f"pyffmpeg 转换失败: {e}, 尝试使用 ffmpeg 命令行进行转换")
 

astrbot/core/utils/version_comparator.py

@@ -60,9 +60,12 @@ class VersionComparator:
                     return -1
                 if isinstance(p1, str) and isinstance(p2, int):
                     return 1
-                if (isinstance(p1, int) and isinstance(p2, int)) or (
-                    isinstance(p1, str) and isinstance(p2, str)
-                ):
+                if isinstance(p1, int) and isinstance(p2, int):
+                    if p1 > p2:
+                        return 1
+                    if p1 < p2:
+                        return -1
+                if isinstance(p1, str) and isinstance(p2, str):
                     if p1 > p2:
                         return 1
                     if p1 < p2:

astrbot/core/utils/webhook_utils.py

@@ -0,0 +1,66 @@
+import uuid
+
+from astrbot.core import astrbot_config, logger
+from astrbot.core.config.default import WEBHOOK_SUPPORTED_PLATFORMS
+
+
+def _get_callback_api_base() -> str:
+    try:
+        return astrbot_config.get("callback_api_base", "").rstrip("/")
+    except Exception as e:
+        logger.error(f"获取 callback_api_base 失败: {e!s}")
+        return ""
+
+
+def _get_dashboard_port() -> int:
+    try:
+        return astrbot_config.get("dashboard", {}).get("port", 6185)
+    except Exception as e:
+        logger.error(f"获取 dashboard 端口失败: {e!s}")
+        return 6185
+
+
+def log_webhook_info(platform_name: str, webhook_uuid: str):
+    """打印美观的 webhook 信息日志
+
+    Args:
+        platform_name: 平台名称
+        webhook_uuid: webhook 的 UUID
+    """
+
+    callback_base = _get_callback_api_base()
+
+    if not callback_base:
+        callback_base = "http(s)://<your-astrbot-domain>"
+
+    if not callback_base.startswith("http"):
+        callback_base = f"http(s)://{callback_base}"
+
+    callback_base = callback_base.rstrip("/")
+    webhook_url = f"{callback_base}/api/platform/webhook/{webhook_uuid}"
+
+    display_log = (
+        "\n====================\n"
+        f"🔗 机器人平台 {platform_name} 已启用统一 Webhook 模式\n"
+        f"📍 Webhook 回调地址: \n"
+        f"   ➜  http://<your-ip>:{_get_dashboard_port()}/api/platform/webhook/{webhook_uuid}\n"
+        f"   ➜  {webhook_url}\n"
+        "====================\n"
+    )
+    logger.info(display_log)
+
+
+def ensure_platform_webhook_config(platform_cfg: dict) -> bool:
+    """为支持统一 webhook 的平台自动生成 webhook_uuid
+
+    Args:
+        platform_cfg (dict): 平台配置字典
+
+    Returns:
+        bool: 如果生成了 webhook_uuid 则返回 True，否则返回 False
+    """
+    pt = platform_cfg.get("type", "")
+    if pt in WEBHOOK_SUPPORTED_PLATFORMS and not platform_cfg.get("webhook_uuid"):
+        platform_cfg["webhook_uuid"] = uuid.uuid4().hex[:16]
+        return True
+    return False

astrbot/dashboard/routes/__init__.py

@@ -6,6 +6,7 @@ from .file import FileRoute
 from .knowledge_base import KnowledgeBaseRoute
 from .log import LogRoute
 from .persona import PersonaRoute
+from .platform import PlatformRoute
 from .plugin import PluginRoute
 from .session_management import SessionManagementRoute
 from .stat import StatRoute
@@ -22,6 +23,7 @@ __all__ = [
     "KnowledgeBaseRoute",
     "LogRoute",
     "PersonaRoute",
+    "PlatformRoute",
     "PluginRoute",
     "SessionManagementRoute",
     "StatRoute",