ErisPulse 2.4.3.dev0__tar.gz → 2.4.4__tar.gz

{erispulse-2.4.3.dev0 → erispulse-2.4.4}/.gitignore

@@ -5,6 +5,7 @@ venvs
 config.toml
 uv.lock
 snapshots/
+logs/
 config.db*
 .website
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.4.3.dev0
+Version: 2.4.4
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: ErisDev <erisdev@88.com>
 Maintainer-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
@@ -48,7 +48,7 @@ Requires-Dist: packaging>=25.0
 Requires-Dist: pip>=23.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: toml>=0.10.2
-Requires-Dist: uvicorn>=0.30.0
+Requires-Dist: uvicorn[standard]>=0.30.0
 Requires-Dist: watchdog>=4.0.0
 Provides-Extra: dev
 Requires-Dist: httpx>=0.24.0; extra == 'dev'
@@ -88,11 +88,10 @@ Description-Content-Type: text/markdown
 **事件驱动的多平台机器人开发框架**
 
 [![PyPI](https://img.shields.io/pypi/v/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
-[![Docker Pulls](https://img.shields.io/docker/pulls/erispulse/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
-[![Docker Pulls](https://img.shields.io/docker/pulls/wsu2059/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
-[![Docker Version](https://img.shields.io/docker/v/erispulse/erispulse?style=flat-square&logo=docker&label=docker)](https://hub.docker.com/r/erispulse/erispulse)
+[![Docker](https://img.shields.io/badge/Docker-2496ED?style=flat-square&logo=docker&logoColor=white)](https://hub.docker.com/r/erispulse/erispulse)
+[![Python](https://img.shields.io/badge/Python-3.10+-3776AB?style=flat-square&logo=python&logoColor=white)](https://pypi.org/project/ErisPulse/)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Socket Badge](https://socket.dev/api/badge/pypi/package/ErisPulse/latest)](https://socket.dev/pypi/package/ErisPulse)
 
 </td>
 </tr>
@@ -118,16 +117,16 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 
 | 适配器 | 说明 |
 |--------|------|
-| <img src=".github/assets/adapter_logo/kook.svg" width="20" /> [Kook](https://github.com/shanfishapp/ErisPulse-KookAdapter) | Kook（开黑啦）即时通讯平台 |
-| <img src=".github/assets/adapter_logo/matrix.svg" width="20" /> [Matrix](https://github.com/ErisPulse/ErisPulse-MatrixAdapter) | Matrix 去中心化通讯协议 |
-| <img src=".github/assets/adapter_logo/onebot.png" width="20" /> [OneBot11](https://github.com/ErisPulse/ErisPulse-OneBot11Adapter) | OneBot v11 通用机器人协议 |
-| <img src=".github/assets/adapter_logo/onebot.png" width="20" /> [OneBot12](https://github.com/ErisPulse/ErisPulse-OneBot12Adapter) | OneBot v12 标准协议 |
-| <img src=".github/assets/adapter_logo/qqbot.svg" width="20" /> [QQ](https://github.com/ErisPulse/ErisPulse-QQBotAdapter) | QQ 官方机器人平台 |
-| <img src=".github/assets/adapter_logo/sandbox.png" width="20" /> [沙箱](https://github.com/ErisPulse/ErisPulse-SandboxAdapter) | 网页端调试，无需接入真实平台 |
-| <img src=".github/assets/adapter_logo/telegram.svg" width="20" /> [Telegram](https://github.com/ErisPulse/ErisPulse-TelegramAdapter) | 全球性即时通讯平台 |
-| <img src=".github/assets/adapter_logo/email.svg" width="20" /> [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) | 邮件协议收发适配器 |
-| <img src=".github/assets/adapter_logo/yunhu.png" width="20" /> [云湖](https://github.com/ErisPulse/ErisPulse-YunhuAdapter) | 企业级即时通讯平台（机器人接入） |
-| <img src=".github/assets/adapter_logo/yunhu.png" width="20" /> [云湖用户](https://github.com/wsu2059q/ErisPulse-YunhuUserAdapter) | 基于云湖用户协议的接入适配器 |
+| [Kook](https://github.com/shanfishapp/ErisPulse-KookAdapter) | Kook（开黑啦）即时通讯平台 |
+| [Matrix](https://github.com/ErisPulse/ErisPulse-MatrixAdapter) | Matrix 去中心化通讯协议 |
+| [OneBot11](https://github.com/ErisPulse/ErisPulse-OneBot11Adapter) | OneBot v11 通用机器人协议 |
+| [OneBot12](https://github.com/ErisPulse/ErisPulse-OneBot12Adapter) | OneBot v12 标准协议 |
+| [QQ](https://github.com/ErisPulse/ErisPulse-QQBotAdapter) | QQ 官方机器人平台 |
+| [沙箱](https://github.com/ErisPulse/ErisPulse-SandboxAdapter) | 网页端调试，无需接入真实平台 |
+| [Telegram](https://github.com/ErisPulse/ErisPulse-TelegramAdapter) | 全球性即时通讯平台 |
+| [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) | 邮件协议收发适配器 |
+| [云湖](https://github.com/ErisPulse/ErisPulse-YunhuAdapter) | 企业级即时通讯平台（机器人接入） |
+| [云湖用户](https://github.com/wsu2059q/ErisPulse-YunhuUserAdapter) | 基于云湖用户协议的接入适配器 |
 
 查看 [适配器详情介绍](docs/zh-CN/platform-guide/README.md)
 
@@ -139,6 +138,22 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 docker pull erispulse/erispulse:latest
 ```
 
+<details>
+<summary>Docker Hub不可用？</summary>
+
+如果 Docker Hub 无法访问，可以使用 GitHub Container Registry：
+
+```bash
+docker pull ghcr.io/erispulse/erispulse:latest
+```
+
+使用 ghcr.io 镜像时，需要修改 `docker-compose.yml` 中的 image：
+```yaml
+image: ghcr.io/erispulse/erispulse:latest
+```
+
+</details>
+
 <details>
 <summary>快速启动</summary>
 
@@ -152,9 +167,9 @@ ERISPULSE_DASHBOARD_TOKEN=your-token docker compose up -d
 
 > 镜像内置 ErisPulse 框架和 Dashboard 管理面板，支持 `linux/amd64` 和 `linux/arm64` 架构。
 
-</details>
+启动后访问 `http://<host>:<port>/Dashboard`，使用设置的令牌作为密码登录 Dashboard 管理面板。
 
-启动后访问 `http://localhost:8000/Dashboard`，使用设置的令牌作为密码登录 Dashboard 管理面板。
+</details>
 
 ### 使用 pip 安装
 

{erispulse-2.4.3.dev0 → erispulse-2.4.4}/README.md

@@ -16,11 +16,10 @@
 **事件驱动的多平台机器人开发框架**
 
 [![PyPI](https://img.shields.io/pypi/v/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/ErisPulse?style=flat-square)](https://pypi.org/project/ErisPulse/)
-[![Docker Pulls](https://img.shields.io/docker/pulls/erispulse/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
-[![Docker Pulls](https://img.shields.io/docker/pulls/wsu2059/erispulse?style=flat-square&logo=docker&label=pulls)](https://hub.docker.com/r/erispulse/erispulse)
-[![Docker Version](https://img.shields.io/docker/v/erispulse/erispulse?style=flat-square&logo=docker&label=docker)](https://hub.docker.com/r/erispulse/erispulse)
+[![Docker](https://img.shields.io/badge/Docker-2496ED?style=flat-square&logo=docker&logoColor=white)](https://hub.docker.com/r/erispulse/erispulse)
+[![Python](https://img.shields.io/badge/Python-3.10+-3776AB?style=flat-square&logo=python&logoColor=white)](https://pypi.org/project/ErisPulse/)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Socket Badge](https://socket.dev/api/badge/pypi/package/ErisPulse/latest)](https://socket.dev/pypi/package/ErisPulse)
 
 </td>
 </tr>
@@ -46,16 +45,16 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 
 | 适配器 | 说明 |
 |--------|------|
-| <img src=".github/assets/adapter_logo/kook.svg" width="20" /> [Kook](https://github.com/shanfishapp/ErisPulse-KookAdapter) | Kook（开黑啦）即时通讯平台 |
-| <img src=".github/assets/adapter_logo/matrix.svg" width="20" /> [Matrix](https://github.com/ErisPulse/ErisPulse-MatrixAdapter) | Matrix 去中心化通讯协议 |
-| <img src=".github/assets/adapter_logo/onebot.png" width="20" /> [OneBot11](https://github.com/ErisPulse/ErisPulse-OneBot11Adapter) | OneBot v11 通用机器人协议 |
-| <img src=".github/assets/adapter_logo/onebot.png" width="20" /> [OneBot12](https://github.com/ErisPulse/ErisPulse-OneBot12Adapter) | OneBot v12 标准协议 |
-| <img src=".github/assets/adapter_logo/qqbot.svg" width="20" /> [QQ](https://github.com/ErisPulse/ErisPulse-QQBotAdapter) | QQ 官方机器人平台 |
-| <img src=".github/assets/adapter_logo/sandbox.png" width="20" /> [沙箱](https://github.com/ErisPulse/ErisPulse-SandboxAdapter) | 网页端调试，无需接入真实平台 |
-| <img src=".github/assets/adapter_logo/telegram.svg" width="20" /> [Telegram](https://github.com/ErisPulse/ErisPulse-TelegramAdapter) | 全球性即时通讯平台 |
-| <img src=".github/assets/adapter_logo/email.svg" width="20" /> [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) | 邮件协议收发适配器 |
-| <img src=".github/assets/adapter_logo/yunhu.png" width="20" /> [云湖](https://github.com/ErisPulse/ErisPulse-YunhuAdapter) | 企业级即时通讯平台（机器人接入） |
-| <img src=".github/assets/adapter_logo/yunhu.png" width="20" /> [云湖用户](https://github.com/wsu2059q/ErisPulse-YunhuUserAdapter) | 基于云湖用户协议的接入适配器 |
+| [Kook](https://github.com/shanfishapp/ErisPulse-KookAdapter) | Kook（开黑啦）即时通讯平台 |
+| [Matrix](https://github.com/ErisPulse/ErisPulse-MatrixAdapter) | Matrix 去中心化通讯协议 |
+| [OneBot11](https://github.com/ErisPulse/ErisPulse-OneBot11Adapter) | OneBot v11 通用机器人协议 |
+| [OneBot12](https://github.com/ErisPulse/ErisPulse-OneBot12Adapter) | OneBot v12 标准协议 |
+| [QQ](https://github.com/ErisPulse/ErisPulse-QQBotAdapter) | QQ 官方机器人平台 |
+| [沙箱](https://github.com/ErisPulse/ErisPulse-SandboxAdapter) | 网页端调试，无需接入真实平台 |
+| [Telegram](https://github.com/ErisPulse/ErisPulse-TelegramAdapter) | 全球性即时通讯平台 |
+| [邮件](https://github.com/ErisPulse/ErisPulse-EmailAdapter) | 邮件协议收发适配器 |
+| [云湖](https://github.com/ErisPulse/ErisPulse-YunhuAdapter) | 企业级即时通讯平台（机器人接入） |
+| [云湖用户](https://github.com/wsu2059q/ErisPulse-YunhuUserAdapter) | 基于云湖用户协议的接入适配器 |
 
 查看 [适配器详情介绍](docs/zh-CN/platform-guide/README.md)
 
@@ -67,6 +66,22 @@ ErisPulse 是一个基于 Python 的事件驱动型多平台机器人开发框
 docker pull erispulse/erispulse:latest
 ```
 
+<details>
+<summary>Docker Hub不可用？</summary>
+
+如果 Docker Hub 无法访问，可以使用 GitHub Container Registry：
+
+```bash
+docker pull ghcr.io/erispulse/erispulse:latest
+```
+
+使用 ghcr.io 镜像时，需要修改 `docker-compose.yml` 中的 image：
+```yaml
+image: ghcr.io/erispulse/erispulse:latest
+```
+
+</details>
+
 <details>
 <summary>快速启动</summary>
 
@@ -80,9 +95,9 @@ ERISPULSE_DASHBOARD_TOKEN=your-token docker compose up -d
 
 > 镜像内置 ErisPulse 框架和 Dashboard 管理面板，支持 `linux/amd64` 和 `linux/arm64` 架构。
 
-</details>
+启动后访问 `http://<host>:<port>/Dashboard`，使用设置的令牌作为密码登录 Dashboard 管理面板。
 
-启动后访问 `http://localhost:8000/Dashboard`，使用设置的令牌作为密码登录 Dashboard 管理面板。
+</details>
 
 ### 使用 pip 安装
 

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

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

{erispulse-2.4.3.dev0 → 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.dev0 → 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.dev0 → 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.4/src/ErisPulse/Core/Bases/__init__.py

@@ -0,0 +1,17 @@
+"""
+ErisPulse 基础模块
+ 
+提供平台适配器、模块和存储后端的基类
+"""
+ 
+from .adapter import SendDSL, BaseAdapter
+from .module import BaseModule
+from .storage import BaseStorage, BaseQueryBuilder
+ 
+__all__ = [
+    "BaseAdapter",
+    "SendDSL",
+    "BaseModule",
+    "BaseStorage",
+    "BaseQueryBuilder",
+]

{erispulse-2.4.3.dev0 → erispulse-2.4.4}/src/ErisPulse/Core/Bases/__init__.pyi

@@ -6,9 +6,10 @@
 
 """
 ErisPulse 基础模块
-
-提供平台适配器以及模块的基类
+ 
+提供平台适配器、模块和存储后端的基类
 """
 
 from .adapter import SendDSL, BaseAdapter
 from .module import BaseModule
+from .storage import BaseStorage, BaseQueryBuilder