ErisPulse 2.1.10__py3-none-any.whl → 2.1.12__py3-none-any.whl

ErisPulse/Core/logger.py

@@ -42,7 +42,7 @@ class Logger:
                 show_time=False,
                 show_level=True,
                 show_path=False,
-                markup=True
+                markup=False
             )
             self._logger.addHandler(console_handler)
         self._setup_config()

ErisPulse/__main__.py

@@ -474,20 +474,20 @@ def main():
 
     # 列表命令
     list_parser = subparsers.add_parser('list', help='列出已安装的模块/适配器')
-    list_parser.add_argument('--type', '-t', choices=['modules', 'adapters', 'all'], default='all', 
-                           help='列出类型 (modules: 仅模块, adapters: 仅适配器, all: 全部)')
+    list_parser.add_argument('--type', '-t', choices=['modules', 'adapters', 'cli', 'all'], default='all', 
+                           help='列出类型 (modules: 仅模块, adapters: 仅适配器, cli: 仅CLI扩展, all: 全部)')
     
     # 远程列表命令
     list_remote_parser = subparsers.add_parser('list-remote', help='列出远程可用的模块和适配器')
-    list_remote_parser.add_argument('--type', '-t', choices=['modules', 'adapters', 'all'], default='all',
-                                  help='列出类型 (modules: 仅模块, adapters: 仅适配器, all: 全部)')
+    list_remote_parser.add_argument('--type', '-t', choices=['modules', 'adapters', 'cli', 'all'], default='all',
+                                  help='列出类型 (modules: 仅模块, adapters: 仅适配器, cli: 仅CLI扩展, all: 全部)')
     # 升级命令
     upgrade_parser = subparsers.add_parser('upgrade', help='升级所有模块/适配器')
     upgrade_parser.add_argument('--force', '-f', action='store_true', help='跳过确认直接升级')
     
     # 运行命令
-    run_parser = subparsers.add_parser('run', help='运行指定主程序')
-    run_parser.add_argument('script', type=str, help='要运行的主程序路径')
+    run_parser = subparsers.add_parser('run', help='运行指定主程序(默认为main.py)')
+    run_parser.add_argument('script', type=str, nargs='?', help='要运行的主程序路径(可选，默认为main.py)')
     run_parser.add_argument('--reload', action='store_true', help='启用热重载模式')
     
     args = parser.parse_args()
@@ -567,6 +567,25 @@ def main():
         elif args.command == "list":
             installed = PyPIManager.get_installed_packages()
             
+            # 获取已安装的CLI扩展
+            cli_extensions = {}
+            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:
+                    dist = entry.dist
+                    cli_extensions[entry.name] = {
+                        "package": dist.metadata["Name"],
+                        "version": dist.version,
+                        "summary": dist.metadata["Summary"]
+                    }
+            except Exception as e:
+                console.print(f"[yellow]获取CLI扩展信息失败: {e}[/]", style="warning")
+            
             if args.type in ["modules", "all"] and installed["modules"]:
                 table = Table(title="已安装模块", box=SIMPLE)
                 table.add_column("模块名", style="green")
@@ -591,9 +610,20 @@ def main():
                 
                 console.print(table)
                 
-            if not installed["modules"] and not installed["adapters"]:
+                if cli_extensions and args.type in ["cli", "all"]:
+                    table = Table(title="已安装CLI扩展", box=SIMPLE)
+                    table.add_column("命令名", style="magenta")
+                    table.add_column("包名", style="blue")
+                    table.add_column("版本")
+                    table.add_column("描述")
+                    
+                    for name, info in cli_extensions.items():
+                        table.add_row(name, info["package"], info["version"], info["summary"])
+                console.print(table)
+                
+            if not installed["modules"] and not installed["adapters"] and not cli_extensions:
                 console.print(Panel(
-                    "没有安装任何ErisPulse模块或适配器",
+                    "没有安装任何ErisPulse模块、适配器或CLI扩展",
                     title="提示",
                     style="info"
                 ))
@@ -603,6 +633,16 @@ def main():
                 PyPIManager.upgrade_all()
                 
         elif args.command == "run":
+            if not hasattr(args, 'script') or not args.script:
+                if not os.path.exists("config.toml") or not os.path.isfile("main.py"):
+                    from ErisPulse import sdk
+                    sdk.init()
+                args.script = "main.py"
+                console.print(Panel(
+                    "未指定主程序，运行入口点为 [bold]main.py[/]",
+                    title="提示",
+                    style="info"
+                ))
             start_reloader(args.script, args.reload)
         elif args.command == "list-remote":
             import asyncio
@@ -632,10 +672,26 @@ def main():
                         table.add_row(name, info["package"], info["version"], info["description"])
                     
                     console.print(table)
+                
+                # 展示远程CLI扩展
+                if "cli_extensions" in remote_packages and args.type in ["cli", "all"] and remote_packages["cli_extensions"]:
+                    table = Table(title="远程CLI扩展", box=SIMPLE)
+                    table.add_column("命令名", style="magenta")
+                    table.add_column("包名", style="blue")
+                    table.add_column("版本")
+                    table.add_column("描述")
+                    
+                    for name, info in remote_packages["cli_extensions"].items():
+                        commands = info.get("command", [])
+                        command_str = ", ".join(commands) if isinstance(commands, list) else str(commands)
+                        table.add_row(command_str, info["package"], info["version"], info["description"])
                     
-                if not remote_packages["modules"] and not remote_packages["adapters"]:
+                    console.print(table)
+                    
+                if not remote_packages["modules"] and not remote_packages["adapters"] and \
+                   (not "cli_extensions" in remote_packages or not remote_packages["cli_extensions"]):
                     console.print(Panel(
-                        "没有找到远程模块或适配器",
+                        "没有找到远程模块、适配器或CLI扩展",
                         title="提示",
                         style="info"
                     ))
@@ -646,7 +702,14 @@ def main():
                     title="错误",
                     style="error"
                 ))
-        
+        elif args.command == "init":
+            from ErisPulse import sdk
+            sdk.init()
+            console.print(Panel(
+                "初始化完成",
+                title="成功",
+                style="success"
+            ))
     except KeyboardInterrupt as e:
         pass
     except Exception as e:

{erispulse-2.1.10.dist-info → erispulse-2.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.1.10
+Version: 2.1.12
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>, runoneall <runoobsteve@gmail.com>
 License: MIT License

{erispulse-2.1.10.dist-info → erispulse-2.1.12.dist-info}/RECORD

@@ -1,16 +1,16 @@
 ErisPulse/__init__.py,sha256=T-N56UQyBmpvlqwH2wGi5ptPzaJpbgF5tKkJt0DlkaM,26099
-ErisPulse/__main__.py,sha256=QwHMu8lmWbjS3EyOYV-wea3I0xcGmH_McWNx7JSGwts,24853
+ErisPulse/__main__.py,sha256=A9rh8y7esZEuY8xb8R_N8zqPYSTWO_YZam1Cd6LFhP0,28190
 ErisPulse/Core/__init__.py,sha256=tBYPahQ7-w7U6M69xy8DW0_ECa9ja-Q0y_SQqVswYBo,409
 ErisPulse/Core/adapter.py,sha256=ZK81dibJ471FowL0MRXkS113iBcMgj_VzpTw0PzhAEo,18102
 ErisPulse/Core/config.py,sha256=ZmwGdtHSOE7K5uOGzLYcyl3ZF3sAmeWAntqcdfDzhpM,5027
 ErisPulse/Core/env.py,sha256=HGkzsdbxh8c1GSDJhnGP9B09Sz2ZeNbRxWieaFmAcug,18870
-ErisPulse/Core/logger.py,sha256=3PPwJVcIM_TZerGGK_68vCdxsR0owrhyek3iyugGVg0,8295
+ErisPulse/Core/logger.py,sha256=cJzNXF-EmdWxwgiHg5Itmkwsva2Jhe9l9X4rXKiXHgc,8296
 ErisPulse/Core/mods.py,sha256=2yIq8t9Ca9CBPRiZU0yr8Lc0XGmmkB7LlH-5FWqXjw4,7023
 ErisPulse/Core/raiserr.py,sha256=vlyaaiOIYkyqm9dAqSW9E54JBzX-9roHDp5_r6I0yUU,5591
 ErisPulse/Core/server.py,sha256=FkDTeLuHD5IBnWVxvYU8pHb6yCt8GzyvC1bpOiJ7G7I,9217
 ErisPulse/Core/util.py,sha256=7rdMmn6sBFqYd4znxBCcJjuv2eyTExdeKyZopgds868,3796
-erispulse-2.1.10.dist-info/METADATA,sha256=3J5J1MQYsOgZLgNmtcOwMnlh7AezJmAuaVAPwrQNRaw,6259
-erispulse-2.1.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-erispulse-2.1.10.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
-erispulse-2.1.10.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
-erispulse-2.1.10.dist-info/RECORD,,
+erispulse-2.1.12.dist-info/METADATA,sha256=rfHYXiTX37hUr5YIfzkm6plWIjxUcMqSp80iSnO34VI,6259
+erispulse-2.1.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.1.12.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.1.12.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
+erispulse-2.1.12.dist-info/RECORD,,