ccxt-ir 4.3.46.0.3__py2.py3-none-any.whl → 4.5.1__py2.py3-none-any.whl

ccxt/pro/ascendex.py

@@ -6,7 +6,7 @@
 import ccxt.async_support
 from ccxt.async_support.base.ws.cache import ArrayCache, ArrayCacheBySymbolById, ArrayCacheByTimestamp
 import hashlib
-from ccxt.base.types import Balances, Int, Order, OrderBook, Str, Trade
+from ccxt.base.types import Any, Balances, Bool, Int, Order, OrderBook, Str, Trade
 from ccxt.async_support.base.ws.client import Client
 from typing import List
 from ccxt.base.errors import AuthenticationError
@@ -15,7 +15,7 @@ from ccxt.base.errors import NetworkError
 
 class ascendex(ccxt.async_support.ascendex):
 
-    def describe(self):
+    def describe(self) -> Any:
         return self.deep_extend(super(ascendex, self).describe(), {
             'has': {
                 'ws': True,
@@ -25,6 +25,7 @@ class ascendex(ccxt.async_support.ascendex):
                 'watchOrders': True,
                 'watchTicker': False,
                 'watchTrades': True,
+                'watchTradesForSymbols': True,
             },
             'urls': {
                 'api': {
@@ -62,6 +63,16 @@ class ascendex(ccxt.async_support.ascendex):
         message = self.extend(request, params)
         return await self.watch(url, messageHash, message, messageHash)
 
+    async def watch_public_multiple(self, messageHashes, params={}):
+        url = self.urls['api']['ws']['public']
+        id = self.nonce()
+        request: dict = {
+            'id': str(id),
+            'op': 'sub',
+        }
+        message = self.extend(request, params)
+        return await self.watch_multiple(url, messageHashes, message, messageHashes)
+
     async def watch_private(self, channel, messageHash, params={}):
         await self.load_accounts()
         accountGroup = self.safe_string(self.options, 'account-group')
@@ -80,6 +91,9 @@ class ascendex(ccxt.async_support.ascendex):
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+
+        https://ascendex.github.io/ascendex-pro-api/#channel-bar-data
+
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
         :param int [since]: timestamp in ms of the earliest candle to fetch
@@ -140,22 +154,48 @@ class ascendex(ccxt.async_support.ascendex):
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
+
+        https://ascendex.github.io/ascendex-pro-api/#channel-market-trades
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict[]: a list of `trade structures <https://docs.ccxt.com/#/?id=public-trades>`
         """
+        return await self.watch_trades_for_symbols([symbol], since, limit, params)
+
+    async def watch_trades_for_symbols(self, symbols: List[str], since: Int = None, limit: Int = None, params={}) -> List[Trade]:
+        """
+        get the list of most recent trades for a list of symbols
+
+        https://ascendex.github.io/ascendex-pro-api/#channel-market-trades
+
+        :param str[] symbols: unified symbol of the market to fetch trades for
+        :param int [since]: timestamp in ms of the earliest trade to fetch
+        :param int [limit]: the maximum amount of trades to fetch
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str [params.name]: the name of the method to call, 'trade' or 'aggTrade', default is 'trade'
+        :returns dict[]: a list of `trade structures <https://docs.ccxt.com/#/?id=public-trades>`
+        """
         await self.load_markets()
-        market = self.market(symbol)
-        symbol = market['symbol']
-        channel = 'trades' + ':' + market['id']
+        symbols = self.market_symbols(symbols, None, False, True, True)
+        marketIds = []
+        messageHashes = []
+        if symbols is not None:
+            for i in range(0, len(symbols)):
+                market = self.market(symbols[i])
+                marketIds.append(market['id'])
+                messageHashes.append('trades:' + market['id'])
+        channel = 'trades:' + ','.join(marketIds)
         params = self.extend(params, {
             'ch': channel,
         })
-        trades = await self.watch_public(channel, params)
+        trades = await self.watch_public_multiple(messageHashes, params)
         if self.newUpdates:
-            limit = trades.getLimit(symbol, limit)
+            first = self.safe_value(trades, 0)
+            tradeSymbol = self.safe_string(first, 'symbol')
+            limit = trades.getLimit(tradeSymbol, limit)
         return self.filter_by_since_limit(trades, since, limit, 'timestamp', True)
 
     def handle_trades(self, client: Client, message):
@@ -195,6 +235,9 @@ class ascendex(ccxt.async_support.ascendex):
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
+
+        https://ascendex.github.io/ascendex-pro-api/#channel-level-2-order-book-updates
+
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int [limit]: the maximum amount of order book entries to return
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -342,6 +385,9 @@ class ascendex(ccxt.async_support.ascendex):
     async def watch_balance(self, params={}) -> Balances:
         """
         watch balance and get the amount of funds available for trading or funds locked in orders
+
+        https://ascendex.github.io/ascendex-pro-api/#channel-order-and-balance
+
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
@@ -366,7 +412,7 @@ class ascendex(ccxt.async_support.ascendex):
         #
         # {
         #     "m": "balance",
-        #     "accountId": "cshQtyfq8XLAA9kcf19h8bXHbAwwoqDo",
+        #     "accountId": "cshQtyfq8XLAA9kcf19h8bXHbAwwoqEo",
         #     "ac": "CASH",
         #     "data": {
         #         "a" : "USDT",
@@ -454,7 +500,9 @@ class ascendex(ccxt.async_support.ascendex):
 
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
-        :see: https://ascendex.github.io/ascendex-pro-api/#channel-order-and-balance
+
+        https://ascendex.github.io/ascendex-pro-api/#channel-order-and-balance
+
         watches information on multiple orders made by the user
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
@@ -647,7 +695,7 @@ class ascendex(ccxt.async_support.ascendex):
             'trades': None,
         }, market)
 
-    def handle_error_message(self, client: Client, message):
+    def handle_error_message(self, client: Client, message) -> Bool:
         #
         # {
         #     "m": "disconnected",

ccxt/pro/bequant.py

@@ -4,6 +4,7 @@
 # https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
 
 from ccxt.pro.hitbtc import hitbtc
+from ccxt.base.types import Any
 
 import ccxt.async_support.hitbtc as hitbtcRest
 
@@ -12,7 +13,7 @@ import ccxt.async_support.bequant as bequantRest
 
 class bequant(hitbtc):
 
-    def describe(self):
+    def describe(self) -> Any:
         # eslint-disable-next-line new-cap
         describeExtended = self.get_describe_for_extended_ws_exchange(bequantRest(), hitbtcRest(), super(bequant, self).describe())
         return self.deep_extend(describeExtended, {
@@ -25,6 +26,10 @@ class bequant(hitbtc):
                 'api': {
                     'public': 'https://api.bequant.io/api/3',
                     'private': 'https://api.bequant.io/api/3',
+                    'ws': {
+                        'public': 'wss://api.bequant.io/api/3/ws/public',
+                        'private': 'wss://api.bequant.io/api/3/ws/trading',
+                    },
                 },
                 'www': 'https://bequant.io',
                 'doc': [