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

astrbot/core/provider/provider.py

@@ -221,11 +221,65 @@ class TTSProvider(AbstractProvider):
         self.provider_config = provider_config
         self.provider_settings = provider_settings
 
+    def support_stream(self) -> bool:
+        """是否支持流式 TTS
+
+        Returns:
+            bool: True 表示支持流式处理，False 表示不支持（默认）
+
+        Notes:
+            子类可以重写此方法返回 True 来启用流式 TTS 支持
+        """
+        return False
+
     @abc.abstractmethod
     async def get_audio(self, text: str) -> str:
         """获取文本的音频，返回音频文件路径"""
         raise NotImplementedError
 
+    async def get_audio_stream(
+        self,
+        text_queue: asyncio.Queue[str | None],
+        audio_queue: "asyncio.Queue[bytes | tuple[str, bytes] | None]",
+    ) -> None:
+        """流式 TTS 处理方法。
+
+        从 text_queue 中读取文本片段，将生成的音频数据（WAV 格式的 in-memory bytes）放入 audio_queue。
+        当 text_queue 收到 None 时，表示文本输入结束，此时应该处理完所有剩余文本并向 audio_queue 发送 None 表示结束。
+
+        Args:
+            text_queue: 输入文本队列，None 表示输入结束
+            audio_queue: 输出音频队列（bytes 或 (text, bytes)），None 表示输出结束
+
+        Notes:
+            - 默认实现会将文本累积后一次性调用 get_audio 生成完整音频
+            - 子类可以重写此方法实现真正的流式 TTS
+            - 音频数据应该是 WAV 格式的 bytes
+        """
+        accumulated_text = ""
+
+        while True:
+            text_part = await text_queue.get()
+
+            if text_part is None:
+                # 输入结束，处理累积的文本
+                if accumulated_text:
+                    try:
+                        # 调用原有的 get_audio 方法获取音频文件路径
+                        audio_path = await self.get_audio(accumulated_text)
+                        # 读取音频文件内容
+                        with open(audio_path, "rb") as f:
+                            audio_data = f.read()
+                        await audio_queue.put((accumulated_text, audio_data))
+                    except Exception:
+                        # 出错时也要发送 None 结束标记
+                        pass
+                # 发送结束标记
+                await audio_queue.put(None)
+                break
+
+            accumulated_text += text_part
+
     async def test(self):
         await self.get_audio("hi")
 

astrbot/core/provider/sources/gemini_embedding_source.py

@@ -68,4 +68,4 @@ class GeminiEmbeddingProvider(EmbeddingProvider):
 
     def get_dim(self) -> int:
         """获取向量的维度"""
-        return self.provider_config.get("embedding_dimensions", 768)
+        return int(self.provider_config.get("embedding_dimensions", 768))

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/provider/sources/genie_tts.py

@@ -0,0 +1,128 @@
+import asyncio
+import os
+import uuid
+
+from astrbot.core import logger
+from astrbot.core.provider.entities import ProviderType
+from astrbot.core.provider.provider import TTSProvider
+from astrbot.core.provider.register import register_provider_adapter
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
+
+try:
+    import genie_tts as genie  # type: ignore
+except ImportError:
+    genie = None
+
+
+@register_provider_adapter(
+    "genie_tts",
+    "Genie TTS",
+    provider_type=ProviderType.TEXT_TO_SPEECH,
+)
+class GenieTTSProvider(TTSProvider):
+    def __init__(
+        self,
+        provider_config: dict,
+        provider_settings: dict,
+    ) -> None:
+        super().__init__(provider_config, provider_settings)
+        if not genie:
+            raise ImportError("Please install genie_tts first.")
+
+        self.character_name = provider_config.get("genie_character_name", "mika")
+        language = provider_config.get("genie_language", "Japanese")
+        model_dir = provider_config.get("genie_onnx_model_dir", "")
+        refer_audio_path = provider_config.get("genie_refer_audio_path", "")
+        refer_text = provider_config.get("genie_refer_text", "")
+
+        try:
+            genie.load_character(
+                character_name=self.character_name,
+                language=language,
+                onnx_model_dir=model_dir,
+            )
+            genie.set_reference_audio(
+                character_name=self.character_name,
+                audio_path=refer_audio_path,
+                audio_text=refer_text,
+                language=language,
+            )
+        except Exception as e:
+            raise RuntimeError(f"Failed to load character {self.character_name}: {e}")
+
+    def support_stream(self) -> bool:
+        return True
+
+    async def get_audio(self, text: str) -> str:
+        temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+        os.makedirs(temp_dir, exist_ok=True)
+        filename = f"genie_tts_{uuid.uuid4()}.wav"
+        path = os.path.join(temp_dir, filename)
+
+        loop = asyncio.get_event_loop()
+
+        def _generate(save_path: str):
+            assert genie is not None
+            genie.tts(
+                character_name=self.character_name,
+                text=text,
+                save_path=save_path,
+            )
+
+        try:
+            await loop.run_in_executor(None, _generate, path)
+
+            if os.path.exists(path):
+                return path
+
+            raise RuntimeError("Genie TTS did not save to file.")
+
+        except Exception as e:
+            raise RuntimeError(f"Genie TTS generation failed: {e}")
+
+    async def get_audio_stream(
+        self,
+        text_queue: asyncio.Queue[str | None],
+        audio_queue: "asyncio.Queue[bytes | tuple[str, bytes] | None]",
+    ) -> None:
+        loop = asyncio.get_event_loop()
+
+        while True:
+            text = await text_queue.get()
+            if text is None:
+                await audio_queue.put(None)
+                break
+
+            try:
+                temp_dir = os.path.join(get_astrbot_data_path(), "temp")
+                os.makedirs(temp_dir, exist_ok=True)
+                filename = f"genie_tts_{uuid.uuid4()}.wav"
+                path = os.path.join(temp_dir, filename)
+
+                def _generate(save_path: str, t: str):
+                    assert genie is not None
+                    genie.tts(
+                        character_name=self.character_name,
+                        text=t,
+                        save_path=save_path,
+                    )
+
+                await loop.run_in_executor(None, _generate, path, text)
+
+                if os.path.exists(path):
+                    with open(path, "rb") as f:
+                        audio_data = f.read()
+
+                    # Put (text, bytes) into queue so frontend can display text
+                    await audio_queue.put((text, audio_data))
+
+                    # Clean up
+                    try:
+                        os.remove(path)
+                    except OSError:
+                        pass
+                else:
+                    logger.error(f"Genie TTS failed to generate audio for: {text}")
+
+            except Exception as e:
+                logger.error(f"Genie TTS stream error: {e}")

astrbot/core/provider/sources/openai_embedding_source.py

@@ -37,4 +37,4 @@ class OpenAIEmbeddingProvider(EmbeddingProvider):
 
     def get_dim(self) -> int:
         """获取向量的维度"""
-        return self.provider_config.get("embedding_dimensions", 1024)
+        return int(self.provider_config.get("embedding_dimensions", 1024))

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/context.py

@@ -328,28 +328,29 @@ class Context:
         """获取所有用于 Embedding 任务的 Provider。"""
         return self.provider_manager.embedding_provider_insts
 
-    def get_using_provider(self, umo: str | None = None) -> Provider:
+    def get_using_provider(self, umo: str | None = None) -> Provider | None:
         """获取当前使用的用于文本生成任务的 LLM Provider(Chat_Completion 类型)。
 
         Args:
             umo: unified_message_origin 值，如果传入并且用户启用了提供商会话隔离，
-                 则使用该会话偏好的提供商。
+                 则使用该会话偏好的对话模型（提供商）。
 
         Returns:
-            当前使用的文本生成提供者。
+            当前使用的对话模型（提供商），如果未设置则返回 None。
 
         Raises:
-            ValueError: 返回的提供者不是 Provider 类型。
-
-        Note:
-            通过 /provider 指令可以切换提供者。
+            ValueError: 该会话来源配置的的对话模型（提供商）的类型不正确。
         """
         prov = self.provider_manager.get_using_provider(
             provider_type=ProviderType.CHAT_COMPLETION,
             umo=umo,
         )
+        if prov is None:
+            return None
         if not isinstance(prov, Provider):
-            raise ValueError("返回的 Provider 不是 Provider 类型")
+            raise ValueError(
+                f"该会话来源的对话模型（提供商）的类型不正确: {type(prov)}"
+            )
         return prov
 
     def get_using_tts_provider(self, umo: str | None = None) -> TTSProvider | None:

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):
@@ -452,9 +452,7 @@ def register_on_llm_tool_respond(**kwargs):
     """
 
     def decorator(awaitable):
-        _ = get_handler_or_create(
-            awaitable, EventType.OnLLMToolRespondEvent, **kwargs
-        )
+        _ = get_handler_or_create(awaitable, EventType.OnLLMToolRespondEvent, **kwargs)
         return awaitable
 
     return decorator

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",
 ]