exchanges-wrapper 2.1.48__tar.gz → 2.1.50.post1__tar.gz

{exchanges_wrapper-2.1.48 → exchanges_wrapper-2.1.50.post1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: exchanges-wrapper
-Version: 2.1.48
+Version: 2.1.50.post1
 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
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Classifier: Programming Language :: Python :: 3
 Classifier: Development Status :: 5 - Production/Stable
@@ -12,10 +12,10 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 License-File: LICENSE.md
-Requires-Dist: crypto-ws-api==2.1.8
-Requires-Dist: pyotp==2.9.0
-Requires-Dist: simplejson==3.20.2
-Requires-Dist: aiohttp~=3.13.4
+Requires-Dist: crypto-ws-api==2.1.9
+Requires-Dist: pyotp==2.10.0
+Requires-Dist: simplejson==4.1.1
+Requires-Dist: aiohttp==3.14.1
 Requires-Dist: expiringdict~=1.2.2
 Requires-Dist: betterproto==2.0.0b7
 Requires-Dist: grpclib~=0.4.8

{exchanges_wrapper-2.1.48 → exchanges_wrapper-2.1.50.post1}/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.48"
+__version__ = "2.1.50post1"
 
 from pathlib import Path
 import shutil

{exchanges_wrapper-2.1.48 → exchanges_wrapper-2.1.50.post1}/exchanges_wrapper/client.py

@@ -47,7 +47,7 @@ def any2str(_x) -> str:
 
 class Client:
     __slots__ = (
-        'exchange', 'sub_account', 'test_net', 'api_key', 'api_secret',
+        'exchange', 'test_net', 'api_key', 'api_secret',
         'passphrase', 'endpoint_api_public', 'endpoint_ws_public',
         'endpoint_api_auth', 'endpoint_ws_auth', 'endpoint_ws_api',
         'ws_add_on', 'master_email', 'master_name', 'two_fa', 'http',
@@ -61,7 +61,6 @@ class Client:
 
     def __init__(self, acc: dict):
         self.exchange = acc['exchange']
-        self.sub_account = acc['sub_account']
         self.test_net = acc['test_net']
         self.api_key = acc['api_key']
         self.api_secret = acc['api_secret']
@@ -231,7 +230,7 @@ class Client:
             raise ExchangePyError(f"Symbol {symbol} is not valid according to the loaded exchange infos")
 
     def symbol_to_bfx(self, symbol) -> str:
-        symbol_info = self.symbols.get(symbol)
+        symbol_info = self.symbols.get(symbol, {})
         base_asset = symbol_info.get('baseAsset')
         quote_asset = symbol_info.get('quoteAsset')
         return (
@@ -241,11 +240,11 @@ class Client:
         )
 
     def symbol_to_okx(self, symbol) -> str:
-        symbol_info = self.symbols.get(symbol)
+        symbol_info = self.symbols.get(symbol, {})
         return f"{symbol_info.get('baseAsset')}-{symbol_info.get('quoteAsset')}"
 
     def symbol_to_id(self, symbol) -> int:
-        return self.symbols.get(symbol).get('instIdCode')
+        return self.symbols.get(symbol, {}).get('instIdCode')
 
     def active_order(self, order_id: int, quantity="0", executed_qty="0", last_event=None):
         quantity_decimal = Decimal(quantity)
@@ -344,6 +343,9 @@ class Client:
     # https://github.com/binance/binance-spot-api-docs/blob/master/rest-api.md#exchange-information
     async def fetch_exchange_info(self, symbol):
         binance_res = {}
+        server_time = {}
+        if self.exchange in ('huobi', 'okx', 'bybit'):
+            server_time: dict = await self.fetch_server_time()
         if self.exchange == 'binance':
             binance_res = await self.http.send_api_call(
                 "/api/v3/exchangeInfo",
@@ -364,20 +366,17 @@ class Client:
             if symbols_details and tickers:
                 binance_res = bfx.exchange_info(symbols_details, tickers, symbol)
         elif self.exchange == 'huobi':
-            server_time = await self.fetch_server_time()
             params = {'symbols': symbol.lower()}
             trading_symbol = await self.http.send_api_call("v1/settings/common/market-symbols", **params)
             await self.set_htx_ids()
             binance_res = hbp.exchange_info(server_time.get('serverTime'), trading_symbol[0])
         elif self.exchange == 'okx':
             params = {'instType': 'SPOT'}
-            server_time = await self.fetch_server_time()
             instruments = await self.http.send_api_call("/api/v5/public/instruments", **params)
             tickers = await self.http.send_api_call("/api/v5/market/tickers", **params)
             binance_res = okx.exchange_info(server_time.get('serverTime'), instruments, tickers, symbol)
         elif self.exchange == 'bybit':
             params = {'category': 'spot', 'symbol': symbol}
-            server_time = await self.fetch_server_time()
             instruments, _ = await self.http.send_api_call("/v5/market/instruments-info", **params)
             binance_res = bbt.exchange_info(server_time.get('serverTime'), instruments.get('list'))
         # logger.info(f"fetch_exchange_info: binance_res: {binance_res}")

{exchanges_wrapper-2.1.48 → exchanges_wrapper-2.1.50.post1}/exchanges_wrapper/exch_srv_cfg.toml.template

@@ -1,6 +1,6 @@
 # Parameters for exchanges-wrapper REST API Server exch_srv.py
 # Copyright © 2021-2025 Jerry Fedorenko aka VM
-# __version__ = "2.1.34"
+# __version__ = "2.1.50"
 
 # region endpoint
 [endpoint]
@@ -146,7 +146,6 @@ test_net = true
 [[accounts]]
 exchange = 'bybit'
 name = 'Demo - ByBitSub01'
-sub_account_name = 'Demo - ByBitSub01'
 api_key = '*********** Place API key there ************'
 api_secret = '*********** Place secret API key there ************'
 test_net = true

{exchanges_wrapper-2.1.48 → exchanges_wrapper-2.1.50.post1}/exchanges_wrapper/lib.py

@@ -65,7 +65,6 @@ def get_account(account_name: str) -> dict:
     for account in accounts:
         if account.get('name') == account_name:
             exchange = account['exchange']
-            sub_account = account.get('sub_account_name')
             test_net = account['test_net']
             master_email = account.get('master_email')
             master_name = account.get('master_name')
@@ -79,7 +78,6 @@ def get_account(account_name: str) -> dict:
 
             return {
                 'exchange': exchange,
-                'sub_account': sub_account,
                 'test_net': test_net,
                 'api_key': account['api_key'],
                 'api_secret': account['api_secret'],

{exchanges_wrapper-2.1.48 → exchanges_wrapper-2.1.50.post1}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["flit_core >=3.2,<4"]
+requires = ["flit_core >=3.12.0,<4"]
 build-backend = "flit_core.buildapi"
 
 [project]
@@ -17,13 +17,13 @@ classifiers=["Programming Language :: Python :: 3",
              "Operating System :: Microsoft :: Windows",
              "Operating System :: MacOS"]
 dynamic = ["version", "description"]
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 
 dependencies = [
-    "crypto-ws-api==2.1.8",
-    "pyotp==2.9.0",
-    "simplejson==3.20.2",
-    "aiohttp~=3.13.4",
+    "crypto-ws-api==2.1.9",
+    "pyotp==2.10.0",
+    "simplejson==4.1.1",
+    "aiohttp==3.14.1",
     "expiringdict~=1.2.2",
     "betterproto==2.0.0b7",
     "grpclib~=0.4.8"