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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fpx-engine
-Version: 0.3.2
+Version: 0.4.0
 Summary: Автоматизация работы с FunPay
 Author-email: Be My Code <gettofarmila@gmail.com>
 Project-URL: Homepage, https://github.com/bymyforge/fpx
@@ -77,6 +77,7 @@ async def main():
         await message.answer('Привет')
     #запускаем приём событий
     await fp.runner.start_polling(3, is_background=True)
+    await fp.runner.idle()
 
 if __name__ == '__main__':
     asyncio.run(main())

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

@@ -61,6 +61,7 @@ async def main():
         await message.answer('Привет')
     #запускаем приём событий
     await fp.runner.start_polling(3, is_background=True)
+    await fp.runner.idle()
 
 if __name__ == '__main__':
     asyncio.run(main())

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

@@ -48,7 +48,7 @@ class Runner:
                 await asyncio.sleep(timer)
             except fpx_err.FpxRequestError:
                 await asyncio.sleep(60)
-            except (httpx.ConnectTimeout, httpx.RemoteProtocolError, httpx.ReadTimeout, httpx.ConnectError):
+            except (httpx.HTTPError, httpx.NetworkError):
                 await asyncio.sleep(timer)
             except Exception as e:
                 raise fpx_err.FpxCriticalRunnerError(message=str(e))

{fpx_engine-0.3.2 → fpx_engine-0.4.0}/fpx/classes/runner/subclasses/category.py

@@ -1,4 +1,4 @@
-
+import asyncio
 
 
 class CategoryRunner:
@@ -6,23 +6,35 @@ class CategoryRunner:
         self.runner = runner
 
     async def _update_lot_category_cache(self, lot_category_ids):
+        tasks = [
+            self.runner._account.category.get_lot_category_last_lot(cat_id)
+            for cat_id in lot_category_ids
+        ]
+        results = await asyncio.gather(*tasks, return_exceptions=True)
         new_cache = []
-        for category_id in lot_category_ids:
-            lots = await self.runner._account.category.get_lot_category_last_lot(category_id)
+        for category_id, lots in zip(lot_category_ids, results):
+            if isinstance(lots, Exception):
+                continue
             for lot in lots:
-                lot.category_id = category_id 
+                lot.category_id = category_id
                 new_cache.append(lot)
-        self.runner._cache['old_lot_categories'] = self.runner._cache['lot_categories']
+        self.runner._cache['old_lot_categories'] = self.runner._cache.get('lot_categories')
         self.runner._cache['lot_categories'] = new_cache
 
     async def _update_chip_category_cache(self, chip_category_ids):
+        tasks = [
+            self.runner._account.category.get_chip_category_last_lot(cat_id)
+            for cat_id in chip_category_ids
+        ]
+        results = await asyncio.gather(*tasks, return_exceptions=True)
         new_cache = []
-        for category_id in chip_category_ids:
-            lots = await self.runner._account.category.get_chip_category_last_lot(category_id)
+        for category_id, lots in zip(chip_category_ids, results):
+            if isinstance(lots, Exception):
+                continue
             for lot in lots:
                 lot.category_id = category_id
                 new_cache.append(lot)
-        self.runner._cache['old_chip_categories'] = self.runner._cache['chip_categories']
+        self.runner._cache['old_chip_categories'] = self.runner._cache.get('chip_categories', [])
         self.runner._cache['chip_categories'] = new_cache
 
     async def _compare_lot_category_cache(self):
@@ -65,7 +77,7 @@ class CategoryRunner:
                 if lot.owner_username == self.runner._account.username:
                     continue
                 for handler in self.runner.handler._handlers['lot_category']:
-                    await handler(lot)
+                    asyncio.create_task(handler(lot))
 
     async def _check_chip_categories(self, chip_category_ids):
         await self._update_chip_category_cache(chip_category_ids)
@@ -75,4 +87,4 @@ class CategoryRunner:
                 if lot.owner_username == self.runner._account.username:
                     continue
                 for handler in self.runner.handler._handlers['chip_category']:
-                    await handler(lot)
+                    asyncio.create_task(handler(lot))

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

@@ -1,4 +1,5 @@
 import inspect
+import asyncio
 
 from fpx.models.account import Order
 from fpx.fsm import FSMContext
@@ -48,8 +49,8 @@ class OrderRunner:
                     order.finded_mapping = trigger
                     matched = True
                     break
-                if not matched:
-                    return False
+            if not matched:
+                return False
         sig = inspect.signature(h_func)
         has_state = False
         for param in sig.parameters.values():
@@ -61,6 +62,33 @@ class OrderRunner:
         else:
             await h_func(order)
 
+    async def _check_trigger_for_command(self, order: Order, state_ctx: FSMContext):
+        if order.description is None:
+            return False
+        for cmd_handler in self.runner.handler._handlers['order_command']:
+            target_command = cmd_handler['trigger_command']
+            target_command_lower = {k.lower(): v for k, v in target_command.items()}
+            target_function = None
+            for command_name in target_command_lower:
+                if command_name in order.description.lower():
+                    target_function = target_command_lower[command_name]
+                    order.finded_mapping = command_name
+                    break 
+            if target_function is None:
+                continue
+            sig = inspect.signature(target_function)
+            has_state = False
+            for param in sig.parameters.values():
+                if param.annotation == FSMContext:
+                    has_state = True
+                    break
+            if has_state:
+                await target_function(order, state_ctx)
+            else:
+                await target_function(order)
+            return True
+        return False
+
     async def _trigger_order_handlers(self, order: Order):
         state_ctx = FSMContext(self.runner.storage, order.chat_id)
         status = order.status.lower()
@@ -69,20 +97,27 @@ class OrderRunner:
         if status in ('закрыт', 'closed', 'закрито'):
             for handler in self.runner.handler._handlers['confirmed_order']:
                 await self._check_handler(handler, order, state_ctx)
-        elif status in('оплачен', 'оплачено', 'paid', 'opened', 'відкрито'):
+        elif status in ('оплачен', 'оплачено', 'paid', 'відкрито'):
             for handler in self.runner.handler._handlers['new_order']:
                 await self._check_handler(handler, order, state_ctx)
+            await self._check_trigger_for_command(order, state_ctx)
         elif status in ('возврат', 'повернення', 'refund'):
             for handler in self.runner.handler._handlers['refund']:
                 await self._check_handler(handler, order, state_ctx)
 
+    async def _process_single_order(self, order: Order):
+        try:
+            order_info = await self.runner._account.order.get_order_details(order.order_id)
+            order.description = order_info.description
+            order.chat_id = order_info.chat_id
+            order._client = self.runner
+            await self._trigger_order_handlers(order)
+        except Exception:
+            pass
+
     async def _check_orders(self):
         await self.runner._order._update_order_cache()
         orders = await self.runner._order._compare_order_cache()
         if orders:
-            for order in orders:
-                order_info = await self.runner._account.order.get_order_details(order.order_id)
-                order.description = order_info.description
-                order.chat_id = order_info.chat_id
-                order._client = self.runner
-                await self._trigger_order_handlers(order)
+            tasks = [self._process_single_order(order) for order in orders]
+            await asyncio.gather(*tasks)

{fpx_engine-0.3.2 → fpx_engine-0.4.0}/fpx/classes/runner/subclasses/review.py

@@ -1,3 +1,5 @@
+import asyncio
+
 
 from fpx.models.account import CurReview, Order
 
@@ -10,7 +12,7 @@ class ReviewRunner:
     async def _update_review_cache(self):
         '''Обновляет кеш отзывов'''
         profile = await self.runner._account.profile.profile()
-        self.runner._cache['old_reviews'] = self.runner._cache['reviews'].copy()
+        self.runner._cache['old_reviews'] = self.runner._cache.get('reviews', [])
         self.runner._cache['reviews'] = profile.reviews
 
     async def _compare_review_cache(self):
@@ -23,19 +25,22 @@ class ReviewRunner:
         return result
 
     async def _target_review_processing(self, review: CurReview):
-        order = await self.runner._account.order.get_order_details(review.order_id)
-        review._client = self.runner
-        review.order = order
-        for handler in self.runner.handler._handlers['review']:
-            if handler['stars'] is None:
-                await handler['function'](review)
-            else:
-                if review.stars == handler['stars']:
-                    await handler['function'](review)
+        try:
+            order = await self.runner._account.order.get_order_details(review.order_id)
+            review._client = self.runner
+            review.order = order
+            for handler in self.runner.handler._handlers['review']:
+                if handler['stars'] is None:
+                    asyncio.create_task(handler['function'](review))
+                else:
+                    if review.stars == handler['stars']:
+                        await handler['function'](review)
+        except Exception:
+            pass
 
     async def _check_reviews(self):
         await self.runner._review._update_review_cache()
         reviews = await self.runner._review._compare_review_cache()
         if reviews:
-            for review in reviews:
-                await self._target_review_processing(review)
+            tasks = [self._target_review_processing(review) for review in reviews]
+            await asyncio.gather(*tasks)

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

@@ -14,12 +14,35 @@ class Router:
             'chip_category': [],
             'commands': [],
             'error': [],
+            'order_command': [],
 
             # системные
             'startup': [],
             'flood': []
         }
 
+    def registrate_order_targets(self, target_dict: dict):
+        '''
+        Метод для регистрации команд автоматизации новых заказов.
+        
+        Args:
+            target_dict (dict): Словарь вида {'target': answer_new_def, 'моя пометка в описании': another_func}
+        '''
+        self._handlers['order_command'].append({
+            'trigger_command': target_dict
+        })
+
+    def registrate_message_command(self, command_dict: dict):
+        '''
+        Метод для регистрации команд автоматизации сообщений.
+
+        Args:
+            target_dict (dict): Словарь вида {'command': answer_new_def, '!start': another_func}
+        '''
+        self._handlers['commands'].append({
+            'command': command_dict
+        })
+
     def on_error(self):
         '''Декоратор для отлова ошибок'''
         def decorator(func):
@@ -31,8 +54,7 @@ class Router:
         self,
         text: str | None = None, 
         mapping: dict[str, str] | None = None, 
-        state: str | None = None, 
-        command: dict | None = None
+        state: str | None = None
     ):
         '''Декоратор отслеживает новые сообщения.
         
@@ -48,24 +70,13 @@ 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):
-            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
-                })
+            self._handlers['message'].append({
+                'function': func,
+                'filter_text': text,
+                'mapping': mapping,
+                'state': state
+            })
             return func
         return decorator
 
@@ -117,9 +128,8 @@ class Router:
 
     def on_new_order(
         self, 
-        mapping: list | None = None, 
-        trigger_with_command: dict | None = None
-        ):
+        mapping: list | None = None
+    ):
         '''
         Декоратор, который отслеживает только новые заказы.
 

{fpx_engine-0.3.2 → fpx_engine-0.4.0}/fpx/main.py

@@ -6,7 +6,10 @@ from fpx.fsm import MemoryStorage, BaseStorage
 
 class FunPayTools:
     def __init__(self, gkey, storage: BaseStorage | None = None):
-        self.cookies = {'golden_key': gkey}
+        self.cookies = {
+            'golden_key': gkey,
+            'locale': 'ru'
+        }
         self.headers = {
             "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0",
             "Accept-Language": "ru-RU,ru;q=0.9"
@@ -15,7 +18,8 @@ class FunPayTools:
             http2=True,
             cookies=self.cookies,
             headers=self.headers,
-            base_url='https://funpay.com'
+            base_url='https://funpay.com',
+            follow_redirects=True
         )
         self.account = Account(self.client)
         self.runner = Runner(self.account)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fpx-engine
-Version: 0.3.2
+Version: 0.4.0
 Summary: Автоматизация работы с FunPay
 Author-email: Be My Code <gettofarmila@gmail.com>
 Project-URL: Homepage, https://github.com/bymyforge/fpx
@@ -77,6 +77,7 @@ async def main():
         await message.answer('Привет')
     #запускаем приём событий
     await fp.runner.start_polling(3, is_background=True)
+    await fp.runner.idle()
 
 if __name__ == '__main__':
     asyncio.run(main())

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fpx-engine"
-version = "0.3.2"
+version = "0.4.0"
 authors = [
   { name="Be My Code", email="gettofarmila@gmail.com" },
 ]