⬆️ deprecated python 3.9

Author: RF-Tar-Railt

.github/workflows/test.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        py_ver: ['3.9', '3.10', '3.11', '3.12']
+        py_ver: ['3.10', '3.11', '3.12', '3.13']
     runs-on:  ubuntu-latest
     steps:
       - uses: actions/checkout@v4

arclet/letoderea/__init__.py

@@ -43,5 +43,6 @@
 from .typing import EVENT as EVENT
 from .typing import Contexts as Contexts
 from .typing import Force as Force
+from .typing import Result as Result
 
 from . import core as es  # noqa: F401

arclet/letoderea/core.py

@@ -8,7 +8,6 @@
 from types import AsyncGeneratorType
 from typing import Any, Callable, Coroutine, Literal, TypeVar, overload, cast
 
-from tarina import generic_isinstance
 from typing_extensions import dataclass_transform
 
 from .exceptions import ExitState, STOP, BLOCK
@@ -120,10 +119,8 @@ async def broadcast(event: Any, scope: str | Scope | None = None, slots: Iterabl
 async def dispatch(event: Any, scope: str | Scope | None = None, slots: Iterable[tuple[Subscriber, str]] | None = None, inherit_ctx: Contexts | None = None, *, return_result: bool = False, validate: bool = False):
     async for res in broadcast(event, scope, slots, inherit_ctx):
         if return_result:
-            if validate and hasattr(event, "__result_type__"):
-                value = res.value if isinstance(res, Result) else res
-                if not generic_isinstance(value, event.__result_type__):  # type: ignore
-                    continue
+            if validate and hasattr(event, "check_result"):
+                return cast(Resultable, event).check_result(res.value if isinstance(res, Result) else res)
             return res if isinstance(res, Result) else Result(res)
 
 

arclet/letoderea/typing.py

@@ -83,4 +83,4 @@ class Result(Generic[T]):
 
 
 class Resultable(Protocol[T]):
-    __result_type__: type[T]
+    def check_result(self, value: Any) -> Result[T] | None: ...

examples/communicate.py

@@ -1,7 +1,7 @@
 import asyncio
 from dataclasses import dataclass
 
-from arclet.letoderea import es, make_event, define
+from arclet.letoderea import Result, es, make_event, define
 
 
 @make_event
@@ -13,7 +13,8 @@ class TestEvent:
 class Data:
     query: str
 
-    __result_type__ = str
+    def check_result(self, value) -> Result[str] | None:
+        ...
 
 
 define(Data, name="pluginA")

pdm.lock

@@ -7,6 +7,7 @@ authors = [
 ]
 dependencies = [
     "tarina<0.8.0,>=0.7.0",
+    "typing-extensions>=4.12.0",
 ]
 requires-python = ">=3.9"
 readme = "README.md"
@@ -47,7 +48,7 @@ dev = [
 ]
 [tool.black]
 line-length = 120
-target-version = ["py39", "py310", "py311", "py312"]
+target-version = ["py310", "py311", "py312", "py313"]
 include = '\.pyi?$'
 extend-exclude = '''
 '''
@@ -60,12 +61,17 @@ extra_standard_library = ["typing_extensions"]
 
 [tool.ruff]
 line-length = 120
-target-version = "py39"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = ["E", "W", "F", "UP", "C", "T", "Q"]
 ignore = ["E402", "F403", "F405", "C901", "UP037"]
 
+[tool.pyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+typeCheckingMode = "basic"
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "session"

pyproject.toml

@@ -6,7 +6,9 @@
 class BaseEvent:
     foo: str
 
-    __result_type__ = str
+    def check_result(self, value) -> le.Result[str] | None:
+        if isinstance(value, str):
+            return le.Result(value)
 
 
 @le.make_event

tests/test_chain_post.py

@@ -28,7 +28,7 @@ class TestEvent1:
     foo: str
     bar: str
 
-    __result_type__ = str
+    def check_result(self, value) -> le.Result[str] | None: ...
 
 
 @pytest.mark.asyncio

tests/test_dispatch.py

@@ -14,7 +14,7 @@ class CallEvent:
     content: str
     params: dict
 
-    __result_type__ = str
+    def check_result(self, value) -> le.Result[str] | None: ...
 
 
 pub = le.define(CallEvent, name="called_event")