telegrinder 0.4.2__py3-none-any.whl → 0.5.1__py3-none-any.whl

telegrinder/bot/dispatch/handler/abc.py

@@ -1,22 +1,24 @@
 import typing
 from abc import ABC, abstractmethod
 
+from fntypes.result import Result
+
 from telegrinder.api import API
 from telegrinder.bot.dispatch.context import Context
-from telegrinder.tools.adapter.abc import ABCAdapter
 from telegrinder.types.objects import Update
 
 
-class ABCHandler[Event](ABC):
+class ABCHandler(ABC):
     final: bool
-    adapter: ABCAdapter[Update, Event] | None = None
-
-    @abstractmethod
-    async def check(self, api: API, event: Update, ctx: Context | None = None) -> bool:
-        pass
 
     @abstractmethod
-    async def run(self, api: API, event: Event, ctx: Context) -> typing.Any:
+    async def run(
+        self,
+        api: API,
+        event: Update,
+        context: Context,
+        check: bool = True,
+    ) -> Result[typing.Any, typing.Any]:
         pass
 
 

telegrinder/bot/dispatch/handler/audio_reply.py

@@ -1,6 +1,5 @@
 import typing
 
-from telegrinder.api.api import API
 from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.handler.base import BaseReplyHandler
@@ -31,8 +30,8 @@ class AudioReplyHandler(BaseReplyHandler):
             **default_params,
         )
 
-    async def run(self, _: API, event: MessageCute, __: Context) -> typing.Any:
-        method = event.answer_audio if not self.as_reply else event.reply_audio
+    async def handle(self, message: MessageCute) -> None:
+        method = message.answer_audio if not self.as_reply else message.reply_audio
         await method(
             audio=self.audio,
             parse_mode=self.parse_mode,

telegrinder/bot/dispatch/handler/base.py

@@ -1,24 +1,14 @@
 import abc
 import typing
 
-from fntypes.result import Result
-
-from telegrinder.api.api import API
-from telegrinder.api.error import APIError
-from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
-from telegrinder.bot.dispatch.handler.abc import ABCHandler
-from telegrinder.bot.dispatch.process import check_rule
+from telegrinder.bot.dispatch.handler.func import FuncHandler
 from telegrinder.bot.rules.abc import ABCRule
-from telegrinder.modules import logger
-from telegrinder.types.objects import Update
 
-type APIMethod = typing.Callable[
-    typing.Concatenate[MessageCute, ...], typing.Awaitable[Result[typing.Any, APIError]]
-]
 
+class BaseReplyHandler(FuncHandler, abc.ABC):
+    final: bool
 
-class BaseReplyHandler(ABCHandler[MessageCute], abc.ABC):
     def __init__(
         self,
         *rules: ABCRule,
@@ -27,30 +17,17 @@ class BaseReplyHandler(ABCHandler[MessageCute], abc.ABC):
         preset_context: Context | None = None,
         **default_params: typing.Any,
     ) -> None:
-        self.rules = list(rules)
         self.as_reply = as_reply
-        self.final = final
         self.default_params = default_params
-        self.preset_context = preset_context or Context()
-
-    def __repr__(self) -> str:
-        return f"<{self.__class__.__qualname__}>"
-
-    async def check(self, api: API, event: Update, ctx: Context | None = None) -> bool:
-        ctx = Context(raw_update=event) if ctx is None else ctx
-        temp_ctx = ctx.copy()
-        temp_ctx |= self.preset_context
-
-        for rule in self.rules:
-            if not await check_rule(api, rule, event, ctx):
-                logger.debug("Rule {!r} failed!", rule)
-                return False
-
-        ctx |= temp_ctx
-        return True
+        super().__init__(
+            function=self.handle,
+            rules=list(rules),
+            final=final,
+            preset_context=preset_context or Context(),
+        )
 
     @abc.abstractmethod
-    async def run(self, api: API, event: MessageCute, ctx: Context) -> typing.Any:
+    async def handle(self, *args: typing.Any, **kwargs: typing.Any) -> typing.Any:
         pass
 
 

telegrinder/bot/dispatch/handler/document_reply.py

@@ -1,6 +1,5 @@
 import typing
 
-from telegrinder.api.api import API
 from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.handler.base import BaseReplyHandler
@@ -31,8 +30,8 @@ class DocumentReplyHandler(BaseReplyHandler):
             **default_params,
         )
 
-    async def run(self, _: API, event: MessageCute, __: Context) -> typing.Any:
-        method = event.answer_document if not self.as_reply else event.reply_document
+    async def handle(self, message: MessageCute) -> None:
+        method = message.answer_document if not self.as_reply else message.reply_document
         await method(
             document=self.document,
             parse_mode=self.parse_mode,

telegrinder/bot/dispatch/handler/func.py

@@ -1,128 +1,96 @@
+from __future__ import annotations
+
 import dataclasses
+import typing
+from collections import deque
 from functools import cached_property
 
-import typing_extensions as typing
+from fntypes.result import Error, Ok, Result
 
 from telegrinder.api.api import API
 from telegrinder.bot.dispatch.context import Context
+from telegrinder.bot.dispatch.handler.abc import ABCHandler
 from telegrinder.bot.dispatch.process import check_rule
 from telegrinder.modules import logger
-from telegrinder.node.base import NodeType, get_nodes
-from telegrinder.node.composer import NodeCollection, compose_nodes
-from telegrinder.tools.adapter.abc import ABCAdapter
-from telegrinder.tools.adapter.dataclass import DataclassAdapter
-from telegrinder.tools.error_handler import ABCErrorHandler, ErrorHandler
-from telegrinder.tools.magic import get_annotations, magic_bundle
-from telegrinder.types.enums import UpdateType
+from telegrinder.node.base import IsNode, get_nodes
+from telegrinder.node.composer import compose_nodes
+from telegrinder.tools.fullname import fullname
+from telegrinder.tools.magic.function import bundle
 from telegrinder.types.objects import Update
 
-from .abc import ABCHandler
-
 if typing.TYPE_CHECKING:
     from telegrinder.bot.rules.abc import ABCRule
-    from telegrinder.node.composer import NodeCollection
 
-Function = typing.TypeVar("Function", bound="Func[..., typing.Any]")
-Event = typing.TypeVar("Event")
-ErrorHandlerT = typing.TypeVar("ErrorHandlerT", bound=ABCErrorHandler, default=ErrorHandler)
-
-type Func[**Rest, Result] = typing.Callable[Rest, typing.Coroutine[typing.Any, typing.Any, Result]]
+type Function = typing.Callable[..., typing.Coroutine[typing.Any, typing.Any, typing.Any]]
 
 
 @dataclasses.dataclass(repr=False, slots=True)
-class FuncHandler(ABCHandler[Event], typing.Generic[Event, Function, ErrorHandlerT]):
-    function: Function
-    rules: list["ABCRule"]
-    adapter: ABCAdapter[Update, Event] | None = dataclasses.field(default=None, kw_only=True)
+class FuncHandler[T: Function](ABCHandler):
+    function: T
+    rules: dataclasses.InitVar[typing.Iterable[ABCRule] | None] = None
     final: bool = dataclasses.field(default=True, kw_only=True)
-    dataclass: type[typing.Any] | None = dataclasses.field(default=dict[str, typing.Any], kw_only=True)
-    error_handler: ErrorHandlerT = dataclasses.field(
-        default_factory=lambda: typing.cast(ErrorHandlerT, ErrorHandler()),
-        kw_only=True,
-    )
     preset_context: Context = dataclasses.field(default_factory=lambda: Context(), kw_only=True)
-    update_type: UpdateType | None = dataclasses.field(default=None, kw_only=True)
-
-    def __post_init__(self) -> None:
-        self.dataclass = typing.get_origin(self.dataclass) or self.dataclass
 
-        if self.dataclass is not None and self.adapter is None:
-            self.adapter = DataclassAdapter(self.dataclass, self.update_type)
+    def __post_init__(self, rules: typing.Iterable[ABCRule] | None) -> None:
+        self.check_rules = deque(rules or ())
 
     @property
     def __call__(self) -> Function:
         return self.function
 
     def __repr__(self) -> str:
-        return "<{}: {}={!r} with rules={!r}, dataclass={!r}, error_handler={!r}>".format(
-            self.__class__.__name__,
-            "final function" if self.final else "function",
-            self.function.__qualname__,
-            self.rules,
-            self.dataclass,
-            self.error_handler,
-        )
+        return fullname(self.function)
 
     @cached_property
-    def required_nodes(self) -> dict[str, type[NodeType]]:
+    def required_nodes(self) -> dict[str, IsNode]:
         return get_nodes(self.function)
 
-    def get_name_event_param(self, event: Event) -> str | None:
-        event_class = self.dataclass or event.__class__
-        for k, v in get_annotations(self.function).items():
-            if isinstance(v := typing.get_origin(v) or v, type) and v is event_class:
-                self.func_event_param = k
-                return k
-        return None
-
-    async def check(self, api: API, event: Update, ctx: Context | None = None) -> bool:
-        if self.update_type is not None and self.update_type != event.update_type:
-            return False
-
-        logger.debug("Checking handler {!r}...", self)
-        ctx = Context(raw_update=event) if ctx is None else ctx
-        temp_ctx = ctx.copy()
+    async def run(
+        self,
+        api: API,
+        event: Update,
+        context: Context,
+        check: bool = True,
+    ) -> Result[typing.Any, str]:
+        logger.debug("Checking rules and composing nodes for handler `{!r}`...", self)
+
+        temp_ctx = context.copy()
         temp_ctx |= self.preset_context.copy()
-        update = event
 
-        for rule in self.rules:
-            if not await check_rule(api, rule, update, temp_ctx):
-                logger.debug("Rule {!r} failed!", rule)
-                return False
+        if check:
+            for rule in self.check_rules:
+                if not await check_rule(api, rule, event, temp_ctx):
+                    return Error(f"Rule {rule!r} failed.")
 
-        nodes = self.required_nodes
+        context |= temp_ctx
+        data = {Update: event, API: api}
         node_col = None
-        if nodes:
-            result = await compose_nodes(nodes, ctx, data={Update: update, API: api})
-            if not result:
-                logger.debug(f"Cannot compose nodes for handler, error: {str(result.error)}")
-                return False
-
-            node_col = result.value
-            temp_ctx |= node_col.values
 
-        logger.debug("All checks passed for handler.")
-        temp_ctx["node_col"] = node_col
-        ctx |= temp_ctx
-        return True
+        if self.required_nodes:
+            match await compose_nodes(self.required_nodes, context, data=data):
+                case Ok(value):
+                    node_col = value
+                case Error(compose_error):
+                    return Error(f"Cannot compose nodes for handler `{self}`, error: {compose_error.message}")
 
-    async def run(
-        self,
-        api: API,
-        event: Event,
-        ctx: Context,
-        node_col: "NodeCollection | None" = None,
-    ) -> typing.Any:
-        logger.debug(f"Running handler {self!r}...")
+        logger.debug("All good, running handler `{!r}`", self)
 
+        temp_ctx = context.copy()
         try:
-            if event_param := self.get_name_event_param(event):
-                ctx = Context(**{event_param: event, **ctx})
-            return await self(**magic_bundle(self.function, ctx, start_idx=0, bundle_ctx=True))
-        except BaseException as exception:
-            return await self.error_handler.run(exception, event, api, ctx)
+            bundle_function = bundle(
+                self.function,
+                {**data, Context: temp_ctx},
+                typebundle=True,
+                start_idx=0,
+            )
+            bundle_function &= bundle(
+                self.function, context | ({} if node_col is None else node_col.values), start_idx=0
+            )
+            return Ok(await bundle_function())
         finally:
-            if node_col := ctx.node_col:
+            context |= temp_ctx
+
+            if node_col is not None:
                 await node_col.close_all()
 
 

telegrinder/bot/dispatch/handler/media_group_reply.py

@@ -1,6 +1,5 @@
 import typing
 
-from telegrinder.api.api import API
 from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.handler.base import BaseReplyHandler
@@ -31,8 +30,8 @@ class MediaGroupReplyHandler(BaseReplyHandler):
             **default_params,
         )
 
-    async def run(self, _: API, event: MessageCute, __: Context) -> typing.Any:
-        method = event.answer_media_group if not self.as_reply else event.reply_media_group
+    async def handle(self, message: MessageCute) -> None:
+        method = message.answer_media_group if not self.as_reply else message.reply_media_group
         await method(
             media=self.media,
             parse_mode=self.parse_mode,

telegrinder/bot/dispatch/handler/message_reply.py

@@ -1,6 +1,5 @@
 import typing
 
-from telegrinder.api.api import API
 from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.handler.base import BaseReplyHandler
@@ -28,8 +27,8 @@ class MessageReplyHandler(BaseReplyHandler):
             **default_params,
         )
 
-    async def run(self, _: API, event: MessageCute, __: Context) -> typing.Any:
-        method = event.answer if not self.as_reply else event.reply
+    async def handle(self, message: MessageCute) -> None:
+        method = message.answer if not self.as_reply else message.reply
         await method(text=self.text, parse_mode=self.parse_mode, **self.default_params)
 
 

telegrinder/bot/dispatch/handler/photo_reply.py

@@ -1,6 +1,5 @@
 import typing
 
-from telegrinder.api.api import API
 from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.handler.base import BaseReplyHandler
@@ -31,8 +30,8 @@ class PhotoReplyHandler(BaseReplyHandler):
             **default_params,
         )
 
-    async def run(self, _: API, event: MessageCute, __: Context) -> typing.Any:
-        method = event.answer_photo if not self.as_reply else event.reply_photo
+    async def handle(self, message: MessageCute) -> None:
+        method = message.answer_photo if not self.as_reply else message.reply_photo
         await method(
             photo=self.photo,
             parse_mode=self.parse_mode,

telegrinder/bot/dispatch/handler/sticker_reply.py

@@ -1,6 +1,5 @@
 import typing
 
-from telegrinder.api.api import API
 from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.handler.base import BaseReplyHandler
@@ -29,8 +28,8 @@ class StickerReplyHandler(BaseReplyHandler):
             **default_params,
         )
 
-    async def run(self, _: API, event: MessageCute, __: Context) -> typing.Any:
-        method = event.answer_sticker if not self.as_reply else event.reply_sticker
+    async def handle(self, message: MessageCute) -> None:
+        method = message.answer_sticker if not self.as_reply else message.reply_sticker
         await method(sticker=self.sticker, emoji=self.emoji, **self.default_params)
 
 

telegrinder/bot/dispatch/handler/video_reply.py

@@ -1,6 +1,5 @@
 import typing
 
-from telegrinder.api.api import API
 from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.handler.base import BaseReplyHandler
@@ -31,8 +30,8 @@ class VideoReplyHandler(BaseReplyHandler):
             **default_params,
         )
 
-    async def run(self, _: API, event: MessageCute, __: Context) -> typing.Any:
-        method = event.answer_video if not self.as_reply else event.reply_video
+    async def run(self, message: MessageCute) -> None:
+        method = message.answer_video if not self.as_reply else message.reply_video
         await method(
             video=self.video,
             parse_mode=self.parse_mode,

telegrinder/bot/dispatch/middleware/abc.py

@@ -1,95 +1,119 @@
-from __future__ import annotations
-
 from abc import ABC
+from functools import cached_property
 
 import typing_extensions as typing
-from fntypes import Some
+from fntypes.result import Error, Ok
 
-from telegrinder.api import API
+from telegrinder.api.api import API
 from telegrinder.bot.cute_types.base import BaseCute
 from telegrinder.bot.dispatch.context import Context
-from telegrinder.model import Model
 from telegrinder.modules import logger
-from telegrinder.tools.adapter.abc import ABCAdapter, run_adapter
+from telegrinder.node.base import IsNode, get_nodes
+from telegrinder.node.composer import compose_nodes
+from telegrinder.tools.aio import maybe_awaitable
 from telegrinder.tools.lifespan import Lifespan
+from telegrinder.tools.magic.function import bundle
 from telegrinder.types.objects import Update
 
-ToEvent = typing.TypeVar("ToEvent", bound=Model, default=typing.Any)
+type Event = Update | BaseCute[typing.Any]
+type MiddlewareResult = bool | None | typing.Coroutine[typing.Any, typing.Any, bool | None]
 
 
-async def run_middleware[Event: Model, R: bool | None](
-    method: typing.Callable[typing.Concatenate[Event, Context, ...], typing.Awaitable[R]],
-    api: API[typing.Any],
-    event: Event,
+async def run_middleware(
+    method: typing.Callable[..., MiddlewareResult],
+    api: API,
+    event: Update,
     ctx: Context,
-    raw_event: Update | None = None,
-    adapter: "ABCAdapter[Update, Event] | None" = None,
-    *args: typing.Any,
-    **kwargs: typing.Any,
-) -> R:
-    if adapter is not None:
-        if raw_event is None:
-            raise RuntimeError("raw_event must be specified to apply adapter")
-        match await run_adapter(adapter, api, raw_event, ctx):
-            case Some(val):
-                event = val
-            case _:
-                return False  # type: ignore
-
-    logger.debug("Running {}-middleware {!r}...", method.__name__, method.__qualname__.split(".")[0])
-    return await method(event, ctx, *args, **kwargs)  # type: ignore
-
-
-class ABCMiddleware[Event: Model | BaseCute](ABC):
-    adapter: ABCAdapter[Update, Event] | None = None
+    required_nodes: typing.Mapping[str, IsNode] | None = None,
+) -> bool | None:
+    node_col = None
+    data = {API: api, Update: event, Context: ctx}
+
+    if required_nodes:
+        match await compose_nodes(required_nodes, ctx, data=data):
+            case Ok(value):
+                node_col = value
+            case Error(compose_error):
+                logger.debug(
+                    "Cannot compose nodes for `{}`, error: {!r}",
+                    method.__qualname__,
+                    compose_error.message,
+                )
+                return False
+
+    try:
+        bundle_method = bundle(method, ctx | ({} if node_col is None else node_col.values))
+        bundle_method &= bundle(method, data, typebundle=True)
+        return await maybe_awaitable(bundle_method())
+    finally:
+        if node_col is not None:
+            await node_col.close_all()
+
 
+class ABCMiddleware(ABC):
     def __repr__(self) -> str:
-        name = f"middleware {self.__class__.__name__!r}:"
-        has_pre = self.pre.__qualname__.split(".")[0] != "ABCMiddleware"
-        has_post = self.post.__qualname__.split(".")[0] != "ABCMiddleware"
+        name = f"middleware {type(self).__name__!r}"
+        middleware_class = type(self)
 
-        if has_post:
+        if middleware_class.post is not ABCMiddleware.post:
             name = "post-" + name
-        if has_pre:
+
+        if middleware_class.pre is not ABCMiddleware.pre:
             name = "pre-" + name
 
-        return "<{} with adapter={!r}>".format(name, self.adapter)
+        return f"<{name}>"
+
+    if typing.TYPE_CHECKING:
+
+        def pre(self, *args: typing.Any, **kwargs: typing.Any) -> MiddlewareResult: ...
+
+        def post(self, *args: typing.Any, **kwargs: typing.Any) -> MiddlewareResult: ...
 
-    async def pre(self, event: Event, ctx: Context) -> bool: ...
+    else:
 
-    async def post(self, event: Event, ctx: Context) -> None: ...
+        def pre(self, *args, **kwargs): ...
 
-    @typing.overload
-    def to_lifespan(self, event: Event, ctx: Context | None = None, *, api: API) -> Lifespan: ...
+        def post(self, *args, **kwargs): ...
 
-    @typing.overload
-    def to_lifespan(self, event: Event, ctx: Context | None = None) -> Lifespan: ...
+    @cached_property
+    def pre_required_nodes(self) -> dict[str, IsNode]:
+        return get_nodes(self.pre)
+
+    @cached_property
+    def post_required_nodes(self) -> dict[str, IsNode]:
+        return get_nodes(self.post)
 
     def to_lifespan(
         self,
         event: Event,
-        ctx: Context | None = None,
+        ctx: Context,
+        *,
         api: API | None = None,
-        **add_context: typing.Any,
     ) -> Lifespan:
+        if isinstance(event, BaseCute):
+            event, api = event.raw_update, event.api
+
         if api is None:
-            if not isinstance(event, BaseCute):
-                raise LookupError("Cannot get api, please pass as kwarg or provide BaseCute api-bound event")
-            api = event.api
+            raise LookupError("Cannot get api, please pass as kwarg or provide BaseCute api-bound event.")
 
-        ctx = ctx or Context()
-        ctx |= add_context
         return Lifespan(
-            startup_tasks=[run_middleware(self.pre, api, event, raw_event=None, ctx=ctx, adapter=None)],
+            startup_tasks=[
+                run_middleware(
+                    self.pre,
+                    api,
+                    event,
+                    ctx,
+                    required_nodes=self.pre_required_nodes,
+                ),
+            ],
             shutdown_tasks=[
                 run_middleware(
                     self.post,
                     api,
                     event,
-                    raw_event=None,
-                    ctx=ctx,
-                    adapter=None,
-                )
+                    ctx,
+                    required_nodes=self.post_required_nodes,
+                ),
             ],
         )