exchanges-wrapper 2.1.2__tar.gz → 2.1.5__tar.gz

{exchanges_wrapper-2.1.2 → exchanges_wrapper-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exchanges-wrapper
-Version: 2.1.2
+Version: 2.1.5
 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
@@ -11,7 +11,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Unix
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
-Requires-Dist: crypto-ws-api==2.0.6
+Requires-Dist: crypto-ws-api==2.0.7
 Requires-Dist: grpcio==1.62.0
 Requires-Dist: pyotp~=2.9.0
 Requires-Dist: simplejson==3.19.2

{exchanges_wrapper-2.1.2 → exchanges_wrapper-2.1.5}/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.2"
+__version__ = "2.1.5"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.2 → exchanges_wrapper-2.1.5}/exchanges_wrapper/bybit_parser.py

@@ -450,7 +450,9 @@ 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 'UNIFIED' in (i['fromAccountType'], i['toAccountType']):
+            if i['coin'] in symbol and \
+                    ((i['fromAccountType'] == 'UNIFIED' and i['fromMemberId'] == uid)
+                     or (i['toAccountType'] == 'UNIFIED' and i['toMemberId'] == uid)):
                 data_out.append(
                     {
                         i['transferId']: {

{exchanges_wrapper-2.1.2 → exchanges_wrapper-2.1.5}/exchanges_wrapper/client.py

@@ -1095,7 +1095,6 @@ class Client:
                         binance_res = bfx.order(res[4], response_type=True, cancelled=True)
                         break
                     await asyncio.sleep(0.1)
-                logger.debug(f"cancel_order.bitfinex {order_id}: timeout: {timeout}")
             else:
                 logger.warning(f"cancel_order.bitfinex {order_id}: res: {res}")
         elif self.exchange == 'huobi':

{exchanges_wrapper-2.1.2 → exchanges_wrapper-2.1.5}/exchanges_wrapper/exch_srv.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import grpclib.exceptions
 
-from exchanges_wrapper import __version__
+from exchanges_wrapper import __version__ as ver_ew
+from crypto_ws_api import __version__ as ver_cw
 import time
 import weakref
 import gc
@@ -129,9 +131,9 @@ class OpenClient:
         )
 
     @classmethod
-    def get_client(cls, _id, raise_ex=True):
+    def get_client(cls, _id):
         res = next((client for client in cls.open_clients if id(client) == _id), None)
-        if res is None and raise_ex:
+        if res is None:
             logger.warning(f"No client exist: {_id}")
             raise GRPCError(status=Status.UNAVAILABLE, message="No client exist")
         return res
@@ -196,7 +198,7 @@ class Martin(mr.MartinBase):
         Martin.rate_limiter = max(Martin.rate_limiter or 0, request.rate_limiter)
         return mr.OpenClientConnectionId(
             client_id=client_id,
-            srv_version=__version__,
+            srv_version=f"{ver_cw}:{ver_ew}",
             exchange=open_client.client.exchange,
             real_market=open_client.real_market
         )
@@ -229,7 +231,7 @@ class Martin(mr.MartinBase):
             await self.rate_limit_control(open_client)
         try:
             res = await getattr(client, client_method_name)(**kwargs)
-        except asyncio.CancelledError:
+        except (asyncio.CancelledError, asyncio.exceptions.CancelledError):
             pass  # Task cancellation should not be logged as an error
         except (errors.RateLimitReached, errors.QueryCanceled) as ex:
             Martin.rate_limit_reached_time = time.time()
@@ -700,7 +702,7 @@ class Martin(mr.MartinBase):
             else:
                 event = vars(_event)
                 event.pop('handlers', None)
-                logger.debug(f"OnOrderUpdate: {open_client.name}: {event}")
+                # logger.info(f"OnOrderUpdate: {open_client.name}: {event}")
                 response.success = True
                 response.result = json.dumps(event)
                 yield response
@@ -709,7 +711,7 @@ class Martin(mr.MartinBase):
     async def create_limit_order(self, request: mr.CreateLimitOrderRequest) -> mr.CreateLimitOrderResponse:
         response = mr.CreateLimitOrderResponse()
 
-        res, _, msg_header = await self.send_request(
+        res, _, _ = await self.send_request(
             'create_order',
             request,
             rate_limit=True,
@@ -730,13 +732,12 @@ class Martin(mr.MartinBase):
         )
 
         response.from_pydict(res)
-        logger.debug(f"{msg_header}: order created: {res.get('orderId')}")
         return response
 
     async def cancel_order(self, request: mr.CancelOrderRequest) -> mr.CancelOrderResponse:
         response = mr.CancelOrderResponse()
 
-        res, _, msg_header = await self.send_request(
+        res, _, _ = await self.send_request(
             'cancel_order',
             request,
             rate_limit=True,
@@ -748,7 +749,6 @@ class Martin(mr.MartinBase):
             receive_window=None
         )
 
-        logger.debug(f"{msg_header}: order canceled: {res}")
         response.from_pydict(res)
         return response
 
@@ -802,11 +802,11 @@ class Martin(mr.MartinBase):
 
     async def check_stream(self, request: mr.MarketRequest) -> mr.SimpleResponse:
         response = mr.SimpleResponse()
-        if open_client := OpenClient.get_client(request.client_id, raise_ex=False):
+        response.success = False
+        if open_client := OpenClient.get_client(request.client_id):
             client = open_client.client
             response.success = bool(client.data_streams.get(request.trade_id))
         else:
-            response.success = False
             logger.warning(f"CheckStream request failed for {request.symbol}")
         return response
 
@@ -843,20 +843,23 @@ async def amain(host: str = '127.0.0.1', port: int = 50051):
     server = Server([Martin()])
     with graceful_exit([server]):
         await server.start(host, port)
-        logger.info(f"Starting server v:{__version__} on {host}:{port}")
+        logger.info(f"Starting server v:{ver_cw}:{ver_ew} on {host}:{port}")
         await server.wait_closed()
 
-        [task.cancel() for task in asyncio.all_tasks() if not task.done()]
-
         for oc in OpenClient.open_clients:
             await oc.client.session.close()
 
+        [task.cancel() for task in asyncio.all_tasks() if not task.done()]
+
 
 def main():
     try:
         asyncio.run(amain())
-    except asyncio.CancelledError:
+    except (asyncio.exceptions.CancelledError, grpclib.exceptions.StreamTerminatedError):
         pass  # # Task cancellation should not be logged as an error
+    except Exception as ex:
+        print(f"Exception: {ex}")
+        print(traceback.format_exc())
 
 
 if __name__ == '__main__':

{exchanges_wrapper-2.1.2 → exchanges_wrapper-2.1.5}/exchanges_wrapper/http_client.py

@@ -18,9 +18,15 @@ from exchanges_wrapper.errors import (
 logger = logging.getLogger(__name__)
 
 AJ = 'application/json'
+STATUS_BAD_REQUEST = 400
+STATUS_UNAUTHORIZED = 401
+STATUS_FORBIDDEN = 403
+STATUS_I_AM_A_TEAPOT = 418  # HTTP status code for IPAddressBanned
+ERR_TIMESTAMP_OUTSIDE_RECV_WINDOW = "Timestamp for this request is outside of the recvWindow"
 
 
 class HttpClient:
+
     def __init__(self, **kwargs):
         self.api_key = kwargs.get('api_key')
         self.api_secret = kwargs.get('api_secret')
@@ -48,16 +54,33 @@ class HttpClient:
             payload = None
 
         if response.status >= 400:
-            # TODO different handling for errors in the exchange and transport layers [400 Bad Request]
-            logger.debug(f"handle_errors: payload: {payload}, response: {response.text}")
-            if response.status == 400 and payload and payload.get("error", str()) == "ERR_RATE_LIMIT":
-                raise RateLimitReached(RateLimitReached.message)
-            elif response.status == 403 and self.exchange != 'okx':
+            if response.status == STATUS_BAD_REQUEST:
+                if payload:
+                    if payload.get("error", "") == "ERR_RATE_LIMIT":
+                        raise RateLimitReached(RateLimitReached.message)
+                    elif (
+                            (self.exchange == 'binance' and payload.get('code', 0) == -1021)
+                            or (self.exchange == 'bybit' and payload.get('retCode', 0) == 10002)
+                    ):
+                        raise ExchangeError(ERR_TIMESTAMP_OUTSIDE_RECV_WINDOW)
+                    else:
+                        raise ExchangeError(f"ExchangeError: {payload}")
+                elif response.reason != "Bad Request":
+                    raise ExchangeError(f"ExchangeError: {response.reason}:{response.text}")
+
+            elif (
+                    response.status == STATUS_UNAUTHORIZED
+                    and self.exchange == 'okx'
+                    and payload
+                    and payload.get('code', 0) == '50102'
+            ):
+                raise ExchangeError(ERR_TIMESTAMP_OUTSIDE_RECV_WINDOW)
+            elif response.status == STATUS_FORBIDDEN and self.exchange != 'okx':
                 raise WAFLimitViolated(WAFLimitViolated.message)
-            elif response.status == 418:
+            elif response.status == STATUS_I_AM_A_TEAPOT:
                 raise IPAddressBanned(IPAddressBanned.message)
             else:
-                raise HTTPError(f"Malformed request: status: {response.status}, reason: {response.reason}")
+                raise HTTPError(f"Malformed request: {payload}:{response.reason}:{response.text}")
 
         if self.exchange == 'bybit' and payload and payload.get('retCode') == 0:
             return payload.get('result'), payload.get('time')

{exchanges_wrapper-2.1.2 → exchanges_wrapper-2.1.5}/pyproject.toml

@@ -17,7 +17,7 @@ dynamic = ["version", "description"]
 requires-python = ">=3.9"
 
 dependencies = [
-    "crypto-ws-api==2.0.6",
+    "crypto-ws-api==2.0.7",
     "grpcio==1.62.0",
     "pyotp~=2.9.0",
     "simplejson==3.19.2",