exchanges-wrapper 2.1.29__tar.gz → 2.1.31__tar.gz

{exchanges_wrapper-2.1.29 → exchanges_wrapper-2.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: exchanges-wrapper
-Version: 2.1.29
+Version: 2.1.31
 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,14 +11,12 @@ 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.16
+License-File: LICENSE.md
+Requires-Dist: crypto-ws-api==2.0.18
 Requires-Dist: pyotp==2.9.0
-Requires-Dist: simplejson==3.19.3
-Requires-Dist: toml~=0.10.2
-Requires-Dist: aiohttp~=3.11.11
-Requires-Dist: websockets==14.2
+Requires-Dist: simplejson==3.20.1
+Requires-Dist: aiohttp~=3.11.12
 Requires-Dist: expiringdict~=1.2.2
-Requires-Dist: ujson~=5.10.0
 Requires-Dist: betterproto==2.0.0b7
 Requires-Dist: grpclib~=0.4.7
 Project-URL: Source, https://github.com/DogsTailFarmer/exchanges-wrapper

{exchanges_wrapper-2.1.29 → exchanges_wrapper-2.1.31}/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.29"
+__version__ = "2.1.31"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.29 → exchanges_wrapper-2.1.31}/exchanges_wrapper/client.py

@@ -1515,11 +1515,13 @@ class Client:
         params = {}
         binance_res = {}
         if self.exchange == 'binance':
+            params["omitZeroBalances"] = "true"
             if receive_window:
                 params["recvWindow"] = receive_window
             binance_res = await self.user_session.handle_request(
                 trade_id,
                 "account.status",
+                _params=params,
                 send_api_key=True,
                 _signed=True
             )
@@ -1548,7 +1550,7 @@ class Client:
             params = {'accountType': 'UNIFIED'}
             res, ts = await self.http.send_api_call("/v5/account/wallet-balance", signed=True, **params)
             binance_res = bbt.account_information(res["list"][0]["coin"], ts)
-        # print(f"fetch_account_information.binance_res: {binance_res}")
+        # logger.info(f"fetch_account_information.binance_res: {trade_id}: {binance_res}")
         return binance_res
 
     # https://binance-docs.github.io/apidocs/spot/en/#funding-wallet-user_data

{exchanges_wrapper-2.1.29 → exchanges_wrapper-2.1.31}/exchanges_wrapper/exch_srv.py

@@ -32,7 +32,7 @@ from exchanges_wrapper.martin import StreamResponse, SimpleResponse, OnKlinesUpd
 #
 HEARTBEAT = 1  # sec
 MAX_QUEUE_SIZE = 100
-WSS_TICKER_TIMEOUT = 300  # sec
+WSS_TICKER_TIMEOUT = 600  # sec
 #
 logger = logging.getLogger(__name__)
 formatter = logging.Formatter(fmt="[%(asctime)s: %(levelname)s] %(message)s")

{exchanges_wrapper-2.1.29 → exchanges_wrapper-2.1.31}/exchanges_wrapper/http_client.py

@@ -63,7 +63,7 @@ class HttpClient:
         if response.status >= 500:
             raise ExchangeError(
                 f"{'API request rejected' if self.exchange == 'bitfinex' else 'An issue occurred on exchange side'}:"
-                f" {response.status}: {response.url}: {response.reason}"
+                f" {response.status}: {response.reason}"
             )
         if response.status == 429 or (self.exchange == 'bybit' and response.status == STATUS_FORBIDDEN):
             logger.error(f"API RateLimitReached: {response.url}")

{exchanges_wrapper-2.1.29 → exchanges_wrapper-2.1.31}/exchanges_wrapper/parsers/huobi.py

@@ -170,6 +170,7 @@ def order(res: {}, response_type=None) -> {}:
             "side": side,
         }
 
+
 def order_cancelled(symbol, order_id=None, origin_client_order_id=None,) -> {}:
     return {
         "symbol": symbol,
@@ -188,27 +189,44 @@ def order_cancelled(symbol, order_id=None, origin_client_order_id=None,) -> {}:
         "side": '',
     }
 
+
 def account_information(res: {}) -> {}:
-    balances = []
+    """
+    This function parses the Huobi API response for account information and
+    returns a dictionary with relevant details.
+
+    Args:
+        res (dict): The API response from the Huobi exchange.
+
+    Returns:
+        dict: A dictionary containing the user's account information.
+    """
+
+    # Filter out balances that have zero value
     res[:] = [i for i in res if i.get('balance') != '0']
+
     assets = {}
     for balance in res:
-        asset = balance.get('currency')
-        asset_i = assets.get(asset, {})
+        asset = balance['currency']
+        assets.setdefault(asset, {
+            'available': Decimal(0),
+            'frozen': Decimal(0)
+        })
+
+        # Update available and frozen balances
         if balance.get('available'):
-            asset_i.setdefault('available', balance.get('available'))
+            assets[asset]['available'] += Decimal(balance['available'])
         else:
-            asset_i.setdefault('frozen', balance.get('balance', '0'))
-        assets[asset] = asset_i
-    for asset in assets:
-        free = assets.get(asset, {}).get('available', '0')
-        locked = assets.get(asset, {}).get('frozen', '0')
-        _binance_res = {
+            assets[asset]['frozen'] += Decimal(balance['balance'])
+
+    balances = [
+        {
             "asset": asset.upper(),
-            "free": free,
-            "locked": locked,
+            "free": str(assets[asset]["available"]),
+            "locked": str(assets[asset]["frozen"])
         }
-        balances.append(_binance_res)
+        for asset in assets
+    ]
 
     return {
         "makerCommission": 0,
@@ -226,20 +244,16 @@ def account_information(res: {}) -> {}:
 
 
 def order_book(res: {}) -> {}:
-    binance_order_book = {"lastUpdateId": res.get('ts')}
-    binance_order_book.setdefault('bids', res.get('bids'))
-    binance_order_book.setdefault('asks', res.get('asks'))
-    return binance_order_book
+    res["lastUpdateId"] = res.pop("ts")
+    return res
 
 
 def order_book_ws(res: {}, symbol: str) -> {}:
-    bids = res.get('tick').get('bids')[:5]
-    asks = res.get('tick').get('asks')[:5]
     return {
         'stream': f"{symbol}@depth5",
-        'data': {'lastUpdateId': res.get('ts'),
-                 'bids': bids,
-                 'asks': asks,
+        'data': {'lastUpdateId': res['ts'],
+                 'bids': res['tick']['bids'][:5],
+                 'asks': res['tick']['asks'][:5],
                  }
     }
 

{exchanges_wrapper-2.1.29 → exchanges_wrapper-2.1.31}/pyproject.toml

@@ -17,14 +17,11 @@ dynamic = ["version", "description"]
 requires-python = ">=3.9"
 
 dependencies = [
-    "crypto-ws-api==2.0.16",
+    "crypto-ws-api==2.0.18",
     "pyotp==2.9.0",
-    "simplejson==3.19.3",
-    "toml~=0.10.2",
-    "aiohttp~=3.11.11",
-    "websockets==14.2",
+    "simplejson==3.20.1",
+    "aiohttp~=3.11.12",
     "expiringdict~=1.2.2",
-    "ujson~=5.10.0",
     "betterproto==2.0.0b7",
     "grpclib~=0.4.7"
 ]