ErisPulse 2.4.1__tar.gz → 2.4.2.dev0__tar.gz

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.4.1
+Version: 2.4.2.dev0
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: ErisDev <erisdev@88.com>
 Maintainer-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
@@ -89,8 +89,9 @@ Description-Content-Type: text/markdown
 
 [![PyPI](https://img.shields.io/pypi/v/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
-[![Docker Pulls](https://img.shields.io/docker/pulls/wsu2059/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/wsu2059/erispulse)
-[![Docker Version](https://img.shields.io/docker/v/wsu2059/erispulse?style=flat-square&logo=docker&label=docker)](https://hub.docker.com/r/wsu2059/erispulse)
+[![Docker Pulls](https://img.shields.io/docker/pulls/erispulse/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
+[![Docker Pulls](https://img.shields.io/docker/pulls/wsu2059/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
+[![Docker Version](https://img.shields.io/docker/v/erispulse/erispulse?style=flat-square&logo=docker&label=docker)](https://hub.docker.com/r/erispulse/erispulse)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 </td>
@@ -116,7 +117,7 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 ### 使用 Docker (推荐)
 
 ```bash
-docker pull wsu2059/erispulse:latest
+docker pull erispulse/erispulse:latest
 ```
 
 <details>

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/README.md

@@ -17,8 +17,9 @@
 
 [![PyPI](https://img.shields.io/pypi/v/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
-[![Docker Pulls](https://img.shields.io/docker/pulls/wsu2059/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/wsu2059/erispulse)
-[![Docker Version](https://img.shields.io/docker/v/wsu2059/erispulse?style=flat-square&logo=docker&label=docker)](https://hub.docker.com/r/wsu2059/erispulse)
+[![Docker Pulls](https://img.shields.io/docker/pulls/erispulse/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
+[![Docker Pulls](https://img.shields.io/docker/pulls/wsu2059/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
+[![Docker Version](https://img.shields.io/docker/v/erispulse/erispulse?style=flat-square&logo=docker&label=docker)](https://hub.docker.com/r/erispulse/erispulse)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 </td>
@@ -44,7 +45,7 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 ### 使用 Docker (推荐)
 
 ```bash
-docker pull wsu2059/erispulse:latest
+docker pull erispulse/erispulse:latest
 ```
 
 <details>

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ErisPulse"
-version = "2.4.1"
+version = "2.4.2-dev.0"
 description = "ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。"
 readme = "README.md"
 requires-python = ">=3.10"

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/cli.py

@@ -6,9 +6,6 @@ ErisPulse 命令行接口主入口
 
 import sys
 import importlib
-import importlib.metadata
-import asyncio
-import inspect
 import traceback
 import pkgutil
 from argparse import ArgumentParser, RawDescriptionHelpFormatter
@@ -24,7 +21,7 @@ class CLI:
     """
     ErisPulse 命令行接口主类
     
-    提供完整的命令行交互功能，支持动态加载第三方命令
+    提供完整的命令行交互功能
     """
     
     def __init__(self):
@@ -32,7 +29,6 @@ class CLI:
         self.registry = CommandRegistry()
         self.parser = self._create_parser()
         self._register_builtin_commands()
-        self._load_external_commands()
     
     def _create_parser(self) -> ArgumentParser:
         """
@@ -128,30 +124,6 @@ class CLI:
             )
             command.add_arguments(parser)
     
-    def _load_external_commands(self):
-        """
-        加载第三方 CLI 命令
-        """
-        try:
-            entry_points = importlib.metadata.entry_points()
-            if hasattr(entry_points, 'select'):
-                cli_entries = entry_points.select(group='erispulse.cli')
-            else:
-                cli_entries = entry_points.get('erispulse.cli', [])
-            
-            for entry in cli_entries:
-                try:
-                    cli_func = entry.load()
-                    if callable(cli_func):
-                        # 传入 subparsers 和 console，保持兼容性
-                        cli_func(self.subparsers, console)
-                    else:
-                        console.print(f"[warning]模块 {entry.name} 的入口点不是可调用对象[/]")
-                except Exception as e:
-                    console.print(f"[error]加载第三方命令 {entry.name} 失败: {e}[/]")
-        except Exception as e:
-            console.print(f"[warning]加载第三方CLI命令失败: {e}[/]")
-    
     def _print_version(self):
         """打印版本信息"""
         from ErisPulse import __version__
@@ -192,8 +164,9 @@ class CLI:
             if command:
                 command.execute(args)
             else:
-                # 第三方命令处理
-                self._execute_external_command(args)
+                console.print(f"[error]未知命令: {args.command}[/]")
+                self.parser.print_help()
+                sys.exit(1)
                 
         except KeyboardInterrupt:
             console.print("\n[warning]操作被用户中断[/]")
@@ -203,29 +176,3 @@ class CLI:
             if args.verbose >= 1:
                 console.print(traceback.format_exc())
             sys.exit(1)
-    
-    def _execute_external_command(self, args):
-        """
-        执行第三方命令
-        
-        :param args: 解析后的参数
-        """
-        try:
-            # 第三方命令在注册时已经通过 set_defaults(func=handle_command) 设置了处理函数
-            # 所以 args.func 就是处理函数
-            if hasattr(args, 'func') and args.func:
-                handler_func = args.func
-                if inspect.iscoroutinefunction(handler_func):
-                    # 异步函数：使用 asyncio.run() 运行
-                    asyncio.run(handler_func(args))
-                else:
-                    # 同步函数：直接调用
-                    handler_func(args)
-            else:
-                console.print(f"[error]命令 {args.command} 没有处理函数[/]")
-                sys.exit(1)
-        except Exception as e:
-            console.print(f"[error]执行第三方命令失败: {e}[/]")
-            if args.verbose >= 1:
-                console.print(traceback.format_exc())
-            sys.exit(1)

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/cli.pyi

@@ -12,9 +12,6 @@ ErisPulse 命令行接口主入口
 
 import sys
 import importlib
-import importlib.metadata
-import asyncio
-import inspect
 import traceback
 import pkgutil
 from argparse import ArgumentParser, RawDescriptionHelpFormatter
@@ -27,7 +24,7 @@ class CLI:
     """
     ErisPulse 命令行接口主类
     
-    提供完整的命令行交互功能，支持动态加载第三方命令
+    提供完整的命令行交互功能
     """
     def __init__(self: None) -> ...:
         """
@@ -54,11 +51,6 @@ class CLI:
         注册所有内置命令（通过自动发现）
         """
         ...
-    def _load_external_commands(self: object) -> ...:
-        """
-        加载第三方 CLI 命令
-        """
-        ...
     def _print_version(self: object) -> ...:
         """
         打印版本信息
@@ -72,10 +64,3 @@ class CLI:
         :raises Exception: 命令执行失败时抛出
         """
         ...
-    def _execute_external_command(self: object, args: ...) -> ...:
-        """
-        执行第三方命令
-        
-        :param args: 解析后的参数
-        """
-        ...

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/commands/init.py

@@ -27,7 +27,7 @@ class InitCommand(Command):
     def add_arguments(self, parser: ArgumentParser):
         parser.add_argument(
             '--project-name', '-n',
-            help='项目名称 (可选，交互式初始化时将会询问)'
+            help='项目名称 (可选)'
         )
         parser.add_argument(
             '--quick', '-q',

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/commands/install.py

@@ -1,7 +1,7 @@
 """
 Install 命令实现
 
-支持交互式和批量安装模块、适配器、CLI 扩展
+支持交互式和批量安装模块、适配器
 """
 
 import sys
@@ -20,7 +20,7 @@ from ..base import Command
 
 class InstallCommand(Command):
     name = "install"
-    description = "安装模块/适配器包（不指定包名时进入交互式安装）"
+    description = "安装模块/适配器包"
     
     def __init__(self):
         self.package_manager = PackageManager()
@@ -256,7 +256,7 @@ class InstallCommand(Command):
         :param pre: 是否包含预发布版本
         """
         console.print(Panel(
-            "[bold cyan]ErisPulse 交互式安装向导[/]\n"
+            "[bold cyan]ErisPulse 安装组件[/]\n"
             "选择您要安装的组件类型",
             title="欢迎",
             border_style="cyan"
@@ -271,13 +271,12 @@ class InstallCommand(Command):
             console.print("[bold cyan]请选择组件类型:[/]")
             console.print("  1. 适配器")
             console.print("  2. 模块")
-            console.print("  3. CLI 扩展")
-            console.print("  4. 自定义安装")
+            console.print("  3. 自定义安装")
             console.print("  q. 退出")
             
             choice = Prompt.ask(
-                "\n请输入选项 [1/2/3/4/q]",
-                choices=["1", "2", "3", "4", "q"],
+                "\n请输入选项 ",
+                choices=["1", "2", "3", "q"],
                 default="q"
             )
             
@@ -290,8 +289,6 @@ class InstallCommand(Command):
             elif choice == "2":
                 self._install_modules(remote_packages, upgrade, pre)
             elif choice == "3":
-                self._install_cli_extensions(remote_packages, upgrade, pre)
-            elif choice == "4":
                 self._install_custom(upgrade, pre)
             
             if not Confirm.ask("\n[cyan]是否继续安装其他组件？[/cyan]", default=False):
@@ -407,61 +404,6 @@ class InstallCommand(Command):
         except ValueError:
             console.print("[red]输入格式错误，请输入数字序号[/]")
     
-    def _install_cli_extensions(self, remote_packages: dict, upgrade: bool, pre: bool):
-        console.print("\n[bold]可用的 CLI 扩展:[/bold]")
-        
-        cli_extensions = remote_packages.get("cli_extensions", {})
-        
-        if not cli_extensions:
-            console.print("[yellow]没有可用的 CLI 扩展[/yellow]")
-            return
-        
-        table = Table(box=SIMPLE, header_style="cli")
-        table.add_column("序号", style="cyan")
-        table.add_column("命令名", style="cli")
-        table.add_column("包名")
-        table.add_column("描述")
-        
-        cli_list = list(cli_extensions.items())
-        for i, (name, info) in enumerate(cli_list, 1):
-            table.add_row(
-                str(i),
-                name,
-                info.get("package", ""),
-                info.get("description", "")
-            )
-        
-        console.print(table)
-        
-        selected = Prompt.ask(
-            "\n[cyan]请输入要安装的 CLI 扩展序号（多个用逗号分隔，如: 1,3）或按 q 返回:[/cyan]"
-        )
-        
-        if selected.lower() == 'q':
-            return
-        
-        try:
-            indices = [int(idx.strip()) for idx in selected.split(",")]
-            selected_packages = []
-            
-            for idx in indices:
-                if 1 <= idx <= len(cli_list):
-                    cli_name = cli_list[idx - 1][0]
-                    selected_packages.append(cli_name)
-                    console.print(f"[green]已选择: {cli_name}[/]")
-                else:
-                    console.print(f"[red]无效的序号: {idx}[/]")
-            
-            if selected_packages:
-                if Confirm.ask(
-                    f"\n[cyan]确认安装以下 {len(selected_packages)} 个 CLI 扩展吗？[/cyan]",
-                    default=True
-                ):
-                    self.package_manager.install_package(selected_packages, upgrade=upgrade, pre=pre)
-        
-        except ValueError:
-            console.print("[red]输入格式错误，请输入数字序号[/]")
-    
     def _install_custom(self, upgrade: bool, pre: bool):
         package_name = Prompt.ask(
             "\n[cyan]请输入要安装的包名（或按 q 返回）:[/cyan]"

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/commands/install.pyi

@@ -7,7 +7,7 @@
 """
 Install 命令实现
 
-支持交互式和批量安装模块、适配器、CLI 扩展
+支持交互式和批量安装模块、适配器
 """
 
 import sys
@@ -42,7 +42,5 @@ class InstallCommand(Command):
         ...
     def _install_modules(self: object, remote_packages: dict, upgrade: bool, pre: bool) -> ...:
         ...
-    def _install_cli_extensions(self: object, remote_packages: dict, upgrade: bool, pre: bool) -> ...:
-        ...
     def _install_custom(self: object, upgrade: bool, pre: bool) -> ...:
         ...

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/commands/list.py

@@ -25,7 +25,7 @@ class ListCommand(Command):
     def add_arguments(self, parser: ArgumentParser):
         parser.add_argument(
             '--type', '-t',
-            choices=['modules', 'adapters', 'cli', 'all'],
+            choices=['modules', 'adapters', 'all'],
             default='all',
             help='列出类型 (默认: all)'
         )
@@ -42,7 +42,6 @@ class ListCommand(Command):
         if pkg_type == "all":
             self._print_installed_packages("modules", outdated_only)
             self._print_installed_packages("adapters", outdated_only)
-            self._print_installed_packages("cli", outdated_only)
         else:
             self._print_installed_packages(pkg_type, outdated_only)
     
@@ -105,31 +104,7 @@ class ListCommand(Command):
                 )
             
             console.print(table)
-            
-        elif pkg_type == "cli" and installed["cli_extensions"]:
-            table = Table(
-                title="已安装CLI扩展",
-                box=SIMPLE,
-                header_style="cli"
-            )
-            table.add_column("命令名", style="cli")
-            table.add_column("包名")
-            table.add_column("版本")
-            table.add_column("描述")
-            
-            for name, info in installed["cli_extensions"].items():
-                if outdated_only and not self._is_package_outdated(info["package"], info["version"]):
-                    continue
-                    
-                table.add_row(
-                    name,
-                    info["package"],
-                    info["version"],
-                    info["summary"]
-                )
-            
-            console.print(table)
-        elif not installed.get(pkg_type.replace("cli", "cli_extensions"), {}):
+        elif not installed.get(pkg_type, {}):
             pass
     
     def _is_package_outdated(self, package_name: str, current_version: str) -> bool:
@@ -152,9 +127,4 @@ class ListCommand(Command):
             if adapter_info["package"] == package_name:
                 return adapter_info["version"] != current_version
                 
-        # 检查CLI扩展
-        for cli_info in remote_packages.get("cli_extensions", {}).values():
-            if cli_info["package"] == package_name:
-                return cli_info["version"] != current_version
-                
         return False

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/commands/list_remote.py

@@ -25,7 +25,7 @@ class ListRemoteCommand(Command):
     def add_arguments(self, parser: ArgumentParser):
         parser.add_argument(
             '--type', '-t',
-            choices=['modules', 'adapters', 'cli', 'all'],
+            choices=['modules', 'adapters', 'all'],
             default='all',
             help='列出类型 (默认: all)'
         )
@@ -42,7 +42,6 @@ class ListRemoteCommand(Command):
         if pkg_type == "all":
             self._print_remote_packages("modules", force_refresh)
             self._print_remote_packages("adapters", force_refresh)
-            self._print_remote_packages("cli", force_refresh)
         else:
             self._print_remote_packages(pkg_type, force_refresh)
     
@@ -98,26 +97,5 @@ class ListRemoteCommand(Command):
                 )
             
             console.print(table)
-            
-        elif pkg_type == "cli" and remote_packages.get("cli_extensions"):
-            table = Table(
-                title="远程CLI扩展",
-                box=SIMPLE,
-                header_style="cli"
-            )
-            table.add_column("命令名", style="cli")
-            table.add_column("包名")
-            table.add_column("最新版本")
-            table.add_column("描述")
-            
-            for name, info in remote_packages["cli_extensions"].items():
-                table.add_row(
-                    name,
-                    info["package"],
-                    info["version"],
-                    info.get("description", "")
-                )
-            
-            console.print(table)
-        elif not remote_packages.get(pkg_type.replace("cli", "cli_extensions"), {}):
+        elif not remote_packages.get(pkg_type, {}):
             console.print(f"[dim]远程没有找到 {pkg_type}[/]")

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/commands/uninstall.py

@@ -74,15 +74,6 @@ class UninstallCommand(Command):
                 "version": info["version"]
             })
         
-        # 添加 CLI 扩展
-        for name, info in installed.get("cli_extensions", {}).items():
-            all_packages.append({
-                "type": "CLI",
-                "name": name,
-                "package": info["package"],
-                "version": info["version"]
-            })
-        
         if not all_packages:
             console.print("[yellow]没有已安装的包[/]")
             return

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/registry.py

@@ -17,7 +17,6 @@ class CommandRegistry:
     {!--< tips >!--}
     1. 使用单例模式确保全局唯一
     2. 支持命令的动态注册和查找
-    3. 支持第三方命令的兼容
     {!--< /tips >!--}
     
     :ivar _commands: 已注册的命令字典 {name: Command}
@@ -25,14 +24,12 @@ class CommandRegistry:
     
     _instance = None
     _commands: Dict[str, Command]
-    _external_commands: Dict[str, Command]
     
     def __new__(cls):
         """实现单例模式"""
         if cls._instance is None:
             cls._instance = super().__new__(cls)
             cls._instance._commands = {}
-            cls._instance._external_commands = {}
         return cls._instance
     
     def register(self, command: Command):
@@ -46,15 +43,6 @@ class CommandRegistry:
             raise ValueError(f"命令 '{command.name}' 已存在")
         self._commands[command.name] = command
     
-    def register_external(self, name: str, command: Command):
-        """
-        注册第三方命令
-        
-        :param name: 命令名称
-        :param command: 命令实例
-        """
-        self._external_commands[name] = command
-    
     def get(self, name: str) -> Optional[Command]:
         """
         获取命令
@@ -62,19 +50,15 @@ class CommandRegistry:
         :param name: 命令名称
         :return: 命令实例，未找到返回 None
         """
-        # 优先查找内置命令
-        if name in self._commands:
-            return self._commands[name]
-        # 然后查找外部命令
-        return self._external_commands.get(name)
+        return self._commands.get(name)
     
     def get_all(self) -> List[Command]:
         """
-        获取所有命令（包括外部命令）
+        获取所有命令
         
         :return: 所有命令列表
         """
-        return list(self._commands.values()) + list(self._external_commands.values())
+        return list(self._commands.values())
     
     def list_all(self) -> List[str]:
         """
@@ -82,7 +66,7 @@ class CommandRegistry:
         
         :return: 命令名称列表
         """
-        return list(self._commands.keys()) + list(self._external_commands.keys())
+        return list(self._commands.keys())
     
     def list_builtin(self) -> List[str]:
         """
@@ -92,14 +76,6 @@ class CommandRegistry:
         """
         return list(self._commands.keys())
     
-    def list_external(self) -> List[str]:
-        """
-        列出外部命令名称
-        
-        :return: 外部命令名称列表
-        """
-        return list(self._external_commands.keys())
-    
     def exists(self, name: str) -> bool:
         """
         检查命令是否存在
@@ -107,8 +83,4 @@ class CommandRegistry:
         :param name: 命令名称
         :return: 命令是否存在
         """
-        return name in self._commands or name in self._external_commands
-    
-    def clear_external(self):
-        """清空外部命令"""
-        self._external_commands.clear()
+        return name in self._commands

{erispulse-2.4.1 → erispulse-2.4.2.dev0}/src/ErisPulse/CLI/registry.pyi

@@ -22,13 +22,11 @@ class CommandRegistry:
     {!--< tips >!--}
     1. 使用单例模式确保全局唯一
     2. 支持命令的动态注册和查找
-    3. 支持第三方命令的兼容
     {!--< /tips >!--}
     
     :ivar _commands: 已注册的命令字典 {name: Command}
     """
     _commands: Dict[(str, Command)]
-    _external_commands: Dict[(str, Command)]
     def __new__(cls: object) -> ...:
         """
         实现单例模式
@@ -42,14 +40,6 @@ class CommandRegistry:
         :raises ValueError: 命令名称已存在时抛出
         """
         ...
-    def register_external(self: object, name: str, command: Command) -> ...:
-        """
-        注册第三方命令
-        
-        :param name: 命令名称
-        :param command: 命令实例
-        """
-        ...
     def get(self: object, name: str) -> Optional[Command]:
         """
         获取命令
@@ -60,7 +50,7 @@ class CommandRegistry:
         ...
     def get_all(self: object) -> List[Command]:
         """
-        获取所有命令（包括外部命令）
+        获取所有命令
         
         :return: 所有命令列表
         """
@@ -79,13 +69,6 @@ class CommandRegistry:
         :return: 内置命令名称列表
         """
         ...
-    def list_external(self: object) -> List[str]:
-        """
-        列出外部命令名称
-        
-        :return: 外部命令名称列表
-        """
-        ...
     def exists(self: object, name: str) -> bool:
         """
         检查命令是否存在
@@ -94,8 +77,3 @@ class CommandRegistry:
         :return: 命令是否存在
         """
         ...
-    def clear_external(self: object) -> ...:
-        """
-        清空外部命令
-        """
-        ...