ErisPulse 2.4.3.dev1__tar.gz → 2.4.4__tar.gz

{erispulse-2.4.3.dev1 → erispulse-2.4.4}/PKG-INFO

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

{erispulse-2.4.3.dev1 → erispulse-2.4.4}/pyproject.toml

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

{erispulse-2.4.3.dev1 → erispulse-2.4.4}/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 项目"
@@ -119,18 +118,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.4}/src/ErisPulse/CLI/commands/run.py

@@ -5,8 +5,11 @@ 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
@@ -114,27 +117,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.4}/src/ErisPulse/CLI/commands/run.pyi

@@ -11,8 +11,11 @@ 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
@@ -55,9 +58,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.4}/src/ErisPulse/Core/logger.py

@@ -120,7 +120,7 @@ class Logger:
             try:
                 self._file_handler = logging.FileHandler(p, encoding="utf-8")
                 # 使用自定义格式化器去除rich markup标签
-                self._file_handler.setFormatter(logging.Formatter("[%(name)s] %(message)s"))
+                self._file_handler.setFormatter(logging.Formatter("%(message)s"))
                 self._logger.addHandler(self._file_handler)
                 return True
             except Exception as e:

{erispulse-2.4.3.dev1 → erispulse-2.4.4}/src/ErisPulse/sdk.py

@@ -646,6 +646,8 @@ class SDK:
             if keep_running:
                 # 保持程序运行
                 await asyncio.Event().wait()
+        except asyncio.CancelledError:
+            logger.info("收到关闭信号，正在清理...")
         except Exception as e:
             logger.error(e)
         finally: