AstrBot 4.0.0b5__py3-none-any.whl → 4.1.1__py3-none-any.whl

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,11 +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):
@@ -156,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)
 
 
@@ -186,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()
@@ -766,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/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>",

{astrbot-4.0.0b5.dist-info → astrbot-4.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.0.0b5
+Version: 4.1.1
 Summary: 易上手的多平台 LLM 聊天机器人及开发框架
 License-File: LICENSE
 Requires-Python: >=3.10
@@ -58,8 +58,6 @@ Description-Content-Type: text/markdown
 
 <div align="center">
 
-_✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
-
 <a href="https://trendshift.io/repositories/12875" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12875" alt="Soulter%2FAstrBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/Soulter/AstrBot?style=for-the-badge&color=76bad9)](https://github.com/Soulter/AstrBot/releases/latest)
@@ -68,7 +66,6 @@ _✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
 <a  href="https://qm.qq.com/cgi-bin/qm/qr?k=wtbaNx7EioxeaqS9z7RQWVXPIxg2zYr7&jump_from=webapi&authKey=vlqnv/AV2DbJEvGIcxdlNSpfxVy+8vVqijgreRdnVKOaydpc+YSw4MctmEbr0k5"><img alt="QQ_community" src="https://img.shields.io/badge/QQ群-775869627-purple?style=for-the-badge&color=76bad9"></a>
 <a  href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
 [![wakatime](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e.svg?style=for-the-badge&color=76bad9)](https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/018e705a-a1a7-409a-a849-3013485e6c8e)
-![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fstats&query=v&label=7日消息量&cacheSeconds=3600&style=for-the-badge&color=3b618e)
 ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&style=for-the-badge&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600)
 
 <a href="https://github.com/Soulter/AstrBot/blob/master/README_en.md">English</a> ｜
@@ -79,7 +76,7 @@ _✨ 易上手的多平台 LLM 聊天机器人及开发框架 ✨_
 
 AstrBot 是一个开源的一站式 Agentic 聊天机器人平台及开发框架。
 
-## ✨ 主要功能
+## 主要功能
 
 1. **大模型对话**。支持接入多种大模型服务。支持多模态、工具调用、MCP、原生知识库、人设等功能。
 2. **多消息平台支持**。支持接入 QQ、企业微信、微信公众号、飞书、Telegram、钉钉、Discord、KOOK 等平台。支持速率限制、白名单、百度内容审核。
@@ -87,7 +84,7 @@ AstrBot 是一个开源的一站式 Agentic 聊天机器人平台及开发框架
 4. **插件扩展**。深度优化的插件机制，支持[开发插件](https://astrbot.app/dev/plugin.html)扩展功能，社区插件生态丰富。
 5. **WebUI**。可视化配置和管理机器人，功能齐全。
 
-## ✨ 使用方式
+## 部署方式
 
 #### Docker 部署
 
@@ -131,9 +128,7 @@ AstrBot 已由雨云官方上架至云应用平台，可一键部署。
 
 #### 手动部署
 
-> 推荐使用 `uv`。
-
-首先，安装 uv：
+首先安装 uv：
 
 ```bash
 pip install uv
@@ -148,6 +143,26 @@ uv run main.py
 
 或者请参阅官方文档 [通过源码部署 AstrBot](https://astrbot.app/deploy/astrbot/cli.html) 。
 
+## 🌍 社区
+
+### QQ 群组
+
+- 1 群：322154837
+- 3 群：630166526
+- 5 群：822130018
+- 6 群：753075035
+- 开发者群：975206796
+- 开发者群（备份）：295657329
+
+### Telegram 群组
+
+<a href="https://t.me/+hAsD2Ebl5as3NmY1"><img alt="Telegram_community" src="https://img.shields.io/badge/Telegram-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+### Discord 群组
+
+<a href="https://discord.gg/hAVk6tgV36"><img alt="Discord_community" src="https://img.shields.io/badge/Discord-AstrBot-purple?style=for-the-badge&color=76bad9"></a>
+
+
 ## ⚡ 消息平台支持情况
 
 | 平台    | 支持性 |
@@ -164,22 +179,18 @@ uv run main.py
 | Discord   | ✔    |
 | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter)   | ✔    |
 | [VoceChat](https://github.com/HikariFroya/astrbot_plugin_vocechat)   | ✔    |
-| 微信对话开放平台 | 🚧    |
-| WhatsApp   | 🚧    |
-| 小爱音响   | 🚧    |
 
 ## ⚡ 提供商支持情况
 
 | 名称    | 支持性 | 类型 | 备注 |
 | -------- | ------- | ------- | ------- |
-| OpenAI API | ✔    | 文本生成 | 也支持 DeepSeek、Gemini、Kimi、xAI 等兼容 OpenAI API 的服务 |
-| Claude API | ✔    | 文本生成 |  |
-| Google Gemini API | ✔    | 文本生成 |  |
+| OpenAI | ✔    | 文本生成 | 支持任何兼容 OpenAI API 的服务 |
+| Anthropic | ✔    | 文本生成 |  |
+| Google Gemini | ✔    | 文本生成 |  |
 | Dify | ✔    | LLMOps |  |
 | 阿里云百炼应用 | ✔    | LLMOps |  |
 | Ollama | ✔    | 模型加载器 | 本地部署 DeepSeek、Llama 等开源语言模型 |
 | LM Studio | ✔    | 模型加载器 | 本地部署 DeepSeek、Llama 等开源语言模型 |
-| LLMTuner | ✔    | 模型加载器 | 本地加载 lora 等微调模型 |
 | [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_astrbot&referral_code=FV7DcGowN4hB5UuXKgpE74) | ✔    | 模型 API 及算力服务平台 |  |
 | [302.AI](https://share.302.ai/rr1M3l) | ✔    | 模型 API 服务平台 |  |
 | 硅基流动 | ✔    | 模型 API 服务平台 |  |
@@ -195,7 +206,6 @@ uv run main.py
 | 阿里云百炼 TTS | ✔    | 文本转语音 |  |
 | Azure TTS | ✔    | 文本转语音 | Microsoft Azure TTS |
 
-
 ## ❤️ 贡献
 
 欢迎任何 Issues/Pull Requests！只需要将你的更改提交到此项目 ：)
@@ -214,38 +224,6 @@ pip install pre-commit
 pre-commit install
 ```
 
-## 🌟 支持
-
-- Star 这个项目！
-- 在[爱发电](https://afdian.com/a/soulter)支持我！
-
-## ✨ Demo
-
-<details><summary>👉 点击展开多张 Demo 截图 👈</summary>
-
-<div align='center'>
-
-<img src="https://github.com/user-attachments/assets/4ee688d9-467d-45c8-99d6-368f9a8a92d8" width="600">
-
-_✨基于 Docker 的沙箱化代码执行器（Beta 测试）✨_
-
-<img src="https://github.com/user-attachments/assets/0378f407-6079-4f64-ae4c-e97ab20611d2" height=500>
-
-_✨ 多模态、网页搜索、长文本转图片（可配置） ✨_
-
-<img src="https://github.com/user-attachments/assets/e137a9e1-340a-4bf2-bb2b-771132780735" height=150>
-<img src="https://github.com/user-attachments/assets/480f5e82-cf6a-4955-a869-0d73137aa6e1" height=150>
-
-_✨ 插件系统——部分插件展示 ✨_
-
-<img src="https://github.com/user-attachments/assets/0cdbf564-2f59-4da5-b524-ce0e7ef3d978" width=600>
-
-_✨ WebUI ✨_
-
-</div>
-
-</details>
-
 
 ## ❤️ Special Thanks
 
@@ -255,10 +233,18 @@ _✨ WebUI ✨_
   <img src="https://contrib.rocks/image?repo=AstrBotDevs/AstrBot" />
 </a>
 
-此外，本项目的诞生离不开以下开源项目：
+此外，本项目的诞生离不开以下开源项目的帮助：
 
 - [NapNeko/NapCatQQ](https://github.com/NapNeko/NapCatQQ) - 伟大的猫猫框架
-- [wechatpy/wechatpy](https://github.com/wechatpy/wechatpy)
+
+另外，一些同类型其他的活跃开源 Bot 项目：
+
+- [nonebot/nonebot2](https://github.com/nonebot/nonebot2) - 扩展性极强的 Bot 框架
+- [koishijs/koishi](https://github.com/koishijs/koishi) - 扩展性极强的 Bot 框架
+- [MaiM-with-u/MaiBot](https://github.com/MaiM-with-u/MaiBot) - 注重拟人功能的 ChatBot
+- [langbot-app/LangBot](https://github.com/langbot-app/LangBot) - 功能丰富的 Bot 平台
+- [LroMiose/nekro-agent](https://github.com/KroMiose/nekro-agent) - 注重 Agent 的 ChatBot
+- [zhenxun-org/zhenxun_bot](https://github.com/zhenxun-org/zhenxun_bot) - 功能完善的 ChatBot
 
 ## ⭐ Star History
 
@@ -271,7 +257,8 @@ _✨ WebUI ✨_
 
 </div>
 
-![10k-star-banner-credit-by-kevin](https://github.com/user-attachments/assets/c97fc5fb-20b9-4bc8-9998-c20b930ab097)
+
+</details>
 
 
 _私は、高性能ですから!_