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

astrbot/core/utils/t2i/network_strategy.py

@@ -1,14 +1,17 @@
-import aiohttp
 import asyncio
-import ssl
-import certifi
 import logging
 import random
-from . import RenderStrategy
+import ssl
+
+import aiohttp
+import certifi
+
 from astrbot.core.config import VERSION
 from astrbot.core.utils.io import download_image_by_url
 from astrbot.core.utils.t2i.template_manager import TemplateManager
 
+from . import RenderStrategy
+
 ASTRBOT_T2I_DEFAULT_ENDPOINT = "https://t2i.soulter.top/text2img"
 
 logger = logging.getLogger("astrbot")
@@ -38,7 +41,7 @@ class NetworkRenderStrategy(RenderStrategy):
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.get(
-                    "https://api.soulter.top/astrbot/t2i-endpoints"
+                    "https://api.soulter.top/astrbot/t2i-endpoints",
                 ) as resp:
                     if resp.status == 200:
                         data = await resp.json()
@@ -49,14 +52,13 @@ class NetworkRenderStrategy(RenderStrategy):
                             if ep.get("active") and ep.get("url")
                         ]
                         logger.info(
-                            f"Successfully got {len(self.endpoints)} official T2I endpoints."
+                            f"Successfully got {len(self.endpoints)} official T2I endpoints.",
                         )
         except Exception as e:
             logger.error(f"Failed to get official endpoints: {e}")
 
     def _clean_url(self, url: str):
-        if url.endswith("/"):
-            url = url[:-1]
+        url = url.removesuffix("/")
         if not url.endswith("text2img"):
             url += "/text2img"
         return url
@@ -69,7 +71,6 @@ class NetworkRenderStrategy(RenderStrategy):
         options: dict | None = None,
     ) -> str:
         """使用自定义文转图模板"""
-
         default_options = {"full_page": True, "type": "jpeg", "quality": 40}
         if options:
             default_options |= options
@@ -89,21 +90,26 @@ class NetworkRenderStrategy(RenderStrategy):
                 if return_url:
                     ssl_context = ssl.create_default_context(cafile=certifi.where())
                     connector = aiohttp.TCPConnector(ssl=ssl_context)
-                    async with aiohttp.ClientSession(
-                        trust_env=True, connector=connector
-                    ) as session:
-                        async with session.post(
-                            f"{endpoint}/generate", json=post_data
-                        ) as resp:
-                            if resp.status == 200:
-                                ret = await resp.json()
-                                return f"{endpoint}/{ret['data']['id']}"
-                            else:
-                                raise Exception(f"HTTP {resp.status}")
+                    async with (
+                        aiohttp.ClientSession(
+                            trust_env=True,
+                            connector=connector,
+                        ) as session,
+                        session.post(
+                            f"{endpoint}/generate",
+                            json=post_data,
+                        ) as resp,
+                    ):
+                        if resp.status == 200:
+                            ret = await resp.json()
+                            return f"{endpoint}/{ret['data']['id']}"
+                        raise Exception(f"HTTP {resp.status}")
                 else:
                     # download_image_by_url 失败时抛异常
                     return await download_image_by_url(
-                        f"{endpoint}/generate", post=True, post_data=post_data
+                        f"{endpoint}/generate",
+                        post=True,
+                        post_data=post_data,
                     )
             except Exception as e:
                 last_exception = e
@@ -114,15 +120,18 @@ class NetworkRenderStrategy(RenderStrategy):
         raise RuntimeError(f"All endpoints failed: {last_exception}")
 
     async def render(
-        self, text: str, return_url: bool = False, template_name: str | None = "base"
+        self,
+        text: str,
+        return_url: bool = False,
+        template_name: str | None = "base",
     ) -> str:
-        """
-        返回图像的文件路径
-        """
+        """返回图像的文件路径"""
         if not template_name:
             template_name = "base"
         tmpl_str = await self.get_template(name=template_name)
         text = text.replace("`", "\\`")
         return await self.render_custom_template(
-            tmpl_str, {"text": text, "version": f"v{VERSION}"}, return_url
+            tmpl_str,
+            {"text": text, "version": f"v{VERSION}"},
+            return_url,
         )

astrbot/core/utils/t2i/renderer.py

@@ -1,7 +1,8 @@
-from .network_strategy import NetworkRenderStrategy
-from .local_strategy import LocalRenderStrategy
 from astrbot.core.log import LogManager
 
+from .local_strategy import LocalRenderStrategy
+from .network_strategy import NetworkRenderStrategy
+
 logger = LogManager.GetLogger(log_name="astrbot")
 
 
@@ -30,7 +31,10 @@ class HtmlRenderer:
         @example: 参见 https://astrbot.app 插件开发部分。
         """
         return await self.network_strategy.render_custom_template(
-            tmpl_str, tmpl_data, return_url, options
+            tmpl_str,
+            tmpl_data,
+            return_url,
+            options,
         )
 
     async def render_t2i(
@@ -44,11 +48,13 @@ class HtmlRenderer:
         if use_network:
             try:
                 return await self.network_strategy.render(
-                    text, return_url=return_url, template_name=template_name
+                    text,
+                    return_url=return_url,
+                    template_name=template_name,
                 )
             except BaseException as e:
                 logger.error(
-                    f"Failed to render image via AstrBot API: {e}. Falling back to local rendering."
+                    f"Failed to render image via AstrBot API: {e}. Falling back to local rendering.",
                 )
                 return await self.local_strategy.render(text)
         else:

astrbot/core/utils/t2i/template_manager.py

@@ -2,12 +2,12 @@
 
 import os
 import shutil
+
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path, get_astrbot_path
 
 
 class TemplateManager:
-    """
-    负责管理 t2i HTML 模板的 CRUD 和重置操作。
+    """负责管理 t2i HTML 模板的 CRUD 和重置操作。
     采用“用户覆盖内置”策略：用户模板存储在 data 目录中，并优先于内置模板加载。
     所有创建、更新、删除操作仅影响用户目录，以确保更新框架时用户数据安全。
     """
@@ -16,7 +16,12 @@ class TemplateManager:
 
     def __init__(self):
         self.builtin_template_dir = os.path.join(
-            get_astrbot_path(), "astrbot", "core", "utils", "t2i", "template"
+            get_astrbot_path(),
+            "astrbot",
+            "core",
+            "utils",
+            "t2i",
+            "template",
         )
         self.user_template_dir = os.path.join(get_astrbot_data_path(), "t2i_templates")
 
@@ -43,12 +48,11 @@ class TemplateManager:
 
     def _read_file(self, path: str) -> str:
         """读取文件内容。"""
-        with open(path, "r", encoding="utf-8") as f:
+        with open(path, encoding="utf-8") as f:
             return f.read()
 
     def list_templates(self) -> list[dict]:
-        """
-        列出所有可用模板。
+        """列出所有可用模板。
         该列表是内置模板和用户模板的合并视图，用户模板将覆盖同名的内置模板。
         """
         dirs_to_scan = [self.builtin_template_dir, self.user_template_dir]
@@ -63,8 +67,7 @@ class TemplateManager:
         ]
 
     def get_template(self, name: str) -> str:
-        """
-        获取指定模板的内容。
+        """获取指定模板的内容。
         优先从用户目录加载，如果不存在则回退到内置目录。
         """
         user_path = self._get_user_template_path(name)
@@ -86,8 +89,7 @@ class TemplateManager:
             f.write(content)
 
     def update_template(self, name: str, content: str):
-        """
-        更新一个模板。此操作始终写入用户目录。
+        """更新一个模板。此操作始终写入用户目录。
         如果更新的是一个内置模板，此操作实际上会在用户目录中创建一个修改后的副本，
         从而实现对内置模板的“覆盖”。
         """
@@ -96,8 +98,7 @@ class TemplateManager:
             f.write(content)
 
     def delete_template(self, name: str):
-        """
-        仅删除用户目录中的模板文件。
+        """仅删除用户目录中的模板文件。
         如果删除的是一个覆盖了内置模板的用户模板，这将有效地“恢复”到内置版本。
         """
         path = self._get_user_template_path(name)
@@ -106,7 +107,5 @@ class TemplateManager:
         os.remove(path)
 
     def reset_default_template(self):
-        """
-        将核心模板从内置目录强制重置到用户目录。
-        """
+        """将核心模板从内置目录强制重置到用户目录。"""
         self._copy_core_templates(overwrite=True)

astrbot/core/utils/tencent_record_helper.py

@@ -1,10 +1,11 @@
+import asyncio
 import base64
-import wave
 import os
 import subprocess
-from io import BytesIO
-import asyncio
 import tempfile
+import wave
+from io import BytesIO
+
 from astrbot.core import logger
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
@@ -35,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())
@@ -60,8 +61,7 @@ async def wav_to_tencent_silk(wav_path: str, output_path: str) -> int:
 
 
 async def convert_to_pcm_wav(input_path: str, output_path: str) -> str:
-    """
-    将 MP3 或其他音频格式转换为 PCM 16bit WAV，采样率24000Hz，单声道。
+    """将 MP3 或其他音频格式转换为 PCM 16bit WAV，采样率24000Hz，单声道。
     若转换失败则抛出异常。
     """
     try:
@@ -99,13 +99,11 @@ async def convert_to_pcm_wav(input_path: str, output_path: str) -> str:
 
     if os.path.exists(output_path) and os.path.getsize(output_path) > 0:
         return output_path
-    else:
-        raise RuntimeError("生成的WAV文件不存在或为空")
+    raise RuntimeError("生成的WAV文件不存在或为空")
 
 
 async def audio_to_tencent_silk_base64(audio_path: str) -> tuple[str, float]:
-    """
-    将 MP3/WAV 文件转为 Tencent Silk 并返回 base64 编码与时长（秒）。
+    """将 MP3/WAV 文件转为 Tencent Silk 并返回 base64 编码与时长（秒）。
 
     参数:
     - audio_path: 输入音频文件路径（.mp3 或 .wav）
@@ -125,7 +123,9 @@ async def audio_to_tencent_silk_base64(audio_path: str) -> tuple[str, float]:
     # 是否需要转换为 WAV
     ext = os.path.splitext(audio_path)[1].lower()
     temp_wav = tempfile.NamedTemporaryFile(
-        suffix=".wav", delete=False, dir=temp_dir
+        suffix=".wav",
+        delete=False,
+        dir=temp_dir,
     ).name
 
     if ext != ".wav":
@@ -140,12 +140,18 @@ async def audio_to_tencent_silk_base64(audio_path: str) -> tuple[str, float]:
         rate = wav_file.getframerate()
 
     silk_path = tempfile.NamedTemporaryFile(
-        suffix=".silk", delete=False, dir=temp_dir
+        suffix=".silk",
+        delete=False,
+        dir=temp_dir,
     ).name
 
     try:
         duration = await asyncio.to_thread(
-            pilk.encode, wav_path, silk_path, pcm_rate=rate, tencent=True
+            pilk.encode,
+            wav_path,
+            silk_path,
+            pcm_rate=rate,
+            tencent=True,
         )
 
         with open(silk_path, "rb") as f:

astrbot/core/utils/version_comparator.py

@@ -38,15 +38,15 @@ class VersionComparator:
         for i in range(length):
             if v1_parts[i] > v2_parts[i]:
                 return 1
-            elif v1_parts[i] < v2_parts[i]:
+            if v1_parts[i] < v2_parts[i]:
                 return -1
 
         # 比较预发布标签
         if v1_prerelease is None and v2_prerelease is not None:
             return 1  # 没有预发布标签的版本高于有预发布标签的版本
-        elif v1_prerelease is not None and v2_prerelease is None:
+        if v1_prerelease is not None and v2_prerelease is None:
             return -1  # 有预发布标签的版本低于没有预发布标签的版本
-        elif v1_prerelease is not None and v2_prerelease is not None:
+        if v1_prerelease is not None and v2_prerelease is not None:
             len_pre = max(len(v1_prerelease), len(v2_prerelease))
             for i in range(len_pre):
                 p1 = v1_prerelease[i] if i < len(v1_prerelease) else None
@@ -54,21 +54,18 @@ class VersionComparator:
 
                 if p1 is None and p2 is not None:
                     return -1
-                elif p1 is not None and p2 is None:
+                if p1 is not None and p2 is None:
                     return 1
-                elif isinstance(p1, int) and isinstance(p2, str):
+                if isinstance(p1, int) and isinstance(p2, str):
                     return -1
-                elif isinstance(p1, str) and isinstance(p2, int):
+                if isinstance(p1, str) and isinstance(p2, int):
                     return 1
-                elif isinstance(p1, int) and isinstance(p2, int):
+                if (isinstance(p1, int) and isinstance(p2, int)) or (
+                    isinstance(p1, str) and isinstance(p2, str)
+                ):
                     if p1 > p2:
                         return 1
-                    elif p1 < p2:
-                        return -1
-                elif isinstance(p1, str) and isinstance(p2, str):
-                    if p1 > p2:
-                        return 1
-                    elif p1 < p2:
+                    if p1 < p2:
                         return -1
             return 0  # 预发布标签完全相同
 

astrbot/core/zip_updator.py

@@ -1,14 +1,14 @@
-import aiohttp
 import os
 import re
-import zipfile
 import shutil
-
 import ssl
+import zipfile
+
+import aiohttp
 import certifi
 
-from astrbot.core.utils.io import on_error, download_file
 from astrbot.core import logger
+from astrbot.core.utils.io import download_file, on_error
 from astrbot.core.utils.version_comparator import VersionComparator
 
 
@@ -18,7 +18,10 @@ class ReleaseInfo:
     body: str
 
     def __init__(
-        self, version: str = "", published_at: str = "", body: str = ""
+        self,
+        version: str = "",
+        published_at: str = "",
+        body: str = "",
     ) -> None:
         self.version = version
         self.published_at = published_at
@@ -34,29 +37,31 @@ class RepoZipUpdator:
         self.rm_on_error = on_error
 
     async def fetch_release_info(self, url: str, latest: bool = True) -> list:
-        """
-        请求版本信息。
+        """请求版本信息。
         返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
         """
         try:
             ssl_context = ssl.create_default_context(
-                cafile=certifi.where()
+                cafile=certifi.where(),
             )  # 新增：创建基于 certifi 的 SSL 上下文
             connector = aiohttp.TCPConnector(
-                ssl=ssl_context
+                ssl=ssl_context,
             )  # 新增：使用 TCPConnector 指定 SSL 上下文
-            async with aiohttp.ClientSession(
-                trust_env=True, connector=connector
-            ) as session:
-                async with session.get(url) as response:
-                    # 检查 HTTP 状态码
-                    if response.status != 200:
-                        text = await response.text()
-                        logger.error(
-                            f"请求 {url} 失败，状态码: {response.status}, 内容: {text}"
-                        )
-                        raise Exception(f"请求失败，状态码: {response.status}")
-                    result = await response.json()
+            async with (
+                aiohttp.ClientSession(
+                    trust_env=True,
+                    connector=connector,
+                ) as session,
+                session.get(url) as response,
+            ):
+                # 检查 HTTP 状态码
+                if response.status != 200:
+                    text = await response.text()
+                    logger.error(
+                        f"请求 {url} 失败，状态码: {response.status}, 内容: {text}",
+                    )
+                    raise Exception(f"请求失败，状态码: {response.status}")
+                result = await response.json()
             if not result:
                 return []
             # if latest:
@@ -72,7 +77,7 @@ class RepoZipUpdator:
                         "body": release["body"],
                         "tag_name": release["tag_name"],
                         "zipball_url": release["zipball_url"],
-                    }
+                    },
                 )
         except Exception as e:
             logger.error(f"解析版本信息时发生异常: {e}")
@@ -80,8 +85,7 @@ class RepoZipUpdator:
         return ret
 
     def github_api_release_parser(self, releases: list) -> list:
-        """
-        解析 GitHub API 返回的 releases 信息。
+        """解析 GitHub API 返回的 releases 信息。
         返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
         """
         ret = []
@@ -93,22 +97,25 @@ class RepoZipUpdator:
                     "body": release["body"],
                     "tag_name": release["tag_name"],
                     "zipball_url": release["zipball_url"],
-                }
+                },
             )
         return ret
 
     def unzip(self):
-        raise NotImplementedError()
+        raise NotImplementedError
 
     async def update(self):
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def compare_version(self, v1: str, v2: str) -> int:
         """Semver 版本比较"""
         return VersionComparator.compare_version(v1, v2)
 
     async def check_update(
-        self, url: str, current_version: str, consider_prerelease: bool = True
+        self,
+        url: str,
+        current_version: str,
+        consider_prerelease: bool = True,
     ) -> ReleaseInfo | None:
         update_data = await self.fetch_release_info(url)
 
@@ -157,7 +164,7 @@ class RepoZipUpdator:
                 releases = await self.fetch_release_info(url=release_url)
             except Exception as e:
                 logger.warning(
-                    f"获取 {author}/{repo} 的 GitHub Releases 失败: {e}，将尝试下载默认分支"
+                    f"获取 {author}/{repo} 的 GitHub Releases 失败: {e}，将尝试下载默认分支",
                 )
                 releases = []
             if not releases:
@@ -173,7 +180,7 @@ class RepoZipUpdator:
             proxy = proxy.rstrip("/")
             release_url = f"{proxy}/{release_url}"
             logger.info(
-                f"检查到设置了镜像站，将使用镜像站下载 {author}/{repo} 仓库源码: {release_url}"
+                f"检查到设置了镜像站，将使用镜像站下载 {author}/{repo} 仓库源码: {release_url}",
             )
 
         await download_file(release_url, target_path + ".zip")
@@ -194,13 +201,10 @@ class RepoZipUpdator:
             repo = match.group(2)
             branch = match.group(4)
             return author, repo, branch
-        else:
-            raise ValueError("无效的 GitHub URL")
+        raise ValueError("无效的 GitHub URL")
 
     def unzip_file(self, zip_path: str, target_dir: str):
-        """
-        解压缩文件, 并将压缩包内**第一个**文件夹内的文件移动到 target_dir
-        """
+        """解压缩文件, 并将压缩包内**第一个**文件夹内的文件移动到 target_dir"""
         os.makedirs(target_dir, exist_ok=True)
         update_dir = ""
         with zipfile.ZipFile(zip_path, "r") as z:
@@ -213,20 +217,19 @@ class RepoZipUpdator:
             if os.path.isdir(os.path.join(target_dir, update_dir, f)):
                 if os.path.exists(os.path.join(target_dir, f)):
                     shutil.rmtree(os.path.join(target_dir, f), onerror=on_error)
-            else:
-                if os.path.exists(os.path.join(target_dir, f)):
-                    os.remove(os.path.join(target_dir, f))
+            elif os.path.exists(os.path.join(target_dir, f)):
+                os.remove(os.path.join(target_dir, f))
             shutil.move(os.path.join(target_dir, update_dir, f), target_dir)
 
         try:
             logger.debug(
-                f"删除临时更新文件: {zip_path} 和 {os.path.join(target_dir, update_dir)}"
+                f"删除临时更新文件: {zip_path} 和 {os.path.join(target_dir, update_dir)}",
             )
             shutil.rmtree(os.path.join(target_dir, update_dir), onerror=on_error)
             os.remove(zip_path)
         except BaseException:
             logger.warning(
-                f"删除更新文件失败，可以手动删除 {zip_path} 和 {os.path.join(target_dir, update_dir)}"
+                f"删除更新文件失败，可以手动删除 {zip_path} 和 {os.path.join(target_dir, update_dir)}",
             )
 
     def format_name(self, name: str) -> str:

astrbot/dashboard/routes/__init__.py

@@ -1,31 +1,31 @@
 from .auth import AuthRoute
-from .plugin import PluginRoute
-from .config import ConfigRoute
-from .update import UpdateRoute
-from .stat import StatRoute
-from .log import LogRoute
-from .static_file import StaticFileRoute
 from .chat import ChatRoute
-from .tools import ToolsRoute
+from .config import ConfigRoute
 from .conversation import ConversationRoute
 from .file import FileRoute
-from .session_management import SessionManagementRoute
-from .persona import PersonaRoute
 from .knowledge_base import KnowledgeBaseRoute
+from .log import LogRoute
+from .persona import PersonaRoute
+from .plugin import PluginRoute
+from .session_management import SessionManagementRoute
+from .stat import StatRoute
+from .static_file import StaticFileRoute
+from .tools import ToolsRoute
+from .update import UpdateRoute
 
 __all__ = [
     "AuthRoute",
-    "PluginRoute",
-    "ConfigRoute",
-    "UpdateRoute",
-    "StatRoute",
-    "LogRoute",
-    "StaticFileRoute",
     "ChatRoute",
-    "ToolsRoute",
+    "ConfigRoute",
     "ConversationRoute",
     "FileRoute",
-    "SessionManagementRoute",
-    "PersonaRoute",
     "KnowledgeBaseRoute",
+    "LogRoute",
+    "PersonaRoute",
+    "PluginRoute",
+    "SessionManagementRoute",
+    "StatRoute",
+    "StaticFileRoute",
+    "ToolsRoute",
+    "UpdateRoute",
 ]

astrbot/dashboard/routes/auth.py

@@ -1,10 +1,13 @@
-import jwt
-import datetime
 import asyncio
-from .route import Route, Response, RouteContext
+import datetime
+
+import jwt
 from quart import request
-from astrbot.core import DEMO_MODE
+
 from astrbot import logger
+from astrbot.core import DEMO_MODE
+
+from .route import Response, Route, RouteContext
 
 
 class AuthRoute(Route):
@@ -37,13 +40,12 @@ class AuthRoute(Route):
                         "token": self.generate_jwt(username),
                         "username": username,
                         "change_pwd_hint": change_pwd_hint,
-                    }
+                    },
                 )
                 .__dict__
             )
-        else:
-            await asyncio.sleep(3)
-            return Response().error("用户名或密码错误").__dict__
+        await asyncio.sleep(3)
+        return Response().error("用户名或密码错误").__dict__
 
     async def edit_account(self):
         if DEMO_MODE: