fpx-engine 0.3.0__tar.gz → 0.3.2__tar.gz

{fpx_engine-0.3.0/fpx_engine.egg-info → fpx_engine-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fpx-engine
-Version: 0.3.0
+Version: 0.3.2
 Summary: Автоматизация работы с FunPay
 Author-email: Be My Code <gettofarmila@gmail.com>
 Project-URL: Homepage, https://github.com/bymyforge/fpx
@@ -10,7 +10,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.24.0
+Requires-Dist: httpx[http2]>=0.24.0
 Requires-Dist: beautifulsoup4>=4.12.0
 Dynamic: license-file
 
@@ -29,6 +29,9 @@ Dynamic: license-file
   <a href="https://github.com/bymyforge/fpx" target="_blank">
     <img src="https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="GitHub">
   </a>
+  <a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
+    <img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
+  </a>
   <a href="https://t.me/fpx_engine" target="_blank">
     <img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram">
   </a>

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/README.md

@@ -13,6 +13,9 @@
   <a href="https://github.com/bymyforge/fpx" target="_blank">
     <img src="https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="GitHub">
   </a>
+  <a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
+    <img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
+  </a>
   <a href="https://t.me/fpx_engine" target="_blank">
     <img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram">
   </a>

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/fpx/__init__.py

@@ -1,6 +1,7 @@
 import logging
 from .main import FunPayTools
 from .classes.runner.subclasses.handler import Router
+from .utils import errors as fpx_error
 from .models.chat import Message
 from .models.account import Order, CurReview
 from .models.lots import CategoryLastLot

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/fpx/classes/runner/runner.py

@@ -65,21 +65,23 @@ class Runner:
         '''
         if is_background:
             asyncio.create_task(self._run_loop(timer, watch_lots, watch_chips))
-            await self.idle()
         else:
             await self._run_loop(timer, watch_lots, watch_chips)
 
     async def _warm_up(self, watch_lots, watch_chips):
         '''Прогрев кеша'''
         await self._account.profile.get_user_data()
-        for _ in range(2):
-            if watch_lots:
-                await self._category._check_lot_categories(watch_lots)
-            if watch_chips:
-                await self._category._check_chip_categories(watch_chips)
-            await self._chat._update_chat_cache()
-            await self._order._update_order_cache()
-            await self._review._update_review_cache()
+        tasks = []
+        if watch_lots:
+            tasks.append(self._category._check_lot_categories(watch_lots))
+        if watch_chips:
+            tasks.append(self._category._check_chip_categories(watch_chips))
+        tasks.extend([
+            self._chat._update_chat_cache(),
+            self._order._update_order_cache(),
+            self._review._update_review_cache()
+        ])
+        await asyncio.gather(*tasks)
         self._cache_is_updated = True
         for handler in self.handler._handlers['startup']:
             asyncio.create_task(handler())
@@ -89,10 +91,14 @@ class Runner:
         if not self._cache_is_updated:
             await self._warm_up(watch_lots, watch_chips)
             return
+        tasks = []
         if watch_lots:
-            await self._category._check_lot_categories(watch_lots)
+            tasks.append(self._category._check_lot_categories(watch_lots))
         if watch_chips:
-            await self._category._check_chip_categories(watch_chips)
-        await self._chat._check_chats()
-        await self._order._check_orders()
-        await self._review._check_reviews()
+            tasks.append(self._category._check_chip_categories(watch_chips))
+        tasks.extend([
+            self._chat._check_chats(),
+            self._order._check_orders(),
+            self._review._check_reviews()
+        ])
+        await asyncio.gather(*tasks)

fpx_engine-0.3.2/fpx/classes/runner/subclasses/chat.py

@@ -0,0 +1,160 @@
+import inspect
+import logging
+import asyncio
+
+from fpx.models.chat import Message
+from fpx.fsm import FSMContext
+from fpx.utils import errors as fpx_err
+
+logger = logging.getLogger("fpx.chat_runner")
+
+class ChatRunner:
+    def __init__(self, runner):
+        self.runner = runner
+
+    async def _compare_chat_cache(self):
+        '''
+        Сравнивает старый кеш сообщений с новым, если находит отличия, выносит сообщение в список, после чего возвращает полный список
+        '''
+        result = []
+        if self.runner._cache['msgs'] != self.runner._cache['old_msgs']:
+            for message in self.runner._cache['msgs']:
+                if message not in self.runner._cache['old_msgs']:
+                    stop_words = ('оплатил заказ', 'можете перейти в discord', 'написал отзыв', 'изменил отзыв', 'вернул деньги', 'подтвердил успешное выполнение')
+                    msg_lower = message['last_msg'].lower()
+                    if not any(word in msg_lower for word in stop_words):
+                        result.append(Message(sender=message['sender'], chat_id=message['chat_id'], text=message['last_msg'], is_system=False))
+        return result
+
+    async def _update_chat_cache(self):
+        '''
+        Обновляет кеш последних чатов
+        '''
+        chats = await self.runner._account.chat.get_chats()
+        result = []
+        counter = 0
+        for chat in chats:
+            if counter > 75:
+                break
+            chat = {'sender': chat.username, 'chat_id': chat.id, 'last_msg': chat.last_msg}
+            result.append(chat)
+            counter += 1
+        self.runner._cache['old_msgs'] = self.runner._cache['msgs']
+        self.runner._cache['msgs'] = result
+
+    async def _process_message(self, message: Message, state_ctx):
+        if not message.text:
+            return False
+        parts = message.text.split()
+        if not parts:
+            return False
+        first_word = parts[0].lower()
+        args = parts[1:]
+        for cmd_handler in self.runner.handler._handlers['commands']:
+            target_command = cmd_handler['command']
+            target_command_lower = {k.lower(): v for k, v in target_command.items()}
+            if first_word in target_command_lower:
+                target_function = target_command_lower[first_word]
+                sig = inspect.signature(target_function)
+                total_params_count = len(sig.parameters)
+                has_state = False
+                for param in sig.parameters.values():
+                    if param.annotation == FSMContext:
+                        has_state = True
+                        break
+                if has_state:
+                    required_args = total_params_count - 2
+                    alowed_args_count = max(0, required_args)
+                    final_args = args[:alowed_args_count]
+                    if len(args) < required_args:
+                        param_names = list(sig.parameters.keys())
+                        missing_param = param_names[2 + len(args)]
+                        raise fpx_err.FpxCommandArgsError(target_function.__name__, missing_param)
+                    await target_function(message, state_ctx, *final_args)
+                else:
+                    required_args = total_params_count - 1
+                    alowed_args_count = max(0, required_args)
+                    final_args = args[:alowed_args_count]
+                    if len(args) < required_args:
+                        param_names = list(sig.parameters.keys())
+                        missing_param = param_names[1 + len(args)]
+                        raise fpx_err.FpxCommandArgsError(target_function.__name__, missing_param)
+                    await target_function(message, *final_args)
+                return True
+        return False
+
+    async def _trigger_message_handlers(self, message):
+        if self.runner._account.username == message.sender:
+            return
+        msg_text = message.text.lower()
+        current_state = await self.runner.storage.get_state(message.chat_id)
+        state_ctx = FSMContext(storage=self.runner.storage, chat_id=message.chat_id)
+        try:
+            if await self._process_message(message, state_ctx):
+                return
+        except Exception as e:
+            if self.runner.handler._handlers['error']:
+                await self.runner.handler._handlers['error'](message, e)
+            else:
+                logger.debug(f'Ошибка при обработке сообщения: {e}', exc_info=True)
+            return
+        for handler in self.runner.handler._handlers['message']:
+            if handler['state'] != current_state:
+                continue
+            async def call_handler(h_func):
+                sig = inspect.signature(h_func)
+                has_state = False
+                for param in sig.parameters.values():
+                    if param.annotation == FSMContext:
+                        has_state = True
+                        break
+                if has_state:
+                    await h_func(message, state_ctx)
+                else:
+                    await h_func(message)
+            if handler['state'] is not None:
+                await call_handler(handler['function'])
+                break
+            if handler['mapping'] is not None:
+                matched = False
+                for trigger, reply in handler['mapping'].items():
+                    if msg_text.startswith(trigger.lower()):
+                        formatted_reply = reply.format(
+                            sender=message.sender,
+                            chat_id=message.chat_id,
+                            text=message.text
+                        )
+                        await message.answer(formatted_reply)
+                        matched = True
+                        break
+                if matched:
+                    await call_handler(handler['function'])
+                    break
+            filter_text = handler['filter_text']
+            if filter_text is None and handler['mapping'] is None:
+                await call_handler(handler['function'])
+                break
+            if isinstance(filter_text, str) and msg_text.startswith(filter_text.lower()):
+                await call_handler(handler['function'])
+                break
+
+    async def _check_chats(self):
+        await self.runner._chat._update_chat_cache()
+        chats = await self.runner._chat._compare_chat_cache()
+        if chats:
+            async def process_single_chat(chat_cache_obj):
+                try:
+                    msg_obj = await self.runner._account.chat.get_chat_data(chat_cache_obj.chat_id)
+                    message = msg_obj.last_message
+                    chat_msg = Message(
+                        sender=message['sender'], 
+                        chat_id=chat_cache_obj.chat_id, 
+                        text=chat_cache_obj.text, 
+                        is_system=message['is_system']
+                    )   
+                    chat_msg._client = self.runner
+                    await self._trigger_message_handlers(chat_msg)
+                except Exception as e:
+                    logger.error(f"Ошибка при параллельной обработке чата {chat_cache_obj.chat_id}: {e}", exc_info=True)
+            tasks = [process_single_chat(chat) for chat in chats]
+            await asyncio.gather(*tasks)

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/fpx/classes/runner/subclasses/order.py

@@ -45,12 +45,18 @@ class OrderRunner:
             matched = False
             for trigger in handler['mapping']:
                 if trigger.lower() in msg_text:
+                    order.finded_mapping = trigger
                     matched = True
                     break
                 if not matched:
                     return False
         sig = inspect.signature(h_func)
-        if len(sig.parameters) >= 2:
+        has_state = False
+        for param in sig.parameters.values():
+            if param.annotation == FSMContext:
+                has_state = True
+                break
+        if has_state:
             await h_func(order, state_ctx)
         else:
             await h_func(order)

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/fpx/classes/runner/subclasses/router.py

@@ -1,4 +1,4 @@
-
+from fpx.utils import errors as fpx_err
 
 
 class Router:
@@ -12,18 +12,33 @@ class Router:
             'review': [],
             'lot_category': [],
             'chip_category': [],
+            'commands': [],
+            'error': [],
 
             # системные
             'startup': [],
             'flood': []
         }
+
+    def on_error(self):
+        '''Декоратор для отлова ошибок'''
+        def decorator(func):
+            self._handlers['error'] = func
+            return func
+        return decorator
         
-    def on_message(self, text: str | None = None, mapping: dict[str, str] | None = None, state: str | None = None):
+    def on_message(
+        self,
+        text: str | None = None, 
+        mapping: dict[str, str] | None = None, 
+        state: str | None = None, 
+        command: dict | None = None
+    ):
         '''Декоратор отслеживает новые сообщения.
         
         Args:
-            - text (str): Текст на который начинается сообщение, по которому фильтруется отображение новых сообщений.
-            - mapping (dict): Словарь 'ключ': 'значение' для упрощённых ответов, вводи 'Привет' и 'Привет, работаю' и теперь скрипт будет всегда отвечать за тебя Привет, работаю когда тебе пишут привет. Вводи сколько угодно маппинга    
+            - text (str | None): Текст на который начинается сообщение, по которому фильтруется отображение новых сообщений.
+            - mapping (dict | None): Словарь 'ключ': 'значение' для упрощённых ответов, вводи 'Привет' и 'Привет, работаю' и теперь скрипт будет всегда отвечать за тебя Привет, работаю когда тебе пишут привет. Вводи сколько угодно маппинга    
 
         Returns:
             Message: Объект, содержащий:    
@@ -33,13 +48,24 @@ class Router:
                 - is_system (bool): Системное ли сообщение      
                 - anwer (method): При указании текста в аргументах, отвечает на сообщение       
         '''
+        if command and (text is not None or mapping is not None):
+            raise fpx_err.FpxAttributeError('В декоратор on_message неправильно переданы аттрибуты, если вы передаёте command, остальные аргументы нельзя передавать.')
         def decorator(func):
-            self._handlers['message'].append({
-                'function': func,
-                'filter_text': text,
-                'mapping': mapping,
-                'state': state
-            })
+            if command:
+                self._handlers['commands'].append({
+                    'function': func,
+                    'filter_text': text,
+                    'mapping': mapping,
+                    'command': command,
+                    'state': state
+                })
+            else:
+                self._handlers['message'].append({
+                    'function': func,
+                    'filter_text': text,
+                    'mapping': mapping,
+                    'state': state
+                })
             return func
         return decorator
 
@@ -89,7 +115,11 @@ class Router:
             return func
         return decorator
 
-    def on_new_order(self, mapping: list | None = None):
+    def on_new_order(
+        self, 
+        mapping: list | None = None, 
+        trigger_with_command: dict | None = None
+        ):
         '''
         Декоратор, который отслеживает только новые заказы.
 

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/fpx/models/account.py

@@ -64,6 +64,7 @@ class Order:
     description: Optional[str] = None
     client_name: Optional[str] = None
     price: Optional[float] = None
+    finded_mapping: Optional[str] = None
     status: Optional[str] = None
     name: Optional[str] = None
     category: Optional[str] = None

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/fpx/utils/errors.py

@@ -22,6 +22,11 @@ class FpxRunnerError(FpxError):
     def __init__(self, message='Ошибка раннера'):
         super().__init__(message)
 
+class FpxHandlerError(FpxError):
+    """Ошибки хендлера."""
+    def __init__(self, message='Ошибка раннера'):
+        super().__init__(message)
+
 # Третий уровень, конкретные ошибки
 
 
@@ -73,4 +78,18 @@ class FpxNullDataError(FpxParseError):
 class FpxCriticalRunnerError(FpxRunnerError):
     """Критический сбой раннера, требующий остановки или жесткого перезапуска."""
     def __init__(self, message='Критический сбой раннера, требующий остановки или жесткого перезапуска'):
-        super().__init__(message)
+        super().__init__(message)
+
+# --- Ошибки хендлера ---
+
+class FpxAttributeError(FpxHandlerError):
+    """Неправильно переданы аттрибуты."""
+    def __init__(self, message='Неправильно переданы аттрибуты'):
+        super().__init__(message)
+
+class FpxCommandArgsError(FpxHandlerError):
+    """Вызывается, когда функция команды ожидает аргументы, но в сообщении их передали меньше, чем нужно."""
+    def __init__(self, function_name, missing_arg):
+        self.function_name = function_name
+        self.missing_arg = missing_arg
+        super().__init__(f"Команда '{function_name}' ожидает аргумент '{missing_arg}', но он не был передан в чате.")

{fpx_engine-0.3.0 → fpx_engine-0.3.2/fpx_engine.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fpx-engine
-Version: 0.3.0
+Version: 0.3.2
 Summary: Автоматизация работы с FunPay
 Author-email: Be My Code <gettofarmila@gmail.com>
 Project-URL: Homepage, https://github.com/bymyforge/fpx
@@ -10,7 +10,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.24.0
+Requires-Dist: httpx[http2]>=0.24.0
 Requires-Dist: beautifulsoup4>=4.12.0
 Dynamic: license-file
 
@@ -29,6 +29,9 @@ Dynamic: license-file
   <a href="https://github.com/bymyforge/fpx" target="_blank">
     <img src="https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="GitHub">
   </a>
+  <a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
+    <img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
+  </a>
   <a href="https://t.me/fpx_engine" target="_blank">
     <img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram">
   </a>

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/fpx_engine.egg-info/requires.txt

@@ -1,2 +1,2 @@
-httpx>=0.24.0
+httpx[http2]>=0.24.0
 beautifulsoup4>=4.12.0

{fpx_engine-0.3.0 → fpx_engine-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fpx-engine"
-version = "0.3.0"
+version = "0.3.2"
 authors = [
   { name="Be My Code", email="gettofarmila@gmail.com" },
 ]
@@ -17,7 +17,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "httpx>=0.24.0",
+    "httpx[http2]>=0.24.0",
     "beautifulsoup4>=4.12.0",
 ]
 

fpx_engine-0.3.0/fpx/classes/runner/subclasses/chat.py

@@ -1,90 +0,0 @@
-import inspect
-
-from fpx.models.chat import Message
-from fpx.fsm import FSMContext
-
-class ChatRunner:
-    def __init__(self, runner):
-        self.runner = runner
-
-    async def _compare_chat_cache(self):
-        '''
-        Сравнивает старый кеш сообщений с новым, если находит отличия, выносит сообщение в список, после чего возвращает полный список
-        '''
-        result = []
-        if self.runner._cache['msgs'] != self.runner._cache['old_msgs']:
-            for message in self.runner._cache['msgs']:
-                if message not in self.runner._cache['old_msgs']:
-                    stop_words = ('оплатил заказ', 'можете перейти в discord', 'написал отзыв', 'изменил отзыв', 'вернул деньги', 'подтвердил успешное выполнение')
-                    msg_lower = message['last_msg'].lower()
-                    if not any(word in msg_lower for word in stop_words):
-                        result.append(Message(sender=message['sender'], chat_id=message['chat_id'], text=message['last_msg'], is_system=False))
-        return result
-
-    async def _update_chat_cache(self):
-        '''
-        Обновляет кеш последних чатов
-        '''
-        chats = await self.runner._account.chat.get_chats()
-        result = []
-        counter = 0
-        for chat in chats:
-            if counter > 30:
-                break
-            chat = {'sender': chat.username, 'chat_id': chat.id, 'last_msg': chat.last_msg}
-            result.append(chat)
-            counter += 1
-        self.runner._cache['old_msgs'] = self.runner._cache['msgs']
-        self.runner._cache['msgs'] = result
-
-    async def _trigger_message_handlers(self, message):
-        if self.runner._account.username == message.sender:
-            return
-        msg_text = message.text.lower()
-        current_state = await self.runner.storage.get_state(message.chat_id)
-        state_ctx = FSMContext(storage=self.runner.storage, chat_id=message.chat_id)
-        for handler in self.runner.handler._handlers['message']:
-            if handler['state'] != current_state:
-                continue
-            async def call_handler(h_func):
-                sig = inspect.signature(h_func)
-                if len(sig.parameters) >= 2:
-                    await h_func(message, state_ctx)
-                else:
-                    await h_func(message)
-            if handler['state'] is not None:
-                await call_handler(handler['function'])
-                break
-            if handler['mapping'] is not None:
-                matched = False
-                for trigger, reply in handler['mapping'].items():
-                    if msg_text.startswith(trigger.lower()):
-                        formatted_reply = reply.format(
-                            sender=message.sender,
-                            chat_id=message.chat_id,
-                            text=message.text
-                        )
-                        await message.answer(formatted_reply)
-                        matched = True
-                        break
-                if matched:
-                    await call_handler(handler['function'])
-                    break
-            filter_text = handler['filter_text']
-            if filter_text is None and handler['mapping'] is None:
-                await call_handler(handler['function'])
-                break
-            if isinstance(filter_text, str) and msg_text.startswith(filter_text.lower()):
-                await call_handler(handler['function'])
-                break
-
-    async def _check_chats(self):
-        await self.runner._chat._update_chat_cache()
-        chats = await self.runner._chat._compare_chat_cache()
-        if chats:
-            for chat in chats:
-                msg_obj = await self.runner._account.chat.get_chat_data(chat.chat_id)
-                message = msg_obj.last_message
-                chat = Message(sender=message['sender'], chat_id=chat.chat_id, text=chat.text, is_system=message['is_system'])   
-                chat._client = self.runner
-                await self._trigger_message_handlers(chat)