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

astrbot/core/utils/io.py

@@ -1,29 +1,26 @@
+import base64
+import logging
 import os
-from pathlib import Path
-import ssl
 import shutil
 import socket
+import ssl
 import time
-import aiohttp
-import base64
-import zipfile
 import uuid
-import psutil
-import logging
+import zipfile
+from pathlib import Path
 
+import aiohttp
 import certifi
-
-
+import psutil
 from PIL import Image
+
 from .astrbot_path import get_astrbot_data_path
 
 logger = logging.getLogger("astrbot")
 
 
 def on_error(func, path, exc_info):
-    """
-    a callback of the rmtree function.
-    """
+    """A callback of the rmtree function."""
     import stat
 
     if not os.access(path, os.W_OK):
@@ -78,61 +75,75 @@ def save_temp_img(img: Image.Image | str) -> str:
 
 
 async def download_image_by_url(
-    url: str, post: bool = False, post_data: dict = None, path=None
+    url: str,
+    post: bool = False,
+    post_data: dict | None = None,
+    path: str | None = None,
 ) -> str:
-    """
-    下载图片, 返回 path
-    """
+    """下载图片, 返回 path"""
     try:
         ssl_context = ssl.create_default_context(
-            cafile=certifi.where()
+            cafile=certifi.where(),
         )  # 使用 certifi 提供的 CA 证书
         connector = aiohttp.TCPConnector(ssl=ssl_context)  # 使用 certifi 的根证书
         async with aiohttp.ClientSession(
-            trust_env=True, connector=connector
+            trust_env=True,
+            connector=connector,
         ) as session:
             if post:
                 async with session.post(url, json=post_data) as resp:
                     if not path:
                         return save_temp_img(await resp.read())
-                    else:
-                        with open(path, "wb") as f:
-                            f.write(await resp.read())
-                        return path
+                    with open(path, "wb") as f:
+                        f.write(await resp.read())
+                    return path
             else:
                 async with session.get(url) as resp:
                     if not path:
                         return save_temp_img(await resp.read())
-                    else:
-                        with open(path, "wb") as f:
-                            f.write(await resp.read())
-                        return path
+                    with open(path, "wb") as f:
+                        f.write(await resp.read())
+                    return path
     except (aiohttp.ClientConnectorSSLError, aiohttp.ClientConnectorCertificateError):
-        # 关闭SSL验证
+        # 关闭SSL验证（仅在证书验证失败时作为fallback）
+        logger.warning(
+            f"SSL certificate verification failed for {url}. "
+            "Disabling SSL verification (CERT_NONE) as a fallback. "
+            "This is insecure and exposes the application to man-in-the-middle attacks. "
+            "Please investigate and resolve certificate issues."
+        )
         ssl_context = ssl.create_default_context()
-        ssl_context.set_ciphers("DEFAULT")
+        ssl_context.check_hostname = False
+        ssl_context.verify_mode = ssl.CERT_NONE
         async with aiohttp.ClientSession() as session:
             if post:
-                async with session.get(url, ssl=ssl_context) as resp:
-                    return save_temp_img(await resp.read())
+                async with session.post(url, json=post_data, ssl=ssl_context) as resp:
+                    if not path:
+                        return save_temp_img(await resp.read())
+                    with open(path, "wb") as f:
+                        f.write(await resp.read())
+                    return path
             else:
                 async with session.get(url, ssl=ssl_context) as resp:
-                    return save_temp_img(await resp.read())
+                    if not path:
+                        return save_temp_img(await resp.read())
+                    with open(path, "wb") as f:
+                        f.write(await resp.read())
+                    return path
     except Exception as e:
         raise e
 
 
 async def download_file(url: str, path: str, show_progress: bool = False):
-    """
-    从指定 url 下载文件到指定路径 path
-    """
+    """从指定 url 下载文件到指定路径 path"""
     try:
         ssl_context = ssl.create_default_context(
-            cafile=certifi.where()
+            cafile=certifi.where(),
         )  # 使用 certifi 提供的 CA 证书
         connector = aiohttp.TCPConnector(ssl=ssl_context)
         async with aiohttp.ClientSession(
-            trust_env=True, connector=connector
+            trust_env=True,
+            connector=connector,
         ) as session:
             async with session.get(url, timeout=1800) as resp:
                 if resp.status != 200:
@@ -161,9 +172,19 @@ async def download_file(url: str, path: str, show_progress: bool = False):
                                 end="",
                             )
     except (aiohttp.ClientConnectorSSLError, aiohttp.ClientConnectorCertificateError):
-        # 关闭SSL验证
+        # 关闭SSL验证（仅在证书验证失败时作为fallback）
+        logger.warning(
+            "SSL 证书验证失败，已关闭 SSL 验证（不安全，仅用于临时下载）。请检查目标服务器的证书配置。"
+        )
+        logger.warning(
+            f"SSL certificate verification failed for {url}. "
+            "Falling back to unverified connection (CERT_NONE). "
+            "This is insecure and exposes the application to man-in-the-middle attacks. "
+            "Please investigate certificate issues with the remote server."
+        )
         ssl_context = ssl.create_default_context()
-        ssl_context.set_ciphers("DEFAULT")
+        ssl_context.check_hostname = False
+        ssl_context.verify_mode = ssl.CERT_NONE
         async with aiohttp.ClientSession() as session:
             async with session.get(url, ssl=ssl_context, timeout=120) as resp:
                 total_size = int(resp.headers.get("content-length", 0))
@@ -227,7 +248,6 @@ async def download_dashboard(
     proxy: str | None = None,
 ) -> None:
     """下载管理面板文件"""
-
     if path is None:
         zip_path = Path(get_astrbot_data_path()).absolute() / "dashboard.zip"
     else:
@@ -237,11 +257,13 @@ async def download_dashboard(
         ver_name = "latest" if latest else version
         dashboard_release_url = f"https://astrbot-registry.soulter.top/download/astrbot-dashboard/{ver_name}/dist.zip"
         logger.info(
-            f"准备下载指定发行版本的 AstrBot WebUI 文件: {dashboard_release_url}"
+            f"准备下载指定发行版本的 AstrBot WebUI 文件: {dashboard_release_url}",
         )
         try:
             await download_file(
-                dashboard_release_url, str(zip_path), show_progress=True
+                dashboard_release_url,
+                str(zip_path),
+                show_progress=True,
             )
         except BaseException as _:
             if latest:
@@ -251,7 +273,9 @@ async def download_dashboard(
             if proxy:
                 dashboard_release_url = f"{proxy}/{dashboard_release_url}"
             await download_file(
-                dashboard_release_url, str(zip_path), show_progress=True
+                dashboard_release_url,
+                str(zip_path),
+                show_progress=True,
             )
     else:
         url = f"https://github.com/AstrBotDevs/astrbot-release-harbour/releases/download/release-{version}/dist.zip"

astrbot/core/utils/log_pipe.py

@@ -1,5 +1,5 @@
-import threading
 import os
+import threading
 from logging import Logger
 
 

astrbot/core/utils/metrics.py

@@ -1,10 +1,12 @@
-import aiohttp
-import sys
 import os
 import socket
+import sys
 import uuid
-from astrbot.core.config import VERSION
+
+import aiohttp
+
 from astrbot.core import db_helper, logger
+from astrbot.core.config import VERSION
 
 
 class Metric:
@@ -21,7 +23,7 @@ class Metric:
 
         if os.path.exists(id_file):
             try:
-                with open(id_file, "r") as f:
+                with open(id_file) as f:
                     Metric._iid_cache = f.read().strip()
                     return Metric._iid_cache
             except Exception:
@@ -39,8 +41,7 @@ class Metric:
 
     @staticmethod
     async def upload(**kwargs):
-        """
-        上传相关非敏感的指标以更好地了解 AstrBot 的使用情况。上传的指标不会包含任何有关消息文本、用户信息等敏感信息。
+        """上传相关非敏感的指标以更好地了解 AstrBot 的使用情况。上传的指标不会包含任何有关消息文本、用户信息等敏感信息。
 
         Powered by TickStats.
         """
@@ -64,7 +65,6 @@ class Metric:
                 )
         except Exception as e:
             logger.error(f"保存指标到数据库失败: {e}")
-            pass
 
         try:
             async with aiohttp.ClientSession(trust_env=True) as session:

astrbot/core/utils/path_util.py

@@ -19,24 +19,23 @@ def path_Mapping(mappings, srcPath: str) -> str:
             # 切割后大于4个项目，或者只有1个项目，那肯定是错误的，只能是2，3，4个项目
             logger.warning(f"路径映射规则错误: {mapping}")
             continue
+        # rule.len == 3 or 4
+        elif os.path.exists(rule[0] + ":" + rule[1]):
+            # 前面两个项目合并路径存在，说明是本地Window路径。后面一个或两个项目组成的路径本地大概率无法解析，直接拼接
+            from_ = rule[0] + ":" + rule[1]
+            if len(rule) == 3:
+                to_ = rule[2]
+            else:
+                to_ = rule[2] + ":" + rule[3]
         else:
-            # rule.len == 3 or 4
-            if os.path.exists(rule[0] + ":" + rule[1]):
-                # 前面两个项目合并路径存在，说明是本地Window路径。后面一个或两个项目组成的路径本地大概率无法解析，直接拼接
-                from_ = rule[0] + ":" + rule[1]
-                if len(rule) == 3:
-                    to_ = rule[2]
-                else:
-                    to_ = rule[2] + ":" + rule[3]
+            # 前面两个项目合并路径不存在，说明第一个项目是本地Linux路径，后面一个或两个项目直接拼接。
+            from_ = rule[0]
+            if len(rule) == 3:
+                to_ = rule[1] + ":" + rule[2]
             else:
-                # 前面两个项目合并路径不存在，说明第一个项目是本地Linux路径，后面一个或两个项目直接拼接。
-                from_ = rule[0]
-                if len(rule) == 3:
-                    to_ = rule[1] + ":" + rule[2]
-                else:
-                    # 这种情况下存在四个项目，说明规则也是错误的
-                    logger.warning(f"路径映射规则错误: {mapping}")
-                    continue
+                # 这种情况下存在四个项目，说明规则也是错误的
+                logger.warning(f"路径映射规则错误: {mapping}")
+                continue
 
         from_ = from_.removesuffix("/")
         from_ = from_.removesuffix("\\")

astrbot/core/utils/pip_installer.py

@@ -1,20 +1,20 @@
-import logging
 import asyncio
+import logging
 import sys
 
 logger = logging.getLogger("astrbot")
 
 
 class PipInstaller:
-    def __init__(self, pip_install_arg: str, pypi_index_url: str = None):
+    def __init__(self, pip_install_arg: str, pypi_index_url: str | None = None):
         self.pip_install_arg = pip_install_arg
         self.pypi_index_url = pypi_index_url
 
     async def install(
         self,
-        package_name: str = None,
-        requirements_path: str = None,
-        mirror: str = None,
+        package_name: str | None = None,
+        requirements_path: str | None = None,
+        mirror: str | None = None,
     ):
         args = ["install"]
         if package_name:

astrbot/core/utils/session_waiter.py

@@ -1,24 +1,22 @@
-"""
-会话控制
-"""
+"""会话控制"""
 
 import abc
 import asyncio
-import time
-import functools
 import copy
+import functools
+import time
+from collections.abc import Awaitable, Callable
+from typing import Any
+
 import astrbot.core.message.components as Comp
-from typing import Dict, Any, Callable, Awaitable, List
 from astrbot.core.platform import AstrMessageEvent
 
-USER_SESSIONS: Dict[str, "SessionWaiter"] = {}  # 存储 SessionWaiter 实例
-FILTERS: List["SessionFilter"] = []  # 存储 SessionFilter 实例
+USER_SESSIONS: dict[str, "SessionWaiter"] = {}  # 存储 SessionWaiter 实例
+FILTERS: list["SessionFilter"] = []  # 存储 SessionFilter 实例
 
 
 class SessionController:
-    """
-    控制一个 Session 是否已经结束
-    """
+    """控制一个 Session 是否已经结束"""
 
     def __init__(self):
         self.future = asyncio.Future()
@@ -29,7 +27,7 @@ class SessionController:
         self.timeout: float | int = None
         """上次保持(keep)开始时的超时时间"""
 
-        self.history_chains: List[List[Comp.BaseMessageComponent]] = []
+        self.history_chains: list[list[Comp.BaseMessageComponent]] = []
 
     def stop(self, error: Exception = None):
         """立即结束这个会话"""
@@ -39,13 +37,14 @@ class SessionController:
             else:
                 self.future.set_result(None)
 
-    def keep(self, timeout: float | int = 0, reset_timeout=False):
+    def keep(self, timeout: float = 0, reset_timeout=False):
         """保持这个会话
 
         Args:
             timeout (float): 必填。会话超时时间。
             当 reset_timeout 设置为 True 时, 代表重置超时时间, timeout 必须 > 0, 如果 <= 0 则立即结束会话。
             当 reset_timeout 设置为 False 时, 代表继续维持原来的超时时间, 新 timeout = 原来剩余的timeout + timeout (可以 < 0)
+
         """
         new_ts = time.time()
 
@@ -81,7 +80,7 @@ class SessionController:
             pass  # 避免报错
         # finally:
 
-    def get_history_chains(self) -> List[List[Comp.BaseMessageComponent]]:
+    def get_history_chains(self) -> list[list[Comp.BaseMessageComponent]]:
         """获取历史消息链"""
         return self.history_chains
 
@@ -92,7 +91,6 @@ class SessionFilter:
     @abc.abstractmethod
     def filter(self, event: AstrMessageEvent) -> str:
         """根据事件返回一个会话标识符"""
-        pass
 
 
 class DefaultSessionFilter(SessionFilter):
@@ -120,7 +118,9 @@ class SessionWaiter:
         """需要保证一个 session 同时只有一个 trigger"""
 
     async def register_wait(
-        self, handler: Callable[[str], Awaitable[Any]], timeout: int = 30
+        self,
+        handler: Callable[[str], Awaitable[Any]],
+        timeout: int = 30,
     ) -> Any:
         """等待外部输入并处理"""
         self.handler = handler
@@ -149,7 +149,7 @@ class SessionWaiter:
     @classmethod
     async def trigger(cls, session_id: str, event: AstrMessageEvent):
         """外部输入触发会话处理"""
-        session = USER_SESSIONS.get(session_id, None)
+        session = USER_SESSIONS.get(session_id)
         if not session or session.session_controller.future.done():
             return
 
@@ -157,7 +157,7 @@ class SessionWaiter:
             if not session.session_controller.future.done():
                 if session.record_history_chains:
                     session.session_controller.history_chains.append(
-                        [copy.deepcopy(comp) for comp in event.get_messages()]
+                        [copy.deepcopy(comp) for comp in event.get_messages()],
                     )
                 try:
                     # TODO: 这里使用 create_task，跟踪 task，防止超时后这里 handler 仍然在执行
@@ -167,8 +167,7 @@ class SessionWaiter:
 
 
 def session_waiter(timeout: int = 30, record_history_chains: bool = False):
-    """
-    装饰器：自动将函数注册为 SessionWaiter 处理函数，并等待外部输入触发执行。
+    """装饰器：自动将函数注册为 SessionWaiter 处理函数，并等待外部输入触发执行。
 
     :param timeout: 超时时间（秒）
     :param record_history_chain: 是否自动记录历史消息链。可以通过 controller.get_history_chains() 获取。深拷贝。

astrbot/core/utils/shared_preferences.py

@@ -1,11 +1,12 @@
-from astrbot.core.db import BaseDatabase
-from astrbot.core.db.po import Preference
-import threading
 import asyncio
 import os
-from typing import TypeVar, Any, overload
-from .astrbot_path import get_astrbot_data_path
+import threading
+from typing import Any, TypeVar, overload
 
+from astrbot.core.db import BaseDatabase
+from astrbot.core.db.po import Preference
+
+from .astrbot_path import get_astrbot_data_path
 
 _VT = TypeVar("_VT")
 
@@ -14,7 +15,8 @@ class SharedPreferences:
     def __init__(self, db_helper: BaseDatabase, json_storage_path=None):
         if json_storage_path is None:
             json_storage_path = os.path.join(
-                get_astrbot_data_path(), "shared_preferences.json"
+                get_astrbot_data_path(),
+                "shared_preferences.json",
             )
         self.path = json_storage_path
         self.db_helper = db_helper
@@ -38,13 +40,15 @@ class SharedPreferences:
             else:
                 ret = default
             return ret
-        else:
-            raise ValueError(
-                "scope_id and key cannot be None when getting a specific preference."
-            )
+        raise ValueError(
+            "scope_id and key cannot be None when getting a specific preference.",
+        )
 
     async def range_get_async(
-        self, scope: str, scope_id: str | None = None, key: str | None = None
+        self,
+        scope: str,
+        scope_id: str | None = None,
+        key: str | None = None,
     ) -> list[Preference]:
         """获取指定范围的偏好设置
         Note: 返回 Preference 列表，其中的 value 属性是一个 dict，value["val"] 为值。scope_id 和 key 可以为 None，这时返回该范围下所有的偏好设置。
@@ -54,21 +58,33 @@ class SharedPreferences:
 
     @overload
     async def session_get(
-        self, umo: None, key: str, default: Any = None
+        self,
+        umo: None,
+        key: str,
+        default: Any = None,
     ) -> list[Preference]: ...
 
     @overload
     async def session_get(
-        self, umo: str, key: None, default: Any = None
+        self,
+        umo: str,
+        key: None,
+        default: Any = None,
     ) -> list[Preference]: ...
 
     @overload
     async def session_get(
-        self, umo: None, key: None, default: Any = None
+        self,
+        umo: None,
+        key: None,
+        default: Any = None,
     ) -> list[Preference]: ...
 
     async def session_get(
-        self, umo: str | None, key: str | None = None, default: _VT = None
+        self,
+        umo: str | None,
+        key: str | None = None,
+        default: _VT = None,
     ) -> _VT | list[Preference]:
         """获取会话范围的偏好设置
 
@@ -85,7 +101,9 @@ class SharedPreferences:
     async def global_get(self, key: str, default: _VT = None) -> _VT: ...
 
     async def global_get(
-        self, key: str | None, default: _VT = None
+        self,
+        key: str | None,
+        default: _VT = None,
     ) -> _VT | list[Preference]:
         """获取全局范围的偏好设置
 
@@ -98,7 +116,10 @@ class SharedPreferences:
     async def put_async(self, scope: str, scope_id: str, key: str, value: Any):
         """设置指定范围和键的偏好设置"""
         await self.db_helper.insert_preference_or_update(
-            scope, scope_id, key, {"val": value}
+            scope,
+            scope_id,
+            key,
+            {"val": value},
         )
 
     async def session_put(self, umo: str, key: str, value: Any):
@@ -139,7 +160,7 @@ class SharedPreferences:
         if scope_id is None or key is None:
             # result = asyncio.run(self.range_get_async(scope, scope_id, key))
             raise ValueError(
-                "scope_id and key cannot be None when getting a specific preference."
+                "scope_id and key cannot be None when getting a specific preference.",
             )
         result = asyncio.run_coroutine_threadsafe(
             self.get_async(scope or "unknown", scope_id or "unknown", key, default),
@@ -149,11 +170,15 @@ class SharedPreferences:
         return result if result is not None else default
 
     def range_get(
-        self, scope: str, scope_id: str | None = None, key: str | None = None
+        self,
+        scope: str,
+        scope_id: str | None = None,
+        key: str | None = None,
     ) -> list[Preference]:
         """获取指定范围的偏好设置（已弃用）"""
         result = asyncio.run_coroutine_threadsafe(
-            self.range_get_async(scope, scope_id, key), self._sync_loop
+            self.range_get_async(scope, scope_id, key),
+            self._sync_loop,
         ).result()
 
         return result

astrbot/core/utils/t2i/__init__.py

@@ -8,6 +8,9 @@ class RenderStrategy(ABC):
 
     @abstractmethod
     def render_custom_template(
-        self, tmpl_str: str, tmpl_data: dict, return_url: bool
+        self,
+        tmpl_str: str,
+        tmpl_data: dict,
+        return_url: bool,
     ) -> str:
         pass