AstrBot 4.12.3__py3-none-any.whl → 4.13.0__py3-none-any.whl

astrbot/dashboard/routes/persona.py

@@ -23,6 +23,15 @@ class PersonaRoute(Route):
             "/persona/create": ("POST", self.create_persona),
             "/persona/update": ("POST", self.update_persona),
             "/persona/delete": ("POST", self.delete_persona),
+            "/persona/move": ("POST", self.move_persona),
+            "/persona/reorder": ("POST", self.reorder_items),
+            # Folder routes
+            "/persona/folder/list": ("GET", self.list_folders),
+            "/persona/folder/tree": ("GET", self.get_folder_tree),
+            "/persona/folder/detail": ("POST", self.get_folder_detail),
+            "/persona/folder/create": ("POST", self.create_folder),
+            "/persona/folder/update": ("POST", self.update_folder),
+            "/persona/folder/delete": ("POST", self.delete_folder),
         }
         self.db_helper = db_helper
         self.persona_mgr = core_lifecycle.persona_mgr
@@ -31,7 +40,14 @@ class PersonaRoute(Route):
     async def list_personas(self):
         """获取所有人格列表"""
         try:
-            personas = await self.persona_mgr.get_all_personas()
+            # 支持按文件夹筛选
+            folder_id = request.args.get("folder_id")
+            if folder_id is not None:
+                personas = await self.persona_mgr.get_personas_by_folder(
+                    folder_id if folder_id else None
+                )
+            else:
+                personas = await self.persona_mgr.get_all_personas()
             return (
                 Response()
                 .ok(
@@ -41,6 +57,9 @@ class PersonaRoute(Route):
                             "system_prompt": persona.system_prompt,
                             "begin_dialogs": persona.begin_dialogs or [],
                             "tools": persona.tools,
+                            "skills": persona.skills,
+                            "folder_id": persona.folder_id,
+                            "sort_order": persona.sort_order,
                             "created_at": persona.created_at.isoformat()
                             if persona.created_at
                             else None,
@@ -78,6 +97,9 @@ class PersonaRoute(Route):
                         "system_prompt": persona.system_prompt,
                         "begin_dialogs": persona.begin_dialogs or [],
                         "tools": persona.tools,
+                        "skills": persona.skills,
+                        "folder_id": persona.folder_id,
+                        "sort_order": persona.sort_order,
                         "created_at": persona.created_at.isoformat()
                         if persona.created_at
                         else None,
@@ -100,6 +122,9 @@ class PersonaRoute(Route):
             system_prompt = data.get("system_prompt", "").strip()
             begin_dialogs = data.get("begin_dialogs", [])
             tools = data.get("tools")
+            skills = data.get("skills")
+            folder_id = data.get("folder_id")  # None 表示根目录
+            sort_order = data.get("sort_order", 0)
 
             if not persona_id:
                 return Response().error("人格ID不能为空").__dict__
@@ -120,6 +145,9 @@ class PersonaRoute(Route):
                 system_prompt=system_prompt,
                 begin_dialogs=begin_dialogs if begin_dialogs else None,
                 tools=tools if tools else None,
+                skills=skills if skills else None,
+                folder_id=folder_id,
+                sort_order=sort_order,
             )
 
             return (
@@ -132,6 +160,9 @@ class PersonaRoute(Route):
                             "system_prompt": persona.system_prompt,
                             "begin_dialogs": persona.begin_dialogs or [],
                             "tools": persona.tools or [],
+                            "skills": persona.skills or [],
+                            "folder_id": persona.folder_id,
+                            "sort_order": persona.sort_order,
                             "created_at": persona.created_at.isoformat()
                             if persona.created_at
                             else None,
@@ -157,6 +188,7 @@ class PersonaRoute(Route):
             system_prompt = data.get("system_prompt")
             begin_dialogs = data.get("begin_dialogs")
             tools = data.get("tools")
+            skills = data.get("skills")
 
             if not persona_id:
                 return Response().error("缺少必要参数: persona_id").__dict__
@@ -174,6 +206,7 @@ class PersonaRoute(Route):
                 system_prompt=system_prompt,
                 begin_dialogs=begin_dialogs,
                 tools=tools,
+                skills=skills,
             )
 
             return Response().ok({"message": "人格更新成功"}).__dict__
@@ -200,3 +233,234 @@ class PersonaRoute(Route):
         except Exception as e:
             logger.error(f"删除人格失败: {e!s}\n{traceback.format_exc()}")
             return Response().error(f"删除人格失败: {e!s}").__dict__
+
+    async def move_persona(self):
+        """移动人格到指定文件夹"""
+        try:
+            data = await request.get_json()
+            persona_id = data.get("persona_id")
+            folder_id = data.get("folder_id")  # None 表示移动到根目录
+
+            if not persona_id:
+                return Response().error("缺少必要参数: persona_id").__dict__
+
+            await self.persona_mgr.move_persona_to_folder(persona_id, folder_id)
+
+            return Response().ok({"message": "人格移动成功"}).__dict__
+        except ValueError as e:
+            return Response().error(str(e)).__dict__
+        except Exception as e:
+            logger.error(f"移动人格失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"移动人格失败: {e!s}").__dict__
+
+    # ====
+    # Folder Routes
+    # ====
+
+    async def list_folders(self):
+        """获取文件夹列表"""
+        try:
+            parent_id = request.args.get("parent_id")
+            # 空字符串视为 None（根目录）
+            if parent_id == "":
+                parent_id = None
+            folders = await self.persona_mgr.get_folders(parent_id)
+            return (
+                Response()
+                .ok(
+                    [
+                        {
+                            "folder_id": folder.folder_id,
+                            "name": folder.name,
+                            "parent_id": folder.parent_id,
+                            "description": folder.description,
+                            "sort_order": folder.sort_order,
+                            "created_at": folder.created_at.isoformat()
+                            if folder.created_at
+                            else None,
+                            "updated_at": folder.updated_at.isoformat()
+                            if folder.updated_at
+                            else None,
+                        }
+                        for folder in folders
+                    ],
+                )
+                .__dict__
+            )
+        except Exception as e:
+            logger.error(f"获取文件夹列表失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"获取文件夹列表失败: {e!s}").__dict__
+
+    async def get_folder_tree(self):
+        """获取文件夹树形结构"""
+        try:
+            tree = await self.persona_mgr.get_folder_tree()
+            return Response().ok(tree).__dict__
+        except Exception as e:
+            logger.error(f"获取文件夹树失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"获取文件夹树失败: {e!s}").__dict__
+
+    async def get_folder_detail(self):
+        """获取指定文件夹的详细信息"""
+        try:
+            data = await request.get_json()
+            folder_id = data.get("folder_id")
+
+            if not folder_id:
+                return Response().error("缺少必要参数: folder_id").__dict__
+
+            folder = await self.persona_mgr.get_folder(folder_id)
+            if not folder:
+                return Response().error("文件夹不存在").__dict__
+
+            return (
+                Response()
+                .ok(
+                    {
+                        "folder_id": folder.folder_id,
+                        "name": folder.name,
+                        "parent_id": folder.parent_id,
+                        "description": folder.description,
+                        "sort_order": folder.sort_order,
+                        "created_at": folder.created_at.isoformat()
+                        if folder.created_at
+                        else None,
+                        "updated_at": folder.updated_at.isoformat()
+                        if folder.updated_at
+                        else None,
+                    },
+                )
+                .__dict__
+            )
+        except Exception as e:
+            logger.error(f"获取文件夹详情失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"获取文件夹详情失败: {e!s}").__dict__
+
+    async def create_folder(self):
+        """创建文件夹"""
+        try:
+            data = await request.get_json()
+            name = data.get("name", "").strip()
+            parent_id = data.get("parent_id")
+            description = data.get("description")
+            sort_order = data.get("sort_order", 0)
+
+            if not name:
+                return Response().error("文件夹名称不能为空").__dict__
+
+            folder = await self.persona_mgr.create_folder(
+                name=name,
+                parent_id=parent_id,
+                description=description,
+                sort_order=sort_order,
+            )
+
+            return (
+                Response()
+                .ok(
+                    {
+                        "message": "文件夹创建成功",
+                        "folder": {
+                            "folder_id": folder.folder_id,
+                            "name": folder.name,
+                            "parent_id": folder.parent_id,
+                            "description": folder.description,
+                            "sort_order": folder.sort_order,
+                            "created_at": folder.created_at.isoformat()
+                            if folder.created_at
+                            else None,
+                            "updated_at": folder.updated_at.isoformat()
+                            if folder.updated_at
+                            else None,
+                        },
+                    },
+                )
+                .__dict__
+            )
+        except Exception as e:
+            logger.error(f"创建文件夹失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"创建文件夹失败: {e!s}").__dict__
+
+    async def update_folder(self):
+        """更新文件夹信息"""
+        try:
+            data = await request.get_json()
+            folder_id = data.get("folder_id")
+            name = data.get("name")
+            parent_id = data.get("parent_id")
+            description = data.get("description")
+            sort_order = data.get("sort_order")
+
+            if not folder_id:
+                return Response().error("缺少必要参数: folder_id").__dict__
+
+            await self.persona_mgr.update_folder(
+                folder_id=folder_id,
+                name=name,
+                parent_id=parent_id,
+                description=description,
+                sort_order=sort_order,
+            )
+
+            return Response().ok({"message": "文件夹更新成功"}).__dict__
+        except Exception as e:
+            logger.error(f"更新文件夹失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"更新文件夹失败: {e!s}").__dict__
+
+    async def delete_folder(self):
+        """删除文件夹"""
+        try:
+            data = await request.get_json()
+            folder_id = data.get("folder_id")
+
+            if not folder_id:
+                return Response().error("缺少必要参数: folder_id").__dict__
+
+            await self.persona_mgr.delete_folder(folder_id)
+
+            return Response().ok({"message": "文件夹删除成功"}).__dict__
+        except Exception as e:
+            logger.error(f"删除文件夹失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"删除文件夹失败: {e!s}").__dict__
+
+    async def reorder_items(self):
+        """批量更新排序顺序
+
+        请求体格式:
+        {
+            "items": [
+                {"id": "persona_id_1", "type": "persona", "sort_order": 0},
+                {"id": "persona_id_2", "type": "persona", "sort_order": 1},
+                {"id": "folder_id_1", "type": "folder", "sort_order": 0},
+                ...
+            ]
+        }
+        """
+        try:
+            data = await request.get_json()
+            items = data.get("items", [])
+
+            if not items:
+                return Response().error("items 不能为空").__dict__
+
+            # 验证每个 item 的格式
+            for item in items:
+                if not all(k in item for k in ("id", "type", "sort_order")):
+                    return (
+                        Response()
+                        .error("每个 item 必须包含 id, type, sort_order 字段")
+                        .__dict__
+                    )
+                if item["type"] not in ("persona", "folder"):
+                    return (
+                        Response()
+                        .error("type 字段必须是 'persona' 或 'folder'")
+                        .__dict__
+                    )
+
+            await self.persona_mgr.batch_update_sort_order(items)
+
+            return Response().ok({"message": "排序更新成功"}).__dict__
+        except Exception as e:
+            logger.error(f"更新排序失败: {e!s}\n{traceback.format_exc()}")
+            return Response().error(f"更新排序失败: {e!s}").__dict__

astrbot/dashboard/routes/skills.py

@@ -0,0 +1,148 @@
+import os
+import traceback
+
+from quart import request
+
+from astrbot.core import DEMO_MODE, logger
+from astrbot.core.computer.computer_client import get_booter
+from astrbot.core.skills.skill_manager import SkillManager
+from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
+
+from .route import Response, Route, RouteContext
+
+
+class SkillsRoute(Route):
+    def __init__(self, context: RouteContext, core_lifecycle) -> None:
+        super().__init__(context)
+        self.core_lifecycle = core_lifecycle
+        self.routes = {
+            "/skills": ("GET", self.get_skills),
+            "/skills/upload": ("POST", self.upload_skill),
+            "/skills/update": ("POST", self.update_skill),
+            "/skills/delete": ("POST", self.delete_skill),
+        }
+        self.register_routes()
+
+    async def get_skills(self):
+        try:
+            cfg = self.core_lifecycle.astrbot_config.get("provider_settings", {}).get(
+                "skills", {}
+            )
+            runtime = cfg.get("runtime", "local")
+            skills = SkillManager().list_skills(
+                active_only=False, runtime=runtime, show_sandbox_path=False
+            )
+            return Response().ok([skill.__dict__ for skill in skills]).__dict__
+        except Exception as e:
+            logger.error(traceback.format_exc())
+            return Response().error(str(e)).__dict__
+
+    async def upload_skill(self):
+        if DEMO_MODE:
+            return (
+                Response()
+                .error("You are not permitted to do this operation in demo mode")
+                .__dict__
+            )
+
+        temp_path = None
+        try:
+            files = await request.files
+            file = files.get("file")
+            if not file:
+                return Response().error("Missing file").__dict__
+            filename = os.path.basename(file.filename or "skill.zip")
+            if not filename.lower().endswith(".zip"):
+                return Response().error("Only .zip files are supported").__dict__
+
+            temp_dir = get_astrbot_temp_path()
+            os.makedirs(temp_dir, exist_ok=True)
+            temp_path = os.path.join(temp_dir, filename)
+            await file.save(temp_path)
+
+            cfg = self.core_lifecycle.astrbot_config.get("provider_settings", {}).get(
+                "skills", {}
+            )
+            runtime = cfg.get("runtime", "local")
+            if runtime == "sandbox":
+                sandbox_enabled = (
+                    self.core_lifecycle.astrbot_config.get("provider_settings", {})
+                    .get("sandbox", {})
+                    .get("enable", False)
+                )
+                if not sandbox_enabled:
+                    return (
+                        Response()
+                        .error(
+                            "Sandbox is not enabled. Please enable sandbox before using sandbox runtime."
+                        )
+                        .__dict__
+                    )
+            skill_mgr = SkillManager()
+            skill_name = skill_mgr.install_skill_from_zip(temp_path, overwrite=True)
+
+            if runtime == "sandbox":
+                sb = await get_booter(self.core_lifecycle.star_context, "skills-upload")
+                remote_root = "/home/shared/skills"
+                remote_zip = f"{remote_root}/{skill_name}.zip"
+                await sb.shell.exec(f"mkdir -p {remote_root}")
+                upload_result = await sb.upload_file(temp_path, remote_zip)
+                if not upload_result.get("success", False):
+                    return (
+                        Response().error("Failed to upload skill to sandbox").__dict__
+                    )
+                await sb.shell.exec(
+                    f"unzip -o {remote_zip} -d {remote_root} && rm -f {remote_zip}"
+                )
+
+            return (
+                Response()
+                .ok({"name": skill_name}, "Skill uploaded successfully.")
+                .__dict__
+            )
+        except Exception as e:
+            logger.error(traceback.format_exc())
+            return Response().error(str(e)).__dict__
+        finally:
+            if temp_path and os.path.exists(temp_path):
+                try:
+                    os.remove(temp_path)
+                except Exception:
+                    logger.warning(f"Failed to remove temp skill file: {temp_path}")
+
+    async def update_skill(self):
+        if DEMO_MODE:
+            return (
+                Response()
+                .error("You are not permitted to do this operation in demo mode")
+                .__dict__
+            )
+        try:
+            data = await request.get_json()
+            name = data.get("name")
+            active = data.get("active", True)
+            if not name:
+                return Response().error("Missing skill name").__dict__
+            SkillManager().set_skill_active(name, bool(active))
+            return Response().ok({"name": name, "active": bool(active)}).__dict__
+        except Exception as e:
+            logger.error(traceback.format_exc())
+            return Response().error(str(e)).__dict__
+
+    async def delete_skill(self):
+        if DEMO_MODE:
+            return (
+                Response()
+                .error("You are not permitted to do this operation in demo mode")
+                .__dict__
+            )
+        try:
+            data = await request.get_json()
+            name = data.get("name")
+            if not name:
+                return Response().error("Missing skill name").__dict__
+            SkillManager().delete_skill(name)
+            return Response().ok({"name": name}).__dict__
+        except Exception as e:
+            logger.error(traceback.format_exc())
+            return Response().error(str(e)).__dict__

astrbot/dashboard/routes/util.py

@@ -0,0 +1,102 @@
+"""Dashboard 路由工具集。
+
+这里放一些 dashboard routes 可复用的小工具函数。
+
+目前主要用于「配置文件上传（file 类型配置项）」功能：
+- 清洗/规范化用户可控的文件名与相对路径
+- 将配置 key 映射到配置项独立子目录
+"""
+
+import os
+
+
+def get_schema_item(schema: dict | None, key_path: str) -> dict | None:
+    """按 dot-path 获取 schema 的节点。
+
+    同时支持：
+    - 扁平 schema（直接 key 命中）
+    - 嵌套 object schema（{type: "object", items: {...}}）
+    """
+
+    if not isinstance(schema, dict) or not key_path:
+        return None
+    if key_path in schema:
+        return schema.get(key_path)
+
+    current = schema
+    parts = key_path.split(".")
+    for idx, part in enumerate(parts):
+        if part not in current:
+            return None
+        meta = current.get(part)
+        if idx == len(parts) - 1:
+            return meta
+        if not isinstance(meta, dict) or meta.get("type") != "object":
+            return None
+        current = meta.get("items", {})
+    return None
+
+
+def sanitize_filename(name: str) -> str:
+    """清洗上传文件名，避免路径穿越与非法名称。
+
+    - 丢弃目录部分，仅保留 basename
+    - 将路径分隔符替换为下划线
+    - 拒绝空字符串 / "." / ".."
+    """
+
+    cleaned = os.path.basename(name).strip()
+    if not cleaned or cleaned in {".", ".."}:
+        return ""
+    for sep in (os.sep, os.altsep):
+        if sep:
+            cleaned = cleaned.replace(sep, "_")
+    return cleaned
+
+
+def sanitize_path_segment(segment: str) -> str:
+    """清洗目录片段（URL/path 安全，避免穿越）。
+
+    仅保留 [A-Za-z0-9_-]，其余替换为 "_"
+    """
+
+    cleaned = []
+    for ch in segment:
+        if (
+            ("a" <= ch <= "z")
+            or ("A" <= ch <= "Z")
+            or ch.isdigit()
+            or ch
+            in {
+                "-",
+                "_",
+            }
+        ):
+            cleaned.append(ch)
+        else:
+            cleaned.append("_")
+    result = "".join(cleaned).strip("_")
+    return result or "_"
+
+
+def config_key_to_folder(key_path: str) -> str:
+    """将 dot-path 的配置 key 转成稳定的文件夹路径。"""
+
+    parts = [sanitize_path_segment(p) for p in key_path.split(".") if p]
+    return "/".join(parts) if parts else "_"
+
+
+def normalize_rel_path(rel_path: str | None) -> str | None:
+    """规范化用户传入的相对路径，并阻止路径穿越。"""
+
+    if not isinstance(rel_path, str):
+        return None
+    rel = rel_path.replace("\\", "/").lstrip("/")
+    if not rel:
+        return None
+    parts = [p for p in rel.split("/") if p]
+    if any(part in {".", ".."} for part in parts):
+        return None
+    if rel.startswith("../") or "/../" in rel:
+        return None
+    return "/".join(parts)

astrbot/dashboard/server.py

@@ -7,6 +7,8 @@ from typing import cast
 import jwt
 import psutil
 from flask.json.provider import DefaultJSONProvider
+from hypercorn.asyncio import serve
+from hypercorn.config import Config as HyperConfig
 from psutil._common import addr as psutil_addr
 from quart import Quart, g, jsonify, request
 from quart.logging import default_handler
@@ -20,6 +22,7 @@ from astrbot.core.utils.io import get_local_ip_addresses
 
 from .routes import *
 from .routes.backup import BackupRoute
+from .routes.live_chat import LiveChatRoute
 from .routes.platform import PlatformRoute
 from .routes.route import Response, RouteContext
 from .routes.session_management import SessionManagementRoute
@@ -76,6 +79,7 @@ class AstrBotDashboard:
         self.chat_route = ChatRoute(self.context, db, core_lifecycle)
         self.chatui_project_route = ChatUIProjectRoute(self.context, db)
         self.tools_root = ToolsRoute(self.context, core_lifecycle)
+        self.skills_route = SkillsRoute(self.context, core_lifecycle)
         self.conversation_route = ConversationRoute(self.context, db, core_lifecycle)
         self.file_route = FileRoute(self.context)
         self.session_management_route = SessionManagementRoute(
@@ -88,6 +92,7 @@ class AstrBotDashboard:
         self.kb_route = KnowledgeBaseRoute(self.context, core_lifecycle)
         self.platform_route = PlatformRoute(self.context, core_lifecycle)
         self.backup_route = BackupRoute(self.context, db, core_lifecycle)
+        self.live_chat_route = LiveChatRoute(self.context, db, core_lifecycle)
 
         self.app.add_url_rule(
             "/api/plug/<path:subpath>",
@@ -242,11 +247,22 @@ class AstrBotDashboard:
 
         logger.info(display)
 
-        return self.app.run_task(
-            host=host,
-            port=port,
-            shutdown_trigger=self.shutdown_trigger,
-        )
+        # 配置 Hypercorn
+        config = HyperConfig()
+        config.bind = [f"{host}:{port}"]
+
+        # 根据配置决定是否禁用访问日志
+        disable_access_log = self.core_lifecycle.astrbot_config.get(
+            "dashboard", {}
+        ).get("disable_access_log", True)
+        if disable_access_log:
+            config.accesslog = None
+        else:
+            # 启用访问日志，使用简洁格式
+            config.accesslog = "-"
+            config.access_log_format = "%(h)s %(r)s %(s)s %(b)s %(D)s"
+
+        return serve(self.app, config, shutdown_trigger=self.shutdown_trigger)
 
     async def shutdown_trigger(self):
         await self.shutdown_event.wait()

{astrbot-4.12.3.dist-info → astrbot-4.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.12.3
+Version: 4.13.0
 Summary: Easy-to-use multi-platform LLM chatbot and development framework
 License-File: LICENSE
 Keywords: Astrbot,Astrbot Module,Astrbot Plugin