funpaybotengine 0.7.1__tar.gz → 0.10.0rc2__tar.gz

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: funpaybotengine
-Version: 0.7.1
+Version: 0.10.0rc2
 Summary: Framework for creating FunPay bots.
 Project-URL: Telegram, https://t.me/funpay_hub
 Project-URL: Issues, https://github.com/funpayhub/funpaybotengine/issues
@@ -20,9 +20,9 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.10
 Requires-Dist: aiohttp-socks>=0.11.0
 Requires-Dist: aiohttp<3.14,>=3.13.3
-Requires-Dist: eventry<0.4.0,>=0.3.6
+Requires-Dist: eventry<0.8.0,>=0.7.1
 Requires-Dist: funpayparsers<0.11.0,>=0.10.0
-Requires-Dist: pydantic<2.13,>=2.12
+Requires-Dist: pydantic<2.14,>=2.13
 Provides-Extra: dev
 Requires-Dist: mypy>=1.10.1; extra == 'dev'
 Requires-Dist: pre-commit>=4.5.1; extra == 'dev'

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/examples/basic.py

@@ -4,15 +4,16 @@ import sys
 import asyncio
 import logging
 
-from funpaybotengine import Bot, Dispatcher
+from funpaybotengine import Bot, Router, Dispatcher
 from funpaybotengine.types import Message
 
 
 bot: Bot = Bot(golden_key='token')
-dp: Dispatcher = Dispatcher()
+router = Router(name='my_router')
+dp: Dispatcher = Dispatcher(router)
 
 
-@dp.on_new_message()
+@router.on_new_message()
 async def echo(message: Message) -> None:
     await message.reply(text='echo')
 

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/examples/with_redis_storage.py

@@ -44,7 +44,7 @@ import logging
 from contextlib import suppress
 
 from redis.asyncio import Redis
-from funpaybotengine import Bot, Dispatcher
+from funpaybotengine import Bot, Router, Dispatcher
 from funpaybotengine.types import Message
 from funpaybotengine.storage.redis import RedisStorage
 
@@ -58,10 +58,11 @@ bot: Bot = Bot(
     golden_key='token',
     storage=storage,
 )
-dp: Dispatcher = Dispatcher()
+router = Router(name='my_router')
+dp: Dispatcher = Dispatcher(router)
 
 
-@dp.on_new_message()
+@router.on_new_message()
 async def echo(message: Message) -> None:
     await message.reply(text='echo')
 

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/funpaybotengine/__init__.py

@@ -4,8 +4,8 @@ import funpaybotengine.dispatching.events as events
 import funpaybotengine.dispatching.filters as filters
 from funpaybotengine.client.bot import Bot
 from funpaybotengine.client.session import BaseSession, AioHttpSession
-from funpaybotengine.dispatching.routers.base import Router
-from funpaybotengine.dispatching.routers.dispatcher import Dispatcher
+from funpaybotengine.dispatching.router import Router
+from funpaybotengine.dispatching.dispatcher import Dispatcher
 
 
 __all__ = [

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/funpaybotengine/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 
-__all__ = ('BindableObject', 'check_bound')
+__all__ = ['BindableObject']
 
 
 from typing import TYPE_CHECKING, Any, TypeVar
@@ -41,24 +41,6 @@ class BindableObject(BaseModel):
         return self._bot
 
     def get_bound_bot(self) -> Bot:
-        if not self.bot:
+        if self.bot is None:
             raise BotNotBoundError(self)
         return self.bot
-
-
-def check_bound(func: F) -> F:
-    """
-    Decorator for instance methods to ensure the object is bound to any Bot instance.
-    """
-
-    def wrapper(*args: Any, **kwargs: Any) -> Any:
-        if not args:
-            raise RuntimeError('Can be used only with instance methods.')
-
-        if not isinstance(args[0], BindableObject):
-            raise ValueError(f'{args[0].__class__.__name__} is not a bindable object.')
-        if args[0].bot is None:
-            raise RuntimeError(f'{args[0]} is not bound to any `Bot` instance.')
-        return func(*args, **kwargs)
-
-    return wrapper  # type: ignore

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/funpaybotengine/client/bot.py

@@ -25,9 +25,9 @@ from funpaybotengine.types import (
     TransactionFilter,
     OrderPreviewsBatch,
     PrivateChatPreview,
+    RaiseOffersResponse,
     TransactionPreviewsBatch,
     CurrentlyViewingOfferInfo,
-    RaiseOffersResponse
 )
 from funpaybotengine.utils import (
     random_runner_tag,
@@ -60,13 +60,12 @@ from funpaybotengine.methods import (
     GetMyChipsPage,
     GetOfferFields,
     GetProfilePage,
-    GetSettingPage,
     GetMyOffersPage,
+    GetSettingsPage,
     GetSrasInfoPage,
     GetTransactions,
     SaveOfferFields,
     SetOffersHidden,
-    MethodReturnType,
     GetSubcategoryPage,
     GetTransactionsPage,
     UpdateNoticeChannel,
@@ -114,11 +113,11 @@ from funpaybotengine.client.session.aiohttp_session import AioHttpSession
 
 if TYPE_CHECKING:
     from funpaybotengine.client.session.base import BaseSession
-    from funpaybotengine.dispatching.routers.dispatcher import Dispatcher
+    from funpaybotengine.dispatching.dispatcher import Dispatcher
 
 
 F = TypeVar('F', bound=Callable[..., Any])
-R = TypeVar('R', bound=Any)
+R = TypeVar('R')
 
 
 class LocaleMismatchHookProto(Protocol):
@@ -157,16 +156,15 @@ class Bot:
 
         self._storage = storage or InMemoryStorage()
         self._runner = Runner(self)
-        self._session = session or AioHttpSession(proxy=proxy, default_headers=default_headers)
+        self._session = session or AioHttpSession(proxy=proxy, headers=default_headers)
         self._session_updated_at = 0
 
         self._on_locale_mismatch_hook: LocaleMismatchHookProto = force_locale_hook
         self.update_categories: bool = update_categories
 
         self._messages_lock = Lock()
-        self._listening_lock = Lock()
-        self._stopping_lock = Lock()
 
+        self._listening_lock = Lock()
         self._stop_event = Event()
         self._stopped_event = Event()
         self._stopped_event.set()
@@ -412,7 +410,7 @@ class Bot:
             image = (
                 image
                 if isinstance(image, int)
-                else (await UploadImage(image).execute(self)).response_obj
+                else (await UploadImage(file=image).execute(self)).response_obj
             )
         elif text is not None:
             if enforce_whitespaces:
@@ -602,7 +600,8 @@ class Bot:
 
         :param args: Tuple of (chat_id, after_message_id)
 
-        :returns: A dictionary [chat_id, list] or a list of up to 100 ``Message`` objects, sorted from oldest to newest.
+        :returns: A dictionary [chat_id, list] or a list of up to 100 ``Message`` objects,
+        sorted from oldest to newest.
         """
         if not args and chat_id is None:
             raise ValueError('Either `chat_id` or `args` must be provided.')
@@ -795,7 +794,7 @@ class Bot:
     ) -> TransactionPreviewsBatch:
         return (
             await GetTransactions(
-                filter=filter,
+                filter=TransactionFilter(filter),
                 from_transaction_id=from_transaction_id,
             ).execute(self)
         ).response_obj
@@ -852,7 +851,7 @@ class Bot:
         return (await GetSrasInfoPage().execute(self)).response_obj
 
     async def get_settings_page(self) -> SettingsPage:
-        return (await GetSettingPage().execute(self)).response_obj
+        return (await GetSettingsPage().execute(self)).response_obj
 
     async def get_transactions_page(self) -> TransactionsPage:
         return (await GetTransactionsPage().execute(self)).response_obj
@@ -868,11 +867,11 @@ class Bot:
 
     async def make_request(
         self,
-        method: FunPayMethod[MethodReturnType],
+        method: FunPayMethod[R],
         skip_update: bool = False,
         skip_locale_check: bool = False,
         skip_session_cookies: bool = False,
-    ) -> Response[MethodReturnType]:
+    ) -> Response[R]:
         if not method.allow_anonymous and self.anonymous:
             raise RuntimeError(
                 f"Method '{method.__class__.__name__}' cannot be executed anonymously.",
@@ -947,20 +946,16 @@ class Bot:
         *,
         config: RunnerConfig | None = None,
         session_storage: Storage | None = None,
-        workflow_injection: dict[str, Any] | None = None,
+        context_injection: dict[str, Any] | None = None,
     ) -> None:
-        workflow_injection = workflow_injection if workflow_injection is not None else {}
+        context_injection = context_injection if context_injection is not None else {}
         try:
             async with self.session:
                 listener = self._runner.listen(config=config, session_storage=session_storage)
-                async for event, stack in listener:
-                    await dp.event_entry(
+                async for event, pack in listener:
+                    await dp.propagate_event(
                         event,
-                        event_context_injection={
-                            **workflow_injection,
-                            'events_stack': stack,
-                            'bot': self,
-                        },
+                        additional_context={**context_injection, 'events_pack': pack, 'bot': self},
                     )
         except KeyboardInterrupt:
             return
@@ -975,36 +970,47 @@ class Bot:
         workflow_injection: dict[str, Any] | None = None,
     ) -> None:
         if self._listening_lock.locked():
-            raise RuntimeError('Already listening')
+            raise RuntimeError('Already listening.')
 
         async with self._listening_lock:
             self._stop_event.clear()
             self._stopped_event.clear()
 
-            tasks = [
-                asyncio.create_task(
-                    self._listen_events(
-                        dp,
-                        config=config,
-                        session_storage=session_storage,
-                        workflow_injection=workflow_injection,
-                    ),
-                ),
-                asyncio.create_task(self._stop_event.wait()),
-            ]
+            listener_task = asyncio.create_task(
+                self._listen_events(
+                    dp,
+                    config=config,
+                    session_storage=session_storage,
+                    context_injection=workflow_injection,
+                )
+            )
+            stop_task = asyncio.create_task(self._stop_event.wait())
+
+            try:
+                done, pending = await asyncio.wait(
+                    [listener_task, stop_task], return_when=asyncio.FIRST_COMPLETED
+                )
+
+                # Если таска прослушивания событий упала - райзим исключение наверх.
+                if listener_task in done:
+                    await listener_task
+                    return
 
-            _, pending = await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
-            for task in pending:
+                listener_task.cancel()
                 with suppress(asyncio.CancelledError):
-                    task.cancel()
-            self._stopped_event.set()
+                    await listener_task
+
+            finally:
+                for task in (listener_task, stop_task):
+                    if not task.done():
+                        task.cancel()
+
+                await asyncio.gather(listener_task, stop_task, return_exceptions=True)
+                self._stopped_event.set()
 
     async def stop_listening(self) -> None:
         if self._stopped_event.is_set():
-            raise RuntimeError('Listening is already stopped.')
-        if self._stopping_lock.locked():
-            raise RuntimeError('Listening stopping already in progress.')
+            return
 
-        async with self._stopping_lock:
-            self._stop_event.set()
-            await self._stopped_event.wait()
+        self._stop_event.set()
+        await self._stopped_event.wait()

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/funpaybotengine/client/session/aiohttp_session.py

@@ -25,21 +25,17 @@ from funpaybotengine.exceptions.session_exceptions import BannedError
 
 if TYPE_CHECKING:
     from funpaybotengine.client.bot import Bot
-    from funpaybotengine.methods.base import FunPayMethod, MethodReturnType
+    from funpaybotengine.methods.base import MethodR, FunPayMethod
 
 
 class AioHttpSession(BaseSession):
-    def __init__(
-        self,
-        proxy: str | None = None,
-        default_headers: dict[str, str] | None = None,
-    ):
+    def __init__(self, proxy: str | None = None, headers: dict[str, str] | None = None) -> None:
         super().__init__()
 
         self._proxy = proxy
         self._default_headers = (
-            default_headers
-            if default_headers is not None
+            headers
+            if headers is not None
             else {
                 USER_AGENT: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:140.0) '
                 'Gecko/20100101 Firefox/140.0',
@@ -74,10 +70,7 @@ class AioHttpSession(BaseSession):
             await asyncio.sleep(0.25)
 
     def prepare_cookies(
-        self,
-        session: ClientSession,
-        bot: Bot,
-        skip_session_cookies: bool = False,
+        self, session: ClientSession, bot: Bot, skip_session_cookies: bool = False
     ) -> None:
         session.cookie_jar.update_cookies({'cookie_prefs': '1'})  # no 3rd-party cookies
 
@@ -95,11 +88,11 @@ class AioHttpSession(BaseSession):
 
     async def make_request(
         self,
-        method: FunPayMethod[MethodReturnType],
+        method: FunPayMethod[MethodR],
         bot: Bot,
         timeout: float | None = None,
         skip_session_cookies: bool = False,
-    ) -> Response[MethodReturnType]:
+    ) -> Response[MethodR]:
         session = await self.session()
 
         self.prepare_cookies(session, bot, skip_session_cookies=skip_session_cookies)

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/funpaybotengine/client/session/base.py

@@ -22,7 +22,7 @@ from funpaybotengine.exceptions import (
 
 if TYPE_CHECKING:
     from funpaybotengine.client.bot import Bot
-    from funpaybotengine.methods.base import FunPayMethod, MethodReturnType
+    from funpaybotengine.methods.base import MethodR, FunPayMethod
 
 
 _exceptions: dict[int, Any] = {
@@ -82,11 +82,11 @@ class BaseSession(ABC):
     @abstractmethod
     async def make_request(
         self,
-        method: FunPayMethod[MethodReturnType],
+        method: FunPayMethod[MethodR],
         bot: Bot,
         timeout: float | None = None,
         skip_session_cookies: bool = False,
-    ) -> Response[MethodReturnType]: ...
+    ) -> Response[MethodR]: ...
 
     def check_status_code(self, method: FunPayMethod[Any], status_code: int | HTTPStatus) -> None:
         """

funpaybotengine-0.10.0rc2/funpaybotengine/dispatching/__init__.py

@@ -0,0 +1,7 @@
+from __future__ import annotations
+
+from .events import *
+from .router import Router as Router
+from .filters import *
+from .dispatcher import Dispatcher as Dispatcher
+from .handler_manager import HandlerManager as HandlerManager

funpaybotengine-0.10.0rc2/funpaybotengine/dispatching/dispatcher.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+
+__all__ = ['Dispatcher']
+
+
+from typing import Any
+
+from eventry.asyncio import (
+    Dispatcher as BaseDispatcher,
+    DispatchingConfig,
+    DispatchingContext,
+    default_error_callback,
+)
+
+from funpaybotengine.loggers import dispatcher_logger as logger
+from funpaybotengine.dispatching import Router, ExceptionEvent
+
+
+async def on_error_callback(ctx: DispatchingContext, exc: Exception) -> None:
+    if isinstance(ctx.event, ExceptionEvent):
+        await default_error_callback(ctx, exc)
+        return
+
+    exc_event = ExceptionEvent(object=exc, context=ctx)
+
+    try:
+        await ctx.dispatcher.propagate_event(exc_event)
+    except Exception as e:
+        logger.error('An error occurred while propagating error event.', exc_info=e)
+
+
+async def on_handler(ctx: DispatchingContext, result: Any) -> None: ...
+
+
+# todo: do things depends on a type
+
+
+class Dispatcher(BaseDispatcher):
+    def __init__(
+        self, router: Router | None = None, context: dict[str, Any] | None = None
+    ) -> None:
+        super().__init__(
+            config=DispatchingConfig(on_error=on_error_callback, on_handler=on_handler),
+            router=router,
+            event_context=context,
+        )

{funpaybotengine-0.7.1 → funpaybotengine-0.10.0rc2}/funpaybotengine/dispatching/events/base.py

@@ -14,7 +14,10 @@ from typing import Any, Generic, TypeVar
 from types import MappingProxyType
 
 from pydantic import Field, PrivateAttr
-from eventry.asyncio.event import Event as EventryEvent
+from eventry.asyncio import (
+    Event as EventryEvent,
+    DispatchingContext,
+)
 
 from funpaybotengine.base import BindableObject
 
@@ -32,8 +35,7 @@ class Event(EventryEvent, BindableObject, Generic[EventObject], event_name='even
     _data: dict[Any, Any] = PrivateAttr(default_factory=dict)
     _flags: set[Any] = PrivateAttr(default_factory=set)
 
-    @property
-    def event_context_injection(self) -> dict[str, Any]:
+    def context_injection(self) -> dict[str, Any]:
         return {'object': self.object}
 
     def __hash__(self) -> int:
@@ -74,36 +76,36 @@ class Event(EventryEvent, BindableObject, Generic[EventObject], event_name='even
 
 
 class RunnerEvent(Event[EventObject], event_name='runner'):
-    tag: str | None = Field(frozen=True)
+    tag: str | None
 
-    @property
-    def event_context_injection(self) -> dict[str, Any]:
-        injection = super().event_context_injection
-        injection['tag'] = self.tag
-        return injection
+    def context_injection(self) -> dict[str, Any]:
+        return super().context_injection() | {'tag': self.tag}
 
 
 class BotEngineEvent(Event[EventObject], event_name='funpaybotengine'): ...
 
 
 class ExceptionEvent(BotEngineEvent[Exception], event_name='error'):
-    event: Event[Any] = Field(frozen=True)
+    context: DispatchingContext
 
     @property
-    def event_context_injection(self) -> dict[str, Any]:
-        injection = super().event_context_injection
-        injection.update({'on_event': self.event, 'exception': self.object})
-        return injection
+    def exception(self) -> Exception:
+        return self.object
 
+    def context_injection(self) -> dict[str, Any]:
+        return super().context_injection() | {
+            'exception': self.object,
+            'event_context': self.context,
+        }
 
-class BotUnauthenticatedEvent(BotEngineEvent[float], event_name='unauthorized'):
-    delay: float
 
+class BotUnauthenticatedEvent(BotEngineEvent[float], event_name='unauthorized'):
     @property
-    def event_context_injection(self) -> dict[str, Any]:
-        injection = super().event_context_injection
-        injection.update({'delay': self.delay})
-        return injection
+    def delay(self) -> float:
+        return self.object
+
+    def context_injection(self) -> dict[str, Any]:
+        return super().context_injection() | {'delay': self.delay}
 
 
 class BotAuthenticatedEvent(BotEngineEvent[None], event_name='authorized'): ...