exchanges-wrapper 2.1.15__tar.gz → 2.1.17__tar.gz

{exchanges_wrapper-2.1.15 → exchanges_wrapper-2.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exchanges-wrapper
-Version: 2.1.15
+Version: 2.1.17
 Summary: REST API and WebSocket asyncio wrapper with grpc powered multiplexer server
 Author-email: Thomas Marchand <thomas.marchand@tuta.io>, Jerry Fedorenko <jerry.fedorenko@yahoo.com>
 Requires-Python: >=3.9

{exchanges_wrapper-2.1.15 → exchanges_wrapper-2.1.17}/exchanges_wrapper/__init__.py

@@ -12,7 +12,7 @@ __maintainer__ = "Jerry Fedorenko"
 __contact__ = "https://github.com/DogsTailFarmer"
 __email__ = "jerry.fedorenko@yahoo.com"
 __credits__ = ["https://github.com/DanyaSWorlD"]
-__version__ = "2.1.15"
+__version__ = "2.1.17"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.15 → exchanges_wrapper-2.1.17}/exchanges_wrapper/client.py

@@ -354,13 +354,7 @@ class Client:
             server_time = await self.fetch_server_time()
             params = {'symbols': symbol.lower()}
             trading_symbol = await self.http.send_api_call("v1/settings/common/market-symbols", **params)
-            if self.account_id is None:
-                accounts = await self.http.send_api_call("v1/account/accounts", signed=True)
-                for account in accounts:
-                    if account.get('type') == 'spot':
-                        self.account_id = account.get('id')
-                        break
-                self.account_uid = await self.http.send_api_call("v2/user/uid", signed=True)
+            await self.set_htx_ids()
             binance_res = hbp.exchange_info(server_time.get('serverTime'), trading_symbol[0])
         elif self.exchange == 'okx':
             params = {'instType': 'SPOT'}
@@ -376,6 +370,15 @@ class Client:
         # logger.info(f"fetch_exchange_info: binance_res: {binance_res}")
         return binance_res
 
+    async def set_htx_ids(self):
+        if self.account_id is None:
+            accounts = await self.http.send_api_call("v1/account/accounts", signed=True)
+            for account in accounts:
+                if account.get('type') == 'spot':
+                    self.account_id = account.get('id')
+                    break
+            self.account_uid = await self.http.send_api_call("v2/user/uid", signed=True)
+
     # MARKET DATA ENDPOINTS
 
     # https://github.com/binance/binance-spot-api-docs/blob/master/rest-api.md#order-book

{exchanges_wrapper-2.1.15 → exchanges_wrapper-2.1.17}/exchanges_wrapper/exch_srv.py

@@ -173,7 +173,7 @@ class Martin(mr.MartinBase):
                     # For HuobiPro get master account uid and account_id
                     main_account = get_account(open_client.client.master_name)
                     main_client = Client(*main_account)
-                    await main_client.fetch_exchange_info(request.symbol)
+                    await asyncio.wait_for(main_client.set_htx_ids(), timeout=HEARTBEAT * 60)
                     if main_client.account_uid and main_client.account_id:
                         open_client.client.main_account_uid = main_client.account_uid
                         open_client.client.main_account_id = main_client.account_id

{exchanges_wrapper-2.1.15 → exchanges_wrapper-2.1.17}/exchanges_wrapper/parsers/okx_parser.py

@@ -16,7 +16,7 @@ def fetch_server_time(res: []) -> {}:
 def exchange_info(server_time: int, trading_symbol: [], tickers: [], symbol_t) -> {}:
     symbols = []
     symbols_price = {
-        pair.get('instId').replace('-', ''): Decimal(pair.get('last'))
+        pair.get('instId').replace('-', ''): Decimal(pair.get('last', '0'))
         for pair in tickers
     }
     for market in trading_symbol:

{exchanges_wrapper-2.1.15 → exchanges_wrapper-2.1.17}/exchanges_wrapper/web_sockets.py

@@ -17,10 +17,7 @@ import exchanges_wrapper.parsers.bybit_parser as bbt
 from crypto_ws_api.ws_session import generate_signature
 from exchanges_wrapper import LOG_PATH
 
-logger = logging.getLogger('exch_srv_logger')
-
-logger_ws = logging.getLogger(__name__)
-logger_ws.level = logging.INFO
+logger = logging.getLogger(__name__)
 formatter = logging.Formatter(fmt="[%(asctime)s: %(levelname)s] %(message)s")
 #
 fh = logging.handlers.RotatingFileHandler(Path(LOG_PATH, 'websockets.log'), maxBytes=1000000, backupCount=10)
@@ -31,8 +28,9 @@ sh = logging.StreamHandler()
 sh.setFormatter(formatter)
 sh.setLevel(logging.INFO)
 
-logger_ws.addHandler(fh)
-logger_ws.addHandler(sh)
+logger.addHandler(fh)
+logger.addHandler(sh)
+logger.propagate = False
 
 sys.tracebacklimit = 0
 
@@ -50,12 +48,13 @@ class EventsDataStream:
         self._price = None
         self.tasks = set()
         self.wss_started = False
+        self.ping = 0
 
     async def start(self):
         ping_interval = None if self.exchange == 'huobi' else 20
         async for self.websocket in websockets.connect(
                 self.endpoint,
-                logger=logger_ws,
+                logger=logger,
                 ping_interval=ping_interval
         ):
             try:
@@ -66,7 +65,7 @@ class EventsDataStream:
                     logger.info(f"WSS closed for {self.exchange}:{self.trade_id}")
                     break
                 else:
-                    logger.warning(f"Restart WSS for {self.exchange}")
+                    logger.warning(f"Restart WSS for {self.exchange}: {ex}")
                     continue
             except Exception as ex:
                 self.tasks_cancel()
@@ -187,9 +186,11 @@ class EventsDataStream:
                 logger.debug(f"Bitfinex undefined WSS: symbol: {symbol}, ch_type: {ch_type}, msg_data: {msg_data}")
         elif self.exchange == 'huobi':
             if ping := msg_data.get('ping'):
+                self.ping = 0
                 await self.websocket.send(json.dumps({"pong": ping}))
                 await asyncio.sleep(0)
             elif msg_data.get('action') == 'ping':
+                self.ping = 0
                 pong = {
                     "action": "pong",
                     "data": {
@@ -229,6 +230,17 @@ class EventsDataStream:
             await asyncio.sleep(interval)
             await self.websocket.send(json.dumps({"req_id": req_id, "op": "ping"}))
 
+    async def htx_keepalive(self, interval=60):
+        await asyncio.sleep(interval * 10)
+        while True:
+            await asyncio.sleep(interval)
+            if self.ping:
+                break
+            else:
+                self.ping = 1
+        logger.warning("From HTX server PING timeout exceeded")
+        await self.websocket.close()
+
 
 class MarketEventsDataStream(EventsDataStream):
     def __init__(self, client, endpoint, exchange, trade_id, channel=None):
@@ -300,6 +312,8 @@ class MarketEventsDataStream(EventsDataStream):
                 elif ch_type == 'depth5':
                     request = {'sub': f"market.{symbol}.depth.step0"}
 
+                self.tasks_manage(self.htx_keepalive(interval=30))
+
         await self.ws_listener(request, symbol, ch_type)
 
     async def _handle_event(self, content, symbol=None, ch_type=str()):
@@ -404,6 +418,7 @@ class HbpPrivateEventsDataStream(EventsDataStream):
             "action": "sub",
             "ch": f"trade.clearing#{self.symbol.lower()}#0"
         }
+        self.tasks_manage(self.htx_keepalive())
         await self.ws_listener(request, symbol=self.symbol)
 
     async def _handle_event(self, msg_data, *args):