AstrBot 4.8.0__py3-none-any.whl → 4.9.1__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

@@ -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

@@ -1,4 +1,7 @@
+import uuid
+
 from astrbot.core import astrbot_config, logger
+from astrbot.core.config.default import WEBHOOK_SUPPORTED_PLATFORMS
 
 
 def _get_callback_api_base() -> str:
@@ -45,3 +48,19 @@ def log_webhook_info(platform_name: str, webhook_uuid: str):
         "====================\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/chat.py

@@ -4,7 +4,9 @@ import mimetypes
 import os
 import uuid
 from contextlib import asynccontextmanager
+from typing import cast
 
+from quart import Response as QuartResponse
 from quart import g, make_response, request, send_file
 
 from astrbot.core import logger
@@ -424,16 +426,19 @@ class ChatRoute(Route):
             sender_name=username,
         )
 
-        response = await make_response(
-            stream(),
-            {
-                "Content-Type": "text/event-stream",
-                "Cache-Control": "no-cache",
-                "Transfer-Encoding": "chunked",
-                "Connection": "keep-alive",
-            },
+        response = cast(
+            QuartResponse,
+            await make_response(
+                stream(),
+                {
+                    "Content-Type": "text/event-stream",
+                    "Cache-Control": "no-cache",
+                    "Transfer-Encoding": "chunked",
+                    "Connection": "keep-alive",
+                },
+            ),
         )
-        response.timeout = None  # fix SSE auto disconnect issue  # pyright: ignore[reportAttributeAccessIssue]
+        response.timeout = None  # fix SSE auto disconnect issue
         return response
 
     async def delete_webchat_session(self):

astrbot/dashboard/routes/config.py

@@ -2,7 +2,7 @@ import asyncio
 import inspect
 import os
 import traceback
-import uuid
+from typing import Any
 
 from quart import request
 
@@ -14,7 +14,6 @@ from astrbot.core.config.default import (
     CONFIG_METADATA_3_SYSTEM,
     DEFAULT_CONFIG,
     DEFAULT_VALUE_MAP,
-    WEBHOOK_SUPPORTED_PLATFORMS,
 )
 from astrbot.core.config.i18n_utils import ConfigMetadataI18n
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
@@ -22,11 +21,12 @@ from astrbot.core.platform.register import platform_cls_map, platform_registry
 from astrbot.core.provider import Provider
 from astrbot.core.provider.register import provider_registry
 from astrbot.core.star.star import star_registry
+from astrbot.core.utils.webhook_utils import ensure_platform_webhook_config
 
 from .route import Response, Route, RouteContext
 
 
-def try_cast(value: str, type_: str):
+def try_cast(value: Any, type_: str):
     if type_ == "int":
         try:
             return int(value)
@@ -505,9 +505,9 @@ class ConfigRoute(Route):
             if not isinstance(inst, EmbeddingProvider):
                 return Response().error("提供商不是 EmbeddingProvider 类型").__dict__
 
-            # 初始化
-            if getattr(inst, "initialize", None):
-                await inst.initialize()
+            init_fn = getattr(inst, "initialize", None)
+            if inspect.iscoroutinefunction(init_fn):
+                await init_fn()
 
             # 获取嵌入向量维度
             vec = await inst.get_embedding("echo")
@@ -558,13 +558,8 @@ class ConfigRoute(Route):
     async def post_new_platform(self):
         new_platform_config = await request.json
 
-        # 如果是支持统一 webhook 模式的平台，且启用了统一 webhook 模式，自动生成 webhook_uuid
-        platform_type = new_platform_config.get("type", "")
-        if platform_type in WEBHOOK_SUPPORTED_PLATFORMS:
-            if new_platform_config.get("unified_webhook_mode", False):
-                # 如果没有 webhook_uuid 或为空，自动生成
-                if not new_platform_config.get("webhook_uuid"):
-                    new_platform_config["webhook_uuid"] = uuid.uuid4().hex[:16]
+        # 如果是支持统一 webhook 模式的平台，生成 webhook_uuid
+        ensure_platform_webhook_config(new_platform_config)
 
         self.config["platform"].append(new_platform_config)
         try:
@@ -596,12 +591,7 @@ class ConfigRoute(Route):
             return Response().error("参数错误").__dict__
 
         # 如果是支持统一 webhook 模式的平台，且启用了统一 webhook 模式，确保有 webhook_uuid
-        platform_type = new_config.get("type", "")
-        if platform_type in WEBHOOK_SUPPORTED_PLATFORMS:
-            if new_config.get("unified_webhook_mode", False):
-                # 如果没有 webhook_uuid 或为空，自动生成
-                if not new_config.get("webhook_uuid"):
-                    new_config["webhook_uuid"] = uuid.uuid4().hex
+        ensure_platform_webhook_config(new_config)
 
         for i, platform in enumerate(self.config["platform"]):
             if platform["id"] == platform_id:
@@ -777,7 +767,7 @@ class ConfigRoute(Route):
         return {"metadata": CONFIG_METADATA_2, "config": config}
 
     async def _get_plugin_config(self, plugin_name: str):
-        ret = {"metadata": None, "config": None}
+        ret: dict = {"metadata": None, "config": None}
 
         for plugin_md in star_registry:
             if plugin_md.name == plugin_name:

astrbot/dashboard/routes/conversation.py

@@ -1,7 +1,9 @@
 import json
 import traceback
+from datetime import datetime
+from io import BytesIO
 
-from quart import request
+from quart import request, send_file
 
 from astrbot.core import logger
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
@@ -30,6 +32,7 @@ class ConversationRoute(Route):
                 "POST",
                 self.update_history,
             ),
+            "/conversation/export": ("POST", self.export_conversations),
         }
         self.db_helper = db_helper
         self.conv_mgr = core_lifecycle.conversation_manager
@@ -283,3 +286,90 @@ class ConversationRoute(Route):
         except Exception as e:
             logger.error(f"更新对话历史失败: {e!s}\n{traceback.format_exc()}")
             return Response().error(f"更新对话历史失败: {e!s}").__dict__
+
+    async def export_conversations(self):
+        """批量导出对话为 JSONL 格式"""
+        try:
+            data = await request.get_json()
+            conversations_to_export = data.get("conversations", [])
+
+            if not conversations_to_export:
+                return Response().error("导出列表不能为空").__dict__
+
+            # 收集所有对话的内容
+            jsonl_lines = []
+            exported_count = 0
+            failed_items = []
+
+            for conv_info in conversations_to_export:
+                user_id = conv_info.get("user_id")
+                cid = conv_info.get("cid")
+
+                if not user_id or not cid:
+                    failed_items.append(
+                        f"user_id:{user_id}, cid:{cid} - 缺少必要参数",
+                    )
+                    continue
+
+                try:
+                    conversation = await self.conv_mgr.get_conversation(
+                        unified_msg_origin=user_id,
+                        conversation_id=cid,
+                    )
+
+                    if not conversation:
+                        failed_items.append(
+                            f"user_id:{user_id}, cid:{cid} - 对话不存在"
+                        )
+                        continue
+
+                    # 解析对话内容 (history is always a JSON string from _convert_conv_from_v2_to_v1)
+                    content = json.loads(conversation.history)
+
+                    # 创建导出记录
+                    export_record = {
+                        "cid": cid,
+                        "user_id": user_id,
+                        "platform_id": conversation.platform_id,
+                        "title": conversation.title,
+                        "persona_id": conversation.persona_id,
+                        "created_at": conversation.created_at,
+                        "updated_at": conversation.updated_at,
+                        "content": content,
+                    }
+
+                    # 将记录转换为 JSON 字符串并添加到 JSONL
+                    jsonl_lines.append(json.dumps(export_record, ensure_ascii=False))
+                    exported_count += 1
+
+                except Exception as e:
+                    failed_items.append(f"user_id:{user_id}, cid:{cid} - {e!s}")
+                    logger.error(
+                        f"导出对话失败: user_id={user_id}, cid={cid}, error={e!s}"
+                    )
+
+            if exported_count == 0:
+                return Response().error("没有成功导出任何对话").__dict__
+
+            # 创建 JSONL 内容
+            jsonl_content = "\n".join(jsonl_lines)
+
+            # 创建一个内存文件对象
+            file_obj = BytesIO(jsonl_content.encode("utf-8"))
+            file_obj.seek(0)
+
+            # 生成文件名
+            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            filename = f"astrbot_conversations_export_{timestamp}.jsonl"
+
+            # 返回文件流
+            return await send_file(
+                file_obj,
+                mimetype="application/jsonl",
+                as_attachment=True,
+                attachment_filename=filename,
+            )
+
+        except Exception as e:
+            logger.error(f"批量导出对话失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"批量导出对话失败: {e!s}").__dict__