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

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,13 +1,14 @@
-import aiohttp
 import os
-import zipfile
+import re
 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
 
 
@@ -17,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
@@ -33,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:
@@ -71,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}")
@@ -79,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 = []
@@ -92,98 +97,140 @@ 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) -> ReleaseInfo | None:
+    async def check_update(
+        self,
+        url: str,
+        current_version: str,
+        consider_prerelease: bool = True,
+    ) -> ReleaseInfo | None:
         update_data = await self.fetch_release_info(url)
-        tag_name = update_data[0]["tag_name"]
+
+        sel_release_data = None
+        if consider_prerelease:
+            tag_name = update_data[0]["tag_name"]
+            sel_release_data = update_data[0]
+        else:
+            for data in update_data:
+                # 跳过带有 alpha、beta 等预发布标签的版本
+                if re.search(
+                    r"[\-_.]?(alpha|beta|rc|dev)[\-_.]?\d*$",
+                    data["tag_name"],
+                    re.IGNORECASE,
+                ):
+                    continue
+                tag_name = data["tag_name"]
+                sel_release_data = data
+                break
+
+        if not sel_release_data or not tag_name:
+            logger.error("未找到合适的发布版本")
+            return None
 
         if self.compare_version(current_version, tag_name) >= 0:
             return None
         return ReleaseInfo(
             version=tag_name,
-            published_at=update_data[0]["published_at"],
-            body=update_data[0]["body"],
+            published_at=sel_release_data["published_at"],
+            body=f"{tag_name}\n\n{sel_release_data['body']}",
         )
 
     async def download_from_repo_url(self, target_path: str, repo_url: str, proxy=""):
-        repo_namespace = repo_url.split("/")[-2:]
-        author = repo_namespace[0]
-        repo = repo_namespace[1]
+        author, repo, branch = self.parse_github_url(repo_url)
 
         logger.info(f"正在下载更新 {repo} ...")
-        release_url = f"https://api.github.com/repos/{author}/{repo}/releases"
-        releases = await self.fetch_release_info(url=release_url)
-        if not releases:
-            # download from the default branch directly.
-            logger.info(f"正在从默认分支下载 {author}/{repo} ")
+
+        if branch:
+            logger.info(f"正在从指定分支 {branch} 下载 {author}/{repo}")
             release_url = (
-                f"https://github.com/{author}/{repo}/archive/refs/heads/master.zip"
+                f"https://github.com/{author}/{repo}/archive/refs/heads/{branch}.zip"
             )
         else:
-            release_url = releases[0]["zipball_url"]
+            try:
+                release_url = f"https://api.github.com/repos/{author}/{repo}/releases"
+                releases = await self.fetch_release_info(url=release_url)
+            except Exception as e:
+                logger.warning(
+                    f"获取 {author}/{repo} 的 GitHub Releases 失败: {e}，将尝试下载默认分支",
+                )
+                releases = []
+            if not releases:
+                # 如果没有最新版本，下载默认分支
+                logger.info(f"正在从默认分支下载 {author}/{repo}")
+                release_url = (
+                    f"https://github.com/{author}/{repo}/archive/refs/heads/master.zip"
+                )
+            else:
+                release_url = releases[0]["zipball_url"]
 
         if proxy:
+            proxy = proxy.rstrip("/")
             release_url = f"{proxy}/{release_url}"
-            logger.info(f"使用代理下载: {release_url}")
+            logger.info(
+                f"检查到设置了镜像站，将使用镜像站下载 {author}/{repo} 仓库源码: {release_url}",
+            )
 
         await download_file(release_url, target_path + ".zip")
 
-    def unzip_file(self, zip_path: str, target_dir: str):
-        """
-        解压缩文件, 并将压缩包内**第一个**文件夹内的文件移动到 target_dir
+    def parse_github_url(self, url: str):
+        """使用正则表达式解析 GitHub 仓库 URL，支持 `.git` 后缀和 `tree/branch` 结构
+        Returns:
+            tuple[str, str, str]: 返回作者名、仓库名和分支名
+        Raises:
+            ValueError: 如果 URL 格式不正确
         """
+        cleaned_url = url.rstrip("/")
+        pattern = r"^https://github\.com/([a-zA-Z0-9_-]+)/([a-zA-Z0-9_-]+)(\.git)?(?:/tree/([a-zA-Z0-9_-]+))?$"
+        match = re.match(pattern, cleaned_url)
+
+        if match:
+            author = match.group(1)
+            repo = match.group(2)
+            branch = match.group(4)
+            return author, repo, branch
+        raise ValueError("无效的 GitHub URL")
+
+    def unzip_file(self, zip_path: str, target_dir: str):
+        """解压缩文件, 并将压缩包内**第一个**文件夹内的文件移动到 target_dir"""
         os.makedirs(target_dir, exist_ok=True)
         update_dir = ""
-        logger.info(f"解压文件: {zip_path}")
         with zipfile.ZipFile(zip_path, "r") as z:
             update_dir = z.namelist()[0]
             z.extractall(target_dir)
+        logger.debug(f"解压文件完成: {zip_path}")
 
         files = os.listdir(os.path.join(target_dir, update_dir))
         for f in files:
-            logger.info(f"移动更新文件/目录: {f}")
             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.info(
-                f"删除临时更新文件: {zip_path} 和 {os.path.join(target_dir, update_dir)}"
+            logger.debug(
+                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.warn(
-                f"删除更新文件失败，可以手动删除 {zip_path} 和 {os.path.join(target_dir, update_dir)}"
+            logger.warning(
+                f"删除更新文件失败，可以手动删除 {zip_path} 和 {os.path.join(target_dir, update_dir)}",
             )
 
-    def format_repo_name(self, repo_url: str) -> str:
-        if repo_url.endswith("/"):
-            repo_url = repo_url[:-1]
-
-        repo_namespace = repo_url.split("/")[-2:]
-        repo = repo_namespace[1]
-
-        repo = self.format_name(repo)
-
-        return repo
-
     def format_name(self, name: str) -> str:
         return name.replace("-", "_").lower()

astrbot/dashboard/routes/__init__.py

@@ -1,24 +1,31 @@
 from .auth import AuthRoute
-from .plugin import PluginRoute
+from .chat import ChatRoute
 from .config import ConfigRoute
-from .update import UpdateRoute
-from .stat import StatRoute
+from .conversation import ConversationRoute
+from .file import FileRoute
+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 .chat import ChatRoute
-from .tools import ToolsRoute  # 导入新的ToolsRoute
-from .conversation import ConversationRoute
-
+from .tools import ToolsRoute
+from .update import UpdateRoute
 
 __all__ = [
     "AuthRoute",
-    "PluginRoute",
+    "ChatRoute",
     "ConfigRoute",
-    "UpdateRoute",
-    "StatRoute",
+    "ConversationRoute",
+    "FileRoute",
+    "KnowledgeBaseRoute",
     "LogRoute",
+    "PersonaRoute",
+    "PluginRoute",
+    "SessionManagementRoute",
+    "StatRoute",
     "StaticFileRoute",
-    "ChatRoute",
-    "ToolsRoute",  # 添加新的ToolsRoute
-    "ConversationRoute",
+    "ToolsRoute",
+    "UpdateRoute",
 ]

astrbot/dashboard/routes/auth.py

@@ -1,9 +1,13 @@
-import jwt
+import asyncio
 import datetime
-from .route import Route, Response, RouteContext
+
+import jwt
 from quart import request
-from astrbot.core import WEBUI_SK, DEMO_MODE
+
 from astrbot import logger
+from astrbot.core import DEMO_MODE
+
+from .route import Response, Route, RouteContext
 
 
 class AuthRoute(Route):
@@ -21,7 +25,11 @@ class AuthRoute(Route):
         post_data = await request.json
         if post_data["username"] == username and post_data["password"] == password:
             change_pwd_hint = False
-            if username == "astrbot" and password == "77b90590a8945a7d36c963981a307dc9":
+            if (
+                username == "astrbot"
+                and password == "77b90590a8945a7d36c963981a307dc9"
+                and not DEMO_MODE
+            ):
                 change_pwd_hint = True
                 logger.warning("为了保证安全，请尽快修改默认密码。")
 
@@ -32,12 +40,12 @@ class AuthRoute(Route):
                         "token": self.generate_jwt(username),
                         "username": username,
                         "change_pwd_hint": change_pwd_hint,
-                    }
+                    },
                 )
                 .__dict__
             )
-        else:
-            return Response().error("用户名或密码错误").__dict__
+        await asyncio.sleep(3)
+        return Response().error("用户名或密码错误").__dict__
 
     async def edit_account(self):
         if DEMO_MODE:
@@ -72,7 +80,10 @@ class AuthRoute(Route):
     def generate_jwt(self, username):
         payload = {
             "username": username,
-            "exp": datetime.datetime.utcnow() + datetime.timedelta(days=30),
+            "exp": datetime.datetime.utcnow() + datetime.timedelta(days=7),
         }
-        token = jwt.encode(payload, WEBUI_SK, algorithm="HS256")
+        jwt_token = self.config["dashboard"].get("jwt_secret", None)
+        if not jwt_token:
+            raise ValueError("JWT secret is not set in the cmd_config.")
+        token = jwt.encode(payload, jwt_token, algorithm="HS256")
         return token