AstrBot 3.5.6__py3-none-any.whl → 4.7.0__py3-none-any.whl

astrbot/core/utils/command_parser.py

@@ -6,7 +6,7 @@ class CommandTokens:
         self.tokens = []
         self.len = 0
 
-    def get(self, idx: int):
+    def get(self, idx: int) -> str | None:
         if idx >= self.len:
             return None
         return self.tokens[idx].strip()

astrbot/core/utils/io.py

@@ -1,25 +1,26 @@
+import base64
+import logging
 import os
-import ssl
 import shutil
 import socket
+import ssl
 import time
-import aiohttp
-import base64
-import zipfile
 import uuid
-import psutil
+import zipfile
+from pathlib import Path
 
+import aiohttp
 import certifi
+import psutil
+from PIL import Image
 
-from typing import Union
+from .astrbot_path import get_astrbot_data_path
 
-from PIL import Image
+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):
@@ -29,7 +30,7 @@ def on_error(func, path, exc_info):
         raise exc_info[1]
 
 
-def remove_dir(file_path) -> bool:
+def remove_dir(file_path: str) -> bool:
     if not os.path.exists(file_path):
         return True
     shutil.rmtree(file_path, onerror=on_error)
@@ -48,12 +49,12 @@ def port_checker(port: int, host: str = "localhost"):
         return False
 
 
-def save_temp_img(img: Union[Image.Image, str]) -> str:
-    os.makedirs("data/temp", exist_ok=True)
+def save_temp_img(img: Image.Image | str) -> str:
+    temp_dir = os.path.join(get_astrbot_data_path(), "temp")
     # 获得文件创建时间，清除超过 12 小时的
     try:
-        for f in os.listdir("data/temp"):
-            path = os.path.join("data/temp", f)
+        for f in os.listdir(temp_dir):
+            path = os.path.join(temp_dir, f)
             if os.path.isfile(path):
                 ctime = os.path.getctime(path)
                 if time.time() - ctime > 3600 * 12:
@@ -63,7 +64,7 @@ def save_temp_img(img: Union[Image.Image, str]) -> str:
 
     # 获得时间戳
     timestamp = f"{int(time.time())}_{uuid.uuid4().hex[:8]}"
-    p = f"data/temp/{timestamp}.jpg"
+    p = os.path.join(temp_dir, f"{timestamp}.jpg")
 
     if isinstance(img, Image.Image):
         img.save(p)
@@ -74,61 +75,75 @@ def save_temp_img(img: Union[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:
@@ -146,16 +161,30 @@ async def download_file(url: str, path: str, show_progress: bool = False):
                         f.write(chunk)
                         downloaded_size += len(chunk)
                         if show_progress:
-                            elapsed_time = time.time() - start_time
+                            elapsed_time = (
+                                time.time() - start_time
+                                if time.time() - start_time > 0
+                                else 1
+                            )
                             speed = downloaded_size / 1024 / elapsed_time  # KB/s
                             print(
                                 f"\r下载进度: {downloaded_size / total_size:.2%} 速度: {speed:.2f} KB/s",
                                 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))
@@ -201,28 +230,58 @@ def get_local_ip_addresses():
 
 
 async def get_dashboard_version():
-    if os.path.exists("data/dist"):
-        if os.path.exists("data/dist/assets/version"):
-            with open("data/dist/assets/version", "r") as f:
+    dist_dir = os.path.join(get_astrbot_data_path(), "dist")
+    if os.path.exists(dist_dir):
+        version_file = os.path.join(dist_dir, "assets", "version")
+        if os.path.exists(version_file):
+            with open(version_file, encoding="utf-8") as f:
                 v = f.read().strip()
                 return v
     return None
 
 
-async def download_dashboard(path: str = "data/dashboard.zip", extract_path: str = "data"):
+async def download_dashboard(
+    path: str | None = None,
+    extract_path: str = "data",
+    latest: bool = True,
+    version: str | None = None,
+    proxy: str | None = None,
+) -> None:
     """下载管理面板文件"""
-    dashboard_release_url = "https://astrbot-registry.soulter.top/download/astrbot-dashboard/latest/dist.zip"
-    try:
-        await download_file(
-            dashboard_release_url, path, show_progress=True
-        )
-    except BaseException as _:
-        dashboard_release_url = (
-            "https://github.com/Soulter/AstrBot/releases/latest/download/dist.zip"
-        )
-        await download_file(
-            dashboard_release_url, path, show_progress=True
+    if path is None:
+        zip_path = Path(get_astrbot_data_path()).absolute() / "dashboard.zip"
+    else:
+        zip_path = Path(path).absolute()
+
+    if latest or len(str(version)) != 40:
+        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}",
         )
-    print("解压管理面板文件中...")
-    with zipfile.ZipFile(path, "r") as z:
+        try:
+            await download_file(
+                dashboard_release_url,
+                str(zip_path),
+                show_progress=True,
+            )
+        except BaseException as _:
+            if latest:
+                dashboard_release_url = "https://github.com/AstrBotDevs/AstrBot/releases/latest/download/dist.zip"
+            else:
+                dashboard_release_url = f"https://github.com/AstrBotDevs/AstrBot/releases/download/{version}/dist.zip"
+            if proxy:
+                dashboard_release_url = f"{proxy}/{dashboard_release_url}"
+            await download_file(
+                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"
+        logger.info(f"准备下载指定版本的 AstrBot WebUI: {url}")
+        if proxy:
+            url = f"{proxy}/{url}"
+        await download_file(url, str(zip_path), show_progress=True)
+    with zipfile.ZipFile(zip_path, "r") as z:
         z.extractall(extract_path)

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.
         """
@@ -58,12 +59,12 @@ class Metric:
             pass
         try:
             if "adapter_name" in kwargs:
-                db_helper.insert_platform_metrics({kwargs["adapter_name"]: 1})
-            if "llm_name" in kwargs:
-                db_helper.insert_llm_metrics({kwargs["llm_name"]: 1})
+                await db_helper.insert_platform_stats(
+                    platform_id=kwargs["adapter_name"],
+                    platform_type=kwargs.get("adapter_type", "unknown"),
+                )
         except Exception as e:
             logger.error(f"保存指标到数据库失败: {e}")
-            pass
 
         try:
             async with aiohttp.ClientSession(trust_env=True) as session:

astrbot/core/utils/migra_helper.py

@@ -0,0 +1,73 @@
+import traceback
+
+from astrbot.core import astrbot_config, logger
+from astrbot.core.astrbot_config_mgr import AstrBotConfig, AstrBotConfigManager
+from astrbot.core.db.migration.migra_45_to_46 import migrate_45_to_46
+from astrbot.core.db.migration.migra_webchat_session import migrate_webchat_session
+
+
+def _migra_agent_runner_configs(conf: AstrBotConfig, ids_map: dict) -> None:
+    """
+    Migra agent runner configs from provider configs.
+    """
+    try:
+        default_prov_id = conf["provider_settings"]["default_provider_id"]
+        if default_prov_id in ids_map:
+            conf["provider_settings"]["default_provider_id"] = ""
+            p = ids_map[default_prov_id]
+            if p["type"] == "dify":
+                conf["provider_settings"]["dify_agent_runner_provider_id"] = p["id"]
+                conf["provider_settings"]["agent_runner_type"] = "dify"
+            elif p["type"] == "coze":
+                conf["provider_settings"]["coze_agent_runner_provider_id"] = p["id"]
+                conf["provider_settings"]["agent_runner_type"] = "coze"
+            elif p["type"] == "dashscope":
+                conf["provider_settings"]["dashscope_agent_runner_provider_id"] = p[
+                    "id"
+                ]
+                conf["provider_settings"]["agent_runner_type"] = "dashscope"
+            conf.save_config()
+    except Exception as e:
+        logger.error(f"Migration for third party agent runner configs failed: {e!s}")
+        logger.error(traceback.format_exc())
+
+
+async def migra(
+    db, astrbot_config_mgr, umop_config_router, acm: AstrBotConfigManager
+) -> None:
+    """
+    Stores the migration logic here.
+    btw, i really don't like migration :(
+    """
+    # 4.5 to 4.6 migration for umop_config_router
+    try:
+        await migrate_45_to_46(astrbot_config_mgr, umop_config_router)
+    except Exception as e:
+        logger.error(f"Migration from version 4.5 to 4.6 failed: {e!s}")
+        logger.error(traceback.format_exc())
+
+    # migration for webchat session
+    try:
+        await migrate_webchat_session(db)
+    except Exception as e:
+        logger.error(f"Migration for webchat session failed: {e!s}")
+        logger.error(traceback.format_exc())
+
+    # migra third party agent runner configs
+    _c = False
+    providers = astrbot_config["provider"]
+    ids_map = {}
+    for prov in providers:
+        type_ = prov.get("type")
+        if type_ in ["dify", "coze", "dashscope"]:
+            prov["provider_type"] = "agent_runner"
+            ids_map[prov["id"]] = {
+                "type": type_,
+                "id": prov["id"],
+            }
+            _c = True
+    if _c:
+        astrbot_config.save_config()
+
+    for conf in acm.confs.values():
+        _migra_agent_runner_configs(conf, ids_map)

astrbot/core/utils/path_util.py

@@ -1,70 +1,71 @@
 import os
+
 from astrbot.core import logger
 
-def path_Mapping(mappings, srcPath: str)->str:
-        """路径映射处理函数。尝试支援 Windows 和 Linux 的路径映射。
-        Args:
-            mappings: 映射规则列表
-            srcPath: 原路径
-        Returns:
-            str: 处理后的路径
-        """
-        for mapping in mappings:
-            rule = mapping.split(":")
-            if len(rule) == 2:
-                from_, to_ = mapping.split(":")
-            elif len(rule) > 4 or len(rule) == 1:
-                # 切割后大于4个项目，或者只有1个项目，那肯定是错误的，只能是2，3，4个项目
+
+def path_Mapping(mappings, srcPath: str) -> str:
+    """路径映射处理函数。尝试支援 Windows 和 Linux 的路径映射。
+    Args:
+        mappings: 映射规则列表
+        srcPath: 原路径
+    Returns:
+        str: 处理后的路径
+    """
+    for mapping in mappings:
+        rule = mapping.split(":")
+        if len(rule) == 2:
+            from_, to_ = mapping.split(":")
+        elif len(rule) > 4 or len(rule) == 1:
+            # 切割后大于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:
+            # 前面两个项目合并路径不存在，说明第一个项目是本地Linux路径，后面一个或两个项目直接拼接。
+            from_ = rule[0]
+            if len(rule) == 3:
+                to_ = rule[1] + ":" + rule[2]
+            else:
+                # 这种情况下存在四个项目，说明规则也是错误的
                 logger.warning(f"路径映射规则错误: {mapping}")
                 continue
-            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]
-                else:
-                    # 前面两个项目合并路径不存在，说明第一个项目是本地Linux路径，后面一个或两个项目直接拼接。
-                    from_ = rule[0]
-                    if len(rule) == 3:
-                        to_ = rule[1] + ":" + rule[2]
-                    else:
-                        # 这种情况下存在四个项目，说明规则也是错误的
-                        logger.warning(f"路径映射规则错误: {mapping}")
-                        continue
 
-            from_ = from_.removesuffix("/")
-            from_ = from_.removesuffix("\\")
-            to_ = to_.removesuffix("/")
-            to_ = to_.removesuffix("\\")
-            # logger.debug(f"\t路径映射-规则(处理): {from_} -> {to_}")
+        from_ = from_.removesuffix("/")
+        from_ = from_.removesuffix("\\")
+        to_ = to_.removesuffix("/")
+        to_ = to_.removesuffix("\\")
+        # logger.debug(f"\t路径映射-规则(处理): {from_} -> {to_}")
 
-            url = srcPath.removeprefix("file://")
-            if url.startswith(from_):
-                srcPath = url.replace(from_, to_, 1)
-                if ":" in srcPath:
-                    # Windows路径处理
-                    srcPath = srcPath.replace("/", "\\")
-                else:
-                    has_replaced_processed = False
-                    if srcPath.startswith("."):
-                        # 相对路径处理。如果是相对路径，可能是Linux路径，也可能是Windows路径
-                        sign = srcPath[1]
-                        # 处理两个点的情况
-                        if sign == ".":
-                            sign = srcPath[2]
-                        if sign == "/":
-                            srcPath = srcPath.replace("\\", "/")
-                            has_replaced_processed = True
-                        elif sign == "\\":
-                            srcPath = srcPath.replace("/", "\\")
-                            has_replaced_processed = True
-                    if has_replaced_processed == False:
-                        # 如果不是相对路径或不能处理，默认按照Linux路径处理
+        url = srcPath.removeprefix("file://")
+        if url.startswith(from_):
+            srcPath = url.replace(from_, to_, 1)
+            if ":" in srcPath:
+                # Windows路径处理
+                srcPath = srcPath.replace("/", "\\")
+            else:
+                has_replaced_processed = False
+                if srcPath.startswith("."):
+                    # 相对路径处理。如果是相对路径，可能是Linux路径，也可能是Windows路径
+                    sign = srcPath[1]
+                    # 处理两个点的情况
+                    if sign == ".":
+                        sign = srcPath[2]
+                    if sign == "/":
                         srcPath = srcPath.replace("\\", "/")
-                logger.info(f"路径映射: {url} -> {srcPath}")
-                return srcPath
-        return srcPath
+                        has_replaced_processed = True
+                    elif sign == "\\":
+                        srcPath = srcPath.replace("/", "\\")
+                        has_replaced_processed = True
+                if not has_replaced_processed:
+                    # 如果不是相对路径或不能处理，默认按照Linux路径处理
+                    srcPath = srcPath.replace("\\", "/")
+            logger.info(f"路径映射: {url} -> {srcPath}")
+            return srcPath
+    return srcPath

astrbot/core/utils/pip_installer.py

@@ -1,19 +1,20 @@
+import asyncio
 import logging
-from pip import main as pip_main
+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
 
-    def install(
+    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:
@@ -29,12 +30,33 @@ class PipInstaller:
             args.extend(self.pip_install_arg.split())
 
         logger.info(f"Pip 包管理器: pip {' '.join(args)}")
-
-        result_code = pip_main(args)
-
-        # 清除 pip.main 导致的多余的 logging handlers
-        for handler in logging.root.handlers[:]:
-            logging.root.removeHandler(handler)
-
-        if result_code != 0:
-            raise Exception(f"安装失败，错误码：{result_code}")
+        try:
+            process = await asyncio.create_subprocess_exec(
+                sys.executable,
+                "-m",
+                "pip",
+                *args,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.STDOUT,
+            )
+
+            assert process.stdout is not None
+            async for line in process.stdout:
+                logger.info(line.decode().strip())
+
+            await process.wait()
+
+            if process.returncode != 0:
+                raise Exception(f"安装失败，错误码：{process.returncode}")
+        except FileNotFoundError:
+            # 没有 pip
+            from pip import main as pip_main
+
+            result_code = await asyncio.to_thread(pip_main, args)
+
+            # 清除 pip.main 导致的多余的 logging handlers
+            for handler in logging.root.handlers[:]:
+                logging.root.removeHandler(handler)
+
+            if result_code != 0:
+                raise Exception(f"安装失败，错误码：{result_code}")

astrbot/core/utils/session_lock.py

@@ -0,0 +1,29 @@
+import asyncio
+from collections import defaultdict
+from contextlib import asynccontextmanager
+
+
+class SessionLockManager:
+    def __init__(self):
+        self._locks: dict[str, asyncio.Lock] = defaultdict(asyncio.Lock)
+        self._lock_count: dict[str, int] = defaultdict(int)
+        self._access_lock = asyncio.Lock()
+
+    @asynccontextmanager
+    async def acquire_lock(self, session_id: str):
+        async with self._access_lock:
+            lock = self._locks[session_id]
+            self._lock_count[session_id] += 1
+
+        try:
+            async with lock:
+                yield
+        finally:
+            async with self._access_lock:
+                self._lock_count[session_id] -= 1
+                if self._lock_count[session_id] == 0:
+                    self._locks.pop(session_id, None)
+                    self._lock_count.pop(session_id, None)
+
+
+session_lock_manager = SessionLockManager()