diff --git a/README.md b/README.md index 2223772..2665120 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AioAbcpApi +## AioAbcpApi Async library for [API ABCP](https://www.abcp.ru/wiki/ABCP.API "API ABCP") with [asyncio](https://docs.python.org/3/library/asyncio.html "asyncio") @@ -13,9 +13,10 @@ and [aiohttp](https://github.com/aio-libs/aiohttp "aiohttp") Присоединяйтесь к [телеграм чату](https://t.me/aioabcpapi "Телеграм чат") +### Установка +`pip install aioabcpapi` - -## Описание +### Описание ------------ @@ -30,7 +31,7 @@ and [aiohttp](https://github.com/aio-libs/aiohttp "aiohttp") Для использования этого метода нам нужно будет обратиться к `await api.ts.client.cart.update()` -#### Доступ к API +### Доступ к API ------------ [Для API Администратора](https://cp.abcp.ru/?page=allsettings&systemsettings&apiInformation) diff --git a/aioabcpapi/base.py b/aioabcpapi/base.py index d213f1f..440b703 100644 --- a/aioabcpapi/base.py +++ b/aioabcpapi/base.py @@ -57,7 +57,7 @@ def __init__( self.timeout = timeout - async def get_new_session(self) -> aiohttp.ClientSession: + async def _get_new_session(self) -> aiohttp.ClientSession: return aiohttp.ClientSession( connector=self._connector_class(**self._connector_init), json_serialize=json.dumps @@ -67,13 +67,13 @@ async def get_new_session(self) -> aiohttp.ClientSession: def loop(self) -> Optional[asyncio.AbstractEventLoop]: return self._main_loop - async def get_session(self) -> Optional[aiohttp.ClientSession]: + async def _get_session(self) -> Optional[aiohttp.ClientSession]: if self._session is None or self._session.closed: - self._session = await self.get_new_session() + self._session = await self._get_new_session() if not self._session._loop.is_running(): await self._session.close() - self._session = await self.get_new_session() + self._session = await self._get_new_session() return self._session @@ -109,5 +109,5 @@ async def request(self, method: str, if data is None: data = {'userlogin': self._login, 'userpsw': self._password} - return await api.make_request(await self.get_session(), self._host, self._admin, + return await api.make_request(await self._get_session(), self._host, self._admin, method, data, post, timeout=self.timeout, **kwargs) diff --git a/examples/basket_params.py b/examples/basket_params.py index acf5c57..26ae370 100644 --- a/examples/basket_params.py +++ b/examples/basket_params.py @@ -20,6 +20,7 @@ async def get_basket_params(): shipment_office_index=0) orders_list = api.cp.client.orders.orders_list(orders=[94233131, 93745568]) + await api.cp.admin.distributors logger.info(f'{orders_list}') diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..29d33bd --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +pytz>=2022.1 +pyRFC3339~=1.1 +environs~=9.5.0 +aiohttp~=3.8.1 +ujson~=5.4.0 +certifi~=2022.6.15 \ No newline at end of file