exchanges-wrapper 2.1.40__tar.gz → 2.1.41__tar.gz

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: exchanges-wrapper
-Version: 2.1.40
+Version: 2.1.41
 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.10
@@ -12,7 +12,7 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 License-File: LICENSE.md
-Requires-Dist: crypto-ws-api==2.0.20
+Requires-Dist: crypto-ws-api==2.1.0
 Requires-Dist: pyotp==2.9.0
 Requires-Dist: simplejson==3.20.1
 Requires-Dist: aiohttp~=3.12.13
@@ -28,12 +28,15 @@ Project-URL: Source, https://github.com/DogsTailFarmer/exchanges-wrapper
 <h3 align="center">For SPOT markets</h3>
 
 ***
-<a href="https://pypi.org/project/exchanges-wrapper/"><img src="https://img.shields.io/pypi/v/exchanges-wrapper" alt="PyPI version"></a>
+<h1 align="center"><a href="https://pypi.org/project/exchanges-wrapper/"><img src="https://img.shields.io/pypi/v/exchanges-wrapper" alt="PyPI version"></a>
 <a href="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper/?ref=repository-badge}" target="_blank"><img alt="DeepSource" title="DeepSource" src="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper.svg/?label=resolved+issues&token=XuG5PmzMiKlDL921-qREIuX_"/></a>
 <a href="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper/?ref=repository-badge}" target="_blank"><img alt="DeepSource" title="DeepSource" src="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper.svg/?label=active+issues&token=XuG5PmzMiKlDL921-qREIuX_"/></a>
 <a href="https://sonarcloud.io/summary/new_code?id=DogsTailFarmer_exchanges-wrapper" target="_blank"><img alt="sonarcloud" title="sonarcloud" src="https://sonarcloud.io/api/project_badges/measure?project=DogsTailFarmer_exchanges-wrapper&metric=alert_status"/></a>
 <a href="https://pepy.tech/project/exchanges-wrapper" target="_blank"><img alt="Downloads" title="Downloads" src="https://static.pepy.tech/badge/exchanges-wrapper/month"/></a>
+</h1>
+
 ***
+
 On `Binance`: now API key type [Ed25519](https://www.binance.com/en/support/faq/detail/6b9a63f1e3384cf48a2eedb82767a69a) is used instead of `HMAC`
 
 From `2.1.34` must be updated `exch_srv_cfg.toml` from `exchanges_wrapper/exch_srv_cfg.toml.template`

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/README.md

@@ -5,12 +5,15 @@
 <h3 align="center">For SPOT markets</h3>
 
 ***
-<a href="https://pypi.org/project/exchanges-wrapper/"><img src="https://img.shields.io/pypi/v/exchanges-wrapper" alt="PyPI version"></a>
+<h1 align="center"><a href="https://pypi.org/project/exchanges-wrapper/"><img src="https://img.shields.io/pypi/v/exchanges-wrapper" alt="PyPI version"></a>
 <a href="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper/?ref=repository-badge}" target="_blank"><img alt="DeepSource" title="DeepSource" src="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper.svg/?label=resolved+issues&token=XuG5PmzMiKlDL921-qREIuX_"/></a>
 <a href="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper/?ref=repository-badge}" target="_blank"><img alt="DeepSource" title="DeepSource" src="https://deepsource.io/gh/DogsTailFarmer/exchanges-wrapper.svg/?label=active+issues&token=XuG5PmzMiKlDL921-qREIuX_"/></a>
 <a href="https://sonarcloud.io/summary/new_code?id=DogsTailFarmer_exchanges-wrapper" target="_blank"><img alt="sonarcloud" title="sonarcloud" src="https://sonarcloud.io/api/project_badges/measure?project=DogsTailFarmer_exchanges-wrapper&metric=alert_status"/></a>
 <a href="https://pepy.tech/project/exchanges-wrapper" target="_blank"><img alt="Downloads" title="Downloads" src="https://static.pepy.tech/badge/exchanges-wrapper/month"/></a>
+</h1>
+
 ***
+
 On `Binance`: now API key type [Ed25519](https://www.binance.com/en/support/faq/detail/6b9a63f1e3384cf48a2eedb82767a69a) is used instead of `HMAC`
 
 From `2.1.34` must be updated `exch_srv_cfg.toml` from `exchanges_wrapper/exch_srv_cfg.toml.template`

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/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.40"
+__version__ = "2.1.41"
 
 from pathlib import Path
 import shutil
@@ -23,7 +23,17 @@ from grpclib.utils import graceful_exit
 from grpclib import exceptions
 
 __all__ = [
-    'Server', 'GRPCError', 'Status', 'Channel', 'graceful_exit', 'exceptions'
+    '__version__',
+    'Server',
+    'GRPCError',
+    'Status',
+    'Channel',
+    'graceful_exit',
+    'exceptions',
+    'LOG_PATH',
+    'WORK_PATH',
+    'LOG_FILE',
+    'CONFIG_FILE'
 ]
 
 WORK_PATH = Path(Path.home(), ".MartinBinance")

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/exchanges_wrapper/client.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Union
+from typing import Union, Dict
 import decimal
 import math
 import asyncio
@@ -587,7 +587,7 @@ class Client:
                 "/api/v3/klines", params=params, signed=False
             )
         elif self.exchange == 'bitfinex':
-            params = {'limit': limit, 'sort': -1}
+            params: Dict[str, Union[str, int]] = {'limit': limit, 'sort': -1}
             if start_time:
                 params["start"] = str(start_time)
             if end_time:

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/exchanges_wrapper/exch_srv.py

@@ -4,7 +4,9 @@ from typing import Any, AsyncGenerator
 
 import grpclib.exceptions
 
+# noinspection PyPep8Naming
 from exchanges_wrapper import __version__ as VER_EW
+# noinspection PyPep8Naming
 from crypto_ws_api import __version__ as VER_CW
 import time
 import weakref
@@ -136,8 +138,6 @@ class Martin(mr.MartinBase):
 
         try:
             await asyncio.wait_for(open_client.client.load(request.symbol), timeout=HEARTBEAT * 60)
-        except asyncio.CancelledError:
-            pass  # Task cancellation should not be logged as an error
         except asyncio.exceptions.TimeoutError:
             await OpenClient.get_client(client_id).client.http.session.close()
             OpenClient.remove_client(request.account_name)
@@ -186,7 +186,7 @@ class Martin(mr.MartinBase):
 
         try:
             res = await asyncio.wait_for(getattr(client, client_method_name)(**kwargs), timeout=90)
-        except asyncio.exceptions.CancelledError:
+        except KeyboardInterrupt:
             raise GRPCError(status=Status.UNAVAILABLE, message=f"{msg_header} Server Shutdown")
         except asyncio.exceptions.TimeoutError:
             self.log_and_raise_grpc_error(msg_header, Status.DEADLINE_EXCEEDED, "timeout error")
@@ -834,7 +834,7 @@ async def amain(host: str = '127.0.0.1', port: int = 50051):
 def main():
     try:
         asyncio.run(amain())
-    except (asyncio.exceptions.CancelledError, grpclib.exceptions.StreamTerminatedError):
+    except grpclib.exceptions.StreamTerminatedError:
         pass  # Task cancellation should not be logged as an error
     except Exception as ex:
         print(f"Exception: {ex}")

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/exchanges_wrapper/http_client.py

@@ -56,7 +56,7 @@ class HttpClient:
     async def _create_session_if_required(self):
         if self.session is None or self.session.closed:
             async with self._session_mutex:
-                self.session = aiohttp.ClientSession(timeout=TIMEOUT)
+                self.session = aiohttp.ClientSession(trust_env=True, timeout=TIMEOUT)
 
     async def handle_errors(self, response, path=None):
         if response.status >= 500:
@@ -170,7 +170,7 @@ class HttpClient:
     async def _bitfinex_request(self, path, method, signed, send_api_key, endpoint, timeout, **kwargs):
         _endpoint = endpoint or self.endpoint
         bfx_post = (method == 'POST' and kwargs) or "params" in kwargs
-        _params = json.dumps(kwargs) if bfx_post else None
+        _params = json.dumps(kwargs) if bfx_post else {}
         url = f'{_endpoint}/{path}'
         query_kwargs = {"headers": {"Accept": AJ}}
         if kwargs and not bfx_post:

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/exchanges_wrapper/parsers/bitfinex.py

@@ -4,6 +4,7 @@ Parser for convert Bitfinex REST API/WSS response to Binance like result
 import time
 from decimal import Decimal
 import logging
+from typing import Dict, List, Union
 
 logger = logging.getLogger(__name__)
 
@@ -21,9 +22,9 @@ class OrderBook:
                 self.asks[str(i[0])] = str(abs(i[2]))
 
     def get_book(self) -> dict:
-        bids = list(map(list, self.bids.items()))
+        bids = [list(item) for item in self.bids.items()]
         bids.sort(key=lambda x: float(x[0]), reverse=True)
-        asks = list(map(list, self.asks.items()))
+        asks = [list(item) for item in self.asks.items()]
         asks.sort(key=lambda x: float(x[0]), reverse=False)
         return {
             'stream': f"{self.symbol}@depth5",
@@ -270,15 +271,32 @@ def orders(res: list, response_type=None, cancelled=False) -> list:
     return binance_orders
 
 
-def order_book(res: list) -> dict:
-    binance_order_book = {"lastUpdateId": int(time.time() * 1000)}
-    bids = []
-    asks = []
+def order_book(res: List[List[float]]) -> Dict[str, Union[int, List[List[str]]]]:
+    """
+    Processes a list of raw order book entries into a structured dictionary.
+
+    Args:
+        res: A list of order entries, where each entry is a list like
+             [price (float), quantity (float), side_indicator (float)].
+             side_indicator > 0 for bids, < 0 for asks.
+
+    Returns:
+        A dictionary representing the order book with 'lastUpdateId', 'bids', and 'asks'.
+    """
+    binance_order_book: Dict[str, Union[int, List[List[str]]]] = {
+        "lastUpdateId": int(time.time() * 1000)
+    }
+
+    bids: List[List[str]] = []
+    asks: List[List[str]] = []
+
     for i in res:
-        if i[2] > 0:
-            bids.append([str(i[0]), str(i[2])])
-        else:
-            asks.append([str(i[0]), str(abs(i[2]))])
+        # Assuming i[2] determines bid/ask side and its absolute value is the quantity
+        if i[2] > 0: # This means it's a bid (positive quantity indicator)
+            bids.append([str(i[0]), str(i[2])]) # price, quantity
+        else: # This means it's an ask (negative quantity indicator or zero)
+            asks.append([str(i[0]), str(abs(i[2]))]) # price, absolute quantity
+
     binance_order_book['bids'] = bids
     binance_order_book['asks'] = asks
     return binance_order_book
@@ -435,7 +453,7 @@ def ticker(res: list, symbol: str = None) -> dict:
 
 
 def on_funds_update(res: list) -> dict:
-    binance_funds = {
+    binance_funds: Dict[str, Union[str, int, List]] = {
         'e': 'outboundAccountPosition',
         'E': int(time.time() * 1000),
         'u': int(time.time() * 1000),

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/exchanges_wrapper/parsers/bybit.py

@@ -23,8 +23,8 @@ class OrderBook:
             'stream': f"{self.symbol}@depth5",
             'data': {
                 'lastUpdateId': self.last_update_id,
-                'bids': list(map(list, self.bids.items()))[:5],
-                'asks': list(map(list, self.asks.items()))[:5],
+                'bids': [list(item) for item in self.bids.items()][:5],
+                'asks': [list(item) for item in self.asks.items()][:5],
             },
         }
 

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/exchanges_wrapper/parsers/okx.py

@@ -3,6 +3,7 @@ Parser for convert OKX REST API/WSS V5 response to Binance like result
 """
 import time
 from decimal import Decimal
+from typing import Dict, List, Union
 import logging
 
 logger = logging.getLogger(__name__)
@@ -214,10 +215,14 @@ def account_balances(res: list) -> dict:
     return {"balances": balances}
 
 
-def order_book(res: dict) -> dict:
-    asks = []
-    bids = []
-    binance_order_book = {"lastUpdateId": int(res.get('ts'))}
+def order_book(res: dict) -> Dict[str, Union[int, List[List[str]]]]:
+    binance_order_book: Dict[str, Union[int, List[List[str]]]] = {
+        "lastUpdateId": int(time.time() * 1000)
+    }
+
+    bids: List[List[str]] = []
+    asks: List[List[str]] = []
+
     [asks.append(ask[:2]) for ask in res.get('asks')]
     binance_order_book['asks'] = asks
     [bids.append(bid[:2]) for bid in res.get('bids')]

{exchanges_wrapper-2.1.40 → exchanges_wrapper-2.1.41}/pyproject.toml

@@ -17,7 +17,7 @@ dynamic = ["version", "description"]
 requires-python = ">=3.10"
 
 dependencies = [
-    "crypto-ws-api==2.0.20",
+    "crypto-ws-api==2.1.0",
     "pyotp==2.9.0",
     "simplejson==3.20.1",
     "aiohttp~=3.12.13",