funpaybotengine 0.4.4__tar.gz → 0.5.0__tar.gz

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funpaybotengine
-Version: 0.4.4
+Version: 0.5.0
 Summary: Framework for creating FunPay bots.
 Project-URL: Telegram, https://t.me/funpay_hub
 Project-URL: Issues, https://github.com/funpayhub/funpaybotengine/issues
@@ -21,7 +21,7 @@ Requires-Python: >=3.10
 Requires-Dist: aiohttp-socks>=0.11.0
 Requires-Dist: aiohttp<3.14,>=3.13.3
 Requires-Dist: eventry<1.0.0,>=0.3.6
-Requires-Dist: funpayparsers<1.0.0,>=0.5.15
+Requires-Dist: funpayparsers<0.7.0,>=0.6.0
 Requires-Dist: pydantic<2.13,>=2.12
 Provides-Extra: dev
 Requires-Dist: mypy>=1.10.1; extra == 'dev'

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/client/bot.py

@@ -878,7 +878,7 @@ class Bot:
         if (
             not skip_locale_check
             and self._locale
-            and self._locale != Language.get_by_lang_code(result.locale)
+            and self._locale != Language.from_lang_code(result.locale)
         ):
             result = await self._on_locale_mismatch_hook(method, self, result)
 

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/client/default_hooks.py

@@ -24,7 +24,7 @@ async def force_locale_hook(
     response: Response[R],
 ) -> Response[R]:
     async with lock:
-        if bot.locale != Language.get_by_lang_code(response.locale):
+        if bot.locale != Language.from_lang_code(response.locale):
             await bot.update(change_locale=bot._locale)
     return await method.execute(as_=bot)
 

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/dispatching/events/builtin_events.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 
 __all__ = [
+    'NewEventsPack',
     'ChatChangedEvent',
     'NewMessageEvent',
     'OrderEvent',
@@ -38,9 +39,12 @@ from funpaybotengine.types.chat import PrivateChatPreview
 from funpaybotengine.types.orders import OrderPreview
 from funpaybotengine.types.reviews import Review
 from funpaybotengine.types.messages import Message
+from funpaybotengine.types.pages.order_page import OrderPage
 
-from .base import RunnerEvent
-from ...types.pages import OrderPage
+from .base import RunnerEvent, BotEngineEvent
+
+
+class NewEventsPack(BotEngineEvent[str], event_name='new_events_pack'): ...
 
 
 class ChatChangedEvent(RunnerEvent[PrivateChatPreview], event_name='chat_changed'):

funpaybotengine-0.5.0/funpaybotengine/dispatching/routers/base.py

@@ -0,0 +1,135 @@
+from __future__ import annotations
+
+
+__all__ = ['Router']
+
+
+from typing import cast
+
+from eventry.asyncio.router import Router as BaseRouter
+
+from funpaybotengine.dispatching import events
+from funpaybotengine.dispatching.handlers.handler_manager import HandlerManager
+
+
+class Router(BaseRouter):
+    def __init__(self, name: str | None = None) -> None:
+        super().__init__(name=name or f'Router{id(self)}')
+        self.set_default_handler_manager(HandlerManager(self, 'default', None))
+
+        self.on_chat_changed = self._add_handler_manager(
+            HandlerManager(self, 'on_chat_changed', events.ChatChangedEvent.__event_name__)
+        )
+        self.on_new_message = self._add_handler_manager(
+            HandlerManager(self, 'on_new_message', events.NewMessageEvent.__event_name__)
+        )
+        self.on_new_sale = self._add_handler_manager(
+            HandlerManager(self, 'on_new_sale', events.NewSaleEvent.__event_name__)
+        )
+        self.on_sale_status_changed = self._add_handler_manager(
+            HandlerManager(
+                self, 'on_sale_status_changed', events.SaleStatusChangedEvent.__event_name__
+            )
+        )
+        self.on_sale_closed = self._add_handler_manager(
+            HandlerManager(self, 'on_sale_closed', events.SaleClosedEvent.__event_name__)
+        )
+        self.on_sale_closed_by_admin = self._add_handler_manager(
+            HandlerManager(
+                self, 'on_sale_closed_by_admin', events.SaleClosedByAdminEvent.__event_name__
+            )
+        )
+        self.on_sale_refunded = self._add_handler_manager(
+            HandlerManager(self, 'on_sale_refunded', events.SaleRefundedEvent.__event_name__)
+        )
+        self.on_sale_partially_refunded = self._add_handler_manager(
+            HandlerManager(
+                self,
+                'on_sale_partially_refunded',
+                events.SalePartiallyRefundedEvent.__event_name__,
+            )
+        )
+        self.on_sale_reopened = self._add_handler_manager(
+            HandlerManager(self, 'on_sale_reopened', events.SaleReopenedEvent.__event_name__)
+        )
+        self.on_new_purchase = self._add_handler_manager(
+            HandlerManager(self, 'on_new_purchase', events.NewPurchaseEvent.__event_name__)
+        )
+        self.on_purchase_status_changed = self._add_handler_manager(
+            HandlerManager(
+                self,
+                'on_purchase_status_changed',
+                events.PurchaseStatusChangedEvent.__event_name__,
+            )
+        )
+        self.on_purchase_closed = self._add_handler_manager(
+            HandlerManager(self, 'on_purchase_closed', events.PurchaseClosedEvent.__event_name__)
+        )
+        self.on_purchase_closed_by_admin = self._add_handler_manager(
+            HandlerManager(
+                self,
+                'on_purchase_closed_by_admin',
+                events.PurchaseClosedByAdminEvent.__event_name__,
+            )
+        )
+        self.on_purchase_refunded = self._add_handler_manager(
+            HandlerManager(
+                self, 'on_purchase_refunded', events.PurchaseRefundedEvent.__event_name__
+            )
+        )
+        self.on_purchase_partially_refunded = self._add_handler_manager(
+            HandlerManager(
+                self,
+                'on_purchase_partially_refunded',
+                events.PurchasePartiallyRefundedEvent.__event_name__,
+            )
+        )
+        self.on_purchase_reopened = self._add_handler_manager(
+            HandlerManager(
+                self, 'on_purchase_reopened', events.PurchaseReopenedEvent.__event_name__
+            )
+        )
+        self.on_new_review = self._add_handler_manager(
+            HandlerManager(self, 'on_new_review', events.NewReviewEvent.__event_name__)
+        )
+        self.on_review_changed = self._add_handler_manager(
+            HandlerManager(self, 'on_review_changed', events.ReviewChangedEvent.__event_name__)
+        )
+        self.on_review_deleted = self._add_handler_manager(
+            HandlerManager(self, 'on_review_deleted', events.ReviewDeletedEvent.__event_name__)
+        )
+        self.on_new_review_response = self._add_handler_manager(
+            HandlerManager(
+                self, 'on_new_review_response', events.NewReviewResponseEvent.__event_name__
+            )
+        )
+        self.on_review_response_changed = self._add_handler_manager(
+            HandlerManager(
+                self,
+                'on_review_response_changed',
+                events.ReviewResponseChangedEvent.__event_name__,
+            )
+        )
+        self.on_review_response_deleted = self._add_handler_manager(
+            HandlerManager(
+                self,
+                'on_review_response_deleted',
+                events.ReviewResponseDeletedEvent.__event_name__,
+            )
+        )
+        self.on_error = self._add_handler_manager(HandlerManager(self, 'on_error', 'error'))
+        self.on_unauthenticated = self._add_handler_manager(
+            HandlerManager(
+                self, 'on_unauthenticated', events.BotUnauthenticatedEvent.__event_name__
+            )
+        )
+        self.on_authenticated = self._add_handler_manager(
+            HandlerManager(self, 'on_authenticated', events.BotAuthenticatedEvent.__event_name__)
+        )
+        self.on_new_events_pack = self._add_handler_manager(
+            HandlerManager(self, 'on_new_events_pack', events.NewEventsPack.__event_name__)
+        )
+
+    @property
+    def on_event(self) -> HandlerManager:
+        return cast(HandlerManager, self._default_handler_manager)

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/methods/get_main_page.py

@@ -37,8 +37,6 @@ class GetMainPage(FunPayMethod[MainPage], BaseModel):
             parser_cls=MainPageParser,
             allow_anonymous=True,
             allow_uninitialized=True,
-            data={'setlocale': change_locale.value.appdata_alias}
-            if change_locale is not None
-            else {},
+            data={'setlocale': change_locale.appdata_alias} if change_locale is not None else {},
             change_locale=change_locale,
         )

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/methods/get_subcategory_page.py

@@ -31,7 +31,7 @@ class GetSubcategoryPage(FunPayMethod[SubcategoryPage], BaseModel):
 
     def __init__(self, type: SubcategoryType, subcategory_id: int, locale: Language | None = None):
         super().__init__(
-            url=f'{type.value.url_alias}/{subcategory_id}/',
+            url=f'{type.url_alias}/{subcategory_id}/',
             method=HTTPMethod.GET,
             allow_anonymous=True,
             allow_uninitialized=True,

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/runner/runner.py

@@ -17,6 +17,7 @@ from funpaybotengine.storage.base import Storage
 from funpaybotengine.dispatching.events import BotAuthenticatedEvent, BotUnauthenticatedEvent
 
 from .config import Backoff, RunnerConfig
+from ..dispatching import NewEventsPack
 from .event_collector import EventCollector
 
 
@@ -27,7 +28,7 @@ if TYPE_CHECKING:
 
 @dataclass
 class EventsStack:
-    events: tuple[RunnerEvent[Any], ...]
+    events: tuple[RunnerEvent[Any] | BotEngineEvent[Any], ...]
     data: dict[Any, Any] = field(default_factory=dict)
     id: str = field(init=False, default='')
 
@@ -113,7 +114,11 @@ class Runner:
                 )
                 sleep_time = backoff.current_delay
 
-            events_stack = EventsStack(events=tuple(result))
+            events_stack = EventsStack(events=())
+            if not backoff.counter:
+                result.insert(0, NewEventsPack(object=events_stack.id))
+            events_stack.events = tuple(result)
+
             for i in events_stack:
                 yield i, events_stack
 

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/types/calc.py

@@ -46,7 +46,7 @@ class MethodResult(FunPayObject, BaseModel):
 
     @property
     def currency(self) -> Currency:
-        return Currency.get_by_character(self.unit)
+        return Currency.from_character(self.unit)
 
 
 class CalcResult(FunPayObject, BaseModel):

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/funpaybotengine/types/common.py

@@ -39,7 +39,7 @@ class MoneyValue(FunPayObject, BaseModel):
 
     @property
     def currency(self) -> Currency:
-        return Currency.get_by_character(self.character)
+        return Currency.from_character(self.character)
 
 
 class UserBadge(FunPayObject, BaseModel):
@@ -74,7 +74,7 @@ class UserBadge(FunPayObject, BaseModel):
     def type(self) -> BadgeType:
         """Badge type."""
 
-        return BadgeType.get_by_css_class(self.css_class)
+        return BadgeType.from_css_class(self.css_class)
 
 
 class UserPreview(FunPayObject, BaseModel):

{funpaybotengine-0.4.4 → funpaybotengine-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "funpaybotengine"
-version = "0.4.4"
+version = "0.5.0"
 description = "Framework for creating FunPay bots."
 requires-python = ">=3.10"
 readme = "README.md"
@@ -9,7 +9,7 @@ dependencies = [
     "aiohttp>=3.13.3,<3.14",
     "aiohttp-socks>=0.11.0",
     "eventry>=0.3.6,<1.0.0",
-    "funpayparsers>=0.5.15,<1.0.0",
+    "funpayparsers>=0.6.0,<0.7.0",
     "pydantic>=2.12,<2.13",
 ]
 authors = [

funpaybotengine-0.4.4/funpaybotengine/dispatching/routers/base.py

@@ -1,76 +0,0 @@
-from __future__ import annotations
-
-
-__all__ = ['Router']
-
-
-from typing import cast
-
-from eventry.asyncio.router import Router as BaseRouter
-
-from funpaybotengine.dispatching.handlers.handler_manager import HandlerManager
-
-
-_events = {
-    'chat_changed',
-    'new_message',
-    'new_sale',
-    'sale_closed_by_admin',
-    'sale_closed',
-    'sale_partially_refunded',
-    'sale_refunded',
-    'sale_reopened',
-    'sale_status_changed',
-    'new_purchase',
-    'purchase_closed_by_admin',
-    'purchase_closed',
-    'purchase_partially_refunded',
-    'purchase_refunded',
-    'purchase_reopened',
-    'purchase_status_changed',
-    'new_review',
-    'review_changed',
-    'review_deleted',
-    'new_review_response',
-    'review_response_changed',
-    'review_response_deleted',
-    'error',
-}
-
-
-class Router(BaseRouter):
-    on_chat_changed: HandlerManager
-    on_new_message: HandlerManager
-    on_new_sale: HandlerManager
-    on_sale_status_changed: HandlerManager
-    on_sale_closed: HandlerManager
-    on_sale_closed_by_admin: HandlerManager
-    on_sale_refunded: HandlerManager
-    on_sale_partially_refunded: HandlerManager
-    on_sale_reopened: HandlerManager
-    on_new_purchase: HandlerManager
-    on_purchase_status_changed: HandlerManager
-    on_purchase_closed: HandlerManager
-    on_purchase_closed_by_admin: HandlerManager
-    on_purchase_refunded: HandlerManager
-    on_purchase_partially_refunded: HandlerManager
-    on_purchase_reopened: HandlerManager
-    on_new_review: HandlerManager
-    on_review_changed: HandlerManager
-    on_review_deleted: HandlerManager
-    on_new_review_response: HandlerManager
-    on_review_response_changed: HandlerManager
-    on_review_response_deleted: HandlerManager
-    on_error: HandlerManager
-
-    def __init__(self, name: str | None = None) -> None:
-        super().__init__(name=name or f'Router{id(self)}')
-        self.set_default_handler_manager(HandlerManager(self, 'default', None))
-
-        for name in _events:
-            manager = self._add_handler_manager(HandlerManager(self, f'on_{name}', name))
-            setattr(self, f'on_{name}', manager)
-
-    @property
-    def on_event(self) -> HandlerManager:
-        return cast(HandlerManager, self._default_handler_manager)