exchanges-wrapper 1.3.4b0__tar.gz → 1.3.4.post2__tar.gz

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/CHANGELOG.md

@@ -1,5 +1,23 @@
-## v1.3.3-1 2023-07-xx
+## v1.3.4-1 2023-07-19
+### Fix
+```
+ERROR: Cannot install crypto_ws_api and grpcio==1.56.0 because these package versions have conflicting dependencies.
+
+The conflict is caused by:
+    The user requested grpcio==1.56.0
+    exchanges-wrapper 1.3.3 depends on grpcio==1.48.1
+    The user requested grpcio==1.56.0
+    exchanges-wrapper 1.3.2 depends on grpcio==1.48.1
+
+```
+
+## v1.3.4 2023-07-17
 ### Update
+* Up requirements for grpcio to 1.56.0
+```bazaar
+Known security vulnerabilities detected
+Dependency grpcio 	Version < 1.53.0 	Upgrade to ~> 1.53.0
+```
 * Bitfinex: `exchanges_wrapper.client.Client.cancel_all_orders()`: removed unnecessary status check after cancel request
 
 ## v1.3.3 2023-07-04

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exchanges-wrapper
-Version: 1.3.4b0
+Version: 1.3.4.post2
 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.8
@@ -13,12 +13,13 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 Requires-Dist: aiohttp==3.8.4
 Requires-Dist: grpcio==1.56.0
+Requires-Dist: grpcio-tools==1.56.0
 Requires-Dist: toml==0.10.2
 Requires-Dist: idna==3.4
 Requires-Dist: pyotp~=2.8.0
 Requires-Dist: simplejson==3.19.1
 Requires-Dist: shortuuid~=1.0.11
-Requires-Dist: crypto_ws_api~=1.0.1
+Requires-Dist: crypto-ws-api==1.0.1.post3
 Project-URL: Source, https://github.com/DogsTailFarmer/exchanges-wrapper
 
 <h1 align="center"><img align="center" src="https://raw.githubusercontent.com/gist/DogsTailFarmer/167eaf65cebfe95d954082c7f181a2cc/raw/a67270de8663ad3de4733330ff64c9ba3153f87d/Logo%202v3.svg" width="75">Crypto exchanges API/WSS wrapper with grpc powered server</h1>

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/exchanges_wrapper/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 """
 REST API and WebSocket asyncio wrapper with grpc powered multiplexer server
- for crypto exchanges (Binance, Bitfinex, OKX, Huobi,)
+ for crypto exchanges (Binance, Bitfinex, OKX, Huobi)
  Utilizes one connection for many accounts and trading pairs.
  For SPOT market only
 """
@@ -12,7 +12,7 @@ __maintainer__ = "Jerry Fedorenko"
 __contact__ = "https://github.com/DogsTailFarmer"
 __email__ = "jerry.fedorenko@yahoo.com"
 __credits__ = ["https://github.com/DanyaSWorlD"]
-__version__ = "1.3.4b0"
+__version__ = "1.3.4-2"
 
 from pathlib import Path
 import shutil
@@ -23,6 +23,7 @@ CONFIG_FILE = Path(CONFIG_PATH, "exch_srv_cfg.toml")
 LOG_PATH = Path(WORK_PATH, "exch_srv_log")
 LOG_FILE = Path(LOG_PATH, "exch_srv.log")
 
+
 def init():
     if CONFIG_FILE.exists():
         print(f"Server config found at {CONFIG_FILE}")
@@ -34,5 +35,6 @@ def init():
         print(f"Before first run place account(s) API key into {CONFIG_FILE}")
         raise SystemExit(1)
 
+
 if __name__ == '__main__':
     init()

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/exchanges_wrapper/bitfinex_parser.py

@@ -212,7 +212,7 @@ def order(res: [], response_type=None, wss_te=None, cancelled=False) -> {}:
         status = 'CANCELED'
     elif Decimal(orig_qty) > Decimal(executed_qty) > 0:
         status = 'PARTIALLY_FILLED'
-    elif  Decimal(executed_qty) >= Decimal(orig_qty):
+    elif Decimal(executed_qty) >= Decimal(orig_qty):
         status = 'FILLED'
     elif cancelled:
         status = 'CANCELED'
@@ -534,7 +534,7 @@ def on_order_update(res: [], last_event: tuple) -> {}:
         status = 'CANCELED'
     elif Decimal(order_quantity) > Decimal(cumulative_filled_quantity) > 0:
         status = 'PARTIALLY_FILLED'
-    elif  Decimal(cumulative_filled_quantity) >= Decimal(order_quantity):
+    elif Decimal(cumulative_filled_quantity) >= Decimal(order_quantity):
         status = 'FILLED'
     else:
         status = 'NEW'

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/exchanges_wrapper/client.py

@@ -159,8 +159,14 @@ class Client:
             start_list.append(market_data_stream.start())
         else:
             for channel in _events:
+                # TODO Remove to config
+                if self.exchange == 'okx' and 'kline' in channel:
+                    _endpoint = 'wss://ws.okx.com:8443/ws/v5/business'
+                else:
+                    _endpoint = self.endpoint_ws_public
+                #
                 market_data_stream = MarketEventsDataStream(self,
-                                                            self.endpoint_ws_public,
+                                                            _endpoint,
                                                             self.exchange, _trade_id,
                                                             channel)
                 self.data_streams[_trade_id] |= {market_data_stream}
@@ -229,7 +235,7 @@ class Client:
                 .rstrip("0")
                 .rstrip(".")
             )
-        return price
+        return decimal.Decimal(price)
 
     def assert_symbol(self, symbol):
         if not symbol:

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/exchanges_wrapper/exch_srv.py

@@ -32,12 +32,10 @@ formatter = logging.Formatter(fmt="[%(asctime)s: %(levelname)s] %(message)s")
 fh = logging.handlers.RotatingFileHandler(LOG_FILE, maxBytes=1000000, backupCount=10)
 fh.setFormatter(formatter)
 fh.setLevel(logging.DEBUG)
-# logger.addHandler(fh)
 #
 sh = logging.StreamHandler()
 sh.setFormatter(formatter)
 sh.setLevel(logging.INFO)
-# logger.addHandler(sh)
 #
 root_logger = logging.getLogger()
 root_logger.setLevel(min([fh.level, sh.level]))

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/exchanges_wrapper/huobi_parser.py

@@ -302,7 +302,7 @@ def ticker(res: {}, symbol: str = None) -> {}:
     return msg_binance
 
 
-def interval(_interval: str) -> str:
+def interval(_interval) -> str:
     resolution = {
         '1m': '1min',
         '5m': '5min',
@@ -314,10 +314,10 @@ def interval(_interval: str) -> str:
         '1w': '1week',
         '1M': '1mon'
     }
-    return resolution.get(_interval, 0)
+    return resolution.get(_interval, 'unresolved')
 
 
-def interval2value(_interval: str) -> int:
+def interval2value(_interval) -> int:
     resolution = {
         '1min': 60,
         '5min': 5 * 60,

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/pyproject.toml

@@ -19,12 +19,13 @@ requires-python = ">=3.8"
 dependencies = [
     "aiohttp==3.8.4",
     "grpcio==1.56.0",
+    "grpcio-tools==1.56.0",
     "toml==0.10.2",
     "idna==3.4",
     "pyotp~=2.8.0",
     "simplejson==3.19.1",
     "shortuuid~=1.0.11",
-    "crypto_ws_api~=1.0.1",
+    "crypto-ws-api==1.0.1.post3",
 ]
 
 [tool.flit.module]

{exchanges-wrapper-1.3.4b0 → exchanges-wrapper-1.3.4.post2}/requirements.txt

@@ -1,8 +1,9 @@
 aiohttp==3.8.4
 grpcio==1.56.0
+grpcio-tools==1.56.0
 toml==0.10.2
 idna==3.4
 pyotp~=2.8.0
 simplejson==3.19.1
 shortuuid~=1.0.11
-crypto_ws_api~=1.0.1
+crypto-ws-api==1.0.1.post3