🔥 clean code

Author: RF-Tar-Railt

arclet/letoderea/context.py

@@ -1,62 +1,21 @@
-from __future__ import annotations
-
 from collections.abc import Awaitable, Callable
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast, overload
-from typing_extensions import Self
+from typing import Any, Generic, TypeVar, cast
 
 T = TypeVar("T")
-T1 = TypeVar("T1")
 
 
 class CtxItem(Generic[T]):
     @classmethod
-    def make(cls, name: str) -> CtxItem[T]:
+    def make(cls, name: str) -> "CtxItem[T]":
         return cast(CtxItem[T], cast(object, name))
 
 
 class Contexts(dict[str, Any]):
-    if TYPE_CHECKING:
-
-        def copy(self) -> Self: ...
-
-        @overload
-        def __getitem__(self, item: CtxItem[T1]) -> T1: ...
-
-        @overload
-        def __getitem__(self, item: str) -> Any: ...
-
-        def __getitem__(self, item: str | CtxItem[T1]) -> Any: ...
-
-        @overload
-        def __setitem__(self, key: CtxItem[T1], value: T1, /) -> None: ...
-
-        @overload
-        def __setitem__(self, key: str, value: Any, /) -> None: ...
-
-        def __setitem__(self, key: str | CtxItem[T1], value: Any, /): ...
-
-        @overload
-        def get(self, __key: CtxItem[T1]) -> T1 | None: ...
-
-        @overload
-        def get(self, __key: str) -> Any | None: ...
-
-        @overload
-        def get(self, __key: CtxItem[T1], __default: T1) -> T1: ...
-
-        @overload
-        def get(self, __key: str, __default: Any) -> Any: ...
-
-        @overload
-        def get(self, __key: CtxItem[T1], __default: T) -> T1 | T: ...
-
-        def get(self, __key: str | CtxItem[T1], __default: Any = ...) -> Any: ...  # type: ignore
-
-    ...
+    pass
 
 
-EVENT: CtxItem[Any] = CtxItem.make("$event")
-shared_suppliers: list[Callable[[Contexts], Awaitable[None]]] = []
+EVENT = CtxItem[Any].make("$event")
+shared_suppliers = []
 
 
 async def generate_contexts(

arclet/letoderea/context.pyi

@@ -0,0 +1,38 @@
+from collections.abc import Awaitable, Callable
+from typing import Any, Generic, TypeVar, overload
+from typing_extensions import Self
+
+T = TypeVar("T")
+T1 = TypeVar("T1")
+
+
+class CtxItem(Generic[T]):
+    @classmethod
+    def make(cls, name: str) -> CtxItem[T]: ...
+
+
+class Contexts(dict[str, Any]):
+    def copy(self) -> Self: ...
+    @overload
+    def __getitem__(self, item: CtxItem[T1]) -> T1: ...
+    @overload
+    def __getitem__(self, item: str) -> Any: ...
+    @overload
+    def __setitem__(self, key: CtxItem[T1], value: T1, /) -> None: ...
+    @overload
+    def __setitem__(self, key: str, value: Any, /) -> None: ...
+    @overload
+    def get(self, __key: CtxItem[T1]) -> T1 | None: ...
+    @overload
+    def get(self, __key: str) -> Any | None: ...
+    @overload
+    def get(self, __key: CtxItem[T1], __default: T1) -> T1: ...
+    @overload
+    def get(self, __key: str, __default: Any) -> Any: ...
+    @overload
+    def get(self, __key: CtxItem[T1], __default: T) -> T1 | T: ...
+
+EVENT: CtxItem[Any]
+shared_suppliers: list[Callable[[Contexts], Awaitable[None]]]
+
+async def generate_contexts(event: T, supplier:  Callable[[T, Contexts], Awaitable[Contexts | None]] | None = None, inherit_ctx: Contexts | None = None) -> Contexts: ...

arclet/letoderea/core.py

@@ -44,6 +44,8 @@ async def gather(self, context: Contexts):
 
 
 def publish_exc_event(event: ExceptionEvent):
+    if isinstance(event.origin, ExceptionEvent) or isinstance(event.exception, _ExitException):  # pragma: no cover
+        return
     scopes = [sp for sp in _scopes.values() if sp.available]
     subs = [slot for sp in scopes for slot in sp.subscribers if slot.publisher_id != "$backend"]
     return add_task(dispatch(event, slots=subs))
@@ -91,8 +93,6 @@ async def dispatch(event: Any, scope: str | Scope | None = None, slots: Iterable
             if isinstance(result, BaseException):
                 if isinstance(result, _ExitException) and result.args[1]:  # pragma: no cover
                     return
-                if isinstance(event, ExceptionEvent):  # pragma: no cover
-                    return
                 publish_exc_event(ExceptionEvent(event, subs[_i], result))
             if isinstance(result, AsyncGeneratorType):  # pragma: no cover
                 async for res in result:
@@ -143,8 +143,6 @@ async def serial(event: Any, scope: str | Scope | None = None, slots: Iterable[S
             if isinstance(result, BaseException):  # pragma: no cover
                 if isinstance(result, _ExitException):
                     return result.args[0]
-                if isinstance(event, ExceptionEvent):
-                    return
                 publish_exc_event(ExceptionEvent(event, subscriber, result))
             elif isinstance(result, AsyncGeneratorType):  # pragma: no cover
                 async for res in result:
@@ -163,7 +161,8 @@ async def broadcast(event: Any, scope: str | Scope | None = None, slots: Iterabl
     grouped, context_map = await compute(event, scope, slots, inherit_ctx)
     for key, subs in grouped.items():
         contexts = context_map[key[1]]
-        async for subscriber, result in (serial_exec_concurrent(subs, contexts) if concurrent else serial_exec(subs, contexts)):
+        gene = serial_exec_concurrent(subs, contexts) if concurrent else serial_exec(subs, contexts)
+        async for subscriber, result in gene:
             if result is None or result is STOP:
                 continue
             if result is BLOCK:
@@ -174,8 +173,6 @@ async def broadcast(event: Any, scope: str | Scope | None = None, slots: Iterabl
                     if result.args[1]:
                         return
                     continue
-                if isinstance(event, ExceptionEvent):
-                    return
                 publish_exc_event(ExceptionEvent(event, subscriber, result))
             elif isinstance(result, AsyncGeneratorType):
                 async for res in result:

arclet/letoderea/decorate.py

@@ -21,10 +21,8 @@ def wrapper(target: TCallable) -> TCallable:
             target.providers.extend(providers)
             target.params = _compile(target.callable_target, target.providers)
         else:
-            if not hasattr(target, "__providers__"):
-                setattr(target, "__providers__", providers)
-            else:
-                getattr(target, "__providers__").extend(providers)
+            _providers = getattr(target, "__providers__", [])
+            setattr(target, "__providers__", _providers + providers)
         return target  # type: ignore
 
     return wrapper
@@ -43,10 +41,8 @@ def wrapper(target: TCallable, /) -> TCallable:
         if isinstance(target, Subscriber):
             target.propagates(*funcs, prepend=prepend)
         else:
-            if not hasattr(target, "__propagates__"):
-                setattr(target, "__propagates__", [(funcs, prepend)])
-            else:
-                getattr(target, "__propagates__").append((funcs, prepend))
+            _propagates = getattr(target, "__propagates__", [])
+            setattr(target, "__propagates__", _propagates + [(funcs, prepend)])
         return target  # type: ignore
 
     return wrapper
@@ -85,11 +81,10 @@ async def _(*args, _func=func, **kwargs):
                 if await _func(*args, **kwargs) is not self.result:
                     return STOP
 
-            yield _
+            yield _, True, self.priority
 
     def compose(self):
-        for checker in self.checkers():
-            yield checker, True, self.priority
+        yield from self.checkers()
 
     def __call__(self, func: TCallable) -> TCallable:
         return propagate(self)(func)

arclet/letoderea/publisher.py

@@ -76,19 +76,6 @@ async def supply(self) -> T:
     def dispose(self):
         _publishers.pop(self.id, None)
 
-    def bind(self, *args: Provider | type[Provider] | ProviderFactory | type[ProviderFactory]) -> None:
-        """增加间接 Provider"""
-        self.providers.extend(p() if isinstance(p, type) else p for p in args)
-
-    def unbind(
-        self,
-        arg: Provider | type[Provider] | ProviderFactory | type[ProviderFactory],
-    ) -> None:  # pragma: no cover
-        """移除间接 Provider"""
-        idx = [i for i, p in enumerate(self.providers) if (isinstance(arg, (ProviderFactory, Provider)) and p == arg) or (isinstance(arg, type) and isinstance(p, arg))]
-        for i in reversed(idx):
-            self.providers.pop(i)
-
     def check(self: Self, func: Callable[[Self, Subscriber], bool]):
         self.check_subscriber = func.__get__(self)  # type: ignore
         return func

arclet/letoderea/scope.py

@@ -91,16 +91,6 @@ def __init__(self, id_: str | None = None):
     def __repr__(self):
         return f"{self.__class__.__name__}::{self.id}"
 
-    def bind(self, *args: Provider | type[Provider] | ProviderFactory | type[ProviderFactory]) -> None:
-        """增加间接 Provider"""
-        self.providers.extend(p() if isinstance(p, type) else p for p in args)
-
-    def unbind(self, arg: Provider | type[Provider] | ProviderFactory | type[ProviderFactory]) -> None:  # pragma: no cover
-        """移除间接 Provider"""
-        idx = [i for i, p in enumerate(self.providers) if (isinstance(arg, (ProviderFactory, Provider)) and p == arg) or (isinstance(arg, type) and isinstance(p, arg))]
-        for i in reversed(idx):
-            self.providers.pop(i)
-
     @contextmanager
     def context(self):
         token = scope_ctx.set(self)
@@ -112,10 +102,8 @@ def context(self):
     def remove_subscriber(self, subscriber: Subscriber) -> None:
         """移除订阅者"""
         indexes = [i for i, slot in enumerate(self.subscribers) if slot.subscriber.id == subscriber.id]
-        removed = 0
-        for i in indexes:
-            self.subscribers.pop(i - removed)
-            removed += 1
+        for i in reversed(indexes):
+            self.subscribers.pop(i)
 
     def register(self, func: Callable[..., Any] | None = None, event: type | None = None, *, priority: int = 16, providers: TProviders | None = None, propagators: list[Propagator] | None = None, publisher: str | Publisher | None = None, once: bool = False, skip_req_missing: bool | None = None):
         """注册一个订阅者"""

arclet/letoderea/scope.pyi

@@ -65,8 +65,6 @@ class Scope:
     @classmethod
     def of(cls: type[Self], id_: str | None = None) -> Self: ...
     def __init__(self, id_: str | None = None): ...
-    def bind(self, *args: Provider | type[Provider] | ProviderFactory | type[ProviderFactory]) -> None: ...
-    def unbind(self, arg: Provider | type[Provider] | ProviderFactory | type[ProviderFactory]) -> None: ...
     @contextmanager
     def context(self) -> Generator[Scope, None, None]: ...
     def remove_subscriber(self, subscriber: Subscriber) -> None: ...

arclet/letoderea/subscriber.py

@@ -33,9 +33,10 @@
 
 R = TypeVar("R")
 T = TypeVar("T")
-RESULT: CtxItem[Any] = CtxItem.make("$result")
-STACK: CtxItem[AsyncExitStack] = CtxItem.make("$exit_stack")
-SUBSCRIBER: CtxItem[Subscriber] = CtxItem.make("$subscriber")
+RESULT = CtxItem[Any].make("$result")
+STACK = CtxItem[AsyncExitStack[Any]].make("$exit_stack")
+SUBSCRIBER = CtxItem["Subscriber"].make("$subscriber")
+
 current_subscriber: ContextVar[Subscriber] = ContextVar("_current_subscriber")