exchanges-wrapper 2.1.6__tar.gz → 2.1.8__tar.gz

{exchanges_wrapper-2.1.6 → exchanges_wrapper-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exchanges-wrapper
-Version: 2.1.6
+Version: 2.1.8
 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
@@ -142,7 +142,7 @@ docker run -itP \
 
 ### Documentations
 * Served methods and examples of their use are described at ```example/exch_client.py```
-* For [Protocol Buffers](https://developers.google.com/protocol-buffers/docs/overview) serializing structured data see ```proto/exchanges_wrapper/api.proto```
+* For [Protocol Buffers](https://developers.google.com/protocol-buffers/docs/overview) serializing structured data see ```exchanges_wrapper/proto/martin.proto```
 
 ## Donate
 *USDT* (TRC20) TN8F3Dz8BU8VwECRh3LTKi7FrsU8eWfsZz

{exchanges_wrapper-2.1.6 → exchanges_wrapper-2.1.8}/README.md

@@ -116,7 +116,7 @@ docker run -itP \
 
 ### Documentations
 * Served methods and examples of their use are described at ```example/exch_client.py```
-* For [Protocol Buffers](https://developers.google.com/protocol-buffers/docs/overview) serializing structured data see ```proto/exchanges_wrapper/api.proto```
+* For [Protocol Buffers](https://developers.google.com/protocol-buffers/docs/overview) serializing structured data see ```exchanges_wrapper/proto/martin.proto```
 
 ## Donate
 *USDT* (TRC20) TN8F3Dz8BU8VwECRh3LTKi7FrsU8eWfsZz

{exchanges_wrapper-2.1.6 → exchanges_wrapper-2.1.8}/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.6"
+__version__ = "2.1.8"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.6 → exchanges_wrapper-2.1.8}/exchanges_wrapper/client.py

@@ -22,10 +22,10 @@ from exchanges_wrapper.web_sockets import UserEventsDataStream, \
     BBTPrivateEventsDataStream
 from exchanges_wrapper.definitions import OrderType
 from exchanges_wrapper.events import Events
-import exchanges_wrapper.bitfinex_parser as bfx
-import exchanges_wrapper.huobi_parser as hbp
-import exchanges_wrapper.okx_parser as okx
-import exchanges_wrapper.bybit_parser as bbt
+import exchanges_wrapper.parsers.bitfinex_parser as bfx
+import exchanges_wrapper.parsers.huobi_parser as hbp
+import exchanges_wrapper.parsers.okx_parser as okx
+import exchanges_wrapper.parsers.bybit_parser as bbt
 from crypto_ws_api.ws_session import UserWSSession
 
 logger = logging.getLogger(__name__)
@@ -117,6 +117,7 @@ class Client:
         return res
 
     async def load(self, symbol):
+        logger.info(f"Try load {self.exchange}:{symbol} info...")
         infos = await self.fetch_exchange_info(symbol)
         if not infos.get('serverTime'):
             raise UserWarning("Can't get exchange info, check availability and operational status of the exchange")
@@ -144,6 +145,7 @@ class Client:
         # load rate limits
         self.rate_limits = infos["rateLimits"]
         self.loaded = True
+        logger.info(f"Info for {self.exchange}:{symbol} loaded success")
 
     async def close(self):
         await self.session.close()
@@ -1177,18 +1179,19 @@ class Client:
             orders = await self.fetch_open_orders(trade_id, symbol, receive_window=receive_window, response_type=True)
             orders_id = [order.get('orderId') for order in orders]
             params = {'id': orders_id}
-            res = (
-                    await self.user_wss_session.handle_request(trade_id, "oc_multi", _params=params)
-                    or await self.http.send_api_call(
+            res = await self.user_wss_session.handle_request(trade_id, "oc_multi", _params=params)
+            if res is None or (res and isinstance(res, list) and res[6] == 'ERROR'):
+                logger.debug(f"cancel_all_orders.bitfinex {orders_id}: res1: {res}")
+                res = await self.http.send_api_call(
                         "v2/auth/w/order/cancel/multi",
                         method="POST",
                         signed=True,
-                        **params,
-                    )
-            )
-            if res and res[6] == 'SUCCESS':
-                return bfx.orders(res[4], response_type=True, cancelled=True)
-            logger.debug(f"bitfinex: cancel_all_orders.res: {res}")
+                        **params
+                )
+            if res and isinstance(res, list) and res[6] == 'SUCCESS':
+                binance_res = bfx.orders(res[4], response_type=True, cancelled=True)
+            else:
+                logger.debug(f"bitfinex: cancel_all_orders.res: {res}")
 
         elif self.exchange == 'huobi':
             orders = await self.fetch_open_orders(trade_id, symbol, receive_window=receive_window, response_type=True)

{exchanges_wrapper-2.1.6 → exchanges_wrapper-2.1.8}/exchanges_wrapper/exch_srv.py

@@ -160,9 +160,11 @@ class Martin(mr.MartinBase):
         logger.info(f"OpenClientConnection start trade: {request.account_name}:{request.trade_id}")
         client_id = OpenClient.get_id(request.account_name)
         if client_id:
+            logger.debug(f"OpenClientConnection: {request.account_name}:{request.trade_id}:{client_id}")
             open_client = OpenClient.get_client(client_id)
             open_client.client.http.rate_limit_reached = False
         else:
+            logger.debug(f"OpenClientConnection: {request.account_name}:{request.trade_id}: set new client_id")
             try:
                 open_client = OpenClient(request.account_name)
                 client_id = id(open_client)

{exchanges_wrapper-2.1.6 → exchanges_wrapper-2.1.8}/exchanges_wrapper/http_client.py

@@ -84,12 +84,14 @@ class HttpClient:
                 return payload.get('result'), payload.get('time')
             elif payload.get('retCode') == 10002:
                 raise ExchangeError(ERR_TIMESTAMP_OUTSIDE_RECV_WINDOW)
+            else:
+                raise ExchangeError(f"API request failed: {response.status}:{response.reason}:{payload}")
         elif self.exchange == 'huobi' and payload and (payload.get('status') == 'ok' or payload.get('ok')):
             return payload.get('data', payload.get('tick'))
         elif self.exchange == 'okx' and payload and payload.get('code') == '0':
             return payload.get('data', [])
-        elif (self.exchange not in ('binance', 'bitfinex') or
-              (self.exchange == 'binance' and payload and "code" in payload)):
+        elif self.exchange not in ('binance', 'bitfinex') \
+                or (self.exchange == 'binance' and payload and "code" in payload):
             raise ExchangeError(f"API request failed: {response.status}:{response.reason}:{payload}")
         else:
             return payload

{exchanges_wrapper-2.1.6/exchanges_wrapper → exchanges_wrapper-2.1.8/exchanges_wrapper/parsers}/bybit_parser.py

@@ -374,7 +374,12 @@ def on_trade_update(res: dict) -> dict:
     last_executed_price = res.get("execPrice", res.get("avgPrice"))
     last_quote_asset_transacted = res.get("execValue", cumulative_quote_asset)
 
-    status = 'NEW' if leaves_qty == order_quantity else 'PARTIALLY_FILLED' if leaves_qty > 0 else 'FILLED'
+    if leaves_qty == order_quantity:
+        status = 'NEW'
+    elif leaves_qty > 0:
+        status = 'PARTIALLY_FILLED'
+    else:
+        status = 'FILLED'
 
     return {
         "e": "executionReport",

{exchanges_wrapper-2.1.6 → exchanges_wrapper-2.1.8}/exchanges_wrapper/web_sockets.py

@@ -10,10 +10,10 @@ from datetime import datetime, timezone
 from urllib.parse import urlencode, urlparse
 import websockets
 
-import exchanges_wrapper.bitfinex_parser as bfx
-import exchanges_wrapper.huobi_parser as hbp
-import exchanges_wrapper.okx_parser as okx
-import exchanges_wrapper.bybit_parser as bbt
+import exchanges_wrapper.parsers.bitfinex_parser as bfx
+import exchanges_wrapper.parsers.huobi_parser as hbp
+import exchanges_wrapper.parsers.okx_parser as okx
+import exchanges_wrapper.parsers.bybit_parser as bbt
 from crypto_ws_api.ws_session import generate_signature
 from exchanges_wrapper import LOG_PATH