AstrBot 3.5.6__py3-none-any.whl → 4.7.0__py3-none-any.whl

astrbot/api/__init__.py

@@ -1,7 +1,19 @@
-from astrbot.core.config.astrbot_config import AstrBotConfig
 from astrbot import logger
-from astrbot.core import html_renderer
-from astrbot.core import sp
+from astrbot.core import html_renderer, sp
+from astrbot.core.agent.tool import FunctionTool, ToolSet
+from astrbot.core.agent.tool_executor import BaseFunctionToolExecutor
+from astrbot.core.config.astrbot_config import AstrBotConfig
+from astrbot.core.star.register import register_agent as agent
 from astrbot.core.star.register import register_llm_tool as llm_tool
 
-__all__ = ["AstrBotConfig", "logger", "html_renderer", "llm_tool", "sp"]
+__all__ = [
+    "AstrBotConfig",
+    "BaseFunctionToolExecutor",
+    "FunctionTool",
+    "ToolSet",
+    "agent",
+    "html_renderer",
+    "llm_tool",
+    "logger",
+    "sp",
+]

astrbot/api/all.py

@@ -36,7 +36,8 @@ from astrbot.core.star.config import *
 
 
 # provider
-from astrbot.core.provider import Provider, Personality, ProviderMetaData
+from astrbot.core.provider import Provider, ProviderMetaData
+from astrbot.core.db.po import Personality
 
 # platform
 from astrbot.core.platform import (

astrbot/api/event/__init__.py

@@ -1,18 +1,17 @@
 from astrbot.core.message.message_event_result import (
-    MessageEventResult,
-    MessageChain,
     CommandResult,
     EventResultType,
+    MessageChain,
+    MessageEventResult,
     ResultContentType,
 )
-
 from astrbot.core.platform import AstrMessageEvent
 
 __all__ = [
-    "MessageEventResult",
-    "MessageChain",
+    "AstrMessageEvent",
     "CommandResult",
     "EventResultType",
-    "AstrMessageEvent",
+    "MessageChain",
+    "MessageEventResult",
     "ResultContentType",
 ]

astrbot/api/event/filter/__init__.py

@@ -1,49 +1,52 @@
-from astrbot.core.star.register import (
-    register_command as command,
-    register_command_group as command_group,
-    register_event_message_type as event_message_type,
-    register_regex as regex,
-    register_platform_adapter_type as platform_adapter_type,
-    register_permission_type as permission_type,
-    register_custom_filter as custom_filter,
-    register_on_astrbot_loaded as on_astrbot_loaded,
-    register_on_llm_request as on_llm_request,
-    register_on_llm_response as on_llm_response,
-    register_llm_tool as llm_tool,
-    register_on_decorating_result as on_decorating_result,
-    register_after_message_sent as after_message_sent,
-)
-
+from astrbot.core.star.filter.custom_filter import CustomFilter
 from astrbot.core.star.filter.event_message_type import (
-    EventMessageTypeFilter,
     EventMessageType,
+    EventMessageTypeFilter,
 )
+from astrbot.core.star.filter.permission import PermissionType, PermissionTypeFilter
 from astrbot.core.star.filter.platform_adapter_type import (
-    PlatformAdapterTypeFilter,
     PlatformAdapterType,
+    PlatformAdapterTypeFilter,
 )
-from astrbot.core.star.filter.permission import PermissionTypeFilter, PermissionType
-from astrbot.core.star.filter.custom_filter import CustomFilter
+from astrbot.core.star.register import register_after_message_sent as after_message_sent
+from astrbot.core.star.register import register_command as command
+from astrbot.core.star.register import register_command_group as command_group
+from astrbot.core.star.register import register_custom_filter as custom_filter
+from astrbot.core.star.register import register_event_message_type as event_message_type
+from astrbot.core.star.register import register_llm_tool as llm_tool
+from astrbot.core.star.register import register_on_astrbot_loaded as on_astrbot_loaded
+from astrbot.core.star.register import (
+    register_on_decorating_result as on_decorating_result,
+)
+from astrbot.core.star.register import register_on_llm_request as on_llm_request
+from astrbot.core.star.register import register_on_llm_response as on_llm_response
+from astrbot.core.star.register import register_on_platform_loaded as on_platform_loaded
+from astrbot.core.star.register import register_permission_type as permission_type
+from astrbot.core.star.register import (
+    register_platform_adapter_type as platform_adapter_type,
+)
+from astrbot.core.star.register import register_regex as regex
 
 __all__ = [
-    "command",
-    "command_group",
-    "event_message_type",
-    "regex",
-    "platform_adapter_type",
-    "permission_type",
-    "EventMessageTypeFilter",
+    "CustomFilter",
     "EventMessageType",
-    "PlatformAdapterTypeFilter",
-    "PlatformAdapterType",
+    "EventMessageTypeFilter",
+    "PermissionType",
     "PermissionTypeFilter",
-    "CustomFilter",
+    "PlatformAdapterType",
+    "PlatformAdapterTypeFilter",
+    "after_message_sent",
+    "command",
+    "command_group",
     "custom_filter",
-    "PermissionType",
-    "on_astrbot_loaded",
-    "on_llm_request",
+    "event_message_type",
     "llm_tool",
+    "on_astrbot_loaded",
     "on_decorating_result",
-    "after_message_sent",
+    "on_llm_request",
     "on_llm_response",
+    "on_platform_loaded",
+    "permission_type",
+    "platform_adapter_type",
+    "regex",
 ]

astrbot/api/platform/__init__.py

@@ -1,23 +1,22 @@
+from astrbot.core.message.components import *
 from astrbot.core.platform import (
-    AstrMessageEvent,
-    Platform,
     AstrBotMessage,
+    AstrMessageEvent,
+    Group,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
-    Group,
 )
-
 from astrbot.core.platform.register import register_platform_adapter
-from astrbot.core.message.components import *
 
 __all__ = [
-    "AstrMessageEvent",
-    "Platform",
     "AstrBotMessage",
+    "AstrMessageEvent",
+    "Group",
     "MessageMember",
     "MessageType",
+    "Platform",
     "PlatformMetadata",
     "register_platform_adapter",
-    "Group",
 ]

astrbot/api/provider/__init__.py

@@ -1,17 +1,18 @@
-from astrbot.core.provider import Provider, STTProvider, Personality
+from astrbot.core.db.po import Personality
+from astrbot.core.provider import Provider, STTProvider
 from astrbot.core.provider.entities import (
+    LLMResponse,
+    ProviderMetaData,
     ProviderRequest,
     ProviderType,
-    ProviderMetaData,
-    LLMResponse,
 )
 
 __all__ = [
-    "Provider",
-    "STTProvider",
+    "LLMResponse",
     "Personality",
+    "Provider",
+    "ProviderMetaData",
     "ProviderRequest",
     "ProviderType",
-    "ProviderMetaData",
-    "LLMResponse",
+    "STTProvider",
 ]

astrbot/api/star/__init__.py

@@ -1,8 +1,7 @@
+from astrbot.core.star import Context, Star, StarTools
+from astrbot.core.star.config import *
 from astrbot.core.star.register import (
     register_star as register,  # 注册插件（Star）
 )
 
-from astrbot.core.star import Context, Star, StarTools
-from astrbot.core.star.config import *
-
-__all__ = ["register", "Context", "Star", "StarTools"]
+__all__ = ["Context", "Star", "StarTools", "register"]

astrbot/api/util/__init__.py

@@ -1,7 +1,7 @@
 from astrbot.core.utils.session_waiter import (
-    SessionWaiter,
     SessionController,
+    SessionWaiter,
     session_waiter,
 )
 
-__all__ = ["SessionWaiter", "SessionController", "session_waiter"]
+__all__ = ["SessionController", "SessionWaiter", "session_waiter"]

astrbot/cli/__init__.py

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

astrbot/cli/__main__.py

@@ -1,11 +1,11 @@
-import asyncio
-import os
-import shutil
+"""AstrBot CLI入口"""
+
 import sys
+
 import click
-from pathlib import Path
-from astrbot.core.config.default import VERSION
 
+from . import __version__
+from .commands import conf, init, plug, run
 
 logo_tmpl = r"""
      ___           _______.___________..______      .______     ______   .___________.
@@ -14,210 +14,25 @@ logo_tmpl = r"""
   /  /_\  \       \   \       |  |     |      /     |   _  <  |  |  |  |     |  |
  /  _____  \  .----)   |      |  |     |  |\  \----.|  |_)  | |  `--'  |     |  |
 /__/     \__\ |_______/       |__|     | _| `._____||______/   \______/      |__|
-
 """
 
 
-# utils
-def _get_astrbot_root(path: str | None) -> Path:
-    """获取astrbot根目录"""
-    match path:
-        case None:
-            match ASTRBOT_ROOT := os.getenv("ASTRBOT_ROOT"):
-                case None:
-                    astrbot_root = Path.cwd() / "data"
-                case _:
-                    astrbot_root = Path(ASTRBOT_ROOT).resolve()
-        case str():
-            astrbot_root = Path(path).resolve()
-
-    dot_astrbot = astrbot_root / ".astrbot"
-    if not dot_astrbot.exists():
-        if click.confirm(
-            f"运行前必须先执行初始化！请检查当前目录是否正确，回车以继续: {astrbot_root}",
-            default=True,
-            abort=True,
-        ):
-            dot_astrbot.touch()
-            astrbot_root.mkdir(parents=True, exist_ok=True)
-            click.echo(f"Created {dot_astrbot}")
-
-    return astrbot_root
-
-
-# 通过类型来验证先后，必须先获取 Path 对象才能对该目录进行检查
-def _check_astrbot_root(astrbot_root: Path) -> None:
-    """验证"""
-    dot_astrbot = astrbot_root / ".astrbot"
-    if not astrbot_root.exists():
-        click.echo(f"AstrBot root directory does not exist: {astrbot_root}")
-        click.echo("Please run 'astrbot init' to create the directory.")
-        sys.exit(1)
-    else:
-        click.echo(f"AstrBot root directory exists: {astrbot_root}")
-        if not dot_astrbot.exists():
-            click.echo(
-                "如果你确认这是 Astrbot root directory, 你需要在当前目录下创建一个 .astrbot 文件标记该目录为 AstrBot 的数据目录。"
-            )
-            if click.confirm(
-                f"请检查当前目录是否正确，确认正确请回车: {astrbot_root}",
-                default=True,
-                abort=True,
-            ):
-                dot_astrbot.touch()
-                click.echo(f"Created {dot_astrbot}")
-        else:
-            click.echo(f"Welcome back! AstrBot root directory: {astrbot_root}")
-
-
-async def _check_dashboard(astrbot_root: Path) -> None:
-    """检查是否安装了dashboard"""
-    try:
-        from ..core.utils.io import get_dashboard_version, download_dashboard
-    except ImportError:
-        from astrbot.core.utils.io import get_dashboard_version, download_dashboard
-
-    try:
-        # 添加 create=True 参数以确保在初始化时不会抛出异常
-        dashboard_version = await get_dashboard_version()
-        match dashboard_version:
-            case None:
-                click.echo("未安装管理面板")
-                if click.confirm(
-                    "是否安装管理面板？",
-                    default=True,
-                    abort=True,
-                ):
-                    click.echo("正在安装管理面板...")
-                    # 确保使用 create=True 参数
-                    await download_dashboard(
-                        path="data/dashboard.zip", extract_path=str(astrbot_root)
-                    )
-                    click.echo("管理面板安装完成")
-
-            case str():
-                if dashboard_version == f"v{VERSION}":
-                    click.echo("无需更新")
-                else:
-                    try:
-                        version = dashboard_version.split("v")[1]
-                        click.echo(f"管理面板版本: {version}")
-                        # 确保使用 create=True 参数
-                        await download_dashboard(
-                            path="data/dashboard.zip", extract_path=str(astrbot_root)
-                        )
-                    except Exception as e:
-                        click.echo(f"下载管理面板失败: {e}")
-                        return
-    except FileNotFoundError:
-        click.echo("初始化管理面板目录...")
-        # 初始化模式下，下载到指定位置
-        try:
-            await download_dashboard(
-                path=str(astrbot_root / "dashboard.zip"), extract_path=str(astrbot_root)
-            )
-            click.echo("管理面板初始化完成")
-        except Exception as e:
-            click.echo(f"下载管理面板失败: {e}")
-            return
-
-
-@click.group(name="astrbot")
+@click.group()
+@click.version_option(__version__, prog_name="AstrBot")
 def cli() -> None:
     """The AstrBot CLI"""
     click.echo(logo_tmpl)
     click.echo("Welcome to AstrBot CLI!")
-    click.echo(f"AstrBot version: {VERSION}")
-
-
-# region init
-@cli.command()
-@click.option("--path", "-p", help="AstrBot 数据目录")
-@click.option("--force", "-f", is_flag=True, help="强制初始化")
-def init(path: str | None, force: bool) -> None:
-    """Initialize AstrBot"""
-    click.echo("Initializing AstrBot...")
-    astrbot_root = _get_astrbot_root(path)
-    if force:
-        if click.confirm(
-            "强制初始化会删除当前目录下的所有文件，是否继续？",
-            default=False,
-            abort=True,
-        ):
-            click.echo("正在删除当前目录下的所有文件...")
-            shutil.rmtree(astrbot_root, ignore_errors=True)
+    click.echo(f"AstrBot CLI version: {__version__}")
 
-    _check_astrbot_root(astrbot_root)
 
-    click.echo(f"AstrBot root directory: {astrbot_root}")
-
-    if not astrbot_root.exists():
-        # 创建目录
-        astrbot_root.mkdir(parents=True, exist_ok=True)
-        click.echo(f"Created directory: {astrbot_root}")
-    else:
-        click.echo(f"Directory already exists: {astrbot_root}")
-
-    config_path: Path = astrbot_root / "config"
-    plugins_path: Path = astrbot_root / "plugins"
-    temp_path: Path = astrbot_root / "temp"
-    config_path.mkdir(parents=True, exist_ok=True)
-    plugins_path.mkdir(parents=True, exist_ok=True)
-    temp_path.mkdir(parents=True, exist_ok=True)
-
-    click.echo(f"Created directories: {config_path}, {plugins_path}, {temp_path}")
-
-    # 检查是否安装了dashboard
-    asyncio.run(_check_dashboard(astrbot_root))
-
-
-# region run
-@cli.command()
-@click.option("--path", "-p", help="AstrBot 数据目录")
-def run(path: str | None = None) -> None:
-    """Run AstrBot"""
-    # 解析为绝对路径
-    try:
-        from ..core.log import LogBroker
-        from ..core import db_helper
-        from ..core.initial_loader import InitialLoader
-    except ImportError:
-        from astrbot.core.log import LogBroker
-        from astrbot.core import db_helper
-        from astrbot.core.initial_loader import InitialLoader
-
-    astrbot_root = _get_astrbot_root(path)
-
-    _check_astrbot_root(astrbot_root)
-
-    asyncio.run(_check_dashboard(astrbot_root))
-
-    log_broker = LogBroker()
-    db = db_helper
-
-    core_lifecycle = InitialLoader(db, log_broker)
-    try:
-        asyncio.run(core_lifecycle.start())
-    except KeyboardInterrupt:
-        click.echo("接收到退出信号，正在关闭 AstrBot...")
-    except Exception as e:
-        click.echo(f"运行时出现错误: {e}")
-
-
-# region Basic
-@cli.command(name="version")
-def version() -> None:
-    """Show the version of AstrBot"""
-    click.echo(f"AstrBot version: {VERSION}")
-
-
-@cli.command()
+@click.command()
 @click.argument("command_name", required=False, type=str)
 def help(command_name: str | None) -> None:
-    """Show help information for commands
+    """显示命令的帮助信息
 
-    If COMMAND_NAME is provided, show detailed help for that command.
-    Otherwise, show general help information.
+    如果提供了 COMMAND_NAME，则显示该命令的详细帮助信息。
+    否则，显示通用帮助信息。
     """
     ctx = click.get_current_context()
     if command_name:
@@ -234,5 +49,11 @@ def help(command_name: str | None) -> None:
         click.echo(cli.get_help(ctx))
 
 
+cli.add_command(init)
+cli.add_command(run)
+cli.add_command(help)
+cli.add_command(plug)
+cli.add_command(conf)
+
 if __name__ == "__main__":
     cli()

astrbot/cli/commands/__init__.py

@@ -0,0 +1,6 @@
+from .cmd_conf import conf
+from .cmd_init import init
+from .cmd_plug import plug
+from .cmd_run import run
+
+__all__ = ["conf", "init", "plug", "run"]