🔥Refactor before release 1.0beta

README.md

@@ -116,23 +116,23 @@ from glQiwiApi import QiwiWrapper
 
 
 async def main():
-    # You can pass on only p2p tokens, if you want to use only p2p api
-    async with QiwiWrapper(
-            secret_p2p="your_secret_p2p"
-    ) as w:
-        # Таким образом можно создать p2p счет
-        # В примере указан счёт на 1 рубль с комментарием some_comment
-        bill = await w.create_p2p_bill(
-            amount=1,
-            comment='my_comm'
-        )
-        # Проверка на статус "оплачено" созданного p2p счёта
-        if (await w.check_p2p_bill_status(bill_id=bill.bill_id)) == 'PAID':
-            print('Успешно оплачено')
-        else:
-            print('Транзакция не найдена')
-        # Или, начиная с версии апи 0.2.0
-        print(await bill.paid)  # This will print you bool answer
+  # You can pass on only p2p tokens, if you want to use only p2p api
+  async with QiwiWrapper(
+          secret_p2p="your_secret_p2p"
+  ) as w:
+    # Таким образом можно создать p2p счет
+    # В примере указан счёт на 1 рубль с комментарием some_comment
+    bill = await w.create_p2p_bill(
+      amount=1,
+      comment='my_comm'
+    )
+    # Проверка на статус "оплачено" созданного p2p счёта
+    if (await w.check_p2p_bill_status(bill_id=bill.bill_id)) == 'PAID':
+      print('Успешно оплачено')
+    else:
+      print('Транзакция не найдена')
+    # Или, начиная с версии апи 0.2.0
+    print(await bill.paid)  # This will print you bool answer
 
 
 asyncio.run(main())

SETUP_REQUIREMENTS.txt

@@ -0,0 +1,7 @@
+pytz>=2021.1
+aiofiles>=0.6.0
+aiohttp>=3.7.4post0
+pydantic>=1.8.2
+wheel>=0.36.2
+loguru>=0.5.3
+

examples/qiwi/polling.py

@@ -1,6 +1,7 @@
 import datetime
 
 from glQiwiApi import QiwiWrapper, types
+from glQiwiApi.utils import executor
 
 api_access_token = "your token"
 phone_number = "your number"
@@ -20,7 +21,8 @@ def on_startup(wrapper: QiwiWrapper):
     wrapper.dispatcher.logger.info("This message logged on startup")
 
 
-wallet.start_polling(
+executor.start_polling(
+    wallet,
     get_updates_from=datetime.datetime.now() - datetime.timedelta(hours=1),
     on_startup=on_startup
 )

examples/qiwi/pretty_webhook.py

@@ -1,6 +1,5 @@
-import logging
-
 from glQiwiApi import QiwiWrapper, types
+from glQiwiApi.utils import executor
 
 wallet = QiwiWrapper(
     api_access_token='token from https://qiwi.com/api/',
@@ -20,8 +19,4 @@ async def fetch_bill(notification: types.Notification):
 
 FORMAT = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
 
-wallet.start_webhook(
-    port=80,
-    level=logging.INFO,
-    format=FORMAT
-)
+executor.start_webhook(wallet, port=80)

glQiwiApi/__init__.py

@@ -5,7 +5,7 @@
 from .utils.exceptions import *  # NOQA
 from .yoo_money import YooMoneyAPI  # NOQA
 
-__version__ = '1.0beta'
+__version__ = '1.0alpha'
 
 __all__ = (
         (

glQiwiApi/core/abstracts.py

@@ -1,7 +1,11 @@
+from __future__ import annotations
+
 import abc
 import asyncio
+import typing
 import unittest
-from typing import AsyncGenerator, Optional, Dict, Any, Union, List, Tuple
+from types import TracebackType
+from typing import AsyncGenerator, Optional, Dict, Any, Union, List, Tuple, Type
 
 from aiohttp import web
 from aiohttp.typedefs import LooseCookies
@@ -27,7 +31,10 @@ def __call__(cls, *args, **kwargs):
         return cls._instances[cls]
 
 
-class BaseStorage(abc.ABC):
+T = typing.TypeVar("T")
+
+
+class BaseStorage(abc.ABC, typing.Generic[T]):
     """
     Абстрактный класс контроллера кэша
 
@@ -97,7 +104,7 @@ class AbstractParser(abc.ABC):
     """ Abstract class of parser for send request to different API's"""
 
     @abc.abstractmethod
-    async def _request(
+    async def _make_request(
             self,
             url: str,
             get_json: bool,
@@ -115,7 +122,9 @@ async def _request(
                 Dict[str, Union[str, int, List[
                     Union[str, int]
                 ]]]
-            ]) -> Response:
+            ],
+            get_bytes: bool,
+            **kwargs) -> Response:
         raise NotImplementedError
 
     @abc.abstractmethod
@@ -128,6 +137,13 @@ async def fetch(
         """ You can override it, but is must to return an AsyncGenerator """
         raise NotImplementedError
 
+    @abc.abstractmethod
+    async def close(self) -> None:  # pragma: no cover
+        """
+        Close client session
+        """
+        pass
+
     def raise_exception(
             self,
             status_code: str,
@@ -136,6 +152,17 @@ def raise_exception(
     ) -> None:
         """Метод для обработки исключений и лучшего логирования"""
 
+    async def __aenter__(self) -> AbstractParser:
+        return self
+
+    async def __aexit__(
+            self,
+            exc_type: Optional[Type[BaseException]],
+            exc_value: Optional[BaseException],
+            traceback: Optional[TracebackType],
+    ) -> None:
+        await self.close()
+
 
 class BaseWebHookView(web.View):
     """

glQiwiApi/core/aiohttp_custom_api.py

@@ -11,14 +11,13 @@
 
 class RequestManager(HttpXParser):
     """
-    Немного переделанный HttpXParser
-    под платежные системы и кэширование запросов
+    Deal with :class:`Storage`,
+    caching queries and managing stable work of sending requests
 
     """
     __slots__ = (
-        'without_context', 'messages', '_cache', '_cached_key',
-        '_connector_type', '_connector_init', '_should_reset_connector',
-        '_proxy'
+        'without_context', 'messages', '_cache', '_should_reset_connector',
+        '_connector_type', '_connector_init', '_proxy'
     )
 
     def __init__(
@@ -33,17 +32,26 @@ def __init__(
         self.without_context: bool = without_context
         self.messages: Optional[Dict[str, str]] = messages
         self._cache: Storage = Storage(cache_time=cache_time)
-        self._cached_key: str = "session"
 
-    def reset_storage(self) -> None:
+    def reset_cache(self) -> None:
         """ Clear all cache in storage """
         self._cache.clear(force=True)
 
-    async def _request(self, *args, **kwargs) -> Response:
+    async def make_request(self, **kwargs) -> Response:
+        """ The user-friendly method that allows sending requests to any URL  """
+        return await super(RequestManager, self)._make_request(**kwargs)
+
+    async def _make_request(self, *args, **kwargs) -> Response:
+        """ Send request to service(API) """
         # Получаем текущий кэш используя ссылку как ключ
         response = self._cache[(kwargs.get('url'))]
         if not self._cache.validate(kwargs):
-            response = await super()._request(*args, **kwargs)
+            try:
+                response = await super()._make_request(*args, **kwargs)
+            except aiohttp.ContentTypeError:
+                raise RequestError(message="Unexpected error. Cannot deserialize answer.",
+                                   status_code="unknown")
+
         # Проверяем, не был ли запрос в кэше, если нет,
         # то проверяем статус код и если он не 200 - выбрасываем ошибку
         if not isinstance(response, Cached):
@@ -58,6 +66,15 @@ async def _request(self, *args, **kwargs) -> Response:
 
         return response
 
+    async def _close_session(self):
+        if self.without_context:
+            await super(RequestManager, self).close()
+
+    async def close(self) -> None:
+        """ Close aiohttp session and reset cache data """
+        await super(RequestManager, self).close()
+        self.reset_cache()
+
     def raise_exception(
             self,
             status_code: str,
@@ -75,10 +92,6 @@ def raise_exception(
             json_info=json_info
         )
 
-    async def _close_session(self):
-        if self.without_context and not self.session.closed:
-            await self.session.close()
-
     def _cache_all(self, response: Response, kwargs: Dict[Any, Any]):
         resolved: Cached = self._cache.convert_to_cache(
             result=response.response_data,
@@ -89,8 +102,8 @@ def _cache_all(self, response: Response, kwargs: Dict[Any, Any]):
 
     @property
     def is_session_closed(self) -> bool:
-        if isinstance(self.session, aiohttp.ClientSession):
-            if not self.session.closed:
+        if isinstance(self._session, aiohttp.ClientSession):
+            if not self._session.closed:
                 return True
         return False