telegrinder 0.4.1__py3-none-any.whl → 0.5.0__py3-none-any.whl

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,
+                ),
             ],
         )
 

telegrinder/bot/dispatch/middleware/global_middleware.py

@@ -1,50 +1,36 @@
-import inspect
 import typing
 from contextlib import contextmanager
 
-from telegrinder.api import API
-from telegrinder.bot.cute_types.update import UpdateCute
+from telegrinder.api.api import API
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.middleware.abc import ABCMiddleware
 from telegrinder.bot.rules.abc import ABCRule, check_rule
-from telegrinder.node import IsNode, compose_nodes
-from telegrinder.tools.adapter.abc import ABCAdapter
-from telegrinder.tools.adapter.raw_update import RawUpdateAdapter
+from telegrinder.node.base import IsNode
+from telegrinder.node.composer import compose_nodes
 from telegrinder.types import Update
+from telegrinder.types.objects import Update
 
 
 class GlobalMiddleware(ABCMiddleware):
-    adapter = RawUpdateAdapter()
-
-    def __init__(self):
+    def __init__(self) -> None:
         self.filters: set[ABCRule] = set()
-        self.source_filters: dict[ABCAdapter | IsNode, dict[typing.Any, ABCRule]] = {}
+        self.source_filters: dict[IsNode, dict[typing.Any, ABCRule]] = {}
 
-    async def pre(self, event: UpdateCute, ctx: Context) -> bool:
+    async def pre(self, event: Update, api: API, ctx: Context) -> bool:
         for filter in self.filters:
-            if not await check_rule(event.api, filter, event, ctx):
+            if not await check_rule(api, filter, event, ctx):
                 return False
 
-        # Simple implication.... Grouped by source categories
+        # Simple implication. Grouped by source categories
         for source, identifiers in self.source_filters.items():
-            if isinstance(source, ABCAdapter):
-                result = source.adapt(event.api, event, ctx)
-                if inspect.isawaitable(result):
-                    result = await result
-
-                result = result.unwrap_or_none()
-                if result is None:
-                    return True
-
+            result = await compose_nodes({"value": source}, ctx, {Update: event, API: api})
+            if result := result.unwrap():
+                result = result.values["value"]
             else:
-                result = await compose_nodes({"value": source}, ctx, {Update: event, API: event.api})
-                if result := result.unwrap():
-                    result = result.values["value"]
-                else:
-                    return True
+                return True
 
             if result in identifiers:
-                return await check_rule(event.api, identifiers[result], event, ctx)
+                return await check_rule(api, identifiers[result], event, ctx)
 
         return True
 
@@ -52,8 +38,8 @@ class GlobalMiddleware(ABCMiddleware):
     def apply_filters(
         self,
         *filters: ABCRule,
-        source_filter: tuple[ABCAdapter | IsNode, typing.Any, ABCRule] | None = None,
-    ):
+        source_filter: tuple[IsNode, typing.Any, ABCRule] | None = None,
+    ) -> typing.Generator[None, typing.Any, None]:
         if source_filter is not None:
             self.source_filters.setdefault(source_filter[0], {})
             self.source_filters[source_filter[0]].update({source_filter[1]: source_filter[2]})
@@ -62,9 +48,8 @@ class GlobalMiddleware(ABCMiddleware):
         yield
         self.filters.difference_update(filters)
 
-        if source_filter is not None:  # noqa: SIM102
-            if identifiers := self.source_filters.get(source_filter[0]):
-                identifiers.pop(source_filter[1], None)
+        if source_filter is not None and (identifiers := self.source_filters.get(source_filter[0])):
+            identifiers.pop(source_filter[1], None)
 
 
 __all__ = ("GlobalMiddleware",)

telegrinder/bot/dispatch/process.py

@@ -1,151 +1,130 @@
+from __future__ import annotations
+
 import typing
 
-from fntypes.option import Nothing, Some
+from fntypes.result import Error, Ok
 
 from telegrinder.api.api import API
-from telegrinder.bot.cute_types.update import UpdateCute
 from telegrinder.bot.dispatch.context import Context
 from telegrinder.bot.dispatch.middleware.abc import ABCMiddleware, run_middleware
-from telegrinder.bot.dispatch.return_manager.abc import ABCReturnManager
-from telegrinder.model import Model
 from telegrinder.modules import logger
-from telegrinder.node.composer import CONTEXT_STORE_NODES_KEY, NodeScope, compose_nodes
-from telegrinder.tools.adapter.abc import run_adapter
-from telegrinder.tools.i18n.abc import I18nEnum
+from telegrinder.node.composer import CONTEXT_STORE_NODES_KEY, compose_nodes
+from telegrinder.tools.aio import maybe_awaitable
+from telegrinder.tools.fullname import fullname
+from telegrinder.tools.magic.function import bundle
 from telegrinder.types.objects import Update
 
 if typing.TYPE_CHECKING:
-    from telegrinder.bot.dispatch.handler.abc import ABCHandler
+    from telegrinder.bot.dispatch.view.base import BaseView
     from telegrinder.bot.rules.abc import ABCRule
 
 
-async def process_inner[Event: Model](
+async def process_inner(
     api: API,
-    event: Event,
-    raw_event: Update,
+    event: Update,
     ctx: Context,
-    middlewares: list[ABCMiddleware[Event]],
-    handlers: list["ABCHandler[Event]"],
-    return_manager: ABCReturnManager[Event] | None = None,
+    view: BaseView,
 ) -> bool:
-    logger.debug("Processing {!r}...", event.__class__.__name__)
     ctx[CONTEXT_STORE_NODES_KEY] = {}  # For per-event shared nodes
 
-    logger.debug("Run pre middlewares...")
-    for m in middlewares:
-        result = await run_middleware(m.pre, api, event, raw_event=raw_event, ctx=ctx, adapter=m.adapter)
-        logger.debug("Middleware {!r} returned: {!r}", m, result)
-        if result is False:
+    for m in view.middlewares:
+        if (
+            type(m).pre is not ABCMiddleware.pre
+            and await run_middleware(m.pre, api, event, ctx, required_nodes=m.pre_required_nodes) is False
+        ):
+            logger.info(
+                "Update(id={}, type={!r}) processed with view `{}`. Pre-middleware `{}` raised failure.",
+                event.update_id,
+                event.update_type,
+                type(view).__name__,
+                fullname(m),
+            )
             return False
 
-    found = False
-    responses = []
+    found_handlers = []
+    responses = list[typing.Any]()
     ctx_copy = ctx.copy()
 
-    for handler in handlers:
-        adapted_event = event
-
-        if await handler.check(api, raw_event, ctx):
-            if handler.adapter is not None:
-                match await run_adapter(handler.adapter, api, raw_event, ctx):
-                    case Some(value):
-                        adapted_event = value
-                    case Nothing():
-                        continue
-
-            found = True
-            logger.debug("Handler {!r} matched, run...", handler)
-            response = await handler.run(api, adapted_event, ctx)
-            logger.debug("Handler {!r} returned: {!r}", handler, response)
-            responses.append(response)
-
-            if return_manager is not None:
-                await return_manager.run(response, event, ctx)
-            if handler.final:
-                break
-
-        ctx = ctx_copy
-
-    logger.debug("Run post middlewares...")
-    ctx.set("responses", responses)
-
-    for m in middlewares:
-        await run_middleware(
-            m.post,
-            api,
-            event,
-            raw_event=raw_event,
-            ctx=ctx,
-            adapter=m.adapter,
-        )
-
-    for session in ctx.get(CONTEXT_STORE_NODES_KEY, {}).values():
-        await session.close(scopes=(NodeScope.PER_EVENT,))
-
-    logger.debug(
-        "{} handlers, returns {!r}",
-        "No found" if not found else "Found",
-        found,
+    for handler in view.handlers:
+        match await handler.run(api, event, ctx):
+            case Ok(response):
+                found_handlers.append(handler)
+                responses.append(response)
+
+                if view.return_manager is not None:
+                    await view.return_manager.run(response, api, event, ctx)
+
+                if handler.final is True:
+                    break
+            case Error(error):
+                logger.debug(error)
+
+    ctx = ctx_copy
+    ctx.responses = responses
+
+    for m in view.middlewares:
+        if type(m).post is not ABCMiddleware.post:
+            await run_middleware(
+                m.post,
+                api,
+                event,
+                ctx,
+                required_nodes=m.post_required_nodes,
+            )
+
+    logger.info(
+        "Update(id={}, type={!r}) processed with view `{}`. {}",
+        event.update_id,
+        event.update_type,
+        type(view).__name__,
+        "No found corresponded handlers."
+        if not found_handlers
+        else f"Handler{'s' if len(found_handlers) > 1 else ''}: {', '.join(f'`{x!r}`' for x in found_handlers)}",
     )
-    return found
+    return bool(found_handlers)
 
 
 async def check_rule(
     api: API,
-    rule: "ABCRule",
+    rule: ABCRule,
     update: Update,
     ctx: Context,
 ) -> bool:
     """Checks requirements, adapts update.
     Returns check result.
     """
-    update_cute = None if not isinstance(update, UpdateCute) else update
-
-    # Running adapter
-    match await run_adapter(rule.adapter, api, update, ctx):
-        case Some(val):
-            adapted_value = val
-        case Nothing():
-            return False
-
-    # Preparing update
-    if isinstance(adapted_value, UpdateCute):
-        update_cute = adapted_value
-    elif isinstance(adapted_val := ctx.get(rule.adapter.ADAPTED_VALUE_KEY or ""), UpdateCute):
-        update_cute = adapted_val
-    else:
-        update_cute = UpdateCute.from_update(update, bound_api=api)
-
     # Running subrules to fetch requirements
     ctx_copy = ctx.copy()
     for requirement in rule.requires:
-        if not await check_rule(api, requirement, update_cute, ctx_copy):
+        if not await check_rule(api, requirement, update, ctx_copy):
             return False
 
-    # Translating translatable rules
-    if I18nEnum.I18N in ctx:
-        rule = await rule.translate(ctx[I18nEnum.I18N])
-
     ctx |= ctx_copy
+    node_col = None
+    data = {Update: update, API: api, Context: ctx}
 
     # Composing required nodes
-    nodes = rule.required_nodes
-    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 rule, error: {str(result.error)}")
-            return False
-        node_col = result.value
+    if rule.required_nodes:
+        match await compose_nodes(rule.required_nodes, ctx, data=data):
+            case Ok(value):
+                node_col = value
+            case Error(compose_error):
+                logger.debug(
+                    "Cannot compose nodes for rule `{!r}`, error: {!r}",
+                    rule,
+                    compose_error.message,
+                )
+                return False
 
     # Running check
-    result = await rule.bounding_check(ctx, adapted_value=adapted_value, node_col=node_col)
-
-    # Closing node sessions if there are any
-    if node_col is not None:
-        await node_col.close_all()
-
-    return result
+    try:
+        bundle_check = bundle(rule.check, data, typebundle=True)
+        bundle_check &= bundle(rule.check, ctx | ({} if node_col is None else node_col.values))
+        return await maybe_awaitable(bundle_check())
+    finally:
+        # Closing node sessions if there are any
+        if node_col is not None:
+            await node_col.close_all()
 
 
 __all__ = ("check_rule", "process_inner")