funpaybotengine 0.3.6__tar.gz → 0.4.1__tar.gz

{funpaybotengine-0.3.6 → funpaybotengine-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funpaybotengine
-Version: 0.3.6
+Version: 0.4.1
 Summary: Framework for creating FunPay bots.
 Project-URL: Telegram, https://t.me/funpay_hub
 Project-URL: Issues, https://github.com/funpayhub/funpaybotengine/issues
@@ -18,11 +18,11 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.10
-Requires-Dist: aiohttp-socks~=0.10.1
-Requires-Dist: aiohttp>=3.13.3
-Requires-Dist: eventry<0.4.0,>=0.3.3
+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.14
-Requires-Dist: pydantic~=2.11.7
+Requires-Dist: pydantic<2.13,>=2.12
 Provides-Extra: dev
 Requires-Dist: mypy>=1.10.1; extra == 'dev'
 Requires-Dist: pre-commit>=4.5.1; extra == 'dev'

{funpaybotengine-0.3.6 → funpaybotengine-0.4.1}/funpaybotengine/dispatching/events/base.py

@@ -1,7 +1,14 @@
 from __future__ import annotations
 
 
-__all__ = ('Event', 'RunnerEvent', 'BotEngineEvent', 'ExceptionEvent')
+__all__ = (
+    'Event',
+    'RunnerEvent',
+    'BotEngineEvent',
+    'ExceptionEvent',
+    'BotUnauthenticatedEvent',
+    'BotAuthenticatedEvent',
+)
 
 from typing import Any, Generic, TypeVar
 from types import MappingProxyType
@@ -16,7 +23,7 @@ EventObject = TypeVar('EventObject')
 
 
 # Not inheriting from ExtendedEvent, cz __iter__ conflict is pydantic BaseModel.
-class Event(EventryEvent, BindableObject, Generic[EventObject], name='event'):
+class Event(EventryEvent, BindableObject, Generic[EventObject], event_name='event'):
     model_config = {
         'arbitrary_types_allowed': True,
     }
@@ -66,7 +73,7 @@ class Event(EventryEvent, BindableObject, Generic[EventObject], name='event'):
         return MappingProxyType(self._data)
 
 
-class RunnerEvent(Event[EventObject], name='runner'):
+class RunnerEvent(Event[EventObject], event_name='runner'):
     tag: str | None = Field(frozen=True)
 
     @property
@@ -76,10 +83,10 @@ class RunnerEvent(Event[EventObject], name='runner'):
         return injection
 
 
-class BotEngineEvent(Event[EventObject], name='funpaybotengine'): ...
+class BotEngineEvent(Event[EventObject], event_name='funpaybotengine'): ...
 
 
-class ExceptionEvent(BotEngineEvent[Exception], name='error'):
+class ExceptionEvent(BotEngineEvent[Exception], event_name='error'):
     event: Event[Any] = Field(frozen=True)
 
     @property
@@ -87,3 +94,16 @@ class ExceptionEvent(BotEngineEvent[Exception], name='error'):
         injection = super().event_context_injection
         injection.update({'on_event': self.event, 'exception': self.object})
         return injection
+
+
+class BotUnauthenticatedEvent(BotEngineEvent[float], event_name='unauthorized'):
+    delay: float
+
+    @property
+    def event_context_injection(self) -> dict[str, Any]:
+        injection = super().event_context_injection
+        injection.update({'delay': self.delay})
+        return injection
+
+
+class BotAuthenticatedEvent(BotEngineEvent[None], event_name='authorized'): ...

{funpaybotengine-0.3.6 → funpaybotengine-0.4.1}/funpaybotengine/dispatching/events/builtin_events.py

@@ -43,7 +43,7 @@ from .base import RunnerEvent
 from ...types.pages import OrderPage
 
 
-class ChatChangedEvent(RunnerEvent[PrivateChatPreview], name='chat_changed'):
+class ChatChangedEvent(RunnerEvent[PrivateChatPreview], event_name='chat_changed'):
     previous: PrivateChatPreview | None = None
 
     @property
@@ -57,7 +57,7 @@ class ChatChangedEvent(RunnerEvent[PrivateChatPreview], name='chat_changed'):
         }
 
 
-class NewMessageEvent(RunnerEvent[Message], name='new_message'):
+class NewMessageEvent(RunnerEvent[Message], event_name='new_message'):
     @property
     def message(self) -> Message:
         return self.object
@@ -69,7 +69,7 @@ class NewMessageEvent(RunnerEvent[Message], name='new_message'):
         }
 
 
-class FromMessageEvent(NewMessageEvent, name='__from_message__'):
+class FromMessageEvent(NewMessageEvent, event_name='__from_message__'):
     related_new_message_event: NewMessageEvent
 
     @property
@@ -79,14 +79,14 @@ class FromMessageEvent(NewMessageEvent, name='__from_message__'):
         return val
 
 
-class OrderEvent(FromMessageEvent, name='__order_event__'):
+class OrderEvent(FromMessageEvent, event_name='__order_event__'):
     _order_preview: OrderPreview | None = PrivateAttr(default=None)
 
     async def get_order_preview(self, update: bool = False) -> OrderPreview:
         raise NotImplementedError
 
 
-class SaleEvent(OrderEvent, name='__sale_event__'):
+class SaleEvent(OrderEvent, event_name='__sale_event__'):
     async def get_order_preview(self, update: bool = False) -> OrderPreview:
         if self._order_preview is not None and not update:
             return self._order_preview
@@ -95,7 +95,7 @@ class SaleEvent(OrderEvent, name='__sale_event__'):
         return orders.orders[0]
 
 
-class PurchaseEvent(OrderEvent, name='__purchase_event__'):
+class PurchaseEvent(OrderEvent, event_name='__purchase_event__'):
     async def get_order_preview(self, update: bool = False) -> OrderPreview:
         if self._order_preview is not None and not update:
             return self._order_preview
@@ -106,55 +106,55 @@ class PurchaseEvent(OrderEvent, name='__purchase_event__'):
         return orders.orders[0]
 
 
-class NewSaleEvent(SaleEvent, name='new_sale'):
+class NewSaleEvent(SaleEvent, event_name='new_sale'):
     related_auto_message_events: list[NewMessageEvent] = Field(default_factory=list)
 
 
-class SaleStatusChangedEvent(SaleEvent, name='sale_status_changed'):
+class SaleStatusChangedEvent(SaleEvent, event_name='sale_status_changed'):
     previous: OrderPreview | None = None
 
 
-class SaleClosedEvent(SaleStatusChangedEvent, name='sale_closed'): ...
+class SaleClosedEvent(SaleStatusChangedEvent, event_name='sale_closed'): ...
 
 
-class SaleClosedByAdminEvent(SaleClosedEvent, name='sale_closed_by_admin'): ...
+class SaleClosedByAdminEvent(SaleClosedEvent, event_name='sale_closed_by_admin'): ...
 
 
-class SaleRefundedEvent(SaleStatusChangedEvent, name='sale_refunded'): ...
+class SaleRefundedEvent(SaleStatusChangedEvent, event_name='sale_refunded'): ...
 
 
-class SalePartiallyRefundedEvent(SaleRefundedEvent, name='sale_partially_refunded'): ...
+class SalePartiallyRefundedEvent(SaleRefundedEvent, event_name='sale_partially_refunded'): ...
 
 
-class SaleReopenedEvent(SaleStatusChangedEvent, name='sale_reopened'): ...
+class SaleReopenedEvent(SaleStatusChangedEvent, event_name='sale_reopened'): ...
 
 
-class NewPurchaseEvent(PurchaseEvent, name='new_purchase'):
+class NewPurchaseEvent(PurchaseEvent, event_name='new_purchase'):
     related_auto_message_events: list[NewMessageEvent] = Field(default_factory=list)
 
 
-class PurchaseStatusChangedEvent(PurchaseEvent, name='purchase_status_changed'):
+class PurchaseStatusChangedEvent(PurchaseEvent, event_name='purchase_status_changed'):
     previous: OrderPreview | None = None
 
 
-class PurchaseClosedEvent(PurchaseStatusChangedEvent, name='purchase_closed'): ...
+class PurchaseClosedEvent(PurchaseStatusChangedEvent, event_name='purchase_closed'): ...
 
 
-class PurchaseClosedByAdminEvent(PurchaseClosedEvent, name='purchase_closed_by_admin'): ...
+class PurchaseClosedByAdminEvent(PurchaseClosedEvent, event_name='purchase_closed_by_admin'): ...
 
 
-class PurchaseRefundedEvent(PurchaseStatusChangedEvent, name='purchase_refunded'): ...
+class PurchaseRefundedEvent(PurchaseStatusChangedEvent, event_name='purchase_refunded'): ...
 
 
 class PurchasePartiallyRefundedEvent(
-    PurchaseRefundedEvent, name='purchase_partially_refunded'
+    PurchaseRefundedEvent, event_name='purchase_partially_refunded'
 ): ...
 
 
-class PurchaseReopenedEvent(PurchaseStatusChangedEvent, name='purchase_reopened'): ...
+class PurchaseReopenedEvent(PurchaseStatusChangedEvent, event_name='purchase_reopened'): ...
 
 
-class ReviewEvent(FromMessageEvent, name='__review_event__'):
+class ReviewEvent(FromMessageEvent, event_name='__review_event__'):
     _order_page: OrderPage | None = PrivateAttr(default=None)
 
     async def get_order_page(self, update: bool = False) -> OrderPage:
@@ -169,19 +169,19 @@ class ReviewEvent(FromMessageEvent, name='__review_event__'):
         return order_page.review
 
 
-class NewReviewEvent(ReviewEvent, name='new_review'): ...
+class NewReviewEvent(ReviewEvent, event_name='new_review'): ...
 
 
-class ReviewChangedEvent(ReviewEvent, name='review_changed'): ...
+class ReviewChangedEvent(ReviewEvent, event_name='review_changed'): ...
 
 
-class ReviewDeletedEvent(ReviewEvent, name='review_deleted'): ...
+class ReviewDeletedEvent(ReviewEvent, event_name='review_deleted'): ...
 
 
-class NewReviewResponseEvent(ReviewEvent, name='new_review_response'): ...
+class NewReviewResponseEvent(ReviewEvent, event_name='new_review_response'): ...
 
 
-class ReviewResponseChangedEvent(ReviewEvent, name='review_response_changed'): ...
+class ReviewResponseChangedEvent(ReviewEvent, event_name='review_response_changed'): ...
 
 
-class ReviewResponseDeletedEvent(ReviewEvent, name='review_response_deleted'): ...
+class ReviewResponseDeletedEvent(ReviewEvent, event_name='review_response_deleted'): ...

funpaybotengine-0.4.1/funpaybotengine/runner/config.py

@@ -0,0 +1,116 @@
+from __future__ import annotations
+
+
+__all__ = ('RunnerConfig', 'BackoffConfig', 'Backoff')
+
+
+import asyncio
+from typing import Literal
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class BackoffConfig:
+    min_delay: float = 6.0
+    max_delay: float = 18.0
+    factor: float = 1.3
+
+    def __post_init__(self) -> None:
+        if self.max_delay <= self.min_delay:
+            raise ValueError('`max_delay` must be greater than `min_delay`.')
+        if self.factor <= 1:
+            raise ValueError('`factor` must be greater than 1')
+
+
+@dataclass
+class RunnerConfig:
+    interval: int | float = 4.0
+    """
+    Interval between updates requests.
+    Must be more than ``0``.
+    
+    Defaults to ``4.0``.
+    """
+
+    discover_sales: bool = True
+    """Whether to discover new sales or not."""
+
+    discover_purchases: bool = True
+    """Whether to discover new purchases or not."""
+
+    keep_unread: bool = False
+    """
+    Whether to preserve the unread status of chats when getting updates.
+
+    If ``False`` (default), a batch method is used: up to 10 chats can be requested in a single
+    request, but they will be marked as read.
+
+    If ``True``, only one chat can be fetched per request to keep it unread.  
+    With high incoming message volume this leads to many requests and may cause
+    ``429 Too Many Requests`` errors.
+    """
+
+    on_unauthenticated_error_policy: Literal['ignore', 'event', 'stop'] = 'ignore'
+    """
+    What to do when an `BotUnauthenticatedError` occurred during fetching updates process?
+    
+    - ``ignore``: ignore the error and continue fetching updates.
+    - ``event``: yield an error event and continue fetching updates.
+    - ``stop``: stop fetching updates, exit a function.
+    
+    Defaults to ``ignore``.
+    """
+
+    backoff_config: BackoffConfig = BackoffConfig()
+
+
+class Backoff:
+    def __init__(self, config: BackoffConfig) -> None:
+        self.config = config
+        self._next_delay = config.min_delay
+        self._current_delay = 0.0
+        self._counter = 0
+
+    def __iter__(self) -> Backoff:
+        return self
+
+    @property
+    def min_delay(self) -> float:
+        return self.config.min_delay
+
+    @property
+    def max_delay(self) -> float:
+        return self.config.max_delay
+
+    @property
+    def factor(self) -> float:
+        return self.config.factor
+
+    @property
+    def next_delay(self) -> float:
+        return self._next_delay
+
+    @property
+    def current_delay(self) -> float:
+        return self._current_delay
+
+    @property
+    def counter(self) -> int:
+        return self._counter
+
+    async def asleep(self) -> None:
+        await asyncio.sleep(next(self))
+
+    def _calculate_next(self, value: float) -> float:
+        return min(value * self.factor, self.max_delay)
+
+    def __next__(self) -> float:
+        self._current_delay = self._next_delay
+        self._next_delay = self._calculate_next(self._next_delay)
+        self._counter += 1
+        return self._current_delay
+
+    def reset(self) -> None:
+        self._current_delay = 0.0
+        self._counter = 0
+        self._next_delay = self.min_delay

{funpaybotengine-0.3.6 → funpaybotengine-0.4.1}/funpaybotengine/runner/runner.py

@@ -14,13 +14,15 @@ from collections.abc import Iterator, AsyncGenerator
 from funpaybotengine.loggers import runner_logger
 from funpaybotengine.exceptions import UnauthorizedError, BotUnauthenticatedError
 from funpaybotengine.storage.base import Storage
-from funpaybotengine.runner.config import RunnerConfig
-from funpaybotengine.runner.event_collector import EventCollector
-from funpaybotengine.dispatching.events.base import RunnerEvent
+from funpaybotengine.dispatching.events import BotAuthenticatedEvent, BotUnauthenticatedEvent
+
+from .config import Backoff, RunnerConfig
+from .event_collector import EventCollector
 
 
 if TYPE_CHECKING:
     from funpaybotengine.client.bot import Bot
+    from funpaybotengine.dispatching.events import RunnerEvent, BotEngineEvent
 
 
 @dataclass
@@ -64,34 +66,62 @@ class Runner:
             config,
             session_storage=session_storage,
         )
+        backoff = Backoff(config.backoff_config)
 
         await collector.init_chats()
 
+        sleep_time: float | None = None
         while True:
             start = time.time()
+            result: list[RunnerEvent[Any] | BotEngineEvent[Any]] = []
 
             try:
                 result = await collector.get_events()
+                if backoff.counter:
+                    backoff.reset()
+                    runner_logger.info('Connection established. Continuing collecting events.')
+                    if config.on_unauthenticated_error_policy == 'event':
+                        result.insert(0, BotAuthenticatedEvent(object=None))
+
             except (BotUnauthenticatedError, UnauthorizedError) as e:
                 runner_logger.warning(
                     'Bot is unauthenticated (%s). Executing current policy %r.',
                     e.__class__.__name__,
                     config.on_unauthenticated_error_policy,
                 )
-                if config.on_unauthenticated_error_policy == 'event':
-                    ...
+
+                if config.on_unauthenticated_error_policy in ['event', 'ignore']:
+                    next(backoff)
+                    sleep_time = backoff.current_delay
+                    runner_logger.warning(
+                        'Current attempt: %d. Delay: %f.', backoff.counter, backoff.current_delay
+                    )
+                    if backoff.counter == 1 and config.on_unauthenticated_error_policy == 'event':
+                        result = [
+                            BotUnauthenticatedEvent(object=None, delay=backoff.current_delay)
+                        ]
+
                 elif config.on_unauthenticated_error_policy == 'stop':
                     return
-                elif config.on_unauthenticated_error_policy == 'stop+event':
-                    return  # todo yield event
-                await _sleep(start, config.interval)
-                continue
+            except Exception:
+                next(backoff)
+                runner_logger.error(
+                    'Failed to collect events. Current attempt: %d. Delay: %f.',
+                    backoff.counter,
+                    backoff.current_delay,
+                    exc_info=True,
+                )
+                sleep_time = backoff.current_delay
 
             events_stack = EventsStack(events=tuple(result))
             for i in events_stack:
                 yield i, events_stack
 
-            await _sleep(start, config.interval)
+            if sleep_time:
+                await asyncio.sleep(sleep_time)
+                sleep_time = None
+            else:
+                await _sleep(start, config.interval)
 
 
 async def _sleep(start_time: int | float, interval: int | float) -> None:

{funpaybotengine-0.3.6 → funpaybotengine-0.4.1}/funpaybotengine/types/messages.py

@@ -216,7 +216,6 @@ class Message(FunPayObject, BaseModel):
 
         return info.context.get('chat_id') if info.context else None
 
-
     @field_validator('chat_name', mode='before')
     @classmethod
     def _get_chat_name_from_context(cls, value: Any, info: ValidationInfo) -> Any:

{funpaybotengine-0.3.6 → funpaybotengine-0.4.1}/funpaybotengine/types/orders.py

@@ -6,7 +6,8 @@ __all__ = ('OrderPreview', 'OrderPreviewsBatch')
 
 from typing import Any
 
-from pydantic import BaseModel, PrivateAttr, computed_field
+from pydantic import BaseModel, PrivateAttr
+from funpayparsers.parsers.utils import parse_date_string
 
 from funpaybotengine.types.base import FunPayObject
 from funpaybotengine.types.enums import OrderStatus, OrderPreviewType
@@ -18,7 +19,11 @@ class OrderPreview(FunPayObject, BaseModel):
 
     def model_post_init(self, context: dict[Any, Any]) -> None:
         super().model_post_init(context)
-        if context and context.get('order_preview_type') is not None:
+        if (
+            self.type is OrderPreviewType.UNKNOWN
+            and context
+            and context.get('order_preview_type') is not None
+        ):
             self._type = context['order_preview_type']
 
     id: str
@@ -42,12 +47,20 @@ class OrderPreview(FunPayObject, BaseModel):
     counterparty: UserPreview
     """Associated counterparty info."""
 
-    _type: OrderPreviewType = PrivateAttr(OrderPreviewType.UNKNOWN)
+    type: OrderPreviewType = OrderPreviewType.UNKNOWN
+    """Order preview type."""
 
-    @computed_field  # type: ignore[prop-decorator]
     @property
-    def type(self) -> OrderPreviewType:
-        return self._type
+    def timestamp(self) -> int:
+        """
+        Order timestamp.
+
+        ``0``, if an error occurred while parsing.
+        """
+        try:
+            return parse_date_string(self.date_text)
+        except ValueError:
+            return 0
 
 
 class OrderPreviewsBatch(FunPayObject):
@@ -114,32 +127,26 @@ class OrderPreviewsBatch(FunPayObject):
 
         return await method_coroutine
 
-    @computed_field  # type: ignore[prop-decorator]
     @property
     def order_id_filter(self) -> str | None:
         return self._order_id_filter
 
-    @computed_field  # type: ignore[prop-decorator]
     @property
     def buyer_username_filter(self) -> str | None:
         return self._buyer_username_filter
 
-    @computed_field  # type: ignore[prop-decorator]
     @property
     def status_filter(self) -> OrderStatus | str | None:
         return self._status_filter
 
-    @computed_field  # type: ignore[prop-decorator]
     @property
     def game_id_filter(self) -> int | None:
         return self._game_id_filter
 
-    @computed_field  # type: ignore[prop-decorator]
     @property
     def other_filters(self) -> dict[str, str] | None:
         return self._other_filters
 
-    @computed_field  # type: ignore[prop-decorator]
     @property
     def type(self) -> OrderPreviewType:
         return self._type

{funpaybotengine-0.3.6 → funpaybotengine-0.4.1}/pyproject.toml

@@ -1,16 +1,16 @@
 [project]
 name = "funpaybotengine"
-version = "0.3.6"
+version = "0.4.1"
 description = "Framework for creating FunPay bots."
 requires-python = ">=3.10"
 readme = "README.md"
 license = "MIT"
 dependencies = [
-    "aiohttp>=3.13.3",
-    "aiohttp-socks~=0.10.1",
-    "eventry>=0.3.3,<0.4.0",
+    "aiohttp>=3.13.3,<3.14",
+    "aiohttp-socks>=0.11.0",
+    "eventry>=0.3.6,<1.0.0",
     "funpayparsers>=0.5.14,<1.0.0",
-    "pydantic~=2.11.7",
+    "pydantic>=2.12,<2.13",
 ]
 authors = [
     {name = "Qvvonk", email="qvvonk@gmail.com"}

funpaybotengine-0.3.6/comments.json

@@ -1 +0,0 @@
-[]

funpaybotengine-0.3.6/funpaybotengine/runner/config.py

@@ -1,49 +0,0 @@
-from __future__ import annotations
-
-
-__all__ = ('RunnerConfig',)
-
-
-from typing import Literal
-from dataclasses import dataclass
-
-
-@dataclass
-class RunnerConfig:
-    interval: int | float = 4.0
-    """
-    Interval between updates requests.
-    Must be more than ``0``.
-    
-    Defaults to ``4.0``.
-    """
-
-    discover_sales: bool = True
-    """Whether to discover new sales or not."""
-
-    discover_purchases: bool = True
-    """Whether to discover new purchases or not."""
-
-    keep_unread: bool = False
-    """
-    Whether to preserve the unread status of chats when getting updates.
-
-    If ``False`` (default), a batch method is used: up to 10 chats can be requested in a single
-    request, but they will be marked as read.
-
-    If ``True``, only one chat can be fetched per request to keep it unread.  
-    With high incoming message volume this leads to many requests and may cause
-    ``429 Too Many Requests`` errors.
-    """
-
-    on_unauthenticated_error_policy: Literal['ignore', 'event', 'stop', 'stop+event'] = 'ignore'
-    """
-    What to do when an `BotUnauthenticatedError` occurred during fetching updates process?
-    
-    - ``ignore``: ignore the error and continue fetching updates.
-    - ``event``: yield an error event and continue fetching updates.
-    - ``stop``: stop fetching updates, exit a function.
-    - ``stop+event``: yield an error event and stop fetching updates, exit a function.
-    
-    Defaults to ``ignore``.
-    """