ErisPulse 2.4.5.dev1__tar.gz → 2.4.5.dev3__tar.gz

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.4.5.dev1
+Version: 2.4.5.dev3
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: ErisDev <erisdev@88.com>
 Maintainer-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
@@ -214,6 +214,14 @@ docker pull erispulse/erispulse:dev
 
 </details>
 
+### 1Panel 应用商店
+
+通过 [1Panel](https://1panel.cn) 应用商店一键安装 ErisPulse，详见 [ErisPulse-1Panel](https://github.com/ErisPulse/ErisPulse-1Panel)。
+
+```bash
+bash <(curl -sL https://get-1panel.erisdev.com/install.sh)
+```
+
 ### 使用 pip 安装
 
 ```bash

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/README.md

@@ -142,6 +142,14 @@ docker pull erispulse/erispulse:dev
 
 </details>
 
+### 1Panel 应用商店
+
+通过 [1Panel](https://1panel.cn) 应用商店一键安装 ErisPulse，详见 [ErisPulse-1Panel](https://github.com/ErisPulse/ErisPulse-1Panel)。
+
+```bash
+bash <(curl -sL https://get-1panel.erisdev.com/install.sh)
+```
+
 ### 使用 pip 安装
 
 ```bash

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/pyproject.toml

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

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/cli.py

@@ -12,7 +12,7 @@ from argparse import ArgumentParser, RawDescriptionHelpFormatter
 
 from rich.panel import Panel
 
-from .console import console
+from .console import console, print_banner
 from .registry import CommandRegistry
 from .base import Command
 
@@ -143,6 +143,8 @@ class CLI:
         args, unknown = self.parser.parse_known_args()
         args._unknown_args = unknown
         
+        print_banner()
+        
         # 处理版本选项
         if args.version:
             self._print_version()
@@ -162,6 +164,7 @@ class CLI:
             # 执行命令
             command = self.registry.get(args.command)
             if command:
+                console.print(f"[title]{command.description}[/]")
                 command.execute(args)
             else:
                 console.print(f"[error]未知命令: {args.command}[/]")

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/cli.pyi

@@ -16,7 +16,7 @@ import traceback
 import pkgutil
 from argparse import ArgumentParser, RawDescriptionHelpFormatter
 from rich.panel import Panel
-from .console import console
+from .console import console, print_banner
 from .registry import CommandRegistry
 from .base import Command
 

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/init.py

@@ -84,32 +84,32 @@ class InitCommand(Command):
                 dir_path.mkdir(exist_ok=True)
                 console.print(f"[green]创建目录: {dir_name}[/green]")
             
-            # 创建配置文件
+            # 创建配置文件 (最小必须配置)
             config_file = project_path / "config" / "config.toml"
             if not config_file.exists():
                 with open(config_file, "w", encoding="utf-8") as f:
-                    f.write("# ErisPulse 配置文件\n\n")
-                    f.write("[ErisPulse]\n")
-                    f.write("# 全局配置\n\n")
+                    f.write("# ErisPulse 配置文件\n")
+                    f.write("# 完整配置示例请参考 config.full.example\n\n")
                     f.write("[ErisPulse.server]\n")
                     f.write('host = "0.0.0.0"\n')
                     f.write("port = 8000\n\n")
                     f.write("[ErisPulse.logger]\n")
                     f.write('level = "INFO"\n')
-                    f.write("log_files = [\"logs/app.log\"]\n")
-                    f.write("memory_limit = 1000\n\n")
                     
-                    # 添加适配器配置
                     if adapter_list:
-                        f.write("[ErisPulse.adapters]\n")
-                        f.write("# 适配器配置\n\n")
-                        f.write("[ErisPulse.adapters.status]\n")
+                        f.write("\n[ErisPulse.adapters.status]\n")
                         for adapter in adapter_list:
-                            f.write(f'{adapter} = false  # 默认禁用，需要时启用\n')
-                        f.write("\n")
+                            f.write(f'{adapter} = false\n')
                 
                 console.print("[green]创建配置文件: config/config.toml[/green]")
             
+            # 创建完整配置示例文件
+            example_file = project_path / "config" / "config.full.example"
+            if not example_file.exists():
+                with open(example_file, "w", encoding="utf-8") as f:
+                    f.write(self._get_full_example_config(adapter_list))
+                console.print("[green]创建配置示例: config/config.full.example[/green]")
+            
             # 创建主程序文件
             main_file = project_path / "main.py"
             if not main_file.exists():
@@ -139,6 +139,112 @@ class InitCommand(Command):
             console.print(f"[red]初始化项目失败: {e}[/]")
             return False
     
+    @staticmethod
+    def _get_full_example_config(adapter_list=None):
+        """
+        生成完整配置示例文件内容
+        
+        :param adapter_list: list 可用适配器列表
+        :return: str 完整配置示例内容
+        
+        {!--< internal-use >!--}
+        {!--< /internal-use >!--}
+        """
+        lines = [
+            "# ErisPulse 完整配置示例",
+            "# 此文件展示所有可用配置项及其默认值",
+            "# 如需使用，将所需配置复制到 config.toml 并按需修改",
+            "",
+            "# ==================== 服务器 ====================",
+            "",
+            "[ErisPulse.server]",
+            'host = "0.0.0.0"              # 监听地址',
+            "port = 8000                   # 监听端口",
+            "ssl_certfile = null           # SSL 证书路径",
+            "ssl_keyfile = null            # SSL 密钥路径",
+            "",
+            "# ==================== 日志 ====================",
+            "",
+            "[ErisPulse.logger]",
+            'level = "INFO"                # 日志级别: DEBUG/INFO/WARNING/ERROR',
+            "log_files = []                # 日志文件列表, 如 [\"logs/app.log\"]",
+            "memory_limit = 1000           # 内存日志条数上限",
+            "",
+            "# ==================== 存储 ====================",
+            "",
+            "[ErisPulse.storage]",
+            "use_global_db = false         # 是否使用全局数据库",
+            "",
+            "# ==================== 事件系统 ====================",
+            "",
+            "[ErisPulse.event.message]",
+            "ignore_self = true            # 忽略自身消息",
+            "",
+            "[ErisPulse.event.command]",
+            'prefix = "/"                  # 命令前缀',
+            "case_sensitive = true         # 区分大小写",
+            "allow_space_prefix = false    # 允许前缀前有空格",
+            "must_at_bot = false           # 必须艾特Bot才触发",
+            "",
+            "# ==================== 框架 ====================",
+            "",
+            "[ErisPulse.framework]",
+            "enable_lazy_loading = true    # 启用模块懒加载",
+            "",
+            "# ==================== 配置审计 ====================",
+            "",
+            "[ErisPulse.config.audit]",
+            "enabled = false               # 是否启用配置审计",
+            "max_entries = 1000            # 审计日志最大条数",
+            "",
+            "# ==================== 指标监控 ====================",
+            "",
+            "[ErisPulse.metrics]",
+            "enabled = false               # 是否启用指标采集",
+            "",
+            "# ==================== 路由增强 ====================",
+            "",
+            "[ErisPulse.router.cors]",
+            "enabled = false",
+            'allow_origins = ["*"]',
+            'allow_methods = ["*"]',
+            'allow_headers = ["*"]',
+            "allow_credentials = false",
+            "max_age = 600",
+            "",
+            "[ErisPulse.router.security]",
+            "enabled = false",
+            "",
+            "[ErisPulse.router.security.headers]",
+            'X-Content-Type-Options = "nosniff"',
+            'X-Frame-Options = "DENY"',
+            "",
+            "# ==================== 适配器状态 ====================",
+            "",
+            "[ErisPulse.adapters.status]",
+        ]
+        
+        if adapter_list:
+            for adapter in adapter_list:
+                lines.append(f"# {adapter} = false")
+        else:
+            lines.extend([
+                "# yunhu = false",
+                "# telegram = false",
+                "# onebot11 = false",
+            ])
+        
+        lines.extend([
+            "",
+            "# ==================== 模块状态 ====================",
+            "",
+            "[ErisPulse.modules.status]",
+            "# MyModule = true",
+            "",
+        ])
+        
+        return "\n".join(lines)
+    
     async def _fetch_available_adapters(self):
         """
         从云端获取可用适配器列表

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/install.py

@@ -8,7 +8,6 @@ import sys
 import asyncio
 from argparse import ArgumentParser
 
-from rich.panel import Panel
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 from rich.box import SIMPLE
@@ -249,13 +248,6 @@ class InstallCommand(Command):
             self._interactive_install(args.upgrade, args.pre)
 
     def _interactive_install(self, upgrade: bool = False, pre: bool = False):
-        console.print(Panel(
-            "[bold cyan]ErisPulse 安装组件[/]\n"
-            "选择您要安装的组件类型",
-            title="欢迎",
-            border_style="cyan"
-        ))
-
         with console.status("[bold green]正在获取远程包列表...", spinner="dots"):
             remote_packages = asyncio.run(self.package_manager.get_remote_packages())
         console.print("[success]✔ 远程包列表获取完成[/]\n")
@@ -297,7 +289,7 @@ class InstallCommand(Command):
             return
 
         table = Table(box=SIMPLE, header_style="adapter", show_lines=False)
-        table.add_column("序号", style="cyan", width=4)
+        table.add_column("序号", style="#A0B0C0", width=4)
         table.add_column("适配器名", style="adapter")
         table.add_column("包名")
         table.add_column("描述")
@@ -352,7 +344,7 @@ class InstallCommand(Command):
             return
 
         table = Table(box=SIMPLE, header_style="module", show_lines=False)
-        table.add_column("序号", style="cyan", width=4)
+        table.add_column("序号", style="#A0B0C0", width=4)
         table.add_column("模块名", style="module")
         table.add_column("包名")
         table.add_column("描述")

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/install.pyi

@@ -13,7 +13,6 @@ Install 命令实现
 import sys
 import asyncio
 from argparse import ArgumentParser
-from rich.panel import Panel
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 from rich.box import SIMPLE

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/run.py

@@ -101,6 +101,10 @@ class RunCommand(Command):
                 console.print(f"[error]脚本 [path]{script}[/] 不存在[/]")
                 console.print("[info]使用 [cyan]epsdk init[/cyan] 创建新项目[/]")
                 return
+            if os.path.isdir(script):
+                console.print(f"[error][path]{script}[/] 是一个目录，无法直接运行[/]")
+                console.print("[info]请指定具体的脚本文件，例如: [cyan]epsdk run {0}/main.py[/]".format(script))
+                return
             self._run_script(script, reload_mode)
         else:
             self._run_internal(reload_mode)

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/self_update.py

@@ -8,7 +8,6 @@ import sys
 import asyncio
 from argparse import ArgumentParser
 from rich.prompt import Confirm, Prompt
-from rich.panel import Panel
 
 from ..utils import PackageManager
 from ..console import console
@@ -41,11 +40,7 @@ class SelfUpdateCommand(Command):
     
     def execute(self, args):
         current_version = self.package_manager.get_installed_version()
-        console.print(Panel(
-            f"[title]ErisPulse SDK 自更新[/]\n"
-            f"当前版本: [bold]{current_version}[/]",
-            title_align="left"
-        ))
+        console.print(f"当前版本: [bold]{current_version}[/]")
         
         # 获取可用版本
         with console.status("[bold green]正在获取版本信息...", spinner="dots"):

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/self_update.pyi

@@ -14,7 +14,6 @@ import sys
 import asyncio
 from argparse import ArgumentParser
 from rich.prompt import Confirm, Prompt
-from rich.panel import Panel
 from ..utils import PackageManager
 from ..console import console
 from ..base import Command

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/uninstall.py

@@ -7,7 +7,6 @@ Uninstall 命令实现
 import sys
 from argparse import ArgumentParser
 
-from rich.panel import Panel
 from rich.prompt import Prompt
 from rich.table import Table
 from rich.box import SIMPLE
@@ -43,13 +42,6 @@ class UninstallCommand(Command):
             self._interactive_uninstall()
     
     def _interactive_uninstall(self):
-        console.print(Panel(
-            "[bold cyan]ErisPulse 卸载向导[/]\n"
-            "选择要卸载的包",
-            title="卸载向导",
-            border_style="cyan"
-        ))
-        
         # 获取已安装的包
         installed = self.package_manager.get_installed_packages()
         
@@ -80,7 +72,7 @@ class UninstallCommand(Command):
         
         # 显示包列表
         table = Table(box=SIMPLE)
-        table.add_column("序号", style="cyan")
+        table.add_column("序号", style="#A0B0C0")
         table.add_column("类型", style="bold")
         table.add_column("名称")
         table.add_column("包名")

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/commands/uninstall.pyi

@@ -12,7 +12,6 @@ Uninstall 命令实现
 
 import sys
 from argparse import ArgumentParser
-from rich.panel import Panel
 from rich.prompt import Prompt
 from rich.table import Table
 from rich.box import SIMPLE

erispulse-2.4.5.dev3/src/ErisPulse/CLI/console.py

@@ -0,0 +1,84 @@
+import sys
+from rich.console import Console
+from rich.theme import Theme
+from rich.highlighter import RegexHighlighter
+
+BANNER = (
+    "\n\n"
+    "███████╗██████╗ ██╗███████╗██████╗ ██╗   ██╗██╗     ███████╗███████╗\n"
+    "██╔════╝██╔══██╗██║██╔════╝██╔══██╗██║   ██║██║     ██╔════╝██╔════╝\n"
+    "█████╗  ██████╔╝██║███████╗██████╔╝██║   ██║██║     ███████╗█████╗  \n"
+    "██╔══╝  ██╔══██╗██║╚════██║██╔═══╝ ██║   ██║██║     ╚════██║██╔══╝  \n"
+    "███████╗██║  ██║██║███████║██║     ╚██████╔╝███████╗███████║███████╗\n"
+    "╚══════╝╚═╝  ╚═╝╚═╝╚══════╝╚═╝      ╚═════╝ ╚══════╝╚══════╝╚══════╝\n"
+    "\n"
+)
+
+_BANNER_MINI = (
+    "\n\n"
+    "███████╗██████╗ ███████╗██████╗ ██╗  ██╗\n"
+    "██╔════╝██╔══██╗██╔════╝██╔══██╗██║ ██╔╝\n"
+    "█████╗  ██████╔╝███████╗██║  ██║█████╔╝ \n"
+    "██╔══╝  ██╔═══╝ ╚════██║██║  ██║██╔═██╗ \n"
+    "███████╗██║     ███████║██████╔╝██║  ██╗\n"
+    "╚══════╝╚═╝     ╚══════╝╚═════╝ ╚═╝  ╚═╝\n"
+    "\n"
+)
+
+
+_banner_printed = False
+
+def print_banner():
+    global _banner_printed
+    if _banner_printed:
+        return
+    _banner_printed = True
+    width = console.width
+    if width >= 75:
+        console.print(BANNER, style="bold white", highlight=False)
+    else:
+        console.print(_BANNER_MINI, style="bold white", highlight=False)
+
+class CommandHighlighter(RegexHighlighter):
+    """
+    高亮CLI命令和参数
+    
+    {!--< tips >!--}
+    使用正则表达式匹配命令行参数和选项
+    {!--< /tips >!--}
+    """
+    highlights = [
+        r"(?P<switch>\-\-?\w+)",
+        r"(?P<option>\[\w+\])",
+        r"(?P<command>\b\w+\b)",
+    ]
+
+# 主题配置
+theme = Theme({
+    "info": "#A0B0C0",
+    "success": "#A5D6A7",
+    "warning": "#FFCC80",
+    "error": "#FFCDD2",
+    "title": "#7DBFE0",
+    "default": "default",
+    "progress": "#A5D6A7",
+    "progress.remaining": "#283545",
+    "cmd": "#90CAF9",
+    "param": "#80CBC4",
+    "switch": "#FFCC80",
+    "module": "#80CBC4",
+    "adapter": "#7DBFE0",
+    "cli": "#A0B0C0",
+})
+
+# 全局控制台实例
+console = Console(
+    theme=theme, 
+    color_system="auto", 
+    highlighter=CommandHighlighter()
+)
+
+__all__ = [
+    "console",
+    "print_banner",
+]

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/console.pyi

@@ -9,6 +9,9 @@ from rich.console import Console
 from rich.theme import Theme
 from rich.highlighter import RegexHighlighter
 
+def print_banner() -> ...:
+    ...
+
 class CommandHighlighter(RegexHighlighter):
     """
     高亮CLI命令和参数

{erispulse-2.4.5.dev1 → erispulse-2.4.5.dev3}/src/ErisPulse/CLI/registry.py

@@ -40,7 +40,7 @@ class CommandRegistry:
         :raises ValueError: 命令名称已存在时抛出
         """
         if command.name in self._commands:
-            raise ValueError(f"命令 '{command.name}' 已存在")
+            return
         self._commands[command.name] = command
     
     def get(self, name: str) -> Optional[Command]: