funpaybotengine 0.5.2__tar.gz → 0.5.4__tar.gz

{funpaybotengine-0.5.2 → funpaybotengine-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funpaybotengine
-Version: 0.5.2
+Version: 0.5.4
 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.2 → funpaybotengine-0.5.4}/funpaybotengine/client/bot.py

@@ -61,6 +61,7 @@ from funpaybotengine.methods import (
     GetProfilePage,
     GetSettingPage,
     GetMyOffersPage,
+    GetSrasInfoPage,
     GetTransactions,
     SaveOfferFields,
     SetOffersHidden,
@@ -86,6 +87,7 @@ from funpaybotengine.types.pages import (
     ProfilePage,
     MyOffersPage,
     SettingsPage,
+    SrasInfoPage,
     SubcategoryPage,
     TransactionsPage,
 )
@@ -837,6 +839,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
 

{funpaybotengine-0.5.2 → funpaybotengine-0.5.4}/funpaybotengine/dispatching/filters/order_filters.py

@@ -7,13 +7,14 @@ __all__ = ('FinalOrderStatusFilter',)
 from typing import TYPE_CHECKING, Any
 
 from funpaybotengine.types.enums import MessageType, OrderStatus
+from funpaybotengine.dispatching.events.builtin_events import NewMessageEvent
 
 from .base import Filter
 
 
 if TYPE_CHECKING:
     from funpaybotengine.dispatching.events.base import Event
-    from funpaybotengine.dispatching.events.builtin_events import OrderEvent, NewMessageEvent
+    from funpaybotengine.dispatching.events.builtin_events import OrderEvent
 
 
 _message_type_to_order_status_mapping = {

{funpaybotengine-0.5.2 → funpaybotengine-0.5.4}/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.5.4/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.2 → funpaybotengine-0.5.4}/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.5.2 → funpaybotengine-0.5.4}/funpaybotengine/methods/get_sales.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 __all__ = ('GetSales',)
 
+
 from pydantic import BaseModel
 from funpayparsers.types import Language
 from funpayparsers.parsers import OrderPreviewsParser

funpaybotengine-0.5.4/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.5.2 → funpaybotengine-0.5.4}/funpaybotengine/methods/raise_offers.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 __all__ = ('RaiseOffers',)
 
-import re
 import json
 from typing import TYPE_CHECKING
 from collections.abc import Sequence
@@ -21,19 +20,6 @@ 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)]
@@ -62,17 +48,9 @@ class RaiseOffers(FunPayMethod[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 url or error:
+            raise RaiseOffersError(response.raw_response, self.category_id, url or msg)
 
-        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(

{funpaybotengine-0.5.2 → funpaybotengine-0.5.4}/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):
@@ -38,8 +40,31 @@ class SaveOfferFields(FunPayMethod[bool], BaseModel):
             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: 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)
+
 
-    async def transform_result(self, parsing_result: Any, response: RawResponse[Any]) -> bool:
-        return True

{funpaybotengine-0.5.2 → funpaybotengine-0.5.4}/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.2 → funpaybotengine-0.5.4}/funpaybotengine/types/base.py

@@ -15,7 +15,6 @@ class FunPayObject(BindableObject, BaseModel):
     """Base class for all FunPay-parsed objects."""
 
     model_config = ConfigDict(
-        frozen=True,
         validate_assignment=True,
         arbitrary_types_allowed=True,
         populate_by_name=True,

{funpaybotengine-0.5.2 → funpaybotengine-0.5.4}/funpaybotengine/types/orders.py

@@ -22,9 +22,9 @@ class OrderPreview(FunPayObject, BaseModel):
         if (
             self.type is OrderPreviewType.UNKNOWN
             and context
-            and context.get('order_preview_type') is not None
+            and isinstance(context.get('order_preview_type'), OrderPreviewType)
         ):
-            self._type = context['order_preview_type']
+            self.type = context['order_preview_type']
 
     id: str
     """Order ID."""

{funpaybotengine-0.5.2 → funpaybotengine-0.5.4}/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.5.4/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.5.4/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.2 → funpaybotengine-0.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "funpaybotengine"
-version = "0.5.2"
+version = "0.5.4"
 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.4/temp.py

@@ -0,0 +1,20 @@
+from funpaybotengine import Bot
+
+bot = Bot(golden_key='ldc86q3vuwdx30wi7koqsr9scpsejash', proxy='socks5://user148429:dgej93@45.39.104.142:19392')
+
+
+async def main():
+    result = await bot.get_my_offers_page(2418)
+    print(result.subcategory_id)
+    print(result.category_id)
+    for i in result.offers.values():
+        print(i.id)
+        print(i.title)
+        print(i.price)
+        print(i.auto_delivery)
+        print(i.seller)
+
+
+if __name__ == '__main__':
+    import asyncio
+    asyncio.run(main())

funpaybotengine-0.5.2/examples/temp.py

@@ -1,34 +0,0 @@
-from __future__ import annotations
-
-import asyncio
-
-from funpaybotengine import Bot, Dispatcher
-from funpaybotengine.types import Message
-
-
-bot: Bot = Bot(golden_key='12345678901234567890123456789012')  # Создаем экземляр бота
-dp: Dispatcher = Dispatcher()  # Создаем диспетчер - корневой роутер
-
-
-# Регистрируем хэндлер на событие о новом сообщении
-# Хэндлер отработает на абсолютно любое сообщение.
-@dp.on_new_message()
-async def print_message(message: Message) -> None:
-    print(f'Пришло новое сообщение от {message.sender_username}: ')
-    print(message.text or message.image_url)
-
-
-# Регистрируем хэндлер на событие о новом сообщении
-# Хэндлер сработает тольько в том случае, если текст сообщения == 'привет'
-@dp.on_new_message(lambda message: message.text.lower() == 'привет')
-async def echo(message: Message) -> None:
-    await message.reply('Пока')
-
-
-async def main() -> None:
-    # Запускаем цикл получения новых событий.
-    await bot.listen_events(dp)
-
-
-if __name__ == '__main__':
-    asyncio.run(main())

funpaybotengine-0.5.2/temp.py

@@ -1,19 +0,0 @@
-from funpaybotengine import Bot
-from funpaybotengine.methods.get_orders import GetOrders
-import json
-
-
-bot = Bot(golden_key='j9k09a1lnifuw3ngpdc9pphxuqe94bqy', proxy='socks5://user148429:dgej93@45.39.104.142:19392')
-
-async def main():
-    await bot.update()
-    print(bot.username)
-
-    method = GetOrders(order_ids=['B72YEFH9'])
-    r = (await method.execute(bot)).response_obj
-    print(json.dumps(r, indent=4, ensure_ascii=False))
-
-
-if __name__ == '__main__':
-    import asyncio
-    asyncio.run(main())