ErisPulse 2.3.9.dev3__tar.gz → 2.4.0.dev3__tar.gz

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.3.9.dev3
+Version: 2.4.0.dev3
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: ErisDev <erisdev@88.com>
 Maintainer-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
@@ -50,6 +50,14 @@ Requires-Dist: pip>=23.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: watchdog>=4.0.0
+Provides-Extra: dev
+Requires-Dist: pyclean>=3.6.0; extra == 'dev'
+Requires-Dist: pytest-asyncio>=0.21.0; extra == 'dev'
+Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
+Requires-Dist: pytest-mock>=3.10.0; extra == 'dev'
+Requires-Dist: pytest-xdist>=3.0.0; extra == 'dev'
+Requires-Dist: pytest>=7.0.0; extra == 'dev'
+Requires-Dist: ruff>=0.1.7; extra == 'dev'
 Provides-Extra: test
 Requires-Dist: pytest-asyncio>=0.21.0; extra == 'test'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'test'
@@ -205,6 +213,7 @@ epsdk run main.py --reload
 - [OneBot12](https://github.com/ErisPulse/ErisPulse-OneBot12Adapter) - OneBot12 标准
 - [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) - 邮件收发处理
 - [沙箱](https://github.com/ErisPulse/ErisPulse-SandboxAdapter) - 网页调试界面，无需接入实际平台
+- [Kook](https://github.com/shanfishapp/ErisPulse-KookAdapter) - Kook(开黑啦)即时通讯平台
 
 查看 [适配器详情介绍](docs/zh-CN/platform-guide/README.md)
 

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/README.md

@@ -144,7 +144,8 @@ epsdk run main.py --reload
 - [OneBot11](https://github.com/ErisPulse/ErisPulse-OneBot11Adapter) - 通用机器人接口标准
 - [OneBot12](https://github.com/ErisPulse/ErisPulse-OneBot12Adapter) - OneBot12 标准
 - [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) - 邮件收发处理
-- [沙箱](https://github.com/ErisPulse/ErisPulse-SandboxAdapter) - 网页调试界面，无需接入实际平台
+- [沙箱](https://github.com/ErisPulse/ErisPulse-SandboxAdapter) - 网页调试界面，无需接入实际平台
+- [Kook](https://github.com/shanfishapp/ErisPulse-KookAdapter) - Kook(开黑啦)即时通讯平台
 
 查看 [适配器详情介绍](docs/zh-CN/platform-guide/README.md)
 

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ErisPulse"
-version = "2.3.9-dev.3"
+version = "2.4.0-dev.3"
 description = "ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -67,6 +67,15 @@ test = [
     "pytest-xdist>=3.0.0",
     "pytest-mock>=3.10.0",
 ]
+dev = [
+    "pytest>=7.0.0",
+    "pytest-cov>=4.0.0",
+    "pytest-asyncio>=0.21.0",
+    "pytest-xdist>=3.0.0",
+    "pytest-mock>=3.10.0",
+    "pyclean>=3.6.0",
+    "ruff>=0.1.7",
+]
 
 [project.scripts]
 ep-init = "ErisPulse.__init__:init_sync"

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/src/ErisPulse/CLI/cli.py

@@ -168,7 +168,8 @@ class CLI:
         :raises KeyboardInterrupt: 用户中断时抛出
         :raises Exception: 命令执行失败时抛出
         """
-        args = self.parser.parse_args()
+        args, unknown = self.parser.parse_known_args()
+        args._unknown_args = unknown
         
         # 处理版本选项
         if args.version:
@@ -177,9 +178,14 @@ class CLI:
         
         # 没有指定命令时显示帮助
         if not args.command:
+            if unknown:
+                console.print(f"[warning]未识别的参数: {' '.join(unknown)}[/]")
             self.parser.print_help()
             return
         
+        if unknown and args.command not in ('install',):
+            console.print(f"[warning]未识别的参数: {' '.join(unknown)}[/]")
+        
         try:
             # 执行命令
             command = self.registry.get(args.command)

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/src/ErisPulse/CLI/commands/install.py

@@ -41,19 +41,211 @@ class InstallCommand(Command):
             action='store_true',
             help='包含预发布版本'
         )
+        parser.add_argument(
+            '-e', '--editable',
+            action='append',
+            metavar='PATH',
+            help='以可编辑模式安装包（开发者模式，可多次指定）'
+        )
+        parser.add_argument(
+            '--user',
+            action='store_true',
+            help='安装到用户目录'
+        )
+        parser.add_argument(
+            '--no-deps',
+            action='store_true',
+            help='不安装依赖包'
+        )
+        parser.add_argument(
+            '-t', '--target',
+            metavar='DIR',
+            help='安装到指定目录'
+        )
+        parser.add_argument(
+            '--index-url',
+            metavar='URL',
+            help='指定包索引 URL'
+        )
+        parser.add_argument(
+            '--extra-index-url',
+            action='append',
+            metavar='URL',
+            help='额外的包索引 URL（可多次指定）'
+        )
+        parser.add_argument(
+            '--no-cache-dir',
+            action='store_true',
+            help='禁用 pip 缓存'
+        )
+        parser.add_argument(
+            '-r', '--requirement',
+            metavar='FILE',
+            help='从 requirements 文件安装'
+        )
+        parser.add_argument(
+            '-c', '--constraint',
+            metavar='FILE',
+            help='使用约束文件限制版本'
+        )
+        parser.add_argument(
+            '--force-reinstall',
+            action='store_true',
+            help='强制重新安装所有包'
+        )
+        parser.add_argument(
+            '--ignore-installed',
+            action='store_true',
+            help='忽略已安装的包'
+        )
+        parser.add_argument(
+            '--compile',
+            action='store_true',
+            help='编译 Python 源文件'
+        )
+        parser.add_argument(
+            '--no-compile',
+            action='store_true',
+            help='不编译 Python 源文件'
+        )
+        parser.add_argument(
+            '--prefix',
+            metavar='DIR',
+            help='安装前缀目录'
+        )
+        parser.add_argument(
+            '--src',
+            metavar='DIR',
+            help='可编辑包的检出目录'
+        )
+        parser.add_argument(
+            '--config-settings',
+            action='append',
+            metavar='SETTINGS',
+            help='构建后端的配置设置（可多次指定）'
+        )
+        parser.add_argument(
+            '--no-binary',
+            action='append',
+            metavar='FORMAT',
+            help='不使用二进制包'
+        )
+        parser.add_argument(
+            '--only-binary',
+            action='append',
+            metavar='FORMAT',
+            help='只使用二进制包'
+        )
+        parser.add_argument(
+            '--prefer-binary',
+            action='store_true',
+            help='优先使用二进制包'
+        )
+        parser.add_argument(
+            '--build-isolation',
+            action='store_true',
+            help='启用构建隔离'
+        )
+        parser.add_argument(
+            '--no-build-isolation',
+            action='store_true',
+            help='禁用构建隔离'
+        )
+        parser.add_argument(
+            '--upgrade-strategy',
+            choices=['eager', 'only-if-needed', 'to-satisfy-only'],
+            help='升级策略'
+        )
+        parser.add_argument(
+            '--break-system-packages',
+            action='store_true',
+            help='允许覆盖系统管理的包'
+        )
+    
+    def _build_extra_pip_args(self, args) -> list:
+        extra = []
+        if getattr(args, 'user', False):
+            extra.append('--user')
+        if getattr(args, 'no_deps', False):
+            extra.append('--no-deps')
+        if getattr(args, 'target', None):
+            extra.extend(['--target', args.target])
+        if getattr(args, 'index_url', None):
+            extra.extend(['--index-url', args.index_url])
+        if getattr(args, 'extra_index_url', None):
+            for url in args.extra_index_url:
+                extra.extend(['--extra-index-url', url])
+        if getattr(args, 'no_cache_dir', False):
+            extra.append('--no-cache-dir')
+        if getattr(args, 'constraint', None):
+            extra.extend(['--constraint', args.constraint])
+        if getattr(args, 'force_reinstall', False):
+            extra.append('--force-reinstall')
+        if getattr(args, 'ignore_installed', False):
+            extra.append('--ignore-installed')
+        if getattr(args, 'compile', False):
+            extra.append('--compile')
+        if getattr(args, 'no_compile', False):
+            extra.append('--no-compile')
+        if getattr(args, 'prefix', None):
+            extra.extend(['--prefix', args.prefix])
+        if getattr(args, 'src', None):
+            extra.extend(['--src', args.src])
+        if getattr(args, 'config_settings', None):
+            for settings in args.config_settings:
+                extra.extend(['--config-settings', settings])
+        if getattr(args, 'no_binary', None):
+            for fmt in args.no_binary:
+                extra.extend(['--no-binary', fmt])
+        if getattr(args, 'only_binary', None):
+            for fmt in args.only_binary:
+                extra.extend(['--only-binary', fmt])
+        if getattr(args, 'prefer_binary', False):
+            extra.append('--prefer-binary')
+        if getattr(args, 'build_isolation', False):
+            extra.append('--build-isolation')
+        if getattr(args, 'no_build_isolation', False):
+            extra.append('--no-build-isolation')
+        if getattr(args, 'upgrade_strategy', None):
+            extra.extend(['--upgrade-strategy', args.upgrade_strategy])
+        if getattr(args, 'break_system_packages', False):
+            extra.append('--break-system-packages')
+        
+        unknown_args = getattr(args, '_unknown_args', []) or []
+        extra.extend(unknown_args)
+        
+        return extra
     
     def execute(self, args):
-        if args.package:
-            # 批量安装
-            success = self.package_manager.install_package(
-                args.package,
-                upgrade=args.upgrade,
-                pre=args.pre
-            )
+        editable_paths = getattr(args, 'editable', None)
+        requirement_file = getattr(args, 'requirement', None)
+        
+        if args.package or editable_paths or requirement_file:
+            success = True
+            pm = self.package_manager
+            extra = self._build_extra_pip_args(args)
+            
+            if editable_paths:
+                for path in editable_paths:
+                    if not pm.install_direct(['-e', path] + extra, f"可编辑安装 {path}"):
+                        success = False
+            
+            if requirement_file:
+                if not pm.install_direct(['-r', requirement_file] + extra, f"从文件安装 {requirement_file}"):
+                    success = False
+            
+            if args.package:
+                if not pm.install_package(
+                    args.package,
+                    upgrade=args.upgrade,
+                    pre=args.pre,
+                    extra_pip_args=extra
+                ):
+                    success = False
+            
             if not success:
                 sys.exit(1)
         else:
-            # 交互式安装
             self._interactive_install(args.upgrade, args.pre)
     
     def _interactive_install(self, upgrade: bool = False, pre: bool = False):
@@ -70,7 +262,6 @@ class InstallCommand(Command):
             border_style="cyan"
         ))
         
-        # 预加载远程包列表，避免每次选择都请求
         console.print("[info]正在获取远程包列表...[/]")
         remote_packages = asyncio.run(self.package_manager.get_remote_packages())
         console.print("[success]远程包列表获取完成[/]")
@@ -103,12 +294,10 @@ class InstallCommand(Command):
             elif choice == "4":
                 self._install_custom(upgrade, pre)
             
-            # 询问是否继续
             if not Confirm.ask("\n[cyan]是否继续安装其他组件？[/cyan]", default=False):
                 break
     
     def _install_adapters(self, remote_packages: dict, upgrade: bool, pre: bool):
-        """安装适配器"""
         console.print("\n[bold]可用的适配器:[/bold]")
         
         adapters = remote_packages.get("adapters", {})
@@ -117,7 +306,6 @@ class InstallCommand(Command):
             console.print("[yellow]没有可用的适配器[/yellow]")
             return
         
-        # 显示适配器列表
         table = Table(box=SIMPLE, header_style="adapter")
         table.add_column("序号", style="cyan")
         table.add_column("适配器名", style="adapter")
@@ -135,7 +323,6 @@ class InstallCommand(Command):
         
         console.print(table)
         
-        # 选择适配器
         selected = Prompt.ask(
             "\n[cyan]请输入要安装的适配器序号（多个用逗号分隔，如: 1,3）或按 q 返回:[/cyan]"
         )
@@ -156,7 +343,6 @@ class InstallCommand(Command):
                     console.print(f"[red]无效的序号: {idx}[/]")
             
             if selected_packages:
-                # 确认安装
                 if Confirm.ask(
                     f"\n[cyan]确认安装以下 {len(selected_packages)} 个适配器吗？[/cyan]",
                     default=True
@@ -167,7 +353,6 @@ class InstallCommand(Command):
             console.print("[red]输入格式错误，请输入数字序号[/]")
     
     def _install_modules(self, remote_packages: dict, upgrade: bool, pre: bool):
-        """安装模块"""
         console.print("\n[bold]可用的模块:[/bold]")
         
         modules = remote_packages.get("modules", {})
@@ -176,7 +361,6 @@ class InstallCommand(Command):
             console.print("[yellow]没有可用的模块[/yellow]")
             return
         
-        # 显示模块列表
         table = Table(box=SIMPLE, header_style="module")
         table.add_column("序号", style="cyan")
         table.add_column("模块名", style="module")
@@ -194,7 +378,6 @@ class InstallCommand(Command):
         
         console.print(table)
         
-        # 选择模块
         selected = Prompt.ask(
             "\n[cyan]请输入要安装的模块序号（多个用逗号分隔，如: 1,3）或按 q 返回:[/cyan]"
         )
@@ -215,7 +398,6 @@ class InstallCommand(Command):
                     console.print(f"[red]无效的序号: {idx}[/]")
             
             if selected_packages:
-                # 确认安装
                 if Confirm.ask(
                     f"\n[cyan]确认安装以下 {len(selected_packages)} 个模块吗？[/cyan]",
                     default=True
@@ -226,7 +408,6 @@ class InstallCommand(Command):
             console.print("[red]输入格式错误，请输入数字序号[/]")
     
     def _install_cli_extensions(self, remote_packages: dict, upgrade: bool, pre: bool):
-        """安装 CLI 扩展"""
         console.print("\n[bold]可用的 CLI 扩展:[/bold]")
         
         cli_extensions = remote_packages.get("cli_extensions", {})
@@ -235,7 +416,6 @@ class InstallCommand(Command):
             console.print("[yellow]没有可用的 CLI 扩展[/yellow]")
             return
         
-        # 显示 CLI 扩展列表
         table = Table(box=SIMPLE, header_style="cli")
         table.add_column("序号", style="cyan")
         table.add_column("命令名", style="cli")
@@ -253,7 +433,6 @@ class InstallCommand(Command):
         
         console.print(table)
         
-        # 选择 CLI 扩展
         selected = Prompt.ask(
             "\n[cyan]请输入要安装的 CLI 扩展序号（多个用逗号分隔，如: 1,3）或按 q 返回:[/cyan]"
         )
@@ -274,7 +453,6 @@ class InstallCommand(Command):
                     console.print(f"[red]无效的序号: {idx}[/]")
             
             if selected_packages:
-                # 确认安装
                 if Confirm.ask(
                     f"\n[cyan]确认安装以下 {len(selected_packages)} 个 CLI 扩展吗？[/cyan]",
                     default=True
@@ -285,7 +463,6 @@ class InstallCommand(Command):
             console.print("[red]输入格式错误，请输入数字序号[/]")
     
     def _install_custom(self, upgrade: bool, pre: bool):
-        """自定义安装"""
         package_name = Prompt.ask(
             "\n[cyan]请输入要安装的包名（或按 q 返回）:[/cyan]"
         )
@@ -294,7 +471,6 @@ class InstallCommand(Command):
             return
         
         if package_name:
-            # 确认安装
             if Confirm.ask(
                 f"\n[cyan]确认安装包 {package_name} 吗？[/cyan]",
                 default=True

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/src/ErisPulse/CLI/commands/install.pyi

@@ -26,6 +26,8 @@ class InstallCommand(Command):
         ...
     def add_arguments(self: object, parser: ArgumentParser) -> ...:
         ...
+    def _build_extra_pip_args(self: object, args: ...) -> list:
+        ...
     def execute(self: object, args: ...) -> ...:
         ...
     def _interactive_install(self: object, upgrade: bool = ..., pre: bool = ...) -> ...:
@@ -37,22 +39,10 @@ class InstallCommand(Command):
         """
         ...
     def _install_adapters(self: object, remote_packages: dict, upgrade: bool, pre: bool) -> ...:
-        """
-        安装适配器
-        """
         ...
     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) -> ...:
-        """
-        安装 CLI 扩展
-        """
         ...
     def _install_custom(self: object, upgrade: bool, pre: bool) -> ...:
-        """
-        自定义安装
-        """
         ...

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/src/ErisPulse/CLI/utils/package_manager.py

@@ -63,7 +63,7 @@ class PackageManager:
         
         timeout = ClientTimeout(total=10)
         try:
-            async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with aiohttp.ClientSession(timeout=timeout, trust_env=True) as session:
                 async with session.get(url) as response:
                     if response.status == 200:
                         data = await response.text()
@@ -321,7 +321,7 @@ class PackageManager:
         url = f"https://pypi.org/pypi/{package_name}/json"
         
         try:
-            async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with aiohttp.ClientSession(timeout=timeout, trust_env=True) as session:
                 async with session.get(url) as response:
                     if response.status == 200:
                         data = await response.json()
@@ -483,13 +483,14 @@ class PackageManager:
         
         return None
 
-    def install_package(self, package_names: List[str], upgrade: bool = False, pre: bool = False) -> bool:
+    def install_package(self, package_names: List[str], upgrade: bool = False, pre: bool = False, extra_pip_args: List[str] = None) -> bool:
         """
         安装指定包（支持多个包）
         
         :param package_names: 要安装的包名或别名列表
         :param upgrade: 是否升级已安装的包
         :param pre: 是否包含预发布版本
+        :param extra_pip_args: 额外的 pip 参数
         :return: 安装是否成功
         """
         all_success = True
@@ -531,6 +532,8 @@ class PackageManager:
                 cmd.append("--upgrade")
             if pre:
                 cmd.append("--pre")
+            if extra_pip_args:
+                cmd.extend(extra_pip_args)
             cmd.append(current_package_name)
             
             # 执行安装命令
@@ -554,6 +557,34 @@ class PackageManager:
         
         return all_success
     
+    def install_direct(self, pip_args: List[str], description: str = "pip install") -> bool:
+        """
+        直接执行 pip install 命令（跳过别名解析和兼容性检查）
+        
+        :param pip_args: pip install 的参数列表（不含 "install" 本身）
+        :param description: 进度条描述
+        :return: 安装是否成功
+        """
+        cmd = ["install"] + pip_args
+        success, stdout, stderr = self._run_pip_command_with_output(cmd, description)
+        
+        if success:
+            console.print(Panel(
+                f"[success]安装成功[/]\n\n"
+                f"[dim]{stdout}[/]",
+                title="安装完成",
+                border_style="success"
+            ))
+        else:
+            console.print(Panel(
+                f"[error]安装失败[/]\n\n"
+                f"[dim]{stderr}[/]",
+                title="安装失败",
+                border_style="error"
+            ))
+        
+        return success
+    
     def uninstall_package(self, package_names: List[str]) -> bool:
         """
         卸载指定包（支持多个包，支持别名）
@@ -829,7 +860,7 @@ class PackageManager:
         url = "https://pypi.org/pypi/ErisPulse/json"
         
         try:
-            async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with aiohttp.ClientSession(timeout=timeout, trust_env=True) as session:
                 async with session.get(url) as response:
                     if response.status == 200:
                         data = await response.json()

{erispulse-2.3.9.dev3 → erispulse-2.4.0.dev3}/src/ErisPulse/CLI/utils/package_manager.pyi

@@ -165,13 +165,23 @@ class PackageManager:
         :return: 包信息字典
         """
         ...
-    def install_package(self: object, package_names: List[str], upgrade: bool = ..., pre: bool = ...) -> bool:
+    def install_package(self: object, package_names: List[str], upgrade: bool = ..., pre: bool = ..., extra_pip_args: List[str] = ...) -> bool:
         """
         安装指定包（支持多个包）
         
         :param package_names: 要安装的包名或别名列表
         :param upgrade: 是否升级已安装的包
         :param pre: 是否包含预发布版本
+        :param extra_pip_args: 额外的 pip 参数
+        :return: 安装是否成功
+        """
+        ...
+    def install_direct(self: object, pip_args: List[str], description: str = ...) -> bool:
+        """
+        直接执行 pip install 命令（跳过别名解析和兼容性检查）
+        
+        :param pip_args: pip install 的参数列表（不含 "install" 本身）
+        :param description: 进度条描述
         :return: 安装是否成功
         """
         ...