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

astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py

@@ -46,6 +46,7 @@ from ...utils import (
     PYTHON_TOOL,
     SANDBOX_MODE_PROMPT,
     TOOL_CALL_PROMPT,
+    TOOL_CALL_PROMPT_SKILLS_LIKE_MODE,
     decoded_blocked,
     retrieve_knowledge_base,
 )
@@ -62,6 +63,13 @@ class InternalAgentSubStage(Stage):
         ]
         self.max_step: int = settings.get("max_agent_step", 30)
         self.tool_call_timeout: int = settings.get("tool_call_timeout", 60)
+        self.tool_schema_mode: str = settings.get("tool_schema_mode", "full")
+        if self.tool_schema_mode not in ("skills_like", "full"):
+            logger.warning(
+                "Unsupported tool_schema_mode: %s, fallback to skills_like",
+                self.tool_schema_mode,
+            )
+            self.tool_schema_mode = "full"
         if isinstance(self.max_step, bool):  # workaround: #2622
             self.max_step = 30
         self.show_tool_use: bool = settings.get("show_tool_use_status", True)
@@ -517,7 +525,7 @@ class InternalAgentSubStage(Stage):
             has_valid_message = bool(event.message_str and event.message_str.strip())
             # 检查是否有图片或其他媒体内容
             has_media_content = any(
-                isinstance(comp, (Image, File)) for comp in event.message_obj.message
+                isinstance(comp, Image | File) for comp in event.message_obj.message
             )
 
             if (
@@ -672,7 +680,12 @@ class InternalAgentSubStage(Stage):
 
                 # 注入基本 prompt
                 if req.func_tool and req.func_tool.tools:
-                    req.system_prompt += f"\n{TOOL_CALL_PROMPT}\n"
+                    tool_prompt = (
+                        TOOL_CALL_PROMPT
+                        if self.tool_schema_mode == "full"
+                        else TOOL_CALL_PROMPT_SKILLS_LIKE_MODE
+                    )
+                    req.system_prompt += f"\n{tool_prompt}\n"
 
                 action_type = event.get_extra("action_type")
                 if action_type == "live":
@@ -693,6 +706,7 @@ class InternalAgentSubStage(Stage):
                     llm_compress_provider=self._get_compress_provider(),
                     truncate_turns=self.dequeue_context_length,
                     enforce_max_turns=self.max_context_length,
+                    tool_schema_mode=self.tool_schema_mode,
                 )
 
                 # 检测 Live Mode

astrbot/core/pipeline/process_stage/utils.py

@@ -7,10 +7,11 @@ from astrbot.api import logger, sp
 from astrbot.core.agent.run_context import ContextWrapper
 from astrbot.core.agent.tool import FunctionTool, ToolExecResult
 from astrbot.core.astr_agent_context import AstrAgentContext
-from astrbot.core.sandbox.tools import (
+from astrbot.core.computer.tools import (
     ExecuteShellTool,
     FileDownloadTool,
     FileUploadTool,
+    LocalPythonTool,
     PythonTool,
 )
 from astrbot.core.star.context import Context
@@ -39,11 +40,23 @@ SANDBOX_MODE_PROMPT = (
 
 TOOL_CALL_PROMPT = (
     "You MUST NOT return an empty response, especially after invoking a tool."
-    "Before calling any tool, provide a brief explanatory message to the user stating the purpose of the tool call."
-    "After the tool call is completed, you must briefly summarize the results returned by the tool for the user."
-    "Keep the role-play and style consistent throughout the conversation."
+    " Before calling any tool, provide a brief explanatory message to the user stating the purpose of the tool call."
+    " Use the provided tool schema to format arguments and do not guess parameters that are not defined."
+    " After the tool call is completed, you must briefly summarize the results returned by the tool for the user."
+    " Keep the role-play and style consistent throughout the conversation."
 )
 
+TOOL_CALL_PROMPT_SKILLS_LIKE_MODE = (
+    "You MUST NOT return an empty response, especially after invoking a tool."
+    " Before calling any tool, provide a brief explanatory message to the user stating the purpose of the tool call."
+    " Tool schemas are provided in two stages: first only name and description; "
+    "if you decide to use a tool, the full parameter schema will be provided in "
+    "a follow-up step. Do not guess arguments before you see the schema."
+    " After the tool call is completed, you must briefly summarize the results returned by the tool for the user."
+    " Keep the role-play and style consistent throughout the conversation."
+)
+
+
 CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT = (
     "You are a calm, patient friend with a systems-oriented way of thinking.\n"
     "When someone expresses strong emotional needs, you begin by offering a concise, grounding response "
@@ -194,7 +207,9 @@ async def retrieve_knowledge_base(
 KNOWLEDGE_BASE_QUERY_TOOL = KnowledgeBaseQueryTool()
 
 EXECUTE_SHELL_TOOL = ExecuteShellTool()
+LOCAL_EXECUTE_SHELL_TOOL = ExecuteShellTool(is_local=True)
 PYTHON_TOOL = PythonTool()
+LOCAL_PYTHON_TOOL = LocalPythonTool()
 FILE_UPLOAD_TOOL = FileUploadTool()
 FILE_DOWNLOAD_TOOL = FileDownloadTool()
 

astrbot/core/pipeline/scheduler.py

@@ -82,7 +82,7 @@ class PipelineScheduler:
         await self._process_stages(event)
 
         # 如果没有发送操作, 则发送一个空消息, 以便于后续的处理
-        if isinstance(event, (WebChatMessageEvent, WecomAIBotMessageEvent)):
+        if isinstance(event, WebChatMessageEvent | WecomAIBotMessageEvent):
             await event.send(None)
 
         logger.debug("pipeline 执行完毕。")

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py

@@ -33,7 +33,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
     @staticmethod
     async def _from_segment_to_dict(segment: BaseMessageComponent) -> dict:
         """修复部分字段"""
-        if isinstance(segment, (Image, Record)):
+        if isinstance(segment, Image | Record):
             # For Image and Record segments, we convert them to base64
             bs64 = await segment.convert_to_base64()
             return {
@@ -110,7 +110,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         """
         # 转发消息、文件消息不能和普通消息混在一起发送
         send_one_by_one = any(
-            isinstance(seg, (Node, Nodes, File)) for seg in message_chain.chain
+            isinstance(seg, Node | Nodes | File) for seg in message_chain.chain
         )
         if not send_one_by_one:
             ret = await cls._parse_onebot_json(message_chain)
@@ -119,7 +119,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
             await cls._dispatch_send(bot, event, is_group, session_id, ret)
             return
         for seg in message_chain.chain:
-            if isinstance(seg, (Node, Nodes)):
+            if isinstance(seg, Node | Nodes):
                 # 合并转发消息
                 if isinstance(seg, Node):
                     nodes = Nodes([seg])

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -90,12 +90,10 @@ class QQOfficialMessageEvent(AstrMessageEvent):
 
         if not isinstance(
             source,
-            (
-                botpy.message.Message,
-                botpy.message.GroupMessage,
-                botpy.message.DirectMessage,
-                botpy.message.C2CMessage,
-            ),
+            botpy.message.Message
+            | botpy.message.GroupMessage
+            | botpy.message.DirectMessage
+            | botpy.message.C2CMessage,
         ):
             logger.warning(f"[QQOfficial] 不支持的消息源类型: {type(source)}")
             return None
@@ -120,7 +118,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             "msg_id": self.message_obj.message_id,
         }
 
-        if not isinstance(source, (botpy.message.Message, botpy.message.DirectMessage)):
+        if not isinstance(source, botpy.message.Message | botpy.message.DirectMessage):
             payload["msg_seq"] = random.randint(1, 10000)
 
         ret = None

astrbot/core/provider/manager.py

@@ -1,5 +1,6 @@
 import asyncio
 import copy
+import os
 import traceback
 from typing import Protocol, runtime_checkable
 
@@ -406,10 +407,40 @@ class ProviderManager:
                 pc = merged_config
         return pc
 
+    def _resolve_env_key_list(self, provider_config: dict) -> dict:
+        keys = provider_config.get("key", [])
+        if not isinstance(keys, list):
+            return provider_config
+        resolved_keys = []
+        for idx, key in enumerate(keys):
+            if isinstance(key, str) and key.startswith("$"):
+                env_key = key[1:]
+                if env_key.startswith("{") and env_key.endswith("}"):
+                    env_key = env_key[1:-1]
+                if env_key:
+                    env_val = os.getenv(env_key)
+                    if env_val is None:
+                        provider_id = provider_config.get("id")
+                        logger.warning(
+                            f"Provider {provider_id} 配置项 key[{idx}] 使用环境变量 {env_key} 但未设置。",
+                        )
+                        resolved_keys.append("")
+                    else:
+                        resolved_keys.append(env_val)
+                else:
+                    resolved_keys.append(key)
+            else:
+                resolved_keys.append(key)
+        provider_config["key"] = resolved_keys
+        return provider_config
+
     async def load_provider(self, provider_config: dict):
         # 如果 provider_source_id 存在且不为空，则从 provider_sources 中找到对应的配置并合并
         provider_config = self.get_merged_provider_config(provider_config)
 
+        if provider_config.get("provider_type", "") == "chat_completion":
+            provider_config = self._resolve_env_key_list(provider_config)
+
         if not provider_config["enable"]:
             logger.info(f"Provider {provider_config['id']} is disabled, skipping")
             return

astrbot/core/provider/sources/gemini_source.py

@@ -382,15 +382,18 @@ class ProviderGoogleGenAI(Provider):
                     append_or_extend(gemini_contents, parts, types.ModelContent)
 
             elif role == "tool" and not native_tool_enabled:
-                parts = [
-                    types.Part.from_function_response(
-                        name=message["tool_call_id"],
-                        response={
-                            "name": message["tool_call_id"],
-                            "content": message["content"],
-                        },
-                    ),
-                ]
+                func_name = message.get("name", message["tool_call_id"])
+                part = types.Part.from_function_response(
+                    name=func_name,
+                    response={
+                        "name": func_name,
+                        "content": message["content"],
+                    },
+                )
+                if part.function_response:
+                    part.function_response.id = message["tool_call_id"]
+
+                parts = [part]
                 append_or_extend(gemini_contents, parts, types.UserContent)
 
         if gemini_contents and isinstance(gemini_contents[0], types.ModelContent):

astrbot/core/skills/__init__.py

@@ -0,0 +1,3 @@
+from .skill_manager import SkillInfo, SkillManager, build_skills_prompt
+
+__all__ = ["SkillInfo", "SkillManager", "build_skills_prompt"]

astrbot/core/skills/skill_manager.py

@@ -0,0 +1,237 @@
+from __future__ import annotations
+
+import json
+import os
+import re
+import shutil
+import tempfile
+import zipfile
+from dataclasses import dataclass
+from pathlib import Path, PurePosixPath
+
+from astrbot.core.utils.astrbot_path import (
+    get_astrbot_data_path,
+    get_astrbot_skills_path,
+    get_astrbot_temp_path,
+)
+
+SKILLS_CONFIG_FILENAME = "skills.json"
+DEFAULT_SKILLS_CONFIG: dict[str, dict] = {"skills": {}}
+SANDBOX_SKILLS_ROOT = "/home/shared/skills"
+
+_SKILL_NAME_RE = re.compile(r"^[A-Za-z0-9._-]+$")
+
+
+@dataclass
+class SkillInfo:
+    name: str
+    description: str
+    path: str
+    active: bool
+
+
+def _parse_frontmatter_description(text: str) -> str:
+    if not text.startswith("---"):
+        return ""
+    lines = text.splitlines()
+    if not lines or lines[0].strip() != "---":
+        return ""
+    end_idx = None
+    for i in range(1, len(lines)):
+        if lines[i].strip() == "---":
+            end_idx = i
+            break
+    if end_idx is None:
+        return ""
+    for line in lines[1:end_idx]:
+        if ":" not in line:
+            continue
+        key, value = line.split(":", 1)
+        if key.strip().lower() == "description":
+            return value.strip().strip('"').strip("'")
+    return ""
+
+
+def build_skills_prompt(skills: list[SkillInfo]) -> str:
+    skills_lines = []
+    for skill in skills:
+        description = skill.description or "No description"
+        skills_lines.append(f"- {skill.name}: {description} (file: {skill.path})")
+    skills_block = "\n".join(skills_lines)
+    # Based on openai/codex
+    return (
+        "## Skills\n"
+        "A skill is a set of local instructions stored in a `SKILL.md` file.\n"
+        "### Available skills\n"
+        f"{skills_block}\n"
+        "### Skill Rules\n"
+        "\n"
+        "- Discovery: The list above shows all skills available in this session. Full instructions live in the referenced `SKILL.md`.\n"
+        "- Trigger rules: Use a skill if the user names it or the task matches its description. Do not carry skills across turns unless re-mentioned\n"
+        "- Unavailable: If a skill is missing or unreadable, say so and fallback.\n"
+        "### How to use a skill (progressive disclosure):\n"
+        "  1) After deciding to use a skill, open its `SKILL.md` and read only what is necessary to follow the workflow.\n"
+        "  2) Load only directly referenced files, DO NOT bulk-load everything.\n"
+        "  3) If `scripts/` exist, prefer running or patching them instead of retyping large blocks of code.\n"
+        "  4) If `assets/` or templates exist, reuse them rather than recreating everything from scratch.\n"
+        "- Coordination:\n"
+        "  - If multiple skills apply, choose the minimal set that covers the request and state the order in which you will use them.\n"
+        "  - Announce which skill(s) you are using and why (one short line). If you skip an obvious skill, explain why.\n"
+        "  - Prefer to use `astrbot_*` tools to perform skills that need to run scripts.\n"
+        "- Context hygiene:\n"
+        "  - Keep context small: summarize long sections instead of pasting them, and load extra files only when necessary.\n"
+        "  - Avoid deep reference chasing: unless blocked, open only files that are directly linked from `SKILL.md`.\n"
+        "  - When variants exist (frameworks, providers, domains), select only the relevant reference file(s) and note that choice.\n"
+        "- Failure handling: If a skill cannot be applied, state the issue and continue with the best alternative."
+    )
+
+
+class SkillManager:
+    def __init__(self, skills_root: str | None = None) -> None:
+        self.skills_root = skills_root or get_astrbot_skills_path()
+        self.config_path = os.path.join(get_astrbot_data_path(), SKILLS_CONFIG_FILENAME)
+        os.makedirs(self.skills_root, exist_ok=True)
+        os.makedirs(get_astrbot_temp_path(), exist_ok=True)
+
+    def _load_config(self) -> dict:
+        if not os.path.exists(self.config_path):
+            self._save_config(DEFAULT_SKILLS_CONFIG.copy())
+            return DEFAULT_SKILLS_CONFIG.copy()
+        with open(self.config_path, encoding="utf-8") as f:
+            data = json.load(f)
+        if not isinstance(data, dict) or "skills" not in data:
+            return DEFAULT_SKILLS_CONFIG.copy()
+        return data
+
+    def _save_config(self, config: dict) -> None:
+        with open(self.config_path, "w", encoding="utf-8") as f:
+            json.dump(config, f, ensure_ascii=False, indent=4)
+
+    def list_skills(
+        self,
+        *,
+        active_only: bool = False,
+        runtime: str = "local",
+        show_sandbox_path: bool = True,
+    ) -> list[SkillInfo]:
+        """List all skills.
+
+        show_sandbox_path: If True and runtime is "sandbox",
+            return the path as it would appear in the sandbox environment,
+            otherwise return the local filesystem path.
+        """
+        config = self._load_config()
+        skill_configs = config.get("skills", {})
+        modified = False
+        skills: list[SkillInfo] = []
+
+        for entry in sorted(Path(self.skills_root).iterdir()):
+            if not entry.is_dir():
+                continue
+            skill_name = entry.name
+            skill_md = entry / "SKILL.md"
+            if not skill_md.exists():
+                continue
+            active = skill_configs.get(skill_name, {}).get("active", True)
+            if skill_name not in skill_configs:
+                skill_configs[skill_name] = {"active": active}
+                modified = True
+            if active_only and not active:
+                continue
+            description = ""
+            try:
+                content = skill_md.read_text(encoding="utf-8")
+                description = _parse_frontmatter_description(content)
+            except Exception:
+                description = ""
+            if runtime == "sandbox" and show_sandbox_path:
+                path_str = f"{SANDBOX_SKILLS_ROOT}/{skill_name}/SKILL.md"
+            else:
+                path_str = str(skill_md)
+            path_str = path_str.replace("\\", "/")
+            skills.append(
+                SkillInfo(
+                    name=skill_name,
+                    description=description,
+                    path=path_str,
+                    active=active,
+                )
+            )
+
+        if modified:
+            config["skills"] = skill_configs
+            self._save_config(config)
+
+        return skills
+
+    def set_skill_active(self, name: str, active: bool) -> None:
+        config = self._load_config()
+        config.setdefault("skills", {})
+        config["skills"][name] = {"active": bool(active)}
+        self._save_config(config)
+
+    def delete_skill(self, name: str) -> None:
+        skill_dir = Path(self.skills_root) / name
+        if skill_dir.exists():
+            shutil.rmtree(skill_dir)
+        config = self._load_config()
+        if name in config.get("skills", {}):
+            config["skills"].pop(name, None)
+            self._save_config(config)
+
+    def install_skill_from_zip(self, zip_path: str, *, overwrite: bool = True) -> str:
+        zip_path_obj = Path(zip_path)
+        if not zip_path_obj.exists():
+            raise FileNotFoundError(f"Zip file not found: {zip_path}")
+        if not zipfile.is_zipfile(zip_path):
+            raise ValueError("Uploaded file is not a valid zip archive.")
+
+        with zipfile.ZipFile(zip_path) as zf:
+            names = [name.replace("\\", "/") for name in zf.namelist()]
+            file_names = [name for name in names if name and not name.endswith("/")]
+            if not file_names:
+                raise ValueError("Zip archive is empty.")
+
+            top_dirs = {
+                PurePosixPath(name).parts[0] for name in file_names if name.strip()
+            }
+            print(top_dirs)
+            if len(top_dirs) != 1:
+                raise ValueError("Zip archive must contain a single top-level folder.")
+            skill_name = next(iter(top_dirs))
+            if skill_name in {".", "..", ""} or not _SKILL_NAME_RE.match(skill_name):
+                raise ValueError("Invalid skill folder name.")
+
+            for name in names:
+                if not name:
+                    continue
+                if name.startswith("/") or re.match(r"^[A-Za-z]:", name):
+                    raise ValueError("Zip archive contains absolute paths.")
+                parts = PurePosixPath(name).parts
+                if ".." in parts:
+                    raise ValueError("Zip archive contains invalid relative paths.")
+                if parts and parts[0] != skill_name:
+                    raise ValueError(
+                        "Zip archive contains unexpected top-level entries."
+                    )
+
+            if (
+                f"{skill_name}/SKILL.md" not in file_names
+                and f"{skill_name}/skill.md" not in file_names
+            ):
+                raise ValueError("SKILL.md not found in the skill folder.")
+
+            with tempfile.TemporaryDirectory(dir=get_astrbot_temp_path()) as tmp_dir:
+                zf.extractall(tmp_dir)
+                src_dir = Path(tmp_dir) / skill_name
+                if not src_dir.exists():
+                    raise ValueError("Skill folder not found after extraction.")
+                dest_dir = Path(self.skills_root) / skill_name
+                if dest_dir.exists():
+                    if not overwrite:
+                        raise FileExistsError("Skill already exists.")
+                    shutil.rmtree(dest_dir)
+                shutil.move(str(src_dir), str(dest_dir))
+
+        self.set_skill_active(skill_name, True)
+        return skill_name

astrbot/core/star/command_management.py

@@ -303,7 +303,7 @@ def _locate_primary_filter(
     handler: StarHandlerMetadata,
 ) -> CommandFilter | CommandGroupFilter | None:
     for filter_ref in handler.event_filters:
-        if isinstance(filter_ref, (CommandFilter, CommandGroupFilter)):
+        if isinstance(filter_ref, CommandFilter | CommandGroupFilter):
             return filter_ref
     return None
 

astrbot/core/star/config.py

@@ -38,7 +38,7 @@ def put_config(namespace: str, name: str, key: str, value, description: str):
         raise ValueError("namespace 不能以 internal_ 开头。")
     if not isinstance(key, str):
         raise ValueError("key 只支持 str 类型。")
-    if not isinstance(value, (str, int, float, bool, list)):
+    if not isinstance(value, str | int | float | bool | list):
         raise ValueError("value 只支持 str, int, float, bool, list 类型。")
 
     config_dir = os.path.join(get_astrbot_data_path(), "config")

astrbot/core/star/filter/command.py

@@ -115,7 +115,7 @@ class CommandFilter(HandlerFilter):
             # 没有 GreedyStr 的情况
             if i >= len(params):
                 if (
-                    isinstance(param_type_or_default_val, (type, types.UnionType))
+                    isinstance(param_type_or_default_val, type | types.UnionType)
                     or typing.get_origin(param_type_or_default_val) is typing.Union
                     or param_type_or_default_val is inspect.Parameter.empty
                 ):

astrbot/core/star/filter/custom_filter.py

@@ -37,7 +37,7 @@ class CustomFilter(HandlerFilter, metaclass=CustomFilterMeta):
 class CustomFilterOr(CustomFilter):
     def __init__(self, filter1: CustomFilter, filter2: CustomFilter):
         super().__init__()
-        if not isinstance(filter1, (CustomFilter, CustomFilterAnd, CustomFilterOr)):
+        if not isinstance(filter1, CustomFilter | CustomFilterAnd | CustomFilterOr):
             raise ValueError(
                 "CustomFilter lass can only operate with other CustomFilter.",
             )
@@ -51,7 +51,7 @@ class CustomFilterOr(CustomFilter):
 class CustomFilterAnd(CustomFilter):
     def __init__(self, filter1: CustomFilter, filter2: CustomFilter):
         super().__init__()
-        if not isinstance(filter1, (CustomFilter, CustomFilterAnd, CustomFilterOr)):
+        if not isinstance(filter1, CustomFilter | CustomFilterAnd | CustomFilterOr):
             raise ValueError(
                 "CustomFilter lass can only operate with other CustomFilter.",
             )

astrbot/core/star/register/star_handler.py

@@ -150,7 +150,7 @@ def register_custom_filter(custom_type_filter, *args, **kwargs):
         if args:
             raise_error = args[0]
 
-    if not isinstance(custom_filter, (CustomFilterAnd, CustomFilterOr)):
+    if not isinstance(custom_filter, CustomFilterAnd | CustomFilterOr):
         custom_filter = custom_filter(raise_error)
 
     def decorator(awaitable):

astrbot/core/utils/astrbot_path.py

@@ -9,6 +9,7 @@
 T2I 模板目录路径：固定为数据目录下的 t2i_templates 目录
 WebChat 数据目录路径：固定为数据目录下的 webchat 目录
 临时文件目录路径：固定为数据目录下的 temp 目录
+Skills 目录路径：固定为数据目录下的 skills 目录
 """
 
 import os
@@ -63,6 +64,11 @@ def get_astrbot_temp_path() -> str:
     return os.path.realpath(os.path.join(get_astrbot_data_path(), "temp"))
 
 
+def get_astrbot_skills_path() -> str:
+    """获取Astrbot Skills 目录路径"""
+    return os.path.realpath(os.path.join(get_astrbot_data_path(), "skills"))
+
+
 def get_astrbot_knowledge_base_path() -> str:
     """获取Astrbot知识库根目录路径"""
     return os.path.realpath(os.path.join(get_astrbot_data_path(), "knowledge_base"))

astrbot/dashboard/routes/__init__.py

@@ -12,6 +12,7 @@ from .persona import PersonaRoute
 from .platform import PlatformRoute
 from .plugin import PluginRoute
 from .session_management import SessionManagementRoute
+from .skills import SkillsRoute
 from .stat import StatRoute
 from .static_file import StaticFileRoute
 from .tools import ToolsRoute
@@ -35,5 +36,6 @@ __all__ = [
     "StatRoute",
     "StaticFileRoute",
     "ToolsRoute",
+    "SkillsRoute",
     "UpdateRoute",
 ]