ErisPulse 2.4.3.dev1__tar.gz → 2.4.5.dev0__tar.gz

{erispulse-2.4.3.dev1 → erispulse-2.4.5.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.4.3.dev1
+Version: 2.4.5.dev0
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: ErisDev <erisdev@88.com>
 Maintainer-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
@@ -79,7 +79,7 @@ Description-Content-Type: text/markdown
 <table>
 <tr>
 <td width="35%" valign="middle" align="center">
-<img src=".github/assets/erispulse_logo_1024.png" width="280" alt="ErisPulse" />
+<img src=".github/assets/erispulse_logo_hp.png" width="280" alt="ErisPulse" />
 </td>
 <td width="65%" valign="middle">
 
@@ -127,6 +127,7 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 | [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) | 邮件协议收发适配器 |
 | [云湖](https://github.com/ErisPulse/ErisPulse-YunhuAdapter) | 企业级即时通讯平台（机器人接入） |
 | [云湖用户](https://github.com/wsu2059q/ErisPulse-YunhuUserAdapter) | 基于云湖用户协议的接入适配器 |
+| [花枫咖啡馆](https://github.com/ErisPulse/ErisPulse-Ideaura/) | Allons! \(・ω・) / |
 
 查看 [适配器详情介绍](docs/zh-CN/platform-guide/README.md)
 
@@ -171,6 +172,48 @@ ERISPULSE_DASHBOARD_TOKEN=your-token docker compose up -d
 
 </details>
 
+<details>
+<summary>使用预发布版本 (Dev)</summary>
+
+设置 `ERISPULSE_CHANNEL=dev` 即可使用预发布版本：
+
+```bash
+# 方式一：使用环境变量（推荐）
+ERISPULSE_CHANNEL=dev ERISPULSE_DASHBOARD_TOKEN=your-token docker compose up -d
+
+# 方式二：构建 dev 镜像
+ERISPULSE_BUILD_TARGET=dev docker compose up -d --build
+```
+
+如需启动时自动更新到最新版本（无论 stable 还是 dev），显式设置 `ERISPULSE_UPDATE_ON_START=true`：
+
+```bash
+ERISPULSE_CHANNEL=dev ERISPULSE_UPDATE_ON_START=true docker compose up -d
+```
+
+也可以拉取预构建的 dev 镜像：
+
+```bash
+docker pull erispulse/erispulse:dev
+```
+
+</details>
+
+<details>
+<summary>Docker 环境变量</summary>
+
+| 变量 | 默认值 | 说明 |
+|------|--------|------|
+| `ERISPULSE_CHANNEL` | `stable` | 版本通道：`stable`（稳定版）或 `dev`（预发布版） |
+| `ERISPULSE_UPDATE_ON_START` | `false` | 容器启动时是否自动更新到最新版本（需显式启用） |
+| `ERISPULSE_DASHBOARD_TOKEN` | 空 | Dashboard 登录令牌 |
+| `ERISPULSE_PORT` | `8000` | Dashboard 端口映射 |
+| `TZ` | `Asia/Shanghai` | 容器时区 |
+
+> 启用 `ERISPULSE_UPDATE_ON_START=true` 可确保即使镜像较旧，容器也能在启动时自动获取最新版本。
+
+</details>
+
 ### 使用 pip 安装
 
 ```bash

{erispulse-2.4.3.dev1 → erispulse-2.4.5.dev0}/README.md

@@ -7,7 +7,7 @@
 <table>
 <tr>
 <td width="35%" valign="middle" align="center">
-<img src=".github/assets/erispulse_logo_1024.png" width="280" alt="ErisPulse" />
+<img src=".github/assets/erispulse_logo_hp.png" width="280" alt="ErisPulse" />
 </td>
 <td width="65%" valign="middle">
 
@@ -55,6 +55,7 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 | [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) | 邮件协议收发适配器 |
 | [云湖](https://github.com/ErisPulse/ErisPulse-YunhuAdapter) | 企业级即时通讯平台（机器人接入） |
 | [云湖用户](https://github.com/wsu2059q/ErisPulse-YunhuUserAdapter) | 基于云湖用户协议的接入适配器 |
+| [花枫咖啡馆](https://github.com/ErisPulse/ErisPulse-Ideaura/) | Allons! \(・ω・) / |
 
 查看 [适配器详情介绍](docs/zh-CN/platform-guide/README.md)
 
@@ -99,6 +100,48 @@ ERISPULSE_DASHBOARD_TOKEN=your-token docker compose up -d
 
 </details>
 
+<details>
+<summary>使用预发布版本 (Dev)</summary>
+
+设置 `ERISPULSE_CHANNEL=dev` 即可使用预发布版本：
+
+```bash
+# 方式一：使用环境变量（推荐）
+ERISPULSE_CHANNEL=dev ERISPULSE_DASHBOARD_TOKEN=your-token docker compose up -d
+
+# 方式二：构建 dev 镜像
+ERISPULSE_BUILD_TARGET=dev docker compose up -d --build
+```
+
+如需启动时自动更新到最新版本（无论 stable 还是 dev），显式设置 `ERISPULSE_UPDATE_ON_START=true`：
+
+```bash
+ERISPULSE_CHANNEL=dev ERISPULSE_UPDATE_ON_START=true docker compose up -d
+```
+
+也可以拉取预构建的 dev 镜像：
+
+```bash
+docker pull erispulse/erispulse:dev
+```
+
+</details>
+
+<details>
+<summary>Docker 环境变量</summary>
+
+| 变量 | 默认值 | 说明 |
+|------|--------|------|
+| `ERISPULSE_CHANNEL` | `stable` | 版本通道：`stable`（稳定版）或 `dev`（预发布版） |
+| `ERISPULSE_UPDATE_ON_START` | `false` | 容器启动时是否自动更新到最新版本（需显式启用） |
+| `ERISPULSE_DASHBOARD_TOKEN` | 空 | Dashboard 登录令牌 |
+| `ERISPULSE_PORT` | `8000` | Dashboard 端口映射 |
+| `TZ` | `Asia/Shanghai` | 容器时区 |
+
+> 启用 `ERISPULSE_UPDATE_ON_START=true` 可确保即使镜像较旧，容器也能在启动时自动获取最新版本。
+
+</details>
+
 ### 使用 pip 安装
 
 ```bash

{erispulse-2.4.3.dev1 → erispulse-2.4.5.dev0}/pyproject.toml

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

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

@@ -16,7 +16,6 @@ from ..console import console
 from ..utils import PackageManager
 from ..base import Command
 
-
 class InitCommand(Command):
     name = "init"
     description = "初始化 ErisPulse 项目"
@@ -62,6 +61,10 @@ class InitCommand(Command):
         :param adapter_list: 需要初始化的适配器列表
         :return: 是否初始化成功
         """
+        if not project_name or not all(c.isalnum() or c in ('_', '-', '.') for c in project_name):
+            console.print("[error]项目名称只能包含字母、数字、下划线、连字符和点号[/]")
+            return False
+
         try:
             project_path = Path(project_name)
             if project_path.exists():
@@ -119,18 +122,7 @@ class InitCommand(Command):
                     f.write("import asyncio\n")
                     f.write("from ErisPulse import sdk\n\n")
                     f.write("async def main():\n")
-                    f.write('    """主程序入口"""\n')
-                    f.write("    # 初始化 SDK\n")
-                    f.write("    await sdk.init()\n\n")
-                    f.write("    # 启动适配器\n")
-                    f.write("    await sdk.adapter.startup()\n\n")
-                    f.write('    print("ErisPulse 已启动，按 Ctrl+C 退出")\n')
-                    f.write("    try:\n")
-                    f.write("        while True:\n")
-                    f.write("            await asyncio.sleep(1)\n")
-                    f.write("    except KeyboardInterrupt:\n")
-                    f.write("        print(\"\\n正在关闭...\")\n")
-                    f.write("        await sdk.adapter.shutdown()\n\n")
+                    f.write("    await sdk.run(keep_running=True)\n\n")
                     f.write("if __name__ == \"__main__\":\n")
                     f.write("    asyncio.run(main())\n")
                 

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

@@ -21,10 +21,10 @@ from ..base import Command
 class InstallCommand(Command):
     name = "install"
     description = "安装模块/适配器包"
-    
+
     def __init__(self):
         self.package_manager = PackageManager()
-    
+
     def add_arguments(self, parser: ArgumentParser):
         parser.add_argument(
             'package',
@@ -161,7 +161,7 @@ class InstallCommand(Command):
             action='store_true',
             help='允许覆盖系统管理的包'
         )
-    
+
     def _build_extra_pip_args(self, args) -> list:
         extra = []
         if getattr(args, 'user', False):
@@ -210,30 +210,30 @@ class InstallCommand(Command):
             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):
         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,
@@ -242,73 +242,66 @@ class InstallCommand(Command):
                     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):
-        """
-        交互式安装界面
-        
-        :param upgrade: 是否升级模式
-        :param pre: 是否包含预发布版本
-        """
         console.print(Panel(
             "[bold cyan]ErisPulse 安装组件[/]\n"
             "选择您要安装的组件类型",
             title="欢迎",
             border_style="cyan"
         ))
-        
-        console.print("[info]正在获取远程包列表...[/]")
-        remote_packages = asyncio.run(self.package_manager.get_remote_packages())
-        console.print("[success]远程包列表获取完成[/]")
-        console.print("")
-        
+
+        with console.status("[bold green]正在获取远程包列表...", spinner="dots"):
+            remote_packages = asyncio.run(self.package_manager.get_remote_packages())
+        console.print("[success]✔ 远程包列表获取完成[/]\n")
+
         while True:
             console.print("[bold cyan]请选择组件类型:[/]")
-            console.print("  1. 适配器")
-            console.print("  2. 模块")
-            console.print("  3. 自定义安装")
-            console.print("  q. 退出")
-            
+            console.print("  [bold]1.[/] 适配器")
+            console.print("  [bold]2.[/] 模块")
+            console.print("  [bold]3.[/] 自定义安装")
+            console.print("  [bold]q.[/] 退出")
+
             choice = Prompt.ask(
-                "\n请输入选项 ",
+                "\n请输入选项",
                 choices=["1", "2", "3", "q"],
                 default="q"
             )
-            
+
             if choice == "q":
                 console.print("[info]退出安装向导[/]")
                 break
-            
+
             elif choice == "1":
                 self._install_adapters(remote_packages, upgrade, pre)
             elif choice == "2":
                 self._install_modules(remote_packages, upgrade, pre)
             elif choice == "3":
                 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", {})
-        
+
         if not adapters:
             console.print("[yellow]没有可用的适配器[/yellow]")
             return
-        
-        table = Table(box=SIMPLE, header_style="adapter")
-        table.add_column("序号", style="cyan")
+
+        table = Table(box=SIMPLE, header_style="adapter", show_lines=False)
+        table.add_column("序号", style="cyan", width=4)
         table.add_column("适配器名", style="adapter")
         table.add_column("包名")
         table.add_column("描述")
-        
+
         adapter_list = list(adapters.items())
         for i, (name, info) in enumerate(adapter_list, 1):
             table.add_row(
@@ -317,20 +310,20 @@ class InstallCommand(Command):
                 info.get("package", ""),
                 info.get("description", "")
             )
-        
+
         console.print(table)
-        
+
         selected = Prompt.ask(
-            "\n[cyan]请输入要安装的适配器序号（多个用逗号分隔，如: 1,3）或按 q 返回:[/cyan]"
+            "\n[cyan]请输入要安装的适配器序号（多个用逗号分隔，如: 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(adapter_list):
                     adapter_name = adapter_list[idx - 1][0]
@@ -338,32 +331,32 @@ class InstallCommand(Command):
                     console.print(f"[green]已选择: {adapter_name}[/]")
                 else:
                     console.print(f"[red]无效的序号: {idx}[/]")
-            
+
             if selected_packages:
                 if Confirm.ask(
                     f"\n[cyan]确认安装以下 {len(selected_packages)} 个适配器吗？[/cyan]",
                     default=True
                 ):
                     self.package_manager.install_package(selected_packages, upgrade=upgrade, pre=pre)
-        
+
         except ValueError:
             console.print("[red]输入格式错误，请输入数字序号[/]")
-    
+
     def _install_modules(self, remote_packages: dict, upgrade: bool, pre: bool):
         console.print("\n[bold]可用的模块:[/bold]")
-        
+
         modules = remote_packages.get("modules", {})
-        
+
         if not modules:
             console.print("[yellow]没有可用的模块[/yellow]")
             return
-        
-        table = Table(box=SIMPLE, header_style="module")
-        table.add_column("序号", style="cyan")
+
+        table = Table(box=SIMPLE, header_style="module", show_lines=False)
+        table.add_column("序号", style="cyan", width=4)
         table.add_column("模块名", style="module")
         table.add_column("包名")
         table.add_column("描述")
-        
+
         module_list = list(modules.items())
         for i, (name, info) in enumerate(module_list, 1):
             table.add_row(
@@ -372,20 +365,20 @@ class InstallCommand(Command):
                 info.get("package", ""),
                 info.get("description", "")
             )
-        
+
         console.print(table)
-        
+
         selected = Prompt.ask(
-            "\n[cyan]请输入要安装的模块序号（多个用逗号分隔，如: 1,3）或按 q 返回:[/cyan]"
+            "\n[cyan]请输入要安装的模块序号（多个用逗号分隔，如: 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(module_list):
                     module_name = module_list[idx - 1][0]
@@ -393,25 +386,25 @@ class InstallCommand(Command):
                     console.print(f"[green]已选择: {module_name}[/]")
                 else:
                     console.print(f"[red]无效的序号: {idx}[/]")
-            
+
             if selected_packages:
                 if Confirm.ask(
                     f"\n[cyan]确认安装以下 {len(selected_packages)} 个模块吗？[/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]"
+            "\n[cyan]请输入要安装的包名（或按 q 返回）[/cyan]"
         )
-        
+
         if package_name.lower() == 'q':
             return
-        
+
         if package_name:
             if Confirm.ask(
                 f"\n[cyan]确认安装包 {package_name} 吗？[/cyan]",

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

@@ -31,12 +31,6 @@ class InstallCommand(Command):
     def execute(self: object, args: ...) -> ...:
         ...
     def _interactive_install(self: object, upgrade: bool = ..., pre: bool = ...) -> ...:
-        """
-        交互式安装界面
-        
-        :param upgrade: 是否升级模式
-        :param pre: 是否包含预发布版本
-        """
         ...
     def _install_adapters(self: object, remote_packages: dict, upgrade: bool, pre: bool) -> ...:
         ...

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

@@ -5,16 +5,26 @@ Run 命令实现
 """
 
 import os
+import sys
 import time
 import asyncio
+import subprocess
+import runpy
 from argparse import ArgumentParser
-from watchdog.observers import Observer
 from rich.panel import Panel
-from watchdog.events import FileSystemEventHandler
 
 from ..console import console
 from ..base import Command
 
+try:
+    from watchdog.observers import Observer
+    from watchdog.events import FileSystemEventHandler
+    _WATCHDOG_AVAILABLE = True
+except ImportError:
+    _WATCHDOG_AVAILABLE = False
+    Observer = None
+    FileSystemEventHandler = object
+
 
 class ReloadHandler(FileSystemEventHandler):
     """
@@ -82,6 +92,10 @@ class RunCommand(Command):
         script = args.script
         reload_mode = args.reload
         
+        if reload_mode and not _WATCHDOG_AVAILABLE:
+            console.print("[error]热重载需要 watchdog 库，请运行: pip install watchdog[/]")
+            reload_mode = False
+        
         if script:
             if not os.path.exists(script):
                 console.print(f"[error]脚本 [path]{script}[/] 不存在[/]")
@@ -114,27 +128,62 @@ class RunCommand(Command):
                 self._observer.join()
 
     def _run_script(self, script_path: str, reload_mode: bool):
-        """
-        运行指定脚本文件
-        """
-        async def _run():
-            from ... import sdk
+        script_path_abs = os.path.abspath(script_path)
 
-            if reload_mode:
-                loop = asyncio.get_running_loop()
-                watch_dir = os.path.dirname(os.path.abspath(script_path))
-                self._setup_watchdog(watch_dir, loop)
+        if reload_mode:
+            self._run_script_with_reload(script_path_abs)
+        else:
+            try:
+                runpy.run_path(script_path_abs, run_name="__main__")
+            except SystemExit:
+                pass
+            except KeyboardInterrupt:
+                pass
+
+    def _run_script_with_reload(self, script_path_abs: str):
+        watch_dir = os.path.dirname(script_path_abs)
+
+        process = subprocess.Popen([sys.executable, script_path_abs])
+
+        reload_state = {
+            "process": process,
+            "last_reload": 0.0,
+        }
+
+        class _ScriptReloadHandler(FileSystemEventHandler):
+            def on_modified(self, event):
+                now = time.time()
+                if now - reload_state["last_reload"] < 1.0:
+                    return
+                if event.src_path.endswith(".py"):
+                    reload_state["last_reload"] = now
+                    console.print(f"检测到文件变更 ({os.path.basename(event.src_path)})，正在重启...")
+                    reload_state["process"].terminate()
+                    reload_state["process"].wait()
+                    reload_state["process"] = subprocess.Popen([sys.executable, script_path_abs])
+
+        observer = Observer()
+        observer.schedule(_ScriptReloadHandler(), watch_dir, recursive=True)
+        observer.start()
 
-            await sdk.run(keep_running=True)
+        console.print(Panel(
+            f"[bold]开发重载模式[/]\n监控目录: [path]{watch_dir}[/]",
+            title="热重载已启动",
+            border_style="info"
+        ))
 
         try:
-            asyncio.run(_run())
+            while True:
+                proc = reload_state["process"]
+                proc.wait()
+                time.sleep(0.3)
+                if reload_state["process"] is proc:
+                    break
         except KeyboardInterrupt:
-            pass
+            reload_state["process"].terminate()
         finally:
-            if reload_mode and hasattr(self, '_observer'):
-                self._observer.stop()
-                self._observer.join()
+            observer.stop()
+            observer.join()
 
     def _setup_watchdog(self, watch_dir: str, loop: asyncio.AbstractEventLoop):
         if not os.path.exists(watch_dir):

{erispulse-2.4.3.dev1 → erispulse-2.4.5.dev0}/src/ErisPulse/CLI/commands/run.pyi

@@ -11,12 +11,13 @@ Run 命令实现
 """
 
 import os
+import sys
 import time
 import asyncio
+import subprocess
+import runpy
 from argparse import ArgumentParser
-from watchdog.observers import Observer
 from rich.panel import Panel
-from watchdog.events import FileSystemEventHandler
 from ..console import console
 from ..base import Command
 
@@ -55,9 +56,8 @@ class RunCommand(Command):
         """
         ...
     def _run_script(self: object, script_path: str, reload_mode: bool) -> ...:
-        """
-        运行指定脚本文件
-        """
+        ...
+    def _run_script_with_reload(self: object, script_path_abs: str) -> ...:
         ...
     def _setup_watchdog(self: object, watch_dir: str, loop: asyncio.AbstractEventLoop) -> ...:
         ...

{erispulse-2.4.3.dev1 → erispulse-2.4.5.dev0}/src/ErisPulse/CLI/console.py

@@ -39,7 +39,6 @@ theme = Theme({
 console = Console(
     theme=theme, 
     color_system="auto", 
-    force_terminal=True,
     highlighter=CommandHighlighter()
 )