ErisPulse 2.12.0__tar.gz → 2.12.1.dev0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (155) hide show
  1. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/PKG-INFO +1 -1
  2. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/pyproject.toml +4 -3
  3. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/utils/scaffold_text.py +4 -0
  4. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/kv_builder.py +3 -3
  5. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/model.py +118 -44
  6. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/sql_base.py +6 -6
  7. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/storage.py +137 -33
  8. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/wrapper.py +2 -12
  9. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/adapter.py +115 -8
  10. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/constants.py +26 -0
  11. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/locales/en.py +6 -1
  12. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/locales/ja.py +6 -1
  13. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/locales/ru.py +6 -1
  14. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/locales/zh_cn.py +6 -1
  15. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/locales/zh_tw.py +6 -1
  16. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/scope.py +22 -0
  17. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/storage/__init__.py +3 -3
  18. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/storage/sqlite.py +46 -11
  19. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/example_config.py +4 -1
  20. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/frame_config.py +12 -0
  21. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/sdk.py +1 -1
  22. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/.gitignore +0 -0
  23. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/LICENSE +0 -0
  24. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/README.pypi.md +0 -0
  25. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/__init__.py +0 -0
  26. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/base.py +0 -0
  27. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/cli.py +0 -0
  28. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/__init__.py +0 -0
  29. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/config.py +0 -0
  30. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/create.py +0 -0
  31. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/doctor.py +0 -0
  32. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/init.py +0 -0
  33. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/install.py +0 -0
  34. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/language.py +0 -0
  35. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/list.py +0 -0
  36. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/list_remote.py +0 -0
  37. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/run.py +0 -0
  38. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/runtime.py +0 -0
  39. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/self_update.py +0 -0
  40. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/types.py +0 -0
  41. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/uninstall.py +0 -0
  42. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/upgrade.py +0 -0
  43. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/commands/version.py +0 -0
  44. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/console.py +0 -0
  45. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/constants.py +0 -0
  46. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/hints.py +0 -0
  47. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/i18n/__init__.py +0 -0
  48. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/i18n/locales/__init__.py +0 -0
  49. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/i18n/locales/en.py +0 -0
  50. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/i18n/locales/ja.py +0 -0
  51. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/i18n/locales/ru.py +0 -0
  52. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/i18n/locales/zh_cn.py +0 -0
  53. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/i18n/locales/zh_tw.py +0 -0
  54. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/registry.py +0 -0
  55. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/utils/__init__.py +0 -0
  56. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/utils/config_wizard.py +0 -0
  57. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/utils/display.py +0 -0
  58. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/utils/interactive.py +0 -0
  59. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/utils/package_manager.py +0 -0
  60. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/CLI/utils/runtime_state.py +0 -0
  61. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/__init__.py +0 -0
  62. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/adapter.py +0 -0
  63. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/adapter_patterns.py +0 -0
  64. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/api_dsl.py +0 -0
  65. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/client.py +0 -0
  66. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/config_schema.py +0 -0
  67. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/converter.py +0 -0
  68. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/errors.py +0 -0
  69. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/i18n_schema.py +0 -0
  70. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/manager.py +0 -0
  71. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/module.py +0 -0
  72. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/router.py +0 -0
  73. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/send_builder.py +0 -0
  74. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/send_rules.py +0 -0
  75. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Bases/websocket.py +0 -0
  76. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/__init__.py +0 -0
  77. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/base.py +0 -0
  78. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/command.py +0 -0
  79. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/command_args.py +0 -0
  80. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/command_flow.py +0 -0
  81. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/conversation.py +0 -0
  82. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/governance.py +0 -0
  83. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/interaction.py +0 -0
  84. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/message.py +0 -0
  85. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/message_builder.py +0 -0
  86. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/meta.py +0 -0
  87. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/notice.py +0 -0
  88. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/overrides.py +0 -0
  89. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/request.py +0 -0
  90. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/session_type.py +0 -0
  91. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/throttle.py +0 -0
  92. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/Event/trace.py +0 -0
  93. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/__init__.py +0 -0
  94. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/assets/__init__.py +0 -0
  95. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/assets/error.css +0 -0
  96. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/assets/error.html +0 -0
  97. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/assets/root.css +0 -0
  98. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/assets/root.html +0 -0
  99. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/client.py +0 -0
  100. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/config.py +0 -0
  101. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/connections.py +0 -0
  102. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/di.py +0 -0
  103. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/__init__.py +0 -0
  104. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/constants.py +0 -0
  105. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/i18n/locales/__init__.py +0 -0
  106. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/lifecycle.py +0 -0
  107. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/logger.py +0 -0
  108. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/master.py +0 -0
  109. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/module.py +0 -0
  110. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/ownership.py +0 -0
  111. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/router.py +0 -0
  112. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/shadow.py +0 -0
  113. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/storage/mysql.py +0 -0
  114. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/storage/postgres.py +0 -0
  115. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/text_match.py +0 -0
  116. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/Core/transcript.py +0 -0
  117. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/__init__.py +0 -0
  118. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/__main__.py +0 -0
  119. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/finders/__init__.py +0 -0
  120. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/finders/adapter.py +0 -0
  121. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/finders/bases/__init__.py +0 -0
  122. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/finders/bases/finder.py +0 -0
  123. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/finders/module.py +0 -0
  124. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/__init__.py +0 -0
  125. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/_reload_utils.py +0 -0
  126. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/adapter.py +0 -0
  127. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/bases/__init__.py +0 -0
  128. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/bases/loader.py +0 -0
  129. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/module.py +0 -0
  130. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/plugin_folder.py +0 -0
  131. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/strategy.py +0 -0
  132. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/loaders/strict.py +0 -0
  133. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/py.typed +0 -0
  134. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/__init__.py +0 -0
  135. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/config_schema.py +0 -0
  136. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/context.py +0 -0
  137. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/dev_watch.py +0 -0
  138. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/diagnostics.py +0 -0
  139. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/exceptions.py +0 -0
  140. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/file_watcher.py +0 -0
  141. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/hints.py +0 -0
  142. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/kernel.py +0 -0
  143. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/memory.py +0 -0
  144. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/metrics.py +0 -0
  145. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/owner_cleanup.py +0 -0
  146. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/plugin_reload.py +0 -0
  147. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/proactive_gc.py +0 -0
  148. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/process_state.py +0 -0
  149. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/reload_ops.py +0 -0
  150. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/reload_target.py +0 -0
  151. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/resource_track.py +0 -0
  152. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/sdk_initializer.py +0 -0
  153. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/tasks.py +0 -0
  154. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/troubleshoot.py +0 -0
  155. {erispulse-2.12.0 → erispulse-2.12.1.dev0}/src/ErisPulse/runtime/version.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: ErisPulse
3
- Version: 2.12.0
3
+ Version: 2.12.1-dev.0
4
4
  Summary: Event-driven modular async bot framework — write once, deploy to any platform | 事件驱动的模块化异步机器人框架,一次编写,多平台部署
5
5
  Project-URL: Homepage, https://github.com/ErisPulse/ErisPulse
6
6
  Project-URL: Documentation, https://www.erisdev.com#docs
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "ErisPulse"
7
- version = "2.12.0"
7
+ version = "2.12.1-dev.0"
8
8
  description = "Event-driven modular async bot framework — write once, deploy to any platform | 事件驱动的模块化异步机器人框架,一次编写,多平台部署"
9
9
  readme = "README.pypi.md"
10
10
  requires-python = ">=3.10"
@@ -256,14 +256,15 @@ docstring-code-format = true
256
256
 
257
257
  [tool.basedpyright]
258
258
  # 基于 standard 模式,对项目质量影响最大的项设为 error
259
- include = ["src"]
259
+ # tests/typing 为静态类型回归目录(条件查询虚拟 bool 边界、typed rows 等,
260
+ # 一旦回退即在本目录产生类型错误被门禁拦截)
261
+ include = ["src", "tests/typing"]
260
262
  exclude = [
261
263
  "**/__pycache__",
262
264
  "**/.venv",
263
265
  "**/node_modules",
264
266
  "build",
265
267
  "dist",
266
- "tests",
267
268
  ]
268
269
  typeCheckingMode = "standard"
269
270
  pythonVersion = "3.10"
@@ -149,6 +149,8 @@ _EN_FALLBACK: dict[str, str] = {
149
149
  "cfg.logger.total_memory_limit": "Global in-memory log entries limit across all modules (0 = unlimited)",
150
150
  "cfg.storage.use_global_db": "Use global database",
151
151
  "cfg.storage.backend": "Storage backend: \"sqlite\" / \"mysql\" / \"postgres\"",
152
+ "cfg.storage.sqlite": "SQLite backend settings",
153
+ "cfg.storage.sqlite_busy_timeout": "Write-lock wait limit in ms (PRAGMA busy_timeout); changes take effect after restart",
152
154
  "cfg.storage.mysql": "MySQL connection params (effective when backend = \"mysql\"), requires: pip install ErisPulse[mysql]",
153
155
  "cfg.storage.postgres": "PostgreSQL connection params (effective when backend = \"postgres\"), requires: pip install ErisPulse[postgres]",
154
156
  "cfg.event.ignore_self": "Ignore self messages",
@@ -287,6 +289,8 @@ _TRANSLATIONS: dict[str, dict[str, str]] = {
287
289
  "cfg.logger.total_memory_limit": "全部模块内存日志总条数上限(0 = 不限,超限淘汰最旧记录)",
288
290
  "cfg.storage.use_global_db": "是否使用全局数据库",
289
291
  "cfg.storage.backend": "存储后端: \"sqlite\" / \"mysql\" / \"postgres\"",
292
+ "cfg.storage.sqlite": "SQLite 后端设置",
293
+ "cfg.storage.sqlite_busy_timeout": "写锁等待上限(毫秒,PRAGMA busy_timeout),改动需重启生效",
290
294
  "cfg.storage.mysql": "MySQL 连接参数(backend = \"mysql\" 时生效),需安装: pip install ErisPulse[mysql]",
291
295
  "cfg.storage.postgres": "PostgreSQL 连接参数(backend = \"postgres\" 时生效),需安装: pip install ErisPulse[postgres]",
292
296
  "cfg.event.ignore_self": "忽略自身消息",
@@ -27,14 +27,14 @@ import json
27
27
  from typing import Any, TypeVar
28
28
 
29
29
  from ..i18n import i18n
30
- from .storage import BaseQueryBuilder
30
+ from .storage import BaseQueryBuilder, BaseStorage
31
31
 
32
32
  T = TypeVar("T")
33
33
 
34
34
  _TABLE_PREFIX = "__erispulse_sql__"
35
35
 
36
36
 
37
- class KVQueryBuilder(BaseQueryBuilder):
37
+ class KVQueryBuilder(BaseQueryBuilder["BaseStorage"]):
38
38
  """
39
39
  基于 KV 存储的查询构建器
40
40
 
@@ -42,7 +42,7 @@ class KVQueryBuilder(BaseQueryBuilder):
42
42
  映射为对 BaseStorage KV 接口的调用。
43
43
  """
44
44
 
45
- def __init__(self, storage, table: str):
45
+ def __init__(self, storage: "BaseStorage", table: str):
46
46
  super().__init__(storage, table)
47
47
  self._table_prefix = f"{_TABLE_PREFIX}:{table}"
48
48
  self._bound_clauses: list[str] | None = None
@@ -19,7 +19,7 @@ ErisPulse 数据模型层(ORM)—— 声明式模型与 Active Record CRUD
19
19
  (``save`` 主键缺失退化为插入时同样回填)
20
20
  3. ``list`` / ``dict`` 类型字段(含 ``list[int]`` 等参数化泛型)以 JSON
21
21
  文本列存储,读写自动序列化
22
- 4. 环境无关:``Model.__storage__`` 可覆写为自定义 ``BaseStorage`` 实例
22
+ 4. 环境无关:``Model.__storage__`` 可覆写为自定义 SQL 存储后端实例
23
23
  (默认使用全局 ``ErisPulse.Core.storage`` 单例)
24
24
  5. 处于 ``storage.atransaction()`` 环境事务内时,读写自动复用事务连接,
25
25
  随事务统一提交/回滚
@@ -31,6 +31,13 @@ ErisPulse 数据模型层(ORM)—— 声明式模型与 Active Record CRUD
31
31
  8. 惯用快捷:``get_or_create`` / ``update_or_create``、
32
32
  ``save(update_fields=[...])`` 部分列更新、``Field(auto_now_add=True /
33
33
  auto_now=True)`` 时间戳列、``Field(on_delete="CASCADE")`` 外键删除动作
34
+ 9. 类型检查友好:条件入口(``where`` / ``count`` / ``delete_all`` /
35
+ ``update_all`` 等)同时接受 ``Condition`` 与 ``bool``——字段按值类型注解
36
+ (``age: int = Field(...)``)声明时,类访问比较(``User.age > 18``)在
37
+ 类型检查器视角为 ``bool``(注解类型屏蔽描述符协议,SQLModel 同款的
38
+ "虚拟类型"现象),运行时实际产物是 :class:`Condition`;框架拒绝真
39
+ ``bool`` 入参(无法编译为 SQL 条件)。IN 条件用 :meth:`Model.where_in`
40
+ (``Field.in_`` 挂在运行时列表达式上,值注解风格下静态不可达)
34
41
  {!--< /tips >!--}
35
42
 
36
43
  :example:
@@ -53,16 +60,17 @@ import json
53
60
  import re
54
61
  import sys
55
62
  import time
56
- from typing import Any, ClassVar
63
+ from collections.abc import Generator
64
+ from typing import Any, ClassVar, Generic, TypeVar
57
65
 
58
66
  if sys.version_info >= (3, 11):
59
- from typing import dataclass_transform
67
+ from typing import Self, dataclass_transform
60
68
  else:
61
- from typing_extensions import dataclass_transform
69
+ from typing_extensions import Self, dataclass_transform
62
70
 
63
71
 
64
72
  from .config_schema import python_type_category, validate_field_constraints
65
- from .sql_base import BaseStorage, SQLDialect, SQLStorageBase
73
+ from .sql_base import SQLDialect, SQLStorageBase
66
74
  from .storage import _current_txn
67
75
 
68
76
  _UNSET = object()
@@ -85,6 +93,9 @@ _JSON_CATEGORIES = frozenset({"list", "dict"})
85
93
  # Field(on_delete=...) 允许的外键删除动作(SQL 标准,三后端通用)
86
94
  _ON_DELETE_ACTIONS = frozenset({"CASCADE", "SET NULL", "RESTRICT", "NO ACTION", "SET DEFAULT"})
87
95
 
96
+ # 查询集持有的模型类型
97
+ ModelT = TypeVar("ModelT", bound="Model")
98
+
88
99
 
89
100
  class Field:
90
101
  """
@@ -384,11 +395,26 @@ class Condition:
384
395
  )
385
396
 
386
397
  def __and__(self, other: Condition) -> Condition:
398
+ # bool 守卫:虚拟类型经组合链漏入的真布尔(与条件入口同一指引文案)
399
+ if isinstance(other, bool):
400
+ raise TypeError(_BOOL_CONDITION_ERROR)
387
401
  return Condition(combinator="AND", left=self, right=other)
388
402
 
389
403
  def __or__(self, other: Condition) -> Condition:
404
+ if isinstance(other, bool):
405
+ raise TypeError(_BOOL_CONDITION_ERROR)
390
406
  return Condition(combinator="OR", left=self, right=other)
391
407
 
408
+ def __rand__(self, other: Condition) -> Condition:
409
+ if isinstance(other, bool):
410
+ raise TypeError(_BOOL_CONDITION_ERROR)
411
+ return Condition(combinator="AND", left=other, right=self)
412
+
413
+ def __ror__(self, other: Condition) -> Condition:
414
+ if isinstance(other, bool):
415
+ raise TypeError(_BOOL_CONDITION_ERROR)
416
+ return Condition(combinator="OR", left=other, right=self)
417
+
392
418
  def compile(self, dialect: SQLDialect | None = None) -> tuple[str, list[Any]]:
393
419
  """
394
420
  编译为 (WHERE 片段, 参数列表);片段为空串表示无条件
@@ -437,12 +463,15 @@ def _quote_ident(name: str, dialect: SQLDialect | None = None) -> str:
437
463
  return dialect.quote(name) if dialect is not None else f'"{name}"'
438
464
 
439
465
 
440
- class QuerySet:
466
+ class QuerySet(Generic[ModelT]):
441
467
  """
442
468
  链式查询集(惰性构建,await 终结符执行)
443
469
 
444
470
  ``User.where(...).order_by("-age").limit(10).all()``
445
471
 
472
+ 终结符返回值静态类型化:``all() -> list[User]`` / ``first() -> User | None``
473
+ (模型实例可类型安全地访问声明字段)。
474
+
446
475
  注意:链式方法(where / order_by / limit / offset)**就地修改**当前实例
447
476
  并返回自身——复用中间 QuerySet 对象会让条件互相串染;需要分支查询时,
448
477
  请各自从 :meth:`Model.where` 重新构建。
@@ -452,23 +481,23 @@ class QuerySet:
452
481
  {!--< /internal-use >!--}
453
482
  """
454
483
 
455
- def __init__(self, model: type[Model], condition: Condition | None = None):
484
+ def __init__(self, model: type[ModelT], condition: Condition | None = None):
456
485
  self._model = model
457
486
  self._condition = condition
458
487
  self._order: list[str] = []
459
488
  self._limit: int | None = None
460
489
  self._offset: int | None = None
461
490
 
462
- def order_by(self, *fields: str) -> QuerySet:
491
+ def order_by(self, *fields: str) -> QuerySet[ModelT]:
463
492
  """排序(``"age"`` 升序 / ``"-age"`` 降序)"""
464
493
  self._order.extend(fields)
465
494
  return self
466
495
 
467
- def limit(self, n: int) -> QuerySet:
496
+ def limit(self, n: int) -> QuerySet[ModelT]:
468
497
  self._limit = n
469
498
  return self
470
499
 
471
- def offset(self, n: int) -> QuerySet:
500
+ def offset(self, n: int) -> QuerySet[ModelT]:
472
501
  self._offset = n
473
502
  return self
474
503
 
@@ -502,7 +531,7 @@ class QuerySet:
502
531
 
503
532
  # ---- 终结符 ----
504
533
 
505
- async def all(self) -> list[Any]:
534
+ async def all(self) -> list[ModelT]:
506
535
  """执行查询,返回模型实例列表"""
507
536
  storage = self._model._get_storage()
508
537
  dialect = storage.dialect
@@ -515,7 +544,7 @@ class QuerySet:
515
544
  rows, cols = await storage._execute_query("select", sql, params)
516
545
  return [self._model._row_to_instance(dict(zip(cols or [], row, strict=False))) for row in rows]
517
546
 
518
- async def first(self) -> Any | None:
547
+ async def first(self) -> ModelT | None:
519
548
  """执行查询,返回首个实例(无结果为 None)
520
549
 
521
550
  在查询集**副本**上附加 ``LIMIT 1``,不修改原查询集——同一实例先
@@ -575,30 +604,36 @@ class QuerySet:
575
604
  return int(await storage._execute_query("dml", sql, where_params))
576
605
 
577
606
 
578
- class _RelatedMany(QuerySet):
607
+ class _RelatedMany(QuerySet[ModelT]):
579
608
  """
580
609
  {!--< internal-use >!--}
581
610
  has-many 关系查询集:在 :class:`QuerySet` 全部链式能力之上,
582
611
  附带 ``create`` 自动回填本表主键到对方外键列
583
612
  """
584
613
 
585
- def __init__(self, model: type[Model], condition: Condition | None, instance: Model, fk: str):
614
+ def __init__(self, model: type[ModelT], condition: Condition | None, instance: Model, fk: str):
586
615
  super().__init__(model, condition)
587
616
  self._owner = instance
588
617
  self._fk = fk
589
618
 
590
- def where(self, *conditions: Condition) -> _RelatedMany:
619
+ def where(self, *conditions: Condition | bool) -> _RelatedMany[ModelT]:
591
620
  """
592
621
  追加对方表字段的条件过滤(与关系外键条件 AND 组合)
593
622
 
623
+ 条件同时接受 ``bool`` 注解形态(静态虚拟类型,见 :meth:`Model.where`);
624
+ 运行时真 ``bool`` 入参抛 :exc:`TypeError`。
625
+
594
626
  :example:
595
627
  >>> await user.posts.where(Post.title == "hi").all()
596
628
  """
597
629
  for cond in conditions:
598
- self._condition = cond if self._condition is None else self._condition & cond
630
+ validated = _condition_arg(cond)
631
+ self._condition = (
632
+ validated if self._condition is None else self._condition & validated
633
+ )
599
634
  return self
600
635
 
601
- async def create(self, **kwargs: Any) -> Any:
636
+ async def create(self, **kwargs: Any) -> ModelT:
602
637
  """
603
638
  创建对方表的一行并自动填入本实例主键
604
639
 
@@ -626,7 +661,7 @@ class _RelatedMany(QuerySet):
626
661
  return await self._model.create(**kwargs)
627
662
 
628
663
 
629
- class _RelatedOne:
664
+ class _RelatedOne(Generic[ModelT]):
630
665
  """
631
666
  {!--< internal-use >!--}
632
667
  belongs-to 单条等待器:``author = await msg.author`` 即解析为对方实例或 None。
@@ -635,11 +670,11 @@ class _RelatedOne:
635
670
 
636
671
  __slots__ = ("_query", "_short_circuit")
637
672
 
638
- def __init__(self, query: QuerySet, short_circuit: bool = False):
673
+ def __init__(self, query: QuerySet[ModelT], short_circuit: bool = False):
639
674
  self._query = query
640
675
  self._short_circuit = short_circuit
641
676
 
642
- def __await__(self):
677
+ def __await__(self) -> Generator[Any, Any, ModelT | None]:
643
678
  if self._short_circuit:
644
679
  return _related_none().__await__()
645
680
  return self._query.first().__await__()
@@ -805,9 +840,10 @@ class Model:
805
840
  >>> await user.save()
806
841
  """
807
842
 
808
- __tablename__: ClassVar[str | None] = None
809
- # 存储后端覆写(None → 全局 ErisPulse.Core.storage 单例)
810
- __storage__: ClassVar[BaseStorage | None] = None
843
+ __tablename__: ClassVar[str] = ""
844
+ # 存储后端覆写(None → 全局 ErisPulse.Core.storage 单例;ORM 需 SQL 后端——
845
+ # 方言与参数化查询漏斗均在 SQLStorageBase 上)
846
+ __storage__: ClassVar[SQLStorageBase | None] = None
811
847
 
812
848
  _fields: ClassVar[dict[str, Field]] = {}
813
849
  # 关系解析注册表:{模型类名: 模型类}(__init_subclass__ 自动登记,
@@ -896,8 +932,9 @@ class Model:
896
932
 
897
933
  @classmethod
898
934
  def table_name(cls) -> str:
899
- """表名(snake_case 自动派生或 ``__tablename__`` 覆写)"""
900
- return cls.__tablename__ # type: ignore[return-value]
935
+ """表名(snake_case 自动派生或 ``__tablename__`` 覆写;基类空串仅为占位,
936
+ 子类在 ``__init_subclass__`` 固化为具体表名)"""
937
+ return cls.__tablename__
901
938
 
902
939
  @classmethod
903
940
  def columns(cls) -> dict[str, Field]:
@@ -908,10 +945,10 @@ class Model:
908
945
  def _get_storage(cls) -> SQLStorageBase:
909
946
  """解析存储后端(覆写优先,否则全局单例)"""
910
947
  if cls.__storage__ is not None:
911
- return cls.__storage__ # type: ignore[return-value]
948
+ return cls.__storage__
912
949
  from ..storage import storage as global_storage
913
950
 
914
- return global_storage # type: ignore[return-value]
951
+ return global_storage
915
952
 
916
953
  # ---- 实例化 ----
917
954
 
@@ -926,7 +963,7 @@ class Model:
926
963
  raise TypeError(f"unknown fields for {type(self).__name__}: {unknown}")
927
964
 
928
965
  @classmethod
929
- def _row_to_instance(cls, row: dict) -> Model:
966
+ def _row_to_instance(cls, row: dict) -> Self:
930
967
  """行 dict → 实例(JSON 列反序列化;bool 类别跨后端归一化为 bool)"""
931
968
  for name, value in row.items():
932
969
  field_obj = cls._fields.get(name)
@@ -1115,24 +1152,43 @@ class Model:
1115
1152
  # ---- CRUD:类操作 ----
1116
1153
 
1117
1154
  @classmethod
1118
- def where(cls, *conditions: Condition) -> QuerySet:
1155
+ def where(cls, *conditions: Condition | bool) -> QuerySet[Self]:
1119
1156
  """
1120
1157
  条件查询入口(``User.where(User.age > 18)`` → :class:`QuerySet`)
1121
1158
 
1122
1159
  多条件以 AND 连接;OR 用 ``(cond1) | (cond2)`` 组合。
1160
+
1161
+ 条件同时接受 ``bool`` 注解形态:字段按值类型注解(``age: int =
1162
+ Field(...)``)声明时,类访问比较(``User.age > 18``)在类型检查器视角
1163
+ 为 ``bool``,运行时实际产物是 :class:`Condition`(SQLModel 同款"虚拟
1164
+ 类型"边界);运行时收到真 ``bool``(携带不了列信息、无法编译为 SQL)
1165
+ 时抛出 :exc:`TypeError`。IN 条件请用 :meth:`where_in`。
1123
1166
  """
1124
- condition: Condition | None = None
1125
- for cond in conditions:
1126
- condition = cond if condition is None else condition & cond
1127
- return QuerySet(cls, condition)
1167
+ return QuerySet(cls, _combine(conditions))
1128
1168
 
1129
1169
  @classmethod
1130
- def all(cls) -> QuerySet:
1170
+ def where_in(cls, field: str, values: list[Any] | tuple[Any, ...]) -> QuerySet[Self]:
1171
+ """
1172
+ IN 条件查询(``User.where_in("id", [1, 2, 3])`` → :class:`QuerySet`)
1173
+
1174
+ 值注解声明风格下 :meth:`Field.in_`(挂在运行时列表达式对象上)静态
1175
+ 不可达(``int`` / ``str`` 上无此方法),本入口为类型检查友好的等价物;
1176
+ 空集合编译为恒假片段(``1=0``)。
1177
+
1178
+ :param field: 字段名(未声明时抛 :exc:`ValueError`)
1179
+ :param values: 取值集合
1180
+ """
1181
+ if field not in cls._fields:
1182
+ raise ValueError(f"unknown fields for {cls.__name__}.where_in: {field}")
1183
+ return QuerySet(cls, ColumnExpr(field)._cond("IN", list(values)))
1184
+
1185
+ @classmethod
1186
+ def all(cls) -> QuerySet[Self]:
1131
1187
  """无条件查询集(等价 ``cls.where()``)"""
1132
1188
  return QuerySet(cls)
1133
1189
 
1134
1190
  @classmethod
1135
- async def get(cls, **eq_kwargs: Any) -> Any | None:
1191
+ async def get(cls, **eq_kwargs: Any) -> Self | None:
1136
1192
  """
1137
1193
  等值查询首条(``User.get(id=1)``);无结果返回 None
1138
1194
 
@@ -1148,7 +1204,7 @@ class Model:
1148
1204
  return await QuerySet(cls, condition).first()
1149
1205
 
1150
1206
  @classmethod
1151
- async def create(cls, **kwargs: Any) -> Any:
1207
+ async def create(cls, **kwargs: Any) -> Self:
1152
1208
  """
1153
1209
  插入一行并返回实例(自增主键自动回填)
1154
1210
 
@@ -1257,24 +1313,24 @@ class Model:
1257
1313
  setattr(instance, pk.name, row[0])
1258
1314
 
1259
1315
  @classmethod
1260
- async def count(cls, *conditions: Condition) -> int:
1261
- """行数统计(``await User.count(User.age > 18)``)"""
1316
+ async def count(cls, *conditions: Condition | bool) -> int:
1317
+ """行数统计(``await User.count(User.age > 18)``;bool 注解形态见 :meth:`where`)"""
1262
1318
  return await QuerySet(cls, _combine(conditions)).count()
1263
1319
 
1264
1320
  @classmethod
1265
- async def delete_all(cls, *conditions: Condition) -> int:
1321
+ async def delete_all(cls, *conditions: Condition | bool) -> int:
1266
1322
  """批量删除(``await User.delete_all(User.age > 18)``;无条件则全表删除)"""
1267
1323
  return await QuerySet(cls, _combine(conditions)).delete()
1268
1324
 
1269
1325
  @classmethod
1270
- async def update_all(cls, *conditions: Condition, **values: Any) -> int:
1326
+ async def update_all(cls, *conditions: Condition | bool, **values: Any) -> int:
1271
1327
  """批量更新(``await User.update_all(User.age > 18, name="adult")``)"""
1272
1328
  return await QuerySet(cls, _combine(conditions)).update(**values)
1273
1329
 
1274
1330
  @classmethod
1275
1331
  async def get_or_create(
1276
1332
  cls, defaults: dict[str, Any] | None = None, **kwargs: Any
1277
- ) -> tuple[Any, bool]:
1333
+ ) -> tuple[Self, bool]:
1278
1334
  """
1279
1335
  查得即返回( ``(实例, False)`` );无则以 ``kwargs + defaults`` 创建( ``(实例, True)`` )
1280
1336
 
@@ -1295,7 +1351,7 @@ class Model:
1295
1351
  @classmethod
1296
1352
  async def update_or_create(
1297
1353
  cls, defaults: dict[str, Any] | None = None, **kwargs: Any
1298
- ) -> tuple[Any, bool]:
1354
+ ) -> tuple[Self, bool]:
1299
1355
  """
1300
1356
  查得则更新 ``defaults`` 字段并保存;无则创建
1301
1357
 
@@ -1405,11 +1461,29 @@ class Model:
1405
1461
  return int(await storage._execute_query("dml", sql, [v for _, v in pk_values]))
1406
1462
 
1407
1463
 
1408
- def _combine(conditions: tuple) -> Condition | None:
1464
+ # 条件入口的 bool 拒绝文案:字段按值类型注解声明时,比较表达式在类型检查器
1465
+ # 视角为 bool(虚拟类型),运行时产物必为 Condition——运行时收到真 bool 只
1466
+ # 可能来自误用的普通布尔值(携带不了列信息、无法编译为 SQL 条件)
1467
+ _BOOL_CONDITION_ERROR = (
1468
+ "query condition must be an inline column comparison "
1469
+ "(e.g. User.where(User.age > 18)), not a plain bool: "
1470
+ "bool values carry no column info and cannot compile to SQL"
1471
+ )
1472
+
1473
+
1474
+ def _condition_arg(cond: Condition | bool) -> Condition:
1475
+ """条件入参校验收窄(bool 为静态虚拟类型,运行时拒绝)"""
1476
+ if isinstance(cond, bool):
1477
+ raise TypeError(_BOOL_CONDITION_ERROR)
1478
+ return cond
1479
+
1480
+
1481
+ def _combine(conditions: tuple[Condition | bool, ...]) -> Condition | None:
1409
1482
  """多条件 AND 组合(类级 CRUD 快捷入口用)"""
1410
1483
  condition: Condition | None = None
1411
1484
  for cond in conditions:
1412
- condition = cond if condition is None else condition & cond
1485
+ validated = _condition_arg(cond)
1486
+ condition = validated if condition is None else condition & validated
1413
1487
  return condition
1414
1488
 
1415
1489
 
@@ -317,7 +317,7 @@ class SQLDialect:
317
317
  return False
318
318
 
319
319
 
320
- class SQLQueryBuilder(BaseQueryBuilder):
320
+ class SQLQueryBuilder(BaseQueryBuilder["SQLStorageBase"]):
321
321
  """
322
322
  SQL 查询构建器(方言无关的共享实现)
323
323
 
@@ -366,7 +366,7 @@ class SQLQueryBuilder(BaseQueryBuilder):
366
366
  return await self._aexecute_insert_multi(conn=conn)
367
367
 
368
368
  sql, params = self._build_sql()
369
- storage: SQLStorageBase = self._storage # type: ignore[assignment]
369
+ storage: SQLStorageBase = self._storage
370
370
  target = conn if conn is not None else storage._routing_conn()
371
371
 
372
372
  if self._operation == "select":
@@ -393,7 +393,7 @@ class SQLQueryBuilder(BaseQueryBuilder):
393
393
  sql = f"INSERT INTO {self._table_sql()} ({cols}) VALUES ({placeholders})"
394
394
  rows_params = [tuple(row.get(col) for col in columns) for row in self._data]
395
395
 
396
- storage: SQLStorageBase = self._storage # type: ignore[assignment]
396
+ storage: SQLStorageBase = self._storage
397
397
  target = conn if conn is not None else storage._routing_conn()
398
398
  return await storage._execute_query(
399
399
  "dml_multi", sql, rows_params, conn=target
@@ -412,7 +412,7 @@ class SQLQueryBuilder(BaseQueryBuilder):
412
412
  >>> row = await storage.Table("users").Select("*").Where("id = ?", 1).aExecuteOne()
413
413
  """
414
414
  sql, params = self._build_sql()
415
- storage: SQLStorageBase = self._storage # type: ignore[assignment]
415
+ storage: SQLStorageBase = self._storage
416
416
  row, columns = await storage._execute_query(
417
417
  "one", sql, params, conn=conn if conn is not None else storage._routing_conn()
418
418
  )
@@ -432,7 +432,7 @@ class SQLQueryBuilder(BaseQueryBuilder):
432
432
  >>> total = await storage.Table("users").Where("age > ?", 18).aCount()
433
433
  """
434
434
  sql, params = self._build_count_sql()
435
- storage: SQLStorageBase = self._storage # type: ignore[assignment]
435
+ storage: SQLStorageBase = self._storage
436
436
  return await storage._execute_query(
437
437
  "count", sql, params, conn=conn if conn is not None else storage._routing_conn()
438
438
  )
@@ -602,7 +602,7 @@ class AlterTableBuilder:
602
602
  """
603
603
  if not self._operations:
604
604
  return True
605
- storage: SQLStorageBase = self._storage # type: ignore[assignment]
605
+ storage: SQLStorageBase = self._storage
606
606
  try:
607
607
  await storage._run_alter(
608
608
  self._table_name, self._operations, conn=storage._routing_conn()