ErisPulse 2.8.5__tar.gz → 2.9.0.dev1__tar.gz

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/.gitignore

@@ -5,7 +5,6 @@ plugins/
 venvs
 config.full.example
 config.toml
-uv.lock
 snapshots/
 logs/
 config.db*
@@ -239,3 +238,5 @@ pyvenv.cfg
 
 # 但保留源中文文档
 !docs/zh-CN/
+
+.zcode/

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ErisPulse
-Version: 2.8.5
+Version: 2.9.0-dev.1
 Summary: Event-driven modular async bot framework — write once, deploy to any platform | 事件驱动的模块化异步机器人框架，一次编写，多平台部署
 Project-URL: Homepage, https://github.com/ErisPulse/ErisPulse
 Project-URL: Documentation, https://www.erisdev.com#docs
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
@@ -33,7 +34,7 @@ Requires-Dist: aiosqlite>=0.20.0
 Requires-Dist: fastapi>=0.116.1
 Requires-Dist: rich>=13.0.0
 Requires-Dist: tomlkit>=0.15.1
-Requires-Dist: uvicorn>=0.30.0
+Requires-Dist: uvicorn>=0.35.0
 Requires-Dist: websockets>=12.0
 Provides-Extra: mysql
 Requires-Dist: aiomysql>=0.2.0; extra == 'mysql'
@@ -42,9 +43,9 @@ Requires-Dist: asyncpg>=0.29.0; extra == 'postgres'
 Provides-Extra: test
 Requires-Dist: httpx>=0.24.0; extra == 'test'
 Requires-Dist: pytest-asyncio>=0.21.0; extra == 'test'
-Requires-Dist: pytest-benchmark>=4.0.0; extra == 'test'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'test'
 Requires-Dist: pytest-mock>=3.10.0; extra == 'test'
+Requires-Dist: pytest-timeout>=2.1.0; extra == 'test'
 Requires-Dist: pytest-xdist>=3.0.0; extra == 'test'
 Requires-Dist: pytest>=7.0.0; extra == 'test'
 Description-Content-Type: text/markdown

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ErisPulse"
-version = "2.8.5"
+version = "2.9.0-dev.1"
 description = "Event-driven modular async bot framework — write once, deploy to any platform | 事件驱动的模块化异步机器人框架，一次编写，多平台部署"
 readme = "README.pypi.md"
 requires-python = ">=3.10"
@@ -51,6 +51,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3 :: Only",
     "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -66,7 +67,7 @@ dependencies = [
     "websockets>=12.0",
     "aiohttp>=3.9.0",
     "fastapi>=0.116.1",
-    "uvicorn>=0.30.0",
+    "uvicorn>=0.35.0",
     # storage 相关（默认 SQLite 后端异步驱动，开箱即用）
     "aiosqlite>=0.20.0",
 ]
@@ -92,12 +93,14 @@ test = [
     "pytest-cov>=4.0.0",
     "pytest-asyncio>=0.21.0",
     "pytest-xdist>=3.0.0",
+    "pytest-timeout>=2.1.0",
     "pytest-mock>=3.10.0",
-    "pytest-benchmark>=4.0.0",
     "httpx>=0.24.0",
 ]
 
 [dependency-groups]
+# 测试依赖统一维护于 [project.optional-dependencies].test（公开 extras，
+# 生态可 pip install ErisPulse[test]）；此处的 test 组已删除以免双处漂移。
 dev = [
     "pyclean>=3.6.0",
     "ruff>=0.1.7",
@@ -105,6 +108,9 @@ dev = [
     "typing_extensions>=4.7.0; python_version < '3.11'",
 ]
 
+[tool.uv]
+default-groups = ["dev"]
+
 [project.scripts]
 ep-init = "ErisPulse.__init__:init_sync"
 epsdk = "ErisPulse.__main__:main"
@@ -130,7 +136,7 @@ include = [
 target-version = "py310"
 line-length = 120
 
-include = ["src/**/*.py", "tests/**/*.py"]
+include = ["src/**/*.py", "tests/**/*.py", "scripts/**/*.py", "examples/**/*.py"]
 
 extend-exclude = [
     "__pycache__",
@@ -168,6 +174,7 @@ ignore = [
     "RUF003",  # ambiguous-unicode-character-comment
 
     # 框架/异步代码风格性规则（强行修会破坏 API 或语义）
+    "B008",     # function-call-in-default-argument —— 依赖注入（Depends）声明的标准形态，DI 框架惯例豁免
     "PLC0415",  # import-outside-top-level —— 异步框架中 lazy import 是常用且必要的模式
     "PLR0911",  # too-many-return-statements
     "PLR0912",  # too-many-branches
@@ -208,6 +215,13 @@ ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "PLC0415", "I001"]  # 导出式 __init__ 经常按需导入
+# 旧版生成/翻译脚本：存量风格债渐进收编（新脚本 check_i18n_locales/check_docs_links/
+# release_check/_common 已全净）。TODO: 逐步修复后移除本段。
+"scripts/tools/translate-docs.py" = ["PERF401", "PTH", "UP035", "B", "RET505", "FURB", "RUF013", "UP008", "A001", "SIM"]
+"scripts/tools/check-translation.py" = ["PERF401", "PTH", "UP035", "B", "RET505", "FURB", "RUF013", "SIM"]
+"scripts/tools/generate-api-docs.py" = ["PERF401", "PTH", "UP035", "B", "RET505", "FURB", "RUF013", "A001", "SIM", "W29", "E501"]
+"scripts/tools/generate-docs-index.py" = ["PERF401", "PTH", "UP035", "B", "RET505", "FURB", "RUF013", "RUF015", "SIM"]
+"scripts/tools/generate-type-stubs.py" = ["PERF401", "PTH", "UP035", "B", "RET505", "FURB", "RUF013", "ANN", "A001", "PLW0603", "SIM", "W29"]
 "tests/**/*.py" = [
     # 断言/夹具相关（测试代码天然模式）
     "S101", "PLR2004", "SLF001", "ARG", "ANN", "PTH",
@@ -282,6 +296,8 @@ python_classes = "Test*"
 python_functions = "test_*"
 minversion = "7.0"
 addopts = [
+        "--timeout=120",
+        "--timeout-method=thread",
     "-v",
     "--strict-markers",
     "--strict-config",

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/src/ErisPulse/CLI/commands/create.py

@@ -219,6 +219,8 @@ class Main(BaseModule):
         # 跨命令的用户黑白名单用覆写系统 ACL
         # （ErisPulse.event.overrides.acl 或 overrides.acl.set(name, allow/deny)，命令名支持 glob）；
         # 模块级可用性 / 事件准入 / 出站限制由作用域 scope 管理（用户可控）
+        # 命令支持声明式参数与选项（args= / options=）：框架自动解析并按名注入处理器参数，
+        # 用户输入错误自动回复本地化提示与用法（类型：str/int/float/bool/literal/duration/rest）
         @command(\"hello\", help=i18n.t(\"module.{name}.command.hello.help\"))
         async def hello_command(event: Event):
             await event.reply(i18n.t(\"module.{name}.command.hello.reply\"))

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/src/ErisPulse/CLI/commands/run.py

@@ -19,7 +19,13 @@ from rich.panel import Panel
 from ...runtime.file_watcher import FileSystemEventHandler, PollingObserver
 from ..base import Command
 from ..console import console
-from ..constants import ENV_SUPERVISED, HARD_RESTART_EXIT_CODE
+from ..constants import (
+    ENV_SUPERVISED,
+    HARD_RESTART_EXIT_CODE,
+    RUN_CRASH_BACKOFF_MAX_SECS,
+    RUN_CRASH_BACKOFF_PER_CRASH_SECS,
+    RUN_RESTART_PAUSE_SECS,
+)
 from ..i18n import i18n
 from ..utils.package_manager import (
     resolve_target_python,
@@ -152,7 +158,6 @@ class RunCommand(Command):
             self._run_internal(reload_mode)
 
     _RESTART_EXIT_CODE = HARD_RESTART_EXIT_CODE
-    _MAX_CRASH_BACKOFF = 60.0
 
     def _run_internal(self, reload_mode: bool):
         """
@@ -213,7 +218,7 @@ class RunCommand(Command):
                 if process.returncode == self._RESTART_EXIT_CODE:
                     console.print(f"[info]{i18n.t('cli.run.restart_request')}[/]")
                     crash_count = 0
-                    time.sleep(0.5)
+                    time.sleep(RUN_RESTART_PAUSE_SECS)
                     continue
 
                 if process.returncode == 0:
@@ -224,7 +229,7 @@ class RunCommand(Command):
                 # 非硬重启/非正常退出码：模块/适配器内部错误导致子进程异常终止
                 # 不退出主进程，等待后自动重试
                 crash_count += 1
-                backoff = min(self._MAX_CRASH_BACKOFF, 3.0 * crash_count)
+                backoff = min(RUN_CRASH_BACKOFF_MAX_SECS, RUN_CRASH_BACKOFF_PER_CRASH_SECS * crash_count)
                 console.print(
                     f"[warning]{i18n.t('cli.run.process_crashed', code=process.returncode)}[/]"
                 )

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/src/ErisPulse/CLI/constants.py

@@ -43,8 +43,19 @@ ADAPTER_ENTRY_POINT_GROUP: str = "erispulse.adapter"
 # PyPI JSON API URL 模板（仅 CLI 做包查询 / 自更新检查时使用）。
 PYPI_PACKAGE_JSON_URL_TEMPLATE: str = "https://pypi.org/pypi/{package}/json"
 
+# run 命令子进程监督的退避参数。
+# 使用位置: CLI/commands/run.py -> 监督循环。
+# 修改影响: 每次崩溃的重试间隔 = min(MAX, PER_CRASH x 崩溃次数)；
+#           RESTART_PAUSE 为硬重启请求后的短暂停顿（让端口等资源释放）。
+RUN_CRASH_BACKOFF_MAX_SECS: float = 60.0
+RUN_CRASH_BACKOFF_PER_CRASH_SECS: float = 3.0
+RUN_RESTART_PAUSE_SECS: float = 0.5
+
 __all__ = [
     "ADAPTER_ENTRY_POINT_GROUP",
+    "RUN_CRASH_BACKOFF_MAX_SECS",
+    "RUN_CRASH_BACKOFF_PER_CRASH_SECS",
+    "RUN_RESTART_PAUSE_SECS",
     "ENV_SUPERVISED",
     "HARD_RESTART_EXIT_CODE",
     "MODULE_ENTRY_POINT_GROUP",

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/src/ErisPulse/CLI/utils/package_manager.py

@@ -1711,15 +1711,18 @@ def append_pyproject_dependencies(project_dir: Path, packages: "list[str]") -> b
     :return: 是否成功（pyproject 不存在 / 解析失败返回 False）
     """
     import tomlkit
-    import tomllib
 
     pyproject = Path(project_dir) / "pyproject.toml"
     if not pyproject.exists():
         return False
     try:
-        with pyproject.open("rb") as f:
-            doc = tomllib.load(f)
-        deps: list = doc.get("project", {}).get("dependencies", [])
+        # tomlkit 解析保留注释与格式（其文档为 dict 子类，get 行为与
+        # tomllib 一致；不用 tomllib——它是 Python 3.11+ 标准库）
+        doc_kit = tomlkit.parse(pyproject.read_text(encoding="utf-8"))
+        proj = doc_kit.get("project")
+        if proj is None:
+            return False
+        deps: list = proj.get("dependencies", [])
         added = False
         for pkg in packages:
             if not any(str(d).split("[;")[0].split("==")[0].split(">=")[0].strip().lower() == pkg.lower() for d in deps):
@@ -1727,11 +1730,6 @@ def append_pyproject_dependencies(project_dir: Path, packages: "list[str]") -> b
                 added = True
         if not added:
             return True
-        # tomllib 读的是普通 dict——用 tomlkit 重新解析原文件以保留格式后写回
-        doc_kit = tomlkit.parse(pyproject.read_text(encoding="utf-8"))
-        proj = doc_kit.get("project")
-        if proj is None:
-            return False
         proj["dependencies"] = deps
         pyproject.write_text(tomlkit.dumps(doc_kit), encoding="utf-8")
         return True
@@ -1848,8 +1846,6 @@ def warn_if_uv_isolated() -> bool:
 
     :return: 是否处于隔离场景（True = 已输出警告）
     """
-    import tomllib
-
     if "UV" not in os.environ:
         return False
     if Path("pyproject.toml").exists():
@@ -1859,7 +1855,6 @@ def warn_if_uv_isolated() -> bool:
         + i18n.t("cli.uv.isolated_warning")
         + "[/]"
     )
-    _ = tomllib  # 保留显式依赖提示位（pyproject 探测未来可深化）
     return True
 
 

{erispulse-2.8.5 → erispulse-2.9.0.dev1}/src/ErisPulse/Core/Bases/__init__.py

@@ -44,6 +44,7 @@ from .config_schema import (
     BotAccountConfig,
     I18nConfig,
 )
+from .model import BaseModel, ColumnExpr, Condition, Field, Model, QuerySet, relationship
 from .i18n_schema import (
     BaseI18n,
     I18nKey,
@@ -63,6 +64,7 @@ __all__ = [
     "BaseHttpResponse",
     # i18n 键声明 Schema 基类（命名对齐 BaseConfig）
     "BaseI18n",
+    "BaseModel",
     "BaseModule",
     "BaseQueryBuilder",
     "BaseStorage",
@@ -71,7 +73,10 @@ __all__ = [
     "ClientConnectionError",
     "ClientError",
     "ClientTimeoutError",
+    "Condition",
+    "ColumnExpr",
     "ErisPulseError",
+    "Field",
     "HTTPStatusError",
     "HttpRequest",
     # i18n 配置 Schema（控制显示语言）
@@ -82,11 +87,14 @@ __all__ = [
     "InteractionCancelled",
     "InteractionError",
     "KVQueryBuilder",
+    "Model",
     "ModuleCallError",
     "ModuleCallTimeoutError",
     "ModuleError",
     "ModuleMeta",
     "ModuleNotAvailableError",
+    "QuerySet",
+    "relationship",
     "RequestDSL",
     "SendBuilder",
     "SendContext",