exchanges-wrapper 2.1.13__tar.gz → 2.1.16__tar.gz

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exchanges-wrapper
-Version: 2.1.13
+Version: 2.1.16
 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
@@ -16,7 +16,6 @@ Requires-Dist: grpcio==1.62.0
 Requires-Dist: pyotp~=2.9.0
 Requires-Dist: simplejson==3.19.2
 Requires-Dist: aiohttp==3.9.5
-Requires-Dist: Pympler~=1.0.1
 Requires-Dist: websockets~=12.0
 Requires-Dist: expiringdict~=1.2.2
 Requires-Dist: ujson~=5.10.0

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/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.13"
+__version__ = "2.1.16"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/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
@@ -493,24 +496,24 @@ class Client:
                 uid=self.account_uid
             )
 
-            params.pop('status')
-            params['accountType'] = 'UNIFIED'
-            params['category'] = 'spot'
-            params['type'] = 'TRANSFER_IN'
+            if not _res:
+                # Get Transaction Log
+                params.pop('status')
+                params['accountType'] = 'UNIFIED'
+                params['category'] = 'spot'
+                params['type'] = 'TRANSFER_IN'
 
-            # Get Transaction Log
-            res, ts = await self.http.send_api_call(
-                "/v5/account/transaction-log",
-                signed=True,
-                **params
-            )
-
-            _res += bbt.on_balance_update(
-                res['list'],
-                ts,
-                symbol,
-                'log'
-            )
+                res, ts = await self.http.send_api_call(
+                    "/v5/account/transaction-log",
+                    signed=True,
+                    **params
+                )
+                _res += bbt.on_balance_update(
+                    res['list'],
+                    ts,
+                    symbol,
+                    'log'
+                )
 
             for i in _res:
                 _id = next(iter(i))
@@ -703,7 +706,8 @@ class Client:
     # https://github.com/binance/binance-spot-api-docs/blob/master/rest-api.md#symbol-price-ticker
     async def fetch_symbol_price_ticker(self, symbol=None):
         if symbol:
-            self.assert_symbol_exists(symbol)
+            if not (self.exchange == 'binance' and symbol == 'BNBUSDT'):
+                self.assert_symbol_exists(symbol)
             binance_res = {}
         elif self.exchange in ('bitfinex', 'huobi'):
             raise ValueError('For fetch_symbol_price_ticker() symbol parameter required')
@@ -1603,25 +1607,34 @@ class Client:
             binance_res = bbt.funding_wallet(res["balance"])
         return binance_res
 
+    # https://developers.binance.com/docs/sub_account/asset-management/Transfer-to-Sub-account-of-Same-Master
+    async def transfer_to_sub(self, email, symbol, quantity, receive_window=None):
+        if self.exchange == 'binance':
+            quantity = any2str(Decimal(quantity).quantize(Decimal('0.01234567'), rounding=ROUND_HALF_DOWN))
+            params = {"toEmail": email, "asset": symbol, "amount": quantity}
+            if receive_window:
+                params["recvWindow"] = receive_window
+            return await self.http.send_api_call(
+                "/sapi/v1/sub-account/transfer/subToSub",
+                "POST",
+                signed=True,
+                params=params
+            )
+        else:
+            raise ValueError(f"Can't implemented for {self.exchange}")
+
     # https://binance-docs.github.io/apidocs/spot/en/#transfer-to-master-for-sub-account
     async def transfer_to_master(self, symbol, quantity, receive_window=None):
-        quantity = any2str(Decimal(quantity).quantize(Decimal('0.01234567'), rounding=ROUND_HALF_DOWN))
-
+        _quantity = any2str(Decimal(quantity).quantize(Decimal('0.01234567'), rounding=ROUND_HALF_DOWN))
         binance_res = {}
         if self.exchange == 'binance':
-            params = {"asset": symbol, "amount": quantity}
-            if receive_window:
-                params["recvWindow"] = receive_window
             if self.master_email:
-                logger.info(f"Collect {quantity}{symbol} to {self.master_email} sub-account")
-                params["toEmail"] = self.master_email
-                binance_res = await self.http.send_api_call(
-                    "/sapi/v1/sub-account/transfer/subToSub",
-                    "POST",
-                    signed=True,
-                    params=params
-                )
+                logger.info(f"Collect {_quantity}{symbol} to {self.master_email} sub-account")
+                binance_res = await self.transfer_to_sub(self.master_email, symbol, quantity, receive_window)
             else:
+                params = {"asset": symbol, "amount": _quantity}
+                if receive_window:
+                    params["recvWindow"] = receive_window
                 binance_res = await self.http.send_api_call(
                     "/sapi/v1/sub-account/transfer/subToMaster",
                     "POST",
@@ -1636,7 +1649,7 @@ class Client:
                 "from": "exchange",
                 "to": "exchange",
                 "currency": symbol,
-                "amount": quantity,
+                "amount": _quantity,
                 "email_dst": self.master_email,
                 "tfaToken": {"method": "otp", "token": totp.now()}
             }
@@ -1658,7 +1671,7 @@ class Client:
                 'to-account-type': "spot",
                 'to-account': self.main_account_id,
                 'currency': symbol.lower(),
-                'amount': quantity
+                'amount': _quantity
             }
             res = await self.http.send_api_call(
                 "v1/account/transfer",
@@ -1670,7 +1683,7 @@ class Client:
         elif self.exchange == 'okx':
             params = {
                 "ccy": symbol,
-                "amt": quantity,
+                "amt": _quantity,
                 "from": '18',
                 "to": '18',
                 "type": '3'
@@ -1692,7 +1705,7 @@ class Client:
             params = {
                 'transferId': str(uuid.uuid4()),
                 'coin': symbol,
-                'amount':  str(math.floor(float(quantity) * 10 ** n) / 10 ** n),
+                'amount':  str(math.floor(float(_quantity) * 10 ** n) / 10 ** n),
                 'fromMemberId': self.account_uid,
                 'toMemberId': self.main_account_uid,
                 'fromAccountType': 'UNIFIED',

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/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
@@ -767,6 +767,24 @@ class Martin(mr.MartinBase):
         response.from_pydict(res)
         return response
 
+    async def transfer_to_sub(self, request: mr.MarketRequest) -> mr.SimpleResponse:
+        response = mr.SimpleResponse()
+        response.success = False
+
+        res, _, _ = await self.send_request(
+            'transfer_to_sub',
+            request,
+            rate_limit=True,
+            email=request.data,
+            symbol=request.symbol,
+            quantity=request.amount
+        )
+
+        if res and res.get("txnId"):
+            response.success = True
+        response.result = json.dumps(res)
+        return response
+
     async def transfer_to_master(self, request: mr.MarketRequest) -> mr.SimpleResponse:
         response = mr.SimpleResponse()
         response.success = False

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/exchanges_wrapper/martin/__init__.py

@@ -407,6 +407,7 @@ class MarketRequest(betterproto.Message):
     trade_id: str = betterproto.string_field(2)
     symbol: str = betterproto.string_field(3)
     amount: str = betterproto.string_field(4)
+    data: str = betterproto.string_field(5)
 
 
 @dataclass(eq=False, repr=False)
@@ -916,6 +917,23 @@ class MartinStub(betterproto.ServiceStub):
             metadata=metadata,
         )
 
+    async def transfer_to_sub(
+        self,
+        market_request: "MarketRequest",
+        *,
+        timeout: Optional[float] = None,
+        deadline: Optional["Deadline"] = None,
+        metadata: Optional["MetadataLike"] = None
+    ) -> "SimpleResponse":
+        return await self._unary_unary(
+            "/martin.Martin/TransferToSub",
+            market_request,
+            SimpleResponse,
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+
 
 class MartinBase(ServiceBase):
 
@@ -1056,6 +1074,11 @@ class MartinBase(ServiceBase):
     ) -> "SimpleResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
+    async def transfer_to_sub(
+        self, market_request: "MarketRequest"
+    ) -> "SimpleResponse":
+        raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
+
     async def __rpc_cancel_all_orders(
         self, stream: "grpclib.server.Stream[MarketRequest, SimpleResponse]"
     ) -> None:
@@ -1270,6 +1293,13 @@ class MartinBase(ServiceBase):
         response = await self.transfer_to_master(request)
         await stream.send_message(response)
 
+    async def __rpc_transfer_to_sub(
+        self, stream: "grpclib.server.Stream[MarketRequest, SimpleResponse]"
+    ) -> None:
+        request = await stream.recv_message()
+        response = await self.transfer_to_sub(request)
+        await stream.send_message(response)
+
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
         return {
             "/martin.Martin/CancelAllOrders": grpclib.const.Handler(
@@ -1434,4 +1464,10 @@ class MartinBase(ServiceBase):
                 MarketRequest,
                 SimpleResponse,
             ),
+            "/martin.Martin/TransferToSub": grpclib.const.Handler(
+                self.__rpc_transfer_to_sub,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                MarketRequest,
+                SimpleResponse,
+            ),
         }

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/exchanges_wrapper/parsers/bybit_parser.py

@@ -452,7 +452,6 @@ def on_balance_update(data_in: list, ts: str, symbol: str, mode: str, uid=None)
                         }
                     }
                 )
-
     elif mode == 'universal':
         for i in data_in:
             if i['coin'] in symbol and \
@@ -469,7 +468,6 @@ def on_balance_update(data_in: list, ts: str, symbol: str, mode: str, uid=None)
                         }
                     }
                 )
-
     elif mode == 'log':
         for i in data_in:
             if i['currency'] in symbol:
@@ -484,7 +482,6 @@ def on_balance_update(data_in: list, ts: str, symbol: str, mode: str, uid=None)
                         }
                     }
                 )
-
     return data_out
 
 

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/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.13 → exchanges_wrapper-2.1.16}/exchanges_wrapper/proto/martin.proto

@@ -38,6 +38,7 @@ service Martin {
   rpc StartStream (StartStreamRequest) returns (SimpleResponse) {}
   rpc StopStream (MarketRequest) returns (SimpleResponse) {}
   rpc TransferToMaster(MarketRequest) returns (SimpleResponse) {}
+  rpc TransferToSub(MarketRequest) returns (SimpleResponse) {}
 }
 
 message JSONResponse {
@@ -368,6 +369,7 @@ message MarketRequest {
   string trade_id = 2;
   string symbol = 3;
   string amount = 4;
+  string data = 5;
 }
 
 message StartStreamRequest {

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/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):

{exchanges_wrapper-2.1.13 → exchanges_wrapper-2.1.16}/pyproject.toml

@@ -22,7 +22,6 @@ dependencies = [
     "pyotp~=2.9.0",
     "simplejson==3.19.2",
     "aiohttp==3.9.5",
-    "Pympler~=1.0.1",
     "websockets~=12.0",
     "expiringdict~=1.2.2",
     "ujson~=5.10.0",