🐛 fix generator result handle

Author: RF-Tar-Railt

arclet/letoderea/core.py

@@ -108,8 +108,8 @@ async def dispatch(event: Any, scope: str | Scope | None = None, slots: Iterable
                         continue
                     if res is BLOCK:
                         return
-                    if isinstance(result, _ExitException):  # type: ignore
-                        if result.args[1]:
+                    if isinstance(res, _ExitException):
+                        if res.args[1]:
                             return
                         continue
 
@@ -146,15 +146,15 @@ async def serial(event: Any, scope: str | Scope | None = None, slots: Iterable[t
                     for t in tasks:    t.cancel()
                     if res is BLOCK:
                         return
-                    if isinstance(result, _ExitException):  # type: ignore
-                        return result.args[0]
+                    if isinstance(res, _ExitException):
+                        return res.args[0]
                     if res.__class__ is Force:
-                        return res.value  # type: ignore
+                        return res.value
                     else:
                         return res
             elif result.__class__ is Force:  # pragma: no cover
                 for t in tasks:    t.cancel()
-                return result.value  # type: ignore
+                return result.value
             else:
                 for t in tasks:    t.cancel()
                 return result
@@ -192,17 +192,17 @@ async def broadcast(event: Any, scope: str | Scope | None = None, slots: Iterabl
                         continue
                     if res is BLOCK:
                         return
-                    if isinstance(result, _ExitException):
-                        yield result.args[0]
-                        if result.args[1]:
+                    if isinstance(res, _ExitException):
+                        yield res.args[0]
+                        if res.args[1]:
                             return
                         continue
                     if res.__class__ is Force:
-                        yield res.value  # type: ignore
+                        yield res.value
                     else:
                         yield res
             elif result.__class__ is Force:
-                yield result.value  # type: ignore
+                yield result.value
             else:
                 yield result
 
@@ -267,7 +267,7 @@ async def _loop_fetch(publisher: Publisher):
 
 def publish(event: Any, scope: str | Scope | None = None, inherit_ctx: Contexts | None = None) -> asyncio.Task[None]:
     """发布事件，并行处理所有响应"""
-    return add_task(dispatch(event, scope, inherit_ctx=inherit_ctx))  # type: ignore
+    return add_task(dispatch(event, scope, inherit_ctx=inherit_ctx))
 
 
 @overload

arclet/letoderea/exceptions.py

@@ -6,9 +6,8 @@
 import sys
 import traceback
 from enum import Enum
-from types import CodeType, TracebackType
+from types import CodeType, TracebackType, FunctionType
 from typing import Any, Final, cast
-from collections.abc import Callable
 
 from .typing import Contexts
 
@@ -55,7 +54,7 @@ def __init__(self, exc_type: type[BaseException], exc_value: BaseException, exc_
 
 
 @functools.lru_cache(maxsize=None)
-def get_caller_info(func: Callable, name: str | None = None) -> tuple[str, int, int, str, int, int]:  # pragma: no cover
+def get_caller_info(func: FunctionType, name: str | None = None) -> tuple[str, int, int, str, int, int]:  # pragma: no cover
     """Get the caller information of a function or method.
 
     Returns:
@@ -66,7 +65,7 @@ def get_caller_info(func: Callable, name: str | None = None) -> tuple[str, int,
         - param_lineno: The line number where the parameter is defined.
         - param_offset: The character offset in the line where the parameter is defined.
     """
-    code: CodeType = func.__code__  # type: ignore
+    code: CodeType = func.__code__
     lines = inspect.getsourcelines(func)
     lineno = code.co_firstlineno
     line = ""
@@ -116,7 +115,7 @@ def print_trace(te: Trace):  # pragma: no cover
             print(line, file=sys.stderr, end="")
 
     @staticmethod
-    def call(e: Exception, callable_target: Callable, contexts: Contexts, inner: bool = False):
+    def call(e: Exception, callable_target: FunctionType, contexts: Contexts, inner: bool = False):
         if isinstance(e, UnresolvedRequirement) and not isinstance(e, SyntaxError):
             name, anno, _, pds = e.args
             param = f"{name}: {inspect.formatannotation(anno)}" if anno is not None else name

arclet/letoderea/publisher.py

@@ -18,6 +18,7 @@
 _publisher_cache: dict[type, list[str]] = {}
 _publisher_cache_ignore = set()
 
+
 async def _supplier(event: Any, context: Contexts):
     if isinstance(event, dict):
         return context.update(event)
@@ -95,7 +96,7 @@ def check_subscriber(self, sub: Subscriber) -> bool:
         return True
 
 
-def filter_publisher(target: type[T]) -> Publisher[T] | None:
+def filter_publisher(target: type[T1]) -> Publisher[T1] | None:
     if (label := getattr(target, "__publisher__", f"$event:{target.__module__}.{target.__name__}")) in _publishers:
         return _publishers[label]
     return next((pub for pub in _publishers.values() if pub.target == target), None)
@@ -112,19 +113,19 @@ def get_publishers(event: Any) -> dict[str, Publisher]:
 
 
 def define(
-    target: type[T],
-    supplier: Callable[[T, Contexts], Awaitable[Contexts | None]] | None = None,
+    target: type[T1],
+    supplier: Callable[[T1, Contexts], Awaitable[Contexts | None]] | None = None,
     name: str | None = None,
-) -> Publisher[T]:
+) -> Publisher[T1]:
     if name and name in _publishers:
         return _publishers[name]
     if (_id := getattr(target, "__publisher__", f"$event:{target.__module__}.{target.__name__}")) in _publishers:
         return _publishers[_id]
     return Publisher(target, name, supplier)
 
 
-def gather(func: Callable[[T, Contexts], Awaitable[Contexts | None]]):
-    target: type[T] = next(iter(get_type_hints(func).values()))  # type: ignore
+def gather(func: Callable[[Any, Contexts], Awaitable[Contexts | None]]):
+    target: type[T1] = next(iter(get_type_hints(func).values()))  # type: ignore
     pub = filter_publisher(target) or define(target)
     pub.supplier = func
     return func

arclet/letoderea/subscriber.py

@@ -8,7 +8,7 @@
 from collections import defaultdict
 from contextlib import AsyncExitStack, asynccontextmanager
 from dataclasses import dataclass
-from typing import Annotated, Any, Generic, TypeVar, cast, final, overload
+from typing import Annotated, Any, Generic, TypeVar, final, overload
 from collections.abc import Callable, Generator, AsyncGenerator, Awaitable
 from typing_extensions import Self
 from typing import get_args, get_origin
@@ -41,9 +41,9 @@
 
 R = TypeVar("R")
 T = TypeVar("T")
-RESULT: CtxItem[Any] = cast(CtxItem, "$result")
-STACK: CtxItem[AsyncExitStack] = cast(CtxItem, "$exit_stack")
-SUBSCRIBER: CtxItem[Subscriber] = cast(CtxItem, "$subscriber")
+RESULT: CtxItem[Any] = CtxItem.make("$result")
+STACK: CtxItem[AsyncExitStack] = CtxItem.make("$exit_stack")
+SUBSCRIBER: CtxItem[Subscriber] = CtxItem.make("$subscriber")
 current_subscriber: ContextVar[Subscriber] = ContextVar("_current_subscriber")
 
 
@@ -339,7 +339,8 @@ async def handle(self, context: Contexts, inner=False):
             current_subscriber.reset(token)  # type: ignore
             if not inner:
                 if "$exit_stack" in context:  # pragma: no cover
-                    await context[STACK].__aexit__(*sys.exc_info())
+                    typ, e, tb = sys.exc_info()
+                    await context[STACK].__aexit__(typ, e, tb)
                 context.clear()
             if self.once:
                 self.dispose()
@@ -480,8 +481,16 @@ def defer(func: Callable[..., Any], ctx: Contexts | TTarget | None = None):
     return sub.propagate(func, once=True)
 
 
-def get_params(ctx: Contexts):
-    sub = ctx[SUBSCRIBER]
+def get_params(ctx: Contexts | Subscriber | None = None):  # pragma: no cover
+    if isinstance(ctx, dict):
+        sub = ctx[SUBSCRIBER]
+    elif isinstance(ctx, Subscriber):
+        sub = ctx
+    else:
+        try:
+            sub = current_subscriber.get()
+        except LookupError:
+            raise TypeError(f"Unsupported type {type(ctx)}") from None
     return sub.params
 
 

arclet/letoderea/typing.py

@@ -14,7 +14,10 @@
 T1 = TypeVar("T1")
 
 
-class CtxItem(Generic[T]): ...
+class CtxItem(Generic[T]):
+    @classmethod
+    def make(cls, name: str) -> CtxItem[T]:
+        return cast(CtxItem[T], cast(object, name))
 
 
 class Contexts(dict[str, Any]):
@@ -50,7 +53,7 @@ def get(self, __key: str | CtxItem[T1], __default: Any = ...) -> Any: ...  # typ
     ...
 
 
-EVENT: CtxItem[Any] = cast(CtxItem, "$event")
+EVENT: CtxItem[Any] = CtxItem.make("$event")
 
 
 async def generate_contexts(