funpaybotengine 0.5.3__tar.gz → 0.6.0__tar.gz

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funpaybotengine
-Version: 0.5.3
+Version: 0.6.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<0.7.0,>=0.6.1
+Requires-Dist: funpayparsers<0.8.0,>=0.7.0
 Requires-Dist: pydantic<2.13,>=2.12
 Provides-Extra: dev
 Requires-Dist: mypy>=1.10.1; extra == 'dev'

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/client/bot.py

@@ -27,6 +27,7 @@ from funpaybotengine.types import (
     PrivateChatPreview,
     TransactionPreviewsBatch,
     CurrentlyViewingOfferInfo,
+    RaiseOffersResponse
 )
 from funpaybotengine.utils import (
     random_runner_tag,
@@ -61,6 +62,7 @@ from funpaybotengine.methods import (
     GetProfilePage,
     GetSettingPage,
     GetMyOffersPage,
+    GetSrasInfoPage,
     GetTransactions,
     SaveOfferFields,
     SetOffersHidden,
@@ -86,6 +88,7 @@ from funpaybotengine.types.pages import (
     ProfilePage,
     MyOffersPage,
     SettingsPage,
+    SrasInfoPage,
     SubcategoryPage,
     TransactionsPage,
 )
@@ -141,6 +144,7 @@ class Bot:
         update_categories: bool = True,
     ) -> None:
         self._golden_key = golden_key
+        self._golden_seal: str | None = None
         self._csrf_token: str | None = None
         self._phpsessid: str | None = phpsessid
         self._logout_token: str | None = None
@@ -201,6 +205,10 @@ class Bot:
         """
         return self._golden_key
 
+    @property
+    def golden_seal(self) -> str | None:
+        return self._golden_seal
+
     @property
     def csrf_token(self) -> str:
         """
@@ -302,7 +310,7 @@ class Bot:
     async def mute_chat(self, chat_id: int, mute: bool) -> bool:
         return (await MuteChat(chat_id=chat_id, mute=mute).execute(self)).response_obj
 
-    async def raise_offers(self, category_id: int, *subcategory_ids: int) -> bool:
+    async def raise_offers(self, category_id: int, *subcategory_ids: int) -> RaiseOffersResponse:
         if not subcategory_ids:
             category = await self.storage.get_category(category_id)
             if category is None:
@@ -837,6 +845,12 @@ class Bot:
     async def get_order_page(self, order_id: str) -> OrderPage:
         return (await GetOrderPage(order_id=order_id).execute(self)).response_obj
 
+    async def get_sras_info_page(self) -> SrasInfoPage:
+        """
+        Retrieves the SRAS info page with seller rating restrictions per subcategory.
+        """
+        return (await GetSrasInfoPage().execute(self)).response_obj
+
     async def get_settings_page(self) -> SettingsPage:
         return (await GetSettingPage().execute(self)).response_obj
 
@@ -893,6 +907,9 @@ class Bot:
             self._phpsessid = result.cookies['PHPSESSID']
             self._session_updated_at = int(time.time())
 
+        if 'golden_seal' in result.cookies and not skip_update:
+            self._golden_seal = result.cookies['golden_seal']
+
         return result
 
     async def update(self, change_locale: Language | None = None) -> Self:
@@ -910,6 +927,7 @@ class Bot:
 
         self._csrf_token = page_obj.app_data.csrf_token
         self._phpsessid = result.cookies.get('PHPSESSID')
+        self._golden_seal = result.cookies.get('golden_seal')
         self._logout_token = page_obj.header.logout_token
 
         if not self._locale or change_locale is not None:

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/client/session/aiohttp_session.py

@@ -89,6 +89,10 @@ class AioHttpSession(BaseSession):
             if bot.phpsessid and not skip_session_cookies:
                 session.cookie_jar.update_cookies({'PHPSESSID': bot.phpsessid})
 
+        with suppress(BotNotInitializedError):
+            if bot.golden_seal and not skip_session_cookies:
+                session.cookie_jar.update_cookies({'golden_seal': bot.golden_seal})
+
     async def make_request(
         self,
         method: FunPayMethod[MethodReturnType],

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/exceptions/action_exceptions.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 
 __all__ = ['RefundError', 'RaiseOffersError']
+import re
+
 from .base import FunPayBotEngineError
 
 
@@ -21,10 +23,26 @@ class RaiseOffersError(FunPayBotEngineError):
         response: str,
         category_id: int,
         message: str | None,
-        wait_time: int | None,
     ) -> None:
         super().__init__()
         self.raw_response = response
         self.category_id = category_id
         self.message = message
-        self.wait_time = wait_time
+
+    @staticmethod
+    def parse_wait_time(response: str) -> int:
+        x = re.search(r'(\d+)\s+', response)
+        time = int(x.group(1)) if x else 0
+
+        if 'секунд' in response or 'second' in response:
+            return time or 2
+        if 'минут' in response or 'хвилин' in response or 'minute' in response:
+            return (time or 1) * 60
+        if 'час' in response or 'годин' in response or 'hour' in response:
+            return (time or 1) * 3600
+
+        return 10
+
+    @property
+    def wait_time(self) -> int:
+        return self.parse_wait_time(self.message or '')

funpaybotengine-0.6.0/funpaybotengine/exceptions/method_exceptions.py

@@ -0,0 +1,20 @@
+__all__ = [
+    'MethodError',
+    'InvalidOfferFieldsError'
+]
+
+
+from .base import FunPayBotEngineError
+
+
+class MethodError(FunPayBotEngineError):
+    ...
+
+
+class InvalidOfferFieldsError(MethodError):
+    def __init__(self, message: str, fields: dict[str, str] | None = None):
+        self.message = message
+        self.fields = fields
+
+    def __str__(self):
+        return self.message

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/methods/__init__.py

@@ -28,6 +28,7 @@ from .get_my_chips_page import *
 from .get_settings_page import *
 from .save_offer_fields import *
 from .set_offers_hidden import *
+from .get_sras_info_page import *
 from .get_my_offers_page import *
 from .get_subcategory_page import *
 from .get_transactions_page import *

funpaybotengine-0.6.0/funpaybotengine/methods/get_sras_info_page.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+
+__all__ = ('GetSrasInfoPage',)
+
+
+from funpayparsers.parsers.page_parsers import SrasInfoPageParser
+
+from funpaybotengine.types.pages import SrasInfoPage
+from funpaybotengine.methods.base import FunPayMethod
+from funpaybotengine.client.session.http_methods import HTTPMethod
+
+
+class GetSrasInfoPage(FunPayMethod[SrasInfoPage]):
+    """
+    Get SRAS info page (``https://funpay.com/sras/info``).
+
+    Returns seller rating restrictions per subcategory.
+    Returns ``funpaybotengine.types.pages.SrasInfoPage``.
+    """
+
+    __model_to_build__ = SrasInfoPage
+
+    def __init__(self) -> None:
+        super().__init__(
+            url='sras/info',
+            method=HTTPMethod.GET,
+            parser_cls=SrasInfoPageParser,
+        )

funpaybotengine-0.6.0/funpaybotengine/methods/raise_offers.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+
+__all__ = ('RaiseOffers',)
+
+import json
+from typing import TYPE_CHECKING, Any
+from collections.abc import Sequence
+
+from pydantic import Field
+from typing_extensions import Annotated
+
+from funpaybotengine.types.enums import Language
+from funpaybotengine.methods.base import FunPayMethod
+from funpaybotengine.client.session.http_methods import HTTPMethod
+from funpaybotengine.types.common import RaiseOffersResponse
+
+
+if TYPE_CHECKING:
+    from funpaybotengine.client.session.base import RawResponse
+
+
+class RaiseOffers(FunPayMethod[RaiseOffersResponse]):
+    category_id: int
+    subcategory_ids: Annotated[Sequence[int], Field(min_length=1)]
+    __model_to_build__ = RaiseOffersResponse
+
+    def __init__(
+        self,
+        category_id: int,
+        subcategory_ids: Sequence[int],
+        locale: Language | None = None,
+    ):
+        super().__init__(
+            url='lots/raise',
+            method=HTTPMethod.POST,
+            locale=locale,
+            data={
+                'game_id': category_id,
+                'node_id': subcategory_ids[0],
+                'node_ids[]': subcategory_ids,
+            },
+            headers={'x-requested-with': 'XMLHttpRequest'},
+            category_id=category_id,
+            subcategory_ids=subcategory_ids,
+        )
+
+    async def parse_result(self, response: RawResponse[bool]) -> dict[str, Any]:
+        data = json.loads(response.raw_response)
+        return {'raw_source': response.raw_response} | data

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/methods/save_offer_fields.py

@@ -9,9 +9,11 @@ from pydantic import BaseModel
 from funpayparsers.types import Language
 from funpayparsers.parsers import OfferFieldsParser
 
+from funpaybotengine.exceptions.method_exceptions import InvalidOfferFieldsError
 from funpaybotengine.methods.base import FunPayMethod
 from funpaybotengine.types.offers import OfferFields
 from funpaybotengine.client.session import HTTPMethod, RawResponse
+import json
 
 
 class SaveOfferFields(FunPayMethod[bool], BaseModel):
@@ -33,13 +35,35 @@ class SaveOfferFields(FunPayMethod[bool], BaseModel):
             url=url,
             method=HTTPMethod.POST,
             data=offer_fields.fields_dict,
+            headers={'X-Requested-With': 'XMLHttpRequest'},
             parser_cls=OfferFieldsParser,
             locale=locale,
             offer_fields=offer_fields,
         )
 
-    async def parse_result(self, response: RawResponse[Any]) -> bool:
-        return True
+    async def parse_result(self, response: RawResponse[Any]) -> bool | dict[str, Any]:
+        try:
+            return json.loads(response.raw_response)
+        except json.decoder.JSONDecodeError:
+            return True
 
-    async def transform_result(self, parsing_result: Any, response: RawResponse[Any]) -> bool:
-        return True
+    async def transform_result(
+        self,
+        parsing_result: bool | dict[str, Any],
+        response: RawResponse[Any]
+    ) -> bool:
+        if isinstance(parsing_result, bool):
+            return parsing_result
+
+
+        if not parsing_result.get('error'):
+            return True
+
+        error_msg = str(parsing_result.get('msg', '')) or str(parsing_result.get('error'))
+        fields: list[list[str, str]] = parsing_result.get('errors')
+        try:
+            fields_dict = {field: error for field, error in fields}
+        except Exception:
+            fields_dict = {}
+
+        raise InvalidOfferFieldsError(error_msg, fields_dict)

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/types/__init__.py

@@ -11,6 +11,7 @@ from .reviews import *
 from .updates import *
 from .finances import *
 from .messages import *
+from .sras import *
 from .settings import *
 from .categories import *
 from .common_page_elements import *

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/types/common.py

@@ -13,6 +13,7 @@ __all__ = (
     'PaymentOption',
 )
 
+from datetime import datetime
 
 from pydantic import BaseModel
 
@@ -157,6 +158,17 @@ class RaiseOffersResponse(FunPayObject, BaseModel):
     msg: str
     """Status message."""
 
+    wait: int
+    """How long to wait until next raise is available (in seconds)."""
+
+    unlock_at: str
+    """String representation of the time when the next raise is available."""
+
+    @property
+    def unlock_at_datetime(self) -> datetime:
+        """Datetime object of the time when the next raise is available."""
+        return datetime.fromisoformat(self.unlock_at)
+
 
 class PaymentOption(FunPayObject):
     """Represents an offer payment option (typically from offer page)."""

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/funpaybotengine/types/pages/__init__.py

@@ -10,4 +10,5 @@ from .my_chips_page import *
 from .settings_page import *
 from .my_offers_page import *
 from .subcategory_page import *
+from .sras_info_page import *
 from .transactions_page import *

funpaybotengine-0.6.0/funpaybotengine/types/pages/sras_info_page.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+
+__all__ = ('SrasInfoPage',)
+
+
+from funpaybotengine.types.sras import SrasSectionRestriction
+from funpaybotengine.types.enums import SubcategoryType
+from funpaybotengine.types.pages.base import FunPayPage
+
+
+class SrasInfoPage(FunPayPage):
+    """Represents the SRAS info page (``https://funpay.com/sras/info``)."""
+
+    restrictions: dict[SubcategoryType, dict[int, SrasSectionRestriction]]
+    """Restrictions grouped by subcategory type and subcategory ID."""

funpaybotengine-0.6.0/funpaybotengine/types/sras.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+
+__all__ = ('SrasSectionRestriction',)
+
+
+from funpaybotengine.types.base import FunPayObject
+from funpaybotengine.types.enums import SubcategoryType
+
+
+class SrasSectionRestriction(FunPayObject):
+    """Represents a SRAS restriction for a specific subcategory."""
+
+    subcategory_id: int
+    """Subcategory ID."""
+
+    subcategory_type: SubcategoryType
+    """Subcategory type."""
+
+    max_rating: int
+    """Maximum allowed seller rating to be listed in this subcategory."""

{funpaybotengine-0.5.3 → funpaybotengine-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "funpaybotengine"
-version = "0.5.3"
+version = "0.6.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.6.1,<0.7.0",
+    "funpayparsers>=0.7.0,<0.8.0",
     "pydantic>=2.12,<2.13",
 ]
 authors = [

funpaybotengine-0.5.3/funpaybotengine/methods/raise_offers.py

@@ -1,83 +0,0 @@
-from __future__ import annotations
-
-
-__all__ = ('RaiseOffers',)
-
-import re
-import json
-from typing import TYPE_CHECKING
-from collections.abc import Sequence
-
-from pydantic import Field
-from typing_extensions import Literal, Annotated
-
-from funpaybotengine.exceptions import RaiseOffersError
-from funpaybotengine.types.enums import Language
-from funpaybotengine.methods.base import FunPayMethod
-from funpaybotengine.client.session.http_methods import HTTPMethod
-
-
-if TYPE_CHECKING:
-    from funpaybotengine.client.session.base import RawResponse
-
-
-def parse_wait_time(response: str) -> int:
-    x = re.search(r'(\d+)', response)
-    time = int(x.group()) if x else 0
-
-    if 'секунд' in response or 'second' in response:
-        return time or 2
-    if 'минут' in response or 'хвилин' in response or 'minute' in response:
-        return (time - 1 if time else 1) * 60
-    if 'час' in response or 'годин' in response or 'hour' in response:
-        return int((time - 0.5 if time else 1) * 3600)
-    return 10
-
-
-class RaiseOffers(FunPayMethod[Literal[True]]):
-    category_id: int
-    subcategory_ids: Annotated[Sequence[int], Field(min_length=1)]
-
-    def __init__(
-        self,
-        category_id: int,
-        subcategory_ids: Sequence[int],
-        locale: Language | None = None,
-    ):
-        super().__init__(
-            url='lots/raise',
-            method=HTTPMethod.POST,
-            locale=locale,
-            data={
-                'game_id': category_id,
-                'node_id': subcategory_ids[0],
-                'node_ids[]': subcategory_ids,
-            },
-            headers={'x-requested-with': 'XMLHttpRequest'},
-            category_id=category_id,
-            subcategory_ids=subcategory_ids,
-        )
-
-    async def parse_result(self, response: RawResponse[bool]) -> Literal[True]:
-        data = json.loads(response.raw_response)
-        error, url, msg = data.get('error'), data.get('url'), data.get('msg')
-
-        if url:
-            raise RaiseOffersError(response.raw_response, self.category_id, url, None)
-
-        if error:
-            if msg:
-                if any(_ in msg for _ in ('Подождите ', 'Please wait ', 'Зачекайте ')):
-                    wait = parse_wait_time(msg)
-                else:
-                    wait = None
-                raise RaiseOffersError(response.raw_response, self.category_id, msg, wait)
-            raise RaiseOffersError(response.raw_response, self.category_id, msg, None)
-        return True
-
-    async def transform_result(
-        self,
-        parsing_result: Literal[True],
-        response: RawResponse[bool],
-    ) -> Literal[True]:
-        return True