⬆️ use letoderea 0.21.0rc2

Author: RF-Tar-Railt

arclet/entari/command/__init__.py

@@ -9,9 +9,9 @@
 from arclet.alconna import Alconna, Arg, Args, Arparma, CommandMeta, command_manager
 from arclet.alconna.tools.construct import AlconnaString, alconna_from_format
 from arclet.alconna.typing import TAValue
-from arclet.letoderea import EVENT, RESULT, ExitState, Scope, Subscriber, make_event
+from arclet.letoderea import Contexts, EVENT, RESULT, ExitState, Scope, Subscriber, make_event
 from arclet.letoderea.provider import TProviders, get_providers
-from arclet.letoderea.typing import Contexts, Result
+from arclet.letoderea.typing import Result
 from nepattern import DirectPattern
 from tarina import LRU
 from tarina.trie import CharTrie

arclet/entari/command/plugin.py

@@ -15,7 +15,7 @@
 from .provider import AlconnaProviderFactory, AlconnaSuppiler, Assign, MessageJudges, _seminal
 
 exec_pub = define(CommandExecute)
-exec_pub.bind(AlconnaProviderFactory())
+exec_pub.providers.append(AlconnaProviderFactory())
 out_pub = define(CommandOutput)
 # fmt: off
 

arclet/entari/const.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from arclet.letoderea.typing import CtxItem
+from arclet.letoderea.context import CtxItem
 
 if TYPE_CHECKING:
     import satori

arclet/entari/core.py

@@ -12,6 +12,7 @@
 from arclet.alconna import Alconna
 from arclet.alconna import config as alconna_config
 from arclet.letoderea import EVENT, Contexts, Param, Provider, ProviderFactory, global_providers
+from arclet.letoderea.context import shared_suppliers
 from arclet.letoderea.scope import configure
 from creart import it
 from graia.amnesia.builtins.aiohttp import AiohttpClientService
@@ -77,16 +78,6 @@ async def __call__(self, context: Contexts):
                 if self.target_type and not generic_isinstance(sess.event, self.target_type):
                     return
                 return sess
-            if ITEM_ORIGIN_EVENT in context and ITEM_ACCOUNT in context:
-                if self.target_type and not generic_isinstance(context[EVENT], self.target_type):
-                    return
-                session = Session(context[ITEM_ACCOUNT], context[EVENT])
-                if ITEM_MESSAGE_CONTENT in context:
-                    session.elements = context[ITEM_MESSAGE_CONTENT]
-                if ITEM_MESSAGE_REPLY in context:
-                    session.reply = context[ITEM_MESSAGE_REPLY]
-                context[ITEM_SESSION] = session
-                return session
 
     def validate(self, param: Param):
         if get_origin(param.annotation) is Session:
@@ -222,6 +213,17 @@ async def __call__(self, context: Contexts):
 )
 
 
+@shared_suppliers.append
+async def session_supplier(context: Contexts):
+    if ITEM_ORIGIN_EVENT in context and ITEM_ACCOUNT in context:
+        session = Session(context[ITEM_ACCOUNT], context[EVENT])
+        if ITEM_MESSAGE_CONTENT in context:
+            session.elements = context[ITEM_MESSAGE_CONTENT]
+        if ITEM_MESSAGE_REPLY in context:
+            session.reply = context[ITEM_MESSAGE_REPLY]
+        context[ITEM_SESSION] = session
+
+
 class RecordConfig(BasicConfModel):
     to_me_only: bool = False
     """是否仅记录提及 Bot 自己的消息"""

arclet/entari/event/send.py

@@ -55,7 +55,7 @@ class SendResponse:
 
 
 send_pub = define(SendResponse, name="entari.event/after_send")
-send_pub.bind(provide(list[MessageObject], call="$resp_result"))
+send_pub.providers.append(provide(list[MessageObject], call="$resp_result"))
 
 
 @send_pub.gather

arclet/entari/plugin/__init__.py

@@ -99,7 +99,7 @@ def get_plugin_subscribers(plug: Plugin | str | None = None) -> list[Subscriber]
         plg = plugin_service.plugins[plug]
     else:
         plg = get_plugin(1)
-    return [s[0] for s in plg._scope.subscribers.values()]
+    return [s.subscriber for s in plg._scope.subscribers]
 
 
 def get_all_subscribers():

arclet/entari/scheduler.py

@@ -6,7 +6,7 @@
 from typing import Literal
 
 from arclet.letoderea import Scope, Subscriber, make_event
-from arclet.letoderea.typing import Contexts
+from arclet.letoderea.context import Contexts
 from launart import Launart, Service, any_completed
 from launart.status import Phase
 

pdm.lock

@@ -6,10 +6,10 @@ authors = [
     {name = "RF-Tar-Railt",email = "rf_tar_railt@qq.com"},
 ]
 dependencies = [
-    "arclet-letoderea<0.21.0,>=0.20.7",
-    "arclet-alconna<2.0.0,>=1.8.42",
-    "satori-python-core<1.4.0,>=1.3.0",
-    "satori-python-client<1.4.0,>=1.3.0",
+    "arclet-letoderea<0.22.0,>=0.21.0rc2",
+    "arclet-alconna<2.0.0,>=1.8.44",
+    "satori-python-core<1.4.0,>=1.3.2",
+    "satori-python-client<1.4.0,>=1.3.2",
     "arclet-alconna-tools>=0.7.3",
     "nonestorage>=0.1.0",
     "simpleeval>=1.0.3",
@@ -117,14 +117,13 @@ format = { composite = ["ruff check --select I --fix ./arclet/","black ./arclet/
 
 [dependency-groups]
 dev = [
-    "black>=24.4.2",
-    "ruff>=0.15.4",
-    "fix-future-annotations>=0.5.0",
+    "black>=26.3.1",
+    "ruff>=0.15.10",
     "watchfiles>=0.24.0",
     "python-dotenv>=1.0.1",
     "ruamel-yaml>=0.18.10",
-    "msgspec>=0.19.0",
-    "pydantic>=2.10.6",
+    "msgspec>=0.21.0",
+    "pydantic>=2.12.5",
     "tomlkit>=0.13.3",
     "richuru>=0.1.1",
 ]