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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exchanges-wrapper
-Version: 2.1.2
+Version: 2.1.3
 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.2 → exchanges_wrapper-2.1.3}/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.3"
 
 from pathlib import Path
 import shutil

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

@@ -700,7 +700,7 @@ class Martin(mr.MartinBase):
             else:
                 event = vars(_event)
                 event.pop('handlers', None)
-                logger.debug(f"OnOrderUpdate: {open_client.name}: {event}")
+                # logger.debug(f"OnOrderUpdate: {open_client.name}: {event}")
                 response.success = True
                 response.result = json.dumps(event)
                 yield response
@@ -709,7 +709,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 +730,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 +747,6 @@ class Martin(mr.MartinBase):
             receive_window=None
         )
 
-        logger.debug(f"{msg_header}: order canceled: {res}")
         response.from_pydict(res)
         return response
 
@@ -846,17 +844,20 @@ async def amain(host: str = '127.0.0.1', port: int = 50051):
         logger.info(f"Starting server v:{__version__} 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:
         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.3}/exchanges_wrapper/http_client.py

@@ -48,16 +48,16 @@ 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 == 400 and response.reason != "Bad Request":
+                raise ExchangeError(f"ExchangeError: {payload}:{response.reason}:{response.text}")
             elif response.status == 403 and self.exchange != 'okx':
                 raise WAFLimitViolated(WAFLimitViolated.message)
             elif response.status == 418:
                 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')