AstrBot 4.12.3__tar.gz → 4.13.0__tar.gz

{astrbot-4.12.3 → astrbot-4.13.0}/.gitignore

@@ -50,3 +50,7 @@ venv/*
 pytest.ini
 AGENTS.md
 IFLOW.md
+
+# genie_tts data
+CharacterModels/
+GenieData/

{astrbot-4.12.3 → astrbot-4.13.0}/PKG-INFO

@@ -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

{astrbot-4.12.3 → astrbot-4.13.0}/astrbot/builtin_stars/astrbot/process_llm_request.py

@@ -10,8 +10,11 @@ from astrbot.api.provider import Provider, ProviderRequest
 from astrbot.core.agent.message import TextPart
 from astrbot.core.pipeline.process_stage.utils import (
     CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT,
+    LOCAL_EXECUTE_SHELL_TOOL,
+    LOCAL_PYTHON_TOOL,
 )
 from astrbot.core.provider.func_tool_manager import ToolSet
+from astrbot.core.skills.skill_manager import SkillManager, build_skills_prompt
 
 
 class ProcessLLMRequest:
@@ -25,6 +28,15 @@ class ProcessLLMRequest:
         else:
             logger.info(f"Timezone set to: {self.timezone}")
 
+        self.skill_manager = SkillManager()
+
+    def _apply_local_env_tools(self, req: ProviderRequest) -> None:
+        """Add local environment tools to the provider request."""
+        if req.func_tool is None:
+            req.func_tool = ToolSet()
+        req.func_tool.add_tool(LOCAL_EXECUTE_SHELL_TOOL)
+        req.func_tool.add_tool(LOCAL_PYTHON_TOOL)
+
     async def _ensure_persona(
         self, req: ProviderRequest, cfg: dict, umo: str, platform_type: str
     ):
@@ -66,6 +78,30 @@ class ProcessLLMRequest:
             if begin_dialogs := copy.deepcopy(persona["_begin_dialogs_processed"]):
                 req.contexts[:0] = begin_dialogs
 
+        # skills select and prompt
+        runtime = self.skills_cfg.get("runtime", "local")
+        skills = self.skill_manager.list_skills(active_only=True, runtime=runtime)
+        if runtime == "sandbox" and not self.sandbox_cfg.get("enable", False):
+            logger.warning(
+                "Skills runtime is set to sandbox, but sandbox mode is disabled, will skip skills prompt injection.",
+            )
+            req.system_prompt += "\n[Background: User added some skills, and skills runtime is set to sandbox, but sandbox mode is disabled. So skills will be unavailable.]\n"
+        elif skills:
+            # persona.skills == None means all skills are allowed
+            if persona and persona.get("skills") is not None:
+                if not persona["skills"]:
+                    return
+                allowed = set(persona["skills"])
+                skills = [skill for skill in skills if skill.name in allowed]
+            if skills:
+                req.system_prompt += f"\n{build_skills_prompt(skills)}\n"
+
+            # if user wants to use skills in non-sandbox mode, apply local env tools
+            runtime = self.skills_cfg.get("runtime", "local")
+            sandbox_enabled = self.sandbox_cfg.get("enable", False)
+            if runtime == "local" and not sandbox_enabled:
+                self._apply_local_env_tools(req)
+
         # tools select
         tmgr = self.ctx.get_llm_tool_manager()
         if (persona and persona.get("tools") is None) or not persona:
@@ -81,7 +117,10 @@ class ProcessLLMRequest:
                     tool = tmgr.get_func(tool_name)
                     if tool and tool.active:
                         toolset.add_tool(tool)
-        req.func_tool = toolset
+        if not req.func_tool:
+            req.func_tool = toolset
+        else:
+            req.func_tool.merge(toolset)
         logger.debug(f"Tool set for persona {persona_id}: {toolset.names()}")
 
     async def _ensure_img_caption(
@@ -134,6 +173,8 @@ class ProcessLLMRequest:
         cfg: dict = self.ctx.get_config(umo=event.unified_msg_origin)[
             "provider_settings"
         ]
+        self.skills_cfg = cfg.get("skills", {})
+        self.sandbox_cfg = cfg.get("sandbox", {})
 
         # prompt prefix
         if prefix := cfg.get("prompt_prefix"):

{astrbot-4.12.3 → astrbot-4.13.0}/astrbot/builtin_stars/builtin_commands/commands/__init__.py

@@ -11,7 +11,6 @@ from .provider import ProviderCommands
 from .setunset import SetUnsetCommands
 from .sid import SIDCommand
 from .t2i import T2ICommand
-from .tool import ToolCommands
 from .tts import TTSCommand
 
 __all__ = [
@@ -27,5 +26,4 @@ __all__ = [
     "SetUnsetCommands",
     "T2ICommand",
     "TTSCommand",
-    "ToolCommands",
 ]

{astrbot-4.12.3 → astrbot-4.13.0}/astrbot/builtin_stars/builtin_commands/commands/persona.py

@@ -1,13 +1,55 @@
 import builtins
+from typing import TYPE_CHECKING
 
 from astrbot.api import sp, star
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 
+if TYPE_CHECKING:
+    from astrbot.core.db.po import Persona
+
 
 class PersonaCommands:
     def __init__(self, context: star.Context):
         self.context = context
 
+    def _build_tree_output(
+        self,
+        folder_tree: list[dict],
+        all_personas: list["Persona"],
+        depth: int = 0,
+    ) -> list[str]:
+        """递归构建树状输出，使用短线条表示层级"""
+        lines: list[str] = []
+        # 使用短线条作为缩进前缀，每层只用 "│" 加一个空格
+        prefix = "│ " * depth
+
+        for folder in folder_tree:
+            # 输出文件夹
+            lines.append(f"{prefix}├ 📁 {folder['name']}/")
+
+            # 获取该文件夹下的人格
+            folder_personas = [
+                p for p in all_personas if p.folder_id == folder["folder_id"]
+            ]
+            child_prefix = "│ " * (depth + 1)
+
+            # 输出该文件夹下的人格
+            for persona in folder_personas:
+                lines.append(f"{child_prefix}├ 👤 {persona.persona_id}")
+
+            # 递归处理子文件夹
+            children = folder.get("children", [])
+            if children:
+                lines.extend(
+                    self._build_tree_output(
+                        children,
+                        all_personas,
+                        depth + 1,
+                    )
+                )
+
+        return lines
+
     async def persona(self, message: AstrMessageEvent):
         l = message.message_str.split(" ")  # noqa: E741
         umo = message.unified_msg_origin
@@ -69,12 +111,32 @@ class PersonaCommands:
                 .use_t2i(False),
             )
         elif l[1] == "list":
-            parts = ["人格列表：\n"]
-            for persona in self.context.provider_manager.personas:
-                parts.append(f"- {persona['name']}\n")
-            parts.append("\n\n*输入 `/persona view 人格名` 查看人格详细信息")
-            msg = "".join(parts)
-            message.set_result(MessageEventResult().message(msg))
+            # 获取文件夹树和所有人格
+            folder_tree = await self.context.persona_manager.get_folder_tree()
+            all_personas = self.context.persona_manager.personas
+
+            lines = ["📂 人格列表：\n"]
+
+            # 构建树状输出
+            tree_lines = self._build_tree_output(folder_tree, all_personas)
+            lines.extend(tree_lines)
+
+            # 输出根目录下的人格（没有文件夹的）
+            root_personas = [p for p in all_personas if p.folder_id is None]
+            if root_personas:
+                if tree_lines:  # 如果有文件夹内容，加个空行
+                    lines.append("")
+                for persona in root_personas:
+                    lines.append(f"👤 {persona.persona_id}")
+
+            # 统计信息
+            total_count = len(all_personas)
+            lines.append(f"\n共 {total_count} 个人格")
+            lines.append("\n*使用 `/persona <人格名>` 设置人格")
+            lines.append("*使用 `/persona view <人格名>` 查看详细信息")
+
+            msg = "\n".join(lines)
+            message.set_result(MessageEventResult().message(msg).use_t2i(False))
         elif l[1] == "view":
             if len(l) == 2:
                 message.set_result(MessageEventResult().message("请输入人格情景名"))

{astrbot-4.12.3 → astrbot-4.13.0}/astrbot/builtin_stars/builtin_commands/main.py

@@ -13,7 +13,6 @@ from .commands import (
     SetUnsetCommands,
     SIDCommand,
     T2ICommand,
-    ToolCommands,
     TTSCommand,
 )
 
@@ -24,7 +23,6 @@ class Main(star.Star):
 
         self.help_c = HelpCommand(self.context)
         self.llm_c = LLMCommands(self.context)
-        self.tool_c = ToolCommands(self.context)
         self.plugin_c = PluginCommands(self.context)
         self.admin_c = AdminCommands(self.context)
         self.conversation_c = ConversationCommands(self.context)
@@ -47,30 +45,6 @@ class Main(star.Star):
         """开启/关闭 LLM"""
         await self.llm_c.llm(event)
 
-    @filter.command_group("tool")
-    def tool(self):
-        """函数工具管理"""
-
-    @tool.command("ls")
-    async def tool_ls(self, event: AstrMessageEvent):
-        """查看函数工具列表"""
-        await self.tool_c.tool_ls(event)
-
-    @tool.command("on")
-    async def tool_on(self, event: AstrMessageEvent, tool_name: str):
-        """启用一个函数工具"""
-        await self.tool_c.tool_on(event, tool_name)
-
-    @tool.command("off")
-    async def tool_off(self, event: AstrMessageEvent, tool_name: str):
-        """停用一个函数工具"""
-        await self.tool_c.tool_off(event, tool_name)
-
-    @tool.command("off_all")
-    async def tool_all_off(self, event: AstrMessageEvent):
-        """停用所有函数工具"""
-        await self.tool_c.tool_all_off(event)
-
     @filter.command_group("plugin")
     def plugin(self):
         """插件管理"""

astrbot-4.13.0/astrbot/cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "4.13.0"

{astrbot-4.12.3 → astrbot-4.13.0}/astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -1,3 +1,4 @@
+import copy
 import sys
 import time
 import traceback
@@ -14,6 +15,7 @@ from mcp.types import (
 
 from astrbot import logger
 from astrbot.core.agent.message import TextPart, ThinkPart
+from astrbot.core.agent.tool import ToolSet
 from astrbot.core.message.components import Json
 from astrbot.core.message.message_event_result import (
     MessageChain,
@@ -64,6 +66,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         # customize
         custom_token_counter: TokenCounter | None = None,
         custom_compressor: ContextCompressor | None = None,
+        tool_schema_mode: str | None = "full",
         **kwargs: T.Any,
     ) -> None:
         self.req = request
@@ -99,6 +102,24 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         self.agent_hooks = agent_hooks
         self.run_context = run_context
 
+        # These two are used for tool schema mode handling
+        # We now have two modes:
+        # - "full": use full tool schema for LLM calls, default.
+        # - "skills_like": use light tool schema for LLM calls, and re-query with param-only schema when needed.
+        #   Light tool schema does not include tool parameters.
+        #   This can reduce token usage when tools have large descriptions.
+        # See #4681
+        self.tool_schema_mode = tool_schema_mode
+        self._tool_schema_param_set = None
+        if tool_schema_mode == "skills_like":
+            tool_set = self.req.func_tool
+            if not tool_set:
+                return
+            light_set = tool_set.get_light_tool_set()
+            self._tool_schema_param_set = tool_set.get_param_only_tool_set()
+            # MODIFIE the req.func_tool to use light tool schemas
+            self.req.func_tool = light_set
+
         messages = []
         # append existing messages in the run context
         for msg in request.contexts:
@@ -253,6 +274,9 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
 
         # 如果有工具调用，还需处理工具调用
         if llm_resp.tools_call_name:
+            if self.tool_schema_mode == "skills_like":
+                llm_resp, _ = await self._resolve_tool_exec(llm_resp)
+
             tool_call_result_blocks = []
             async for result in self._handle_function_tools(self.req, llm_resp):
                 if isinstance(result, list):
@@ -269,6 +293,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                         type=ar_type,
                         data=AgentResponseData(chain=result),
                     )
+
             # 将结果添加到上下文中
             parts = []
             if llm_resp.reasoning_content or llm_resp.reasoning_signature:
@@ -354,7 +379,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
             try:
                 if not req.func_tool:
                     return
-                func_tool = req.func_tool.get_func(func_tool_name)
+                func_tool = req.func_tool.get_tool(func_tool_name)
                 logger.info(f"使用工具：{func_tool_name}，参数：{func_tool_args}")
 
                 if not func_tool:
@@ -537,6 +562,71 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         if tool_call_result_blocks:
             yield tool_call_result_blocks
 
+    def _build_tool_requery_context(
+        self, tool_names: list[str]
+    ) -> list[dict[str, T.Any]]:
+        """Build contexts for re-querying LLM with param-only tool schemas."""
+        contexts: list[dict[str, T.Any]] = []
+        for msg in self.run_context.messages:
+            if hasattr(msg, "model_dump"):
+                contexts.append(msg.model_dump())  # type: ignore[call-arg]
+            elif isinstance(msg, dict):
+                contexts.append(copy.deepcopy(msg))
+        instruction = (
+            "You have decided to call tool(s): "
+            + ", ".join(tool_names)
+            + ". Now call the tool(s) with required arguments using the tool schema, "
+            "and follow the existing tool-use rules."
+        )
+        if contexts and contexts[0].get("role") == "system":
+            content = contexts[0].get("content") or ""
+            contexts[0]["content"] = f"{content}\n{instruction}"
+        else:
+            contexts.insert(0, {"role": "system", "content": instruction})
+        return contexts
+
+    def _build_tool_subset(self, tool_set: ToolSet, tool_names: list[str]) -> ToolSet:
+        """Build a subset of tools from the given tool set based on tool names."""
+        subset = ToolSet()
+        for name in tool_names:
+            tool = tool_set.get_tool(name)
+            if tool:
+                subset.add_tool(tool)
+        return subset
+
+    async def _resolve_tool_exec(
+        self,
+        llm_resp: LLMResponse,
+    ) -> tuple[LLMResponse, ToolSet | None]:
+        """Used in 'skills_like' tool schema mode to re-query LLM with param-only tool schemas."""
+        tool_names = llm_resp.tools_call_name
+        if not tool_names:
+            return llm_resp, self.req.func_tool
+        full_tool_set = self.req.func_tool
+        if not isinstance(full_tool_set, ToolSet):
+            return llm_resp, self.req.func_tool
+
+        subset = self._build_tool_subset(full_tool_set, tool_names)
+        if not subset.tools:
+            return llm_resp, full_tool_set
+
+        if isinstance(self._tool_schema_param_set, ToolSet):
+            param_subset = self._build_tool_subset(
+                self._tool_schema_param_set, tool_names
+            )
+            if param_subset.tools and tool_names:
+                contexts = self._build_tool_requery_context(tool_names)
+                requery_resp = await self.provider.text_chat(
+                    contexts=contexts,
+                    func_tool=param_subset,
+                    model=self.req.model,
+                    session_id=self.req.session_id,
+                )
+                if requery_resp:
+                    llm_resp = requery_resp
+
+        return llm_resp, subset
+
     def done(self) -> bool:
         """检查 Agent 是否已完成工作"""
         return self._state in (AgentState.DONE, AgentState.ERROR)

{astrbot-4.12.3 → astrbot-4.13.0}/astrbot/core/agent/tool.py

@@ -1,3 +1,4 @@
+import copy
 from collections.abc import AsyncGenerator, Awaitable, Callable
 from typing import Any, Generic
 
@@ -102,6 +103,47 @@ class ToolSet:
                 return tool
         return None
 
+    def get_light_tool_set(self) -> "ToolSet":
+        """Return a light tool set with only name/description."""
+        light_tools = []
+        for tool in self.tools:
+            if hasattr(tool, "active") and not tool.active:
+                continue
+            light_params = {
+                "type": "object",
+                "properties": {},
+            }
+            light_tools.append(
+                FunctionTool(
+                    name=tool.name,
+                    parameters=light_params,
+                    description=tool.description,
+                    handler=None,
+                )
+            )
+        return ToolSet(light_tools)
+
+    def get_param_only_tool_set(self) -> "ToolSet":
+        """Return a tool set with name/parameters only (no description)."""
+        param_tools = []
+        for tool in self.tools:
+            if hasattr(tool, "active") and not tool.active:
+                continue
+            params = (
+                copy.deepcopy(tool.parameters)
+                if tool.parameters
+                else {"type": "object", "properties": {}}
+            )
+            param_tools.append(
+                FunctionTool(
+                    name=tool.name,
+                    parameters=params,
+                    description="",
+                    handler=None,
+                )
+            )
+        return ToolSet(param_tools)
+
     @deprecated(reason="Use add_tool() instead", version="4.0.0")
     def add_func(
         self,
@@ -147,18 +189,15 @@ class ToolSet:
         """Convert tools to OpenAI API function calling schema format."""
         result = []
         for tool in self.tools:
-            func_def = {
-                "type": "function",
-                "function": {
-                    "name": tool.name,
-                    "description": tool.description,
-                },
-            }
+            func_def = {"type": "function", "function": {"name": tool.name}}
+            if tool.description:
+                func_def["function"]["description"] = tool.description
 
-            if (
-                tool.parameters and tool.parameters.get("properties")
-            ) or not omit_empty_parameter_field:
-                func_def["function"]["parameters"] = tool.parameters
+            if tool.parameters is not None:
+                if (
+                    tool.parameters and tool.parameters.get("properties")
+                ) or not omit_empty_parameter_field:
+                    func_def["function"]["parameters"] = tool.parameters
 
             result.append(func_def)
         return result
@@ -171,11 +210,9 @@ class ToolSet:
             if tool.parameters:
                 input_schema["properties"] = tool.parameters.get("properties", {})
                 input_schema["required"] = tool.parameters.get("required", [])
-            tool_def = {
-                "name": tool.name,
-                "description": tool.description,
-                "input_schema": input_schema,
-            }
+            tool_def = {"name": tool.name, "input_schema": input_schema}
+            if tool.description:
+                tool_def["description"] = tool.description
             result.append(tool_def)
         return result
 
@@ -245,10 +282,9 @@ class ToolSet:
 
         tools = []
         for tool in self.tools:
-            d: dict[str, Any] = {
-                "name": tool.name,
-                "description": tool.description,
-            }
+            d: dict[str, Any] = {"name": tool.name}
+            if tool.description:
+                d["description"] = tool.description
             if tool.parameters:
                 d["parameters"] = convert_schema(tool.parameters)
             tools.append(d)
@@ -274,6 +310,11 @@ class ToolSet:
         """获取所有工具的名称列表"""
         return [tool.name for tool in self.tools]
 
+    def merge(self, other: "ToolSet"):
+        """Merge another ToolSet into this one."""
+        for tool in other.tools:
+            self.add_tool(tool)
+
     def __len__(self):
         return len(self.tools)
 

{astrbot-4.12.3 → astrbot-4.13.0}/astrbot/core/astr_agent_hooks.py

@@ -56,8 +56,10 @@ class MainAgentHooks(BaseAgentRunHooks[AstrAgentContext]):
         )
 
         # special handle web_search_tavily
+        platform_name = run_context.context.event.get_platform_name()
         if (
-            tool.name == "web_search_tavily"
+            platform_name == "webchat"
+            and tool.name == "web_search_tavily"
             and len(run_context.messages) > 0
             and tool_result
             and len(tool_result.content)