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

astrbot/core/{sandbox → computer}/tools/fs.py

@@ -9,7 +9,7 @@ from astrbot.core.astr_agent_context import AstrAgentContext
 from astrbot.core.message.components import File
 from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
 
-from ..sandbox_client import get_booter
+from ..computer_client import get_booter
 
 # @dataclass
 # class CreateFileTool(FunctionTool):

astrbot/core/computer/tools/python.py

@@ -0,0 +1,94 @@
+from dataclasses import dataclass, field
+
+import mcp
+
+from astrbot.api import FunctionTool
+from astrbot.core.agent.run_context import ContextWrapper
+from astrbot.core.agent.tool import ToolExecResult
+from astrbot.core.astr_agent_context import AstrAgentContext
+from astrbot.core.computer.computer_client import get_booter, get_local_booter
+
+param_schema = {
+    "type": "object",
+    "properties": {
+        "code": {
+            "type": "string",
+            "description": "The Python code to execute.",
+        },
+        "silent": {
+            "type": "boolean",
+            "description": "Whether to suppress the output of the code execution.",
+            "default": False,
+        },
+    },
+    "required": ["code"],
+}
+
+
+def handle_result(result: dict) -> ToolExecResult:
+    data = result.get("data", {})
+    output = data.get("output", {})
+    error = data.get("error", "")
+    images: list[dict] = output.get("images", [])
+    text: str = output.get("text", "")
+
+    resp = mcp.types.CallToolResult(content=[])
+
+    if error:
+        resp.content.append(mcp.types.TextContent(type="text", text=f"error: {error}"))
+
+    if images:
+        for img in images:
+            resp.content.append(
+                mcp.types.ImageContent(
+                    type="image", data=img["image/png"], mimeType="image/png"
+                )
+            )
+    if text:
+        resp.content.append(mcp.types.TextContent(type="text", text=text))
+
+    if not resp.content:
+        resp.content.append(mcp.types.TextContent(type="text", text="No output."))
+
+    return resp
+
+
+@dataclass
+class PythonTool(FunctionTool):
+    name: str = "astrbot_execute_ipython"
+    description: str = "Run codes in an IPython shell."
+    parameters: dict = field(default_factory=lambda: param_schema)
+
+    async def call(
+        self, context: ContextWrapper[AstrAgentContext], code: str, silent: bool = False
+    ) -> ToolExecResult:
+        sb = await get_booter(
+            context.context.context,
+            context.context.event.unified_msg_origin,
+        )
+        try:
+            result = await sb.python.exec(code, silent=silent)
+            return handle_result(result)
+        except Exception as e:
+            return f"Error executing code: {str(e)}"
+
+
+@dataclass
+class LocalPythonTool(FunctionTool):
+    name: str = "astrbot_execute_python"
+    description: str = "Execute codes in a Python environment."
+
+    parameters: dict = field(default_factory=lambda: param_schema)
+
+    async def call(
+        self, context: ContextWrapper[AstrAgentContext], code: str, silent: bool = False
+    ) -> ToolExecResult:
+        if context.context.event.role != "admin":
+            return "error: Permission denied. Local Python execution is only allowed for admin users. Set admins in AstrBot WebUI."
+
+        sb = get_local_booter()
+        try:
+            result = await sb.python.exec(code, silent=silent)
+            return handle_result(result)
+        except Exception as e:
+            return f"Error executing code: {str(e)}"

astrbot/core/{sandbox → computer}/tools/shell.py

@@ -6,7 +6,7 @@ from astrbot.core.agent.run_context import ContextWrapper
 from astrbot.core.agent.tool import ToolExecResult
 from astrbot.core.astr_agent_context import AstrAgentContext
 
-from ..sandbox_client import get_booter
+from ..computer_client import get_booter, get_local_booter
 
 
 @dataclass
@@ -37,6 +37,8 @@ class ExecuteShellTool(FunctionTool):
         }
     )
 
+    is_local: bool = False
+
     async def call(
         self,
         context: ContextWrapper[AstrAgentContext],
@@ -44,10 +46,16 @@ class ExecuteShellTool(FunctionTool):
         background: bool = False,
         env: dict = {},
     ) -> ToolExecResult:
-        sb = await get_booter(
-            context.context.context,
-            context.context.event.unified_msg_origin,
-        )
+        if context.context.event.role != "admin":
+            return "error: Permission denied. Shell execution is only allowed for admin users. Set admins in AstrBot WebUI."
+
+        if self.is_local:
+            sb = get_local_booter()
+        else:
+            sb = await get_booter(
+                context.context.context,
+                context.context.event.unified_msg_origin,
+            )
         try:
             result = await sb.shell.exec(command, background=background, env=env)
             return json.dumps(result)

astrbot/core/config/default.py

@@ -5,7 +5,7 @@ from typing import Any, TypedDict
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.12.3"
+VERSION = "4.13.0"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -106,6 +106,7 @@ DEFAULT_CONFIG = {
         "reachability_check": False,
         "max_agent_step": 30,
         "tool_call_timeout": 60,
+        "tool_schema_mode": "full",
         "llm_safety_mode": True,
         "safety_mode_strategy": "system_prompt",  # TODO: llm judge
         "file_extract": {
@@ -121,6 +122,7 @@ DEFAULT_CONFIG = {
             "shipyard_ttl": 3600,
             "shipyard_max_sessions": 10,
         },
+        "skills": {"runtime": "sandbox"},
     },
     "provider_stt_settings": {
         "enable": False,
@@ -166,6 +168,7 @@ DEFAULT_CONFIG = {
         "jwt_secret": "",
         "host": "0.0.0.0",
         "port": 6185,
+        "disable_access_log": True,
     },
     "platform": [],
     "platform_specific": {
@@ -321,6 +324,7 @@ CONFIG_METADATA_2 = {
                         "enable": False,
                         "client_id": "",
                         "client_secret": "",
+                        "card_template_id": "",
                     },
                     "Telegram": {
                         "id": "telegram",
@@ -582,6 +586,11 @@ CONFIG_METADATA_2 = {
                         "type": "string",
                         "hint": "可选：填写 Misskey 网盘中目标文件夹的 ID，上传的文件将放置到该文件夹内。留空则使用账号网盘根目录。",
                     },
+                    "card_template_id": {
+                        "description": "卡片模板 ID",
+                        "type": "string",
+                        "hint": "可选。钉钉互动卡片模板 ID。启用后将使用互动卡片进行流式回复。",
+                    },
                     "telegram_command_register": {
                         "description": "Telegram 命令注册",
                         "type": "bool",
@@ -767,27 +776,21 @@ CONFIG_METADATA_2 = {
                             "interval_method": {
                                 "type": "string",
                                 "options": ["random", "log"],
-                                "hint": "分段回复的间隔时间计算方法。random 为随机时间，log 为根据消息长度计算，$y=log_<log_base>(x)$，x为字数，y的单位为秒。",
                             },
                             "interval": {
                                 "type": "string",
-                                "hint": "`random` 方法用。每一段回复的间隔时间，格式为 `最小时间,最大时间`。如 `0.75,2.5`",
                             },
                             "log_base": {
                                 "type": "float",
-                                "hint": "`log` 方法用。对数函数的底数。默认为 2.6",
                             },
                             "words_count_threshold": {
                                 "type": "int",
-                                "hint": "分段回复的字数上限。只有字数小于此值的消息才会被分段，超过此值的长消息将直接发送（不分段）。默认为 150",
                             },
                             "regex": {
                                 "type": "string",
-                                "hint": "用于分隔一段消息。默认情况下会根据句号、问号等标点符号分隔。re.findall(r'<regex>', text)",
                             },
                             "content_cleanup_rule": {
                                 "type": "string",
-                                "hint": "移除分段后的内容中的指定的内容。支持正则表达式。如填写 `[。？！]` 将移除所有的句号、问号、感叹号。re.sub(r'<regex>', '', text)",
                             },
                         },
                     },
@@ -1179,6 +1182,19 @@ CONFIG_METADATA_2 = {
                         "openai-tts-voice": "alloy",
                         "timeout": "20",
                     },
+                    "Genie TTS": {
+                        "id": "genie_tts",
+                        "provider": "genie_tts",
+                        "type": "genie_tts",
+                        "provider_type": "text_to_speech",
+                        "enable": False,
+                        "genie_character_name": "mika",
+                        "genie_onnx_model_dir": "CharacterModels/v2ProPlus/mika/tts_models",
+                        "genie_language": "Japanese",
+                        "genie_refer_audio_path": "",
+                        "genie_refer_text": "",
+                        "timeout": 20,
+                    },
                     "Edge TTS": {
                         "id": "edge_tts",
                         "provider": "microsoft",
@@ -1395,6 +1411,16 @@ CONFIG_METADATA_2 = {
                     },
                 },
                 "items": {
+                    "genie_onnx_model_dir": {
+                        "description": "ONNX Model Directory",
+                        "type": "string",
+                        "hint": "The directory path containing the ONNX model files",
+                    },
+                    "genie_language": {
+                        "description": "Language",
+                        "type": "string",
+                        "options": ["Japanese", "English", "Chinese"],
+                    },
                     "provider_source_id": {
                         "invisible": True,
                         "type": "string",
@@ -2158,6 +2184,9 @@ CONFIG_METADATA_2 = {
                     "tool_call_timeout": {
                         "type": "int",
                     },
+                    "tool_schema_mode": {
+                        "type": "string",
+                    },
                     "file_extract": {
                         "type": "object",
                         "items": {
@@ -2172,6 +2201,17 @@ CONFIG_METADATA_2 = {
                             },
                         },
                     },
+                    "skills": {
+                        "type": "object",
+                        "items": {
+                            "enable": {
+                                "type": "bool",
+                            },
+                            "runtime": {
+                                "type": "string",
+                            },
+                        },
+                    },
                 },
             },
             "provider_stt_settings": {
@@ -2549,6 +2589,7 @@ CONFIG_METADATA_3 = {
             # },
             "sandbox": {
                 "description": "Agent 沙箱环境",
+                "hint": "",
                 "type": "object",
                 "items": {
                     "provider_settings.sandbox.enable": {
@@ -2560,6 +2601,7 @@ CONFIG_METADATA_3 = {
                         "description": "沙箱环境驱动器",
                         "type": "string",
                         "options": ["shipyard"],
+                        "labels": ["Shipyard"],
                         "condition": {
                             "provider_settings.sandbox.enable": True,
                         },
@@ -2602,6 +2644,27 @@ CONFIG_METADATA_3 = {
                         },
                     },
                 },
+                "condition": {
+                    "provider_settings.agent_runner_type": "local",
+                    "provider_settings.enable": True,
+                },
+            },
+            "skills": {
+                "description": "Skills",
+                "type": "object",
+                "items": {
+                    "provider_settings.skills.runtime": {
+                        "description": "Skill Runtime",
+                        "type": "string",
+                        "options": ["local", "sandbox"],
+                        "labels": ["本地", "沙箱"],
+                        "hint": "选择 Skills 运行环境。使用沙箱时需先启用沙箱环境。",
+                    },
+                },
+                "condition": {
+                    "provider_settings.agent_runner_type": "local",
+                    "provider_settings.enable": True,
+                },
             },
             "truncate_and_compress": {
                 "description": "上下文管理策略",
@@ -2662,6 +2725,10 @@ CONFIG_METADATA_3 = {
                         },
                     },
                 },
+                "condition": {
+                    "provider_settings.agent_runner_type": "local",
+                    "provider_settings.enable": True,
+                },
             },
             "others": {
                 "description": "其他配置",
@@ -2749,6 +2816,16 @@ CONFIG_METADATA_3 = {
                             "provider_settings.agent_runner_type": "local",
                         },
                     },
+                    "provider_settings.tool_schema_mode": {
+                        "description": "工具调用模式",
+                        "type": "string",
+                        "options": ["skills_like", "full"],
+                        "labels": ["Skills-like（两阶段）", "Full（完整参数）"],
+                        "hint": "skills-like 先下发工具名称与描述，再下发参数；full 一次性下发完整参数。",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
+                    },
                     "provider_settings.wake_prefix": {
                         "description": "LLM 聊天额外唤醒前缀 ",
                         "type": "string",
@@ -3016,7 +3093,8 @@ CONFIG_METADATA_3 = {
                         "type": "bool",
                     },
                     "platform_settings.segmented_reply.interval_method": {
-                        "description": "间隔方法",
+                        "description": "间隔方法。",
+                        "hint": "random 为随机时间，log 为根据消息长度计算，$y=log_<log_base>(x)$，x为字数，y的单位为秒。",
                         "type": "string",
                         "options": ["random", "log"],
                     },
@@ -3031,13 +3109,14 @@ CONFIG_METADATA_3 = {
                     "platform_settings.segmented_reply.log_base": {
                         "description": "对数底数",
                         "type": "float",
-                        "hint": "对数间隔的底数，默认为 2.0。取值范围为 1.0-10.0。",
+                        "hint": "对数间隔的底数，默认为 2.6。取值范围为 1.0-10.0。",
                         "condition": {
                             "platform_settings.segmented_reply.interval_method": "log",
                         },
                     },
                     "platform_settings.segmented_reply.words_count_threshold": {
                         "description": "分段回复字数阈值",
+                        "hint": "分段回复的字数上限。只有字数小于此值的消息才会被分段，超过此值的长消息将直接发送（不分段）。默认为 150",
                         "type": "int",
                     },
                     "platform_settings.segmented_reply.split_mode": {
@@ -3048,6 +3127,7 @@ CONFIG_METADATA_3 = {
                     },
                     "platform_settings.segmented_reply.regex": {
                         "description": "分段正则表达式",
+                        "hint": "用于分隔一段消息。默认情况下会根据句号、问号等标点符号分隔。如填写 `[。？！]` 将移除所有的句号、问号、感叹号。re.findall(r'<regex>', text)",
                         "type": "string",
                         "condition": {
                             "platform_settings.segmented_reply.split_mode": "regex",
@@ -3217,6 +3297,7 @@ DEFAULT_VALUE_MAP = {
     "string": "",
     "text": "",
     "list": [],
+    "file": [],
     "object": {},
     "template_list": [],
 }

astrbot/core/db/__init__.py

@@ -14,6 +14,7 @@ from astrbot.core.db.po import (
     CommandConflict,
     ConversationV2,
     Persona,
+    PersonaFolder,
     PlatformMessageHistory,
     PlatformSession,
     PlatformStat,
@@ -253,8 +254,21 @@ class BaseDatabase(abc.ABC):
         system_prompt: str,
         begin_dialogs: list[str] | None = None,
         tools: list[str] | None = None,
+        skills: list[str] | None = None,
+        folder_id: str | None = None,
+        sort_order: int = 0,
     ) -> Persona:
-        """Insert a new persona record."""
+        """Insert a new persona record.
+
+        Args:
+            persona_id: Unique identifier for the persona
+            system_prompt: System prompt for the persona
+            begin_dialogs: Optional list of initial dialog strings
+            tools: Optional list of tool names (None means all tools, [] means no tools)
+            skills: Optional list of skill names (None means all skills, [] means no skills)
+            folder_id: Optional folder ID to place the persona in (None means root)
+            sort_order: Sort order within the folder (default 0)
+        """
         ...
 
     @abc.abstractmethod
@@ -274,6 +288,7 @@ class BaseDatabase(abc.ABC):
         system_prompt: str | None = None,
         begin_dialogs: list[str] | None = None,
         tools: list[str] | None = None,
+        skills: list[str] | None = None,
     ) -> Persona | None:
         """Update a persona's system prompt or begin dialogs."""
         ...
@@ -283,6 +298,84 @@ class BaseDatabase(abc.ABC):
         """Delete a persona by its ID."""
         ...
 
+    # ====
+    # Persona Folder Management
+    # ====
+
+    @abc.abstractmethod
+    async def insert_persona_folder(
+        self,
+        name: str,
+        parent_id: str | None = None,
+        description: str | None = None,
+        sort_order: int = 0,
+    ) -> PersonaFolder:
+        """Insert a new persona folder."""
+        ...
+
+    @abc.abstractmethod
+    async def get_persona_folder_by_id(self, folder_id: str) -> PersonaFolder | None:
+        """Get a persona folder by its folder_id."""
+        ...
+
+    @abc.abstractmethod
+    async def get_persona_folders(
+        self, parent_id: str | None = None
+    ) -> list[PersonaFolder]:
+        """Get all persona folders, optionally filtered by parent_id."""
+        ...
+
+    @abc.abstractmethod
+    async def get_all_persona_folders(self) -> list[PersonaFolder]:
+        """Get all persona folders."""
+        ...
+
+    @abc.abstractmethod
+    async def update_persona_folder(
+        self,
+        folder_id: str,
+        name: str | None = None,
+        parent_id: T.Any = None,
+        description: T.Any = None,
+        sort_order: int | None = None,
+    ) -> PersonaFolder | None:
+        """Update a persona folder."""
+        ...
+
+    @abc.abstractmethod
+    async def delete_persona_folder(self, folder_id: str) -> None:
+        """Delete a persona folder by its folder_id."""
+        ...
+
+    @abc.abstractmethod
+    async def move_persona_to_folder(
+        self, persona_id: str, folder_id: str | None
+    ) -> Persona | None:
+        """Move a persona to a folder (or root if folder_id is None)."""
+        ...
+
+    @abc.abstractmethod
+    async def get_personas_by_folder(
+        self, folder_id: str | None = None
+    ) -> list[Persona]:
+        """Get all personas in a specific folder."""
+        ...
+
+    @abc.abstractmethod
+    async def batch_update_sort_order(
+        self,
+        items: list[dict],
+    ) -> None:
+        """Batch update sort_order for personas and/or folders.
+
+        Args:
+            items: List of dicts with keys:
+                - id: The persona_id or folder_id
+                - type: Either "persona" or "folder"
+                - sort_order: The new sort_order value
+        """
+        ...
+
     @abc.abstractmethod
     async def insert_preference_or_update(
         self,

astrbot/core/db/po.py

@@ -68,6 +68,44 @@ class ConversationV2(SQLModel, table=True):
     )
 
 
+class PersonaFolder(SQLModel, table=True):
+    """Persona 文件夹，支持递归层级结构。
+
+    用于组织和管理多个 Persona，类似于文件系统的目录结构。
+    """
+
+    __tablename__: str = "persona_folders"
+
+    id: int | None = Field(
+        primary_key=True,
+        sa_column_kwargs={"autoincrement": True},
+        default=None,
+    )
+    folder_id: str = Field(
+        max_length=36,
+        nullable=False,
+        unique=True,
+        default_factory=lambda: str(uuid.uuid4()),
+    )
+    name: str = Field(max_length=255, nullable=False)
+    parent_id: str | None = Field(default=None, max_length=36)
+    """父文件夹ID，NULL表示根目录"""
+    description: str | None = Field(default=None, sa_type=Text)
+    sort_order: int = Field(default=0)
+    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    updated_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
+    )
+
+    __table_args__ = (
+        UniqueConstraint(
+            "folder_id",
+            name="uix_persona_folder_id",
+        ),
+    )
+
+
 class Persona(SQLModel, table=True):
     """Persona is a set of instructions for LLMs to follow.
 
@@ -87,6 +125,12 @@ class Persona(SQLModel, table=True):
     """a list of strings, each representing a dialog to start with"""
     tools: list | None = Field(default=None, sa_type=JSON)
     """None means use ALL tools for default, empty list means no tools, otherwise a list of tool names."""
+    skills: list | None = Field(default=None, sa_type=JSON)
+    """None means use ALL skills for default, empty list means no skills, otherwise a list of skill names."""
+    folder_id: str | None = Field(default=None, max_length=36)
+    """所属文件夹ID，NULL 表示在根目录"""
+    sort_order: int = Field(default=0)
+    """排序顺序"""
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     updated_at: datetime = Field(
         default_factory=lambda: datetime.now(timezone.utc),
@@ -400,6 +444,8 @@ class Personality(TypedDict):
     """情感模拟对话预设。在 v4.0.0 版本及之后，已被废弃。"""
     tools: list[str] | None
     """工具列表。None 表示使用所有工具，空列表表示不使用任何工具"""
+    skills: list[str] | None
+    """Skills 列表。None 表示使用所有 Skills，空列表表示不使用任何 Skills"""
 
     # cache
     _begin_dialogs_processed: list[dict]