AstrBot 4.0.0b4__py3-none-any.whl → 4.1.0__py3-none-any.whl

astrbot/core/zip_updator.py

@@ -107,16 +107,38 @@ class RepoZipUpdator:
         """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=""):

astrbot/dashboard/routes/chat.py

@@ -157,7 +157,11 @@ class ChatRoute(Route):
 
                     if type == "end":
                         break
-                    elif (streaming and type == "complete") or not streaming:
+                    elif (
+                        (streaming and type == "complete")
+                        or not streaming
+                        or type == "break"
+                    ):
                         # append bot message
                         new_his = {"type": "bot", "message": result_text}
                         await self.platform_history_mgr.insert(
@@ -197,6 +201,7 @@ class ChatRoute(Route):
                 "Connection": "keep-alive",
             },
         )
+        response.timeout = None  # fix SSE auto disconnect issue
         return response
 
     async def _get_webchat_conv_id_from_conv_id(self, conversation_id: str) -> str:

astrbot/dashboard/routes/config.py

@@ -1,6 +1,7 @@
 import typing
 import traceback
 import os
+import copy
 from .route import Route, Response, RouteContext
 from astrbot.core.provider.entities import ProviderType
 from quart import request
@@ -16,10 +17,10 @@ from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.platform.register import platform_registry
 from astrbot.core.provider.register import provider_registry
 from astrbot.core.star.star import star_registry
-from astrbot.core import logger, html_renderer
+from astrbot.core import logger
 from astrbot.core.provider import Provider
+from astrbot.core.provider.provider import RerankProvider
 import asyncio
-from astrbot.core.utils.t2i.network_strategy import CUSTOM_T2I_TEMPLATE_PATH
 
 
 def try_cast(value: str, type_: str):
@@ -155,6 +156,7 @@ def save_config(post_config: dict, config: AstrBotConfig, is_core: bool = False)
         raise ValueError(f"验证配置时出现异常: {e}")
     if errors:
         raise ValueError(f"格式校验未通过: {errors}")
+
     config.save_config(post_config)
 
 
@@ -185,56 +187,9 @@ class ConfigRoute(Route):
             "/config/provider/check_one": ("GET", self.check_one_provider_status),
             "/config/provider/list": ("GET", self.get_provider_config_list),
             "/config/provider/model_list": ("GET", self.get_provider_model_list),
-            "/config/astrbot/t2i-template/get": ("GET", self.get_t2i_template),
-            "/config/astrbot/t2i-template/save": ("POST", self.post_t2i_template),
-            "/config/astrbot/t2i-template/delete": ("DELETE", self.delete_t2i_template),
         }
         self.register_routes()
 
-    async def get_t2i_template(self):
-        """获取 T2I 模板"""
-        try:
-            template = await html_renderer.network_strategy.get_template()
-            has_custom_template = os.path.exists(CUSTOM_T2I_TEMPLATE_PATH)
-            return (
-                Response()
-                .ok({"template": template, "has_custom_template": has_custom_template})
-                .__dict__
-            )
-        except Exception as e:
-            logger.error(traceback.format_exc())
-            return Response().error(f"获取模板失败: {str(e)}").__dict__
-
-    async def post_t2i_template(self):
-        """保存 T2I 模板"""
-        try:
-            post_data = await request.json
-            if not post_data or "template" not in post_data:
-                return Response().error("缺少模板内容").__dict__
-
-            template_content = post_data["template"]
-
-            # 保存自定义模板到文件
-            with open(CUSTOM_T2I_TEMPLATE_PATH, "w", encoding="utf-8") as f:
-                f.write(template_content)
-
-            return Response().ok(message="模板保存成功").__dict__
-        except Exception as e:
-            logger.error(traceback.format_exc())
-            return Response().error(f"保存模板失败: {str(e)}").__dict__
-
-    async def delete_t2i_template(self):
-        """删除自定义 T2I 模板，恢复默认模板"""
-        try:
-            if os.path.exists(CUSTOM_T2I_TEMPLATE_PATH):
-                os.remove(CUSTOM_T2I_TEMPLATE_PATH)
-                return Response().ok(message="已恢复默认模板").__dict__
-            else:
-                return Response().ok(message="未找到自定义模板文件").__dict__
-        except Exception as e:
-            logger.error(traceback.format_exc())
-            return Response().error(f"删除模板失败: {str(e)}").__dict__
-
     async def get_abconf_list(self):
         """获取所有 AstrBot 配置文件的列表"""
         abconf_list = self.acm.get_conf_list()
@@ -481,6 +436,19 @@ class ConfigRoute(Route):
                 )
                 status_info["status"] = "unavailable"
                 status_info["error"] = f"STT test failed: {str(e)}"
+        elif provider_capability_type == ProviderType.RERANK:
+            try:
+                assert isinstance(provider, RerankProvider)
+                await provider.rerank("Apple", documents=["apple", "banana"])
+                status_info["status"] = "available"
+            except Exception as e:
+                logger.error(
+                    f"Error testing rerank provider {provider_name}: {e}",
+                    exc_info=True,
+                )
+                status_info["status"] = "unavailable"
+                status_info["error"] = f"Rerank test failed: {str(e)}"
+
         else:
             logger.debug(
                 f"Provider {provider_name} is not a Chat Completion or Embedding provider. Marking as available without test. Meta: {meta}"
@@ -752,6 +720,13 @@ class ConfigRoute(Route):
             if conf_id not in self.acm.confs:
                 raise ValueError(f"配置文件 {conf_id} 不存在")
             astrbot_config = self.acm.confs[conf_id]
+
+            # 保留服务端的 t2i_active_template 值
+            if "t2i_active_template" in astrbot_config:
+                post_configs["t2i_active_template"] = astrbot_config[
+                    "t2i_active_template"
+                ]
+
             save_config(post_configs, astrbot_config, is_core=True)
         except Exception as e:
             raise e

astrbot/dashboard/routes/route.py

@@ -1,3 +1,4 @@
+from astrbot.core import logger
 from astrbot.core.config.astrbot_config import AstrBotConfig
 from dataclasses import dataclass
 from quart import Quart
@@ -15,8 +16,24 @@ class Route:
         self.config = context.config
 
     def register_routes(self):
-        for route, (method, func) in self.routes.items():
-            self.app.add_url_rule(f"/api{route}", view_func=func, methods=[method])
+        def _add_rule(path, method, func):
+            # 统一添加 /api 前缀
+            full_path = f"/api{path}"
+            self.app.add_url_rule(full_path, view_func=func, methods=[method])
+
+        # 兼容字典和列表两种格式
+        routes_to_register = (
+            self.routes.items() if isinstance(self.routes, dict) else self.routes
+        )
+
+        for route, definition in routes_to_register:
+            # 兼容一个路由多个方法
+            if isinstance(definition, list):
+                for method, func in definition:
+                    _add_rule(route, method, func)
+            else:
+                method, func = definition
+                _add_rule(route, method, func)
 
 
 @dataclass

astrbot/dashboard/routes/t2i.py

@@ -0,0 +1,230 @@
+# astrbot/dashboard/routes/t2i.py
+
+from dataclasses import asdict
+from quart import jsonify, request
+
+from astrbot.core import logger
+from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
+from astrbot.core.utils.t2i.template_manager import TemplateManager
+from .route import Response, Route, RouteContext
+
+
+class T2iRoute(Route):
+    def __init__(self, context: RouteContext, core_lifecycle: AstrBotCoreLifecycle):
+        super().__init__(context)
+        self.core_lifecycle = core_lifecycle
+        self.config = core_lifecycle.astrbot_config
+        self.manager = TemplateManager()
+        # 使用列表保证路由注册顺序，避免 /<name> 路由优先匹配 /reset_default
+        self.routes = [
+            ("/t2i/templates", ("GET", self.list_templates)),
+            ("/t2i/templates/active", ("GET", self.get_active_template)),
+            ("/t2i/templates/create", ("POST", self.create_template)),
+            ("/t2i/templates/reset_default", ("POST", self.reset_default_template)),
+            ("/t2i/templates/set_active", ("POST", self.set_active_template)),
+            # 动态路由应该在静态路由之后注册
+            (
+                "/t2i/templates/<name>",
+                [
+                    ("GET", self.get_template),
+                    ("PUT", self.update_template),
+                    ("DELETE", self.delete_template),
+                ],
+            ),
+        ]
+        self.register_routes()
+
+    async def list_templates(self):
+        """获取所有T2I模板列表"""
+        try:
+            templates = self.manager.list_templates()
+            return jsonify(asdict(Response().ok(data=templates)))
+        except Exception as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response
+
+    async def get_active_template(self):
+        """获取当前激活的T2I模板"""
+        try:
+            active_template = self.config.get("t2i_active_template", "base")
+            return jsonify(
+                asdict(Response().ok(data={"active_template": active_template}))
+            )
+        except Exception as e:
+            logger.error("Error in get_active_template", exc_info=True)
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response
+
+    async def get_template(self, name: str):
+        """获取指定名称的T2I模板内容"""
+        try:
+            content = self.manager.get_template(name)
+            return jsonify(
+                asdict(Response().ok(data={"name": name, "content": content}))
+            )
+        except FileNotFoundError:
+            response = jsonify(asdict(Response().error("Template not found")))
+            response.status_code = 404
+            return response
+        except Exception as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response
+
+    async def create_template(self):
+        """创建一个新的T2I模板"""
+        try:
+            data = await request.json
+            name = data.get("name")
+            content = data.get("content")
+            if not name or not content:
+                response = jsonify(
+                    asdict(Response().error("Name and content are required."))
+                )
+                response.status_code = 400
+                return response
+            name = name.strip()
+
+            self.manager.create_template(name, content)
+            response = jsonify(
+                asdict(
+                    Response().ok(
+                        data={"name": name}, message="Template created successfully."
+                    )
+                )
+            )
+            response.status_code = 201
+            return response
+        except FileExistsError:
+            response = jsonify(
+                asdict(Response().error("Template with this name already exists."))
+            )
+            response.status_code = 409
+            return response
+        except ValueError as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 400
+            return response
+        except Exception as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response
+
+    async def update_template(self, name: str):
+        """更新一个已存在的T2I模板"""
+        try:
+            name = name.strip()
+            data = await request.json
+            content = data.get("content")
+            if content is None:
+                response = jsonify(asdict(Response().error("Content is required.")))
+                response.status_code = 400
+                return response
+
+            self.manager.update_template(name, content)
+
+            # 检查更新的是否为当前激活的模板，如果是，则热重载
+            active_template = self.config.get("t2i_active_template", "base")
+            if name == active_template:
+                await self.core_lifecycle.reload_pipeline_scheduler("default")
+                message = f"模板 '{name}' 已更新并重新加载。"
+            else:
+                message = f"模板 '{name}' 已更新。"
+
+            return jsonify(asdict(Response().ok(data={"name": name}, message=message)))
+        except ValueError as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 400
+            return response
+        except Exception as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response
+
+    async def delete_template(self, name: str):
+        """删除一个T2I模板"""
+        try:
+            name = name.strip()
+            self.manager.delete_template(name)
+            return jsonify(
+                asdict(Response().ok(message="Template deleted successfully."))
+            )
+        except FileNotFoundError:
+            response = jsonify(asdict(Response().error("Template not found.")))
+            response.status_code = 404
+            return response
+        except ValueError as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 400
+            return response
+        except Exception as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response
+
+    async def set_active_template(self):
+        """设置当前活动的T2I模板"""
+        try:
+            data = await request.json
+            name = data.get("name")
+            if not name:
+                response = jsonify(asdict(Response().error("模板名称(name)不能为空。")))
+                response.status_code = 400
+                return response
+
+            # 验证模板文件是否存在
+            self.manager.get_template(name)
+
+            # 更新配置
+            config = self.config
+            config["t2i_active_template"] = name
+            config.save_config(config)
+
+            # 热重载以应用更改
+            await self.core_lifecycle.reload_pipeline_scheduler("default")
+
+            return jsonify(asdict(Response().ok(message=f"模板 '{name}' 已成功应用。")))
+
+        except FileNotFoundError:
+            response = jsonify(
+                asdict(Response().error(f"模板 '{name}' 不存在，无法应用。"))
+            )
+            response.status_code = 404
+            return response
+        except Exception as e:
+            logger.error("Error in set_active_template", exc_info=True)
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response
+
+    async def reset_default_template(self):
+        """重置默认的'base'模板"""
+        try:
+            self.manager.reset_default_template()
+
+            # 更新配置，将激活模板也重置为'base'
+            config = self.config
+            config["t2i_active_template"] = "base"
+            config.save_config(config)
+
+            # 热重载以应用更改
+            await self.core_lifecycle.reload_pipeline_scheduler("default")
+
+            return jsonify(
+                asdict(
+                    Response().ok(
+                        message="Default template has been reset and activated."
+                    )
+                )
+            )
+        except FileNotFoundError as e:
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 404
+            return response
+        except Exception as e:
+            logger.error("Error in reset_default_template", exc_info=True)
+            response = jsonify(asdict(Response().error(str(e))))
+            response.status_code = 500
+            return response

astrbot/dashboard/routes/update.py

@@ -57,7 +57,7 @@ class UpdateRoute(Route):
                     .__dict__
                 )
             else:
-                ret = await self.astrbot_updator.check_update(None, None)
+                ret = await self.astrbot_updator.check_update(None, None, False)
                 return Response(
                     status="success",
                     message=str(ret) if ret is not None else "已经是最新版本了。",
@@ -100,9 +100,7 @@ class UpdateRoute(Route):
             )
 
             try:
-                await download_dashboard(
-                    latest=latest, version=version, proxy=proxy
-                )
+                await download_dashboard(latest=latest, version=version, proxy=proxy)
             except Exception as e:
                 logger.error(f"下载管理面板文件失败: {e}。")
 
@@ -133,7 +131,7 @@ class UpdateRoute(Route):
     async def update_dashboard(self):
         try:
             try:
-                await download_dashboard()
+                await download_dashboard(version=f"v{VERSION}", latest=False)
             except Exception as e:
                 logger.error(f"下载管理面板文件失败: {e}。")
                 return Response().error(f"下载管理面板文件失败: {e}").__dict__

astrbot/dashboard/server.py

@@ -18,6 +18,7 @@ from astrbot.core.utils.io import get_local_ip_addresses
 from .routes import *
 from .routes.route import Response, RouteContext
 from .routes.session_management import SessionManagementRoute
+from .routes.t2i import T2iRoute
 
 APP: Quart = None
 
@@ -28,10 +29,19 @@ class AstrBotDashboard:
         core_lifecycle: AstrBotCoreLifecycle,
         db: BaseDatabase,
         shutdown_event: asyncio.Event,
+        webui_dir: str | None = None,
     ) -> None:
         self.core_lifecycle = core_lifecycle
         self.config = core_lifecycle.astrbot_config
-        self.data_path = os.path.abspath(os.path.join(get_astrbot_data_path(), "dist"))
+
+        # 参数指定webui目录
+        if webui_dir and os.path.exists(webui_dir):
+            self.data_path = os.path.abspath(webui_dir)
+        else:
+            self.data_path = os.path.abspath(
+                os.path.join(get_astrbot_data_path(), "dist")
+            )
+
         self.app = Quart("dashboard", static_folder=self.data_path, static_url_path="/")
         APP = self.app  # noqa
         self.app.config["MAX_CONTENT_LENGTH"] = (
@@ -60,9 +70,8 @@ class AstrBotDashboard:
         self.session_management_route = SessionManagementRoute(
             self.context, db, core_lifecycle
         )
-        self.persona_route = PersonaRoute(
-            self.context, db, core_lifecycle
-        )
+        self.persona_route = PersonaRoute(self.context, db, core_lifecycle)
+        self.t2i_route = T2iRoute(self.context, core_lifecycle)
 
         self.app.add_url_rule(
             "/api/plug/<path:subpath>",