bitget 0.0.82__py3-none-any.whl → 0.0.84__py3-none-any.whl

bitget/ccxt/__init__.py

@@ -26,7 +26,7 @@ sys.modules['ccxt'] = ccxt_module
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.5.0'
+__version__ = '4.5.2'
 
 # ----------------------------------------------------------------------------
 

bitget/ccxt/async_support/__init__.py

@@ -8,7 +8,7 @@ sys.modules['ccxt'] = ccxt_module
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.5.0'
+__version__ = '4.5.2'
 
 # -----------------------------------------------------------------------------
 

bitget/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.5.0'
+__version__ = '4.5.2'
 
 # -----------------------------------------------------------------------------
 

bitget/ccxt/async_support/bitget.py

@@ -1917,7 +1917,7 @@ class bitget(Exchange, ImplicitAPI):
             res = self.safe_dict(results, i)
             data = self.safe_list(res, 'data', [])
             firstData = self.safe_dict(data, 0, {})
-            isBorrowable = self.safe_string(firstData, 'isBorrowable')
+            isBorrowable = self.safe_bool(firstData, 'isBorrowable')
             if fetchMargins and isBorrowable is not None:
                 keysList = list(self.index_by(data, 'symbol').keys())
                 self.options['crossMarginPairsData'] = keysList

bitget/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.5.0'
+__version__ = '4.5.2'
 
 # -----------------------------------------------------------------------------
 
@@ -2337,6 +2337,12 @@ class Exchange(object):
         # return the first index of the cache that can be applied to the orderbook or -1 if not possible
         return -1
 
+    def arrays_concat(self, arraysOfArrays: List[Any]):
+        result = []
+        for i in range(0, len(arraysOfArrays)):
+            result = self.array_concat(result, arraysOfArrays[i])
+        return result
+
     def find_timeframe(self, timeframe, timeframes=None):
         if timeframes is None:
             timeframes = self.timeframes

bitget/ccxt/bitget.py

@@ -1916,7 +1916,7 @@ class bitget(Exchange, ImplicitAPI):
             res = self.safe_dict(results, i)
             data = self.safe_list(res, 'data', [])
             firstData = self.safe_dict(data, 0, {})
-            isBorrowable = self.safe_string(firstData, 'isBorrowable')
+            isBorrowable = self.safe_bool(firstData, 'isBorrowable')
             if fetchMargins and isBorrowable is not None:
                 keysList = list(self.index_by(data, 'symbol').keys())
                 self.options['crossMarginPairsData'] = keysList

bitget/ccxt/pro/__init__.py

@@ -8,7 +8,7 @@ sys.modules['ccxt'] = ccxt_module
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.5.0'
+__version__ = '4.5.2'
 
 # ----------------------------------------------------------------------------
 

bitget/ccxt/pro/bitget.py

@@ -54,10 +54,14 @@ class bitget(bitgetAsync):
                     'ws': {
                         'public': 'wss://ws.bitget.com/v2/ws/public',
                         'private': 'wss://ws.bitget.com/v2/ws/private',
+                        'utaPublic': 'wss://ws.bitget.com/v3/ws/public',
+                        'utaPrivate': 'wss://ws.bitget.com/v3/ws/private',
                     },
                     'demo': {
                         'public': 'wss://wspap.bitget.com/v2/ws/public',
                         'private': 'wss://wspap.bitget.com/v2/ws/private',
+                        'utaPublic': 'wss://wspap.bitget.com/v3/ws/public',
+                        'utaPrivate': 'wss://wspap.bitget.com/v3/ws/private',
                     },
                 },
             },
@@ -67,6 +71,7 @@ class bitget(bitgetAsync):
                 # WS timeframes differ from REST timeframes
                 'timeframes': {
                     '1m': '1m',
+                    '3m': '3m',
                     '5m': '5m',
                     '15m': '15m',
                     '30m': '30m',
@@ -109,7 +114,9 @@ class bitget(bitgetAsync):
             },
         })
 
-    def get_inst_type(self, market, params={}):
+    def get_inst_type(self, market, uta: bool = False, params={}):
+        if (uta is None) or not uta:
+            uta, params = self.handle_option_and_params(params, 'getInstType', 'uta', False)
         instType = None
         if market is None:
             instType, params = self.handleProductTypeAndParams(None, params)
@@ -120,6 +127,8 @@ class bitget(bitgetAsync):
         instypeAux = None
         instypeAux, params = self.handle_option_and_params(params, 'getInstType', 'instType', instType)
         instType = instypeAux
+        if uta:
+            instType = instType.lower()
         return [instType, params]
 
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
@@ -128,9 +137,11 @@ class bitget(bitgetAsync):
 
         https://www.bitget.com/api-doc/spot/websocket/public/Tickers-Channel
         https://www.bitget.com/api-doc/contract/websocket/public/Tickers-Channel
+        https://www.bitget.com/api-doc/uta/websocket/public/Tickers-Channel
 
         :param str symbol: unified symbol of the market to watch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param boolean [params.uta]: set to True for the unified trading account(uta), defaults to False
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
         """
         await self.load_markets()
@@ -138,12 +149,16 @@ class bitget(bitgetAsync):
         symbol = market['symbol']
         messageHash = 'ticker:' + symbol
         instType = None
-        instType, params = self.get_inst_type(market, params)
+        uta = None
+        uta, params = self.handle_option_and_params(params, 'watchTicker', 'uta', False)
+        instType, params = self.get_inst_type(market, uta, params)
         args: dict = {
             'instType': instType,
-            'channel': 'ticker',
-            'instId': market['id'],
         }
+        topicOrChannel = 'topic' if uta else 'channel'
+        symbolOrInstId = 'symbol' if uta else 'instId'
+        args[topicOrChannel] = 'ticker'
+        args[symbolOrInstId] = market['id']
         return await self.watch_public(messageHash, args, params)
 
     async def un_watch_ticker(self, symbol: str, params={}) -> Any:
@@ -166,16 +181,20 @@ class bitget(bitgetAsync):
 
         https://www.bitget.com/api-doc/spot/websocket/public/Tickers-Channel
         https://www.bitget.com/api-doc/contract/websocket/public/Tickers-Channel
+        https://www.bitget.com/api-doc/uta/websocket/public/Tickers-Channel
 
         :param str[] symbols: unified symbol of the market to watch the tickers for
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param boolean [params.uta]: set to True for the unified trading account(uta), defaults to False
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
         """
         await self.load_markets()
         symbols = self.market_symbols(symbols, None, False)
         market = self.market(symbols[0])
         instType = None
-        instType, params = self.get_inst_type(market, params)
+        uta = None
+        uta, params = self.handle_option_and_params(params, 'watchTickers', 'uta', False)
+        instType, params = self.get_inst_type(market, uta, params)
         topics = []
         messageHashes = []
         for i in range(0, len(symbols)):
@@ -183,9 +202,11 @@ class bitget(bitgetAsync):
             marketInner = self.market(symbol)
             args: dict = {
                 'instType': instType,
-                'channel': 'ticker',
-                'instId': marketInner['id'],
             }
+            topicOrChannel = 'topic' if uta else 'channel'
+            symbolOrInstId = 'symbol' if uta else 'instId'
+            args[topicOrChannel] = 'ticker'
+            args[symbolOrInstId] = marketInner['id']
             topics.append(args)
             messageHashes.append('ticker:' + symbol)
         tickers = await self.watch_public_multiple(messageHashes, topics, params)
@@ -196,6 +217,8 @@ class bitget(bitgetAsync):
         return self.filter_by_array(self.tickers, 'symbol', symbols)
 
     def handle_ticker(self, client: Client, message):
+        #
+        # default
         #
         #     {
         #         "action": "snapshot",
@@ -226,6 +249,29 @@ class bitget(bitgetAsync):
         #         "ts": 1701842994341
         #     }
         #
+        # uta
+        #
+        #     {
+        #         "action": "snapshot",
+        #         "arg": {"instType": "spot", topic: "ticker", symbol: "BTCUSDT"},
+        #         "data": [
+        #             {
+        #                 "highPrice24h": "120255.61",
+        #                 "lowPrice24h": "116145.88",
+        #                 "openPrice24h": "118919.38",
+        #                 "lastPrice": "119818.83",
+        #                 "turnover24h": "215859996.272276",
+        #                 "volume24h": "1819.756798",
+        #                 "bid1Price": "119811.26",
+        #                 "ask1Price": "119831.18",
+        #                 "bid1Size": "0.008732",
+        #                 "ask1Size": "0.004297",
+        #                 "price24hPcnt": "0.02002"
+        #             }
+        #         ],
+        #         "ts": 1753230479687
+        #     }
+        #
         self.handle_bid_ask(client, message)
         ticker = self.parse_ws_ticker(message)
         symbol = ticker['symbol']
@@ -304,56 +350,85 @@ class bitget(bitgetAsync):
         #         "ts": 1701843962812
         #     }
         #
+        # uta
+        #
+        #     {
+        #         "action": "snapshot",
+        #         "arg": {"instType": "spot", topic: "ticker", symbol: "BTCUSDT"},
+        #         "data": [
+        #             {
+        #                 "highPrice24h": "120255.61",
+        #                 "lowPrice24h": "116145.88",
+        #                 "openPrice24h": "118919.38",
+        #                 "lastPrice": "119818.83",
+        #                 "turnover24h": "215859996.272276",
+        #                 "volume24h": "1819.756798",
+        #                 "bid1Price": "119811.26",
+        #                 "ask1Price": "119831.18",
+        #                 "bid1Size": "0.008732",
+        #                 "ask1Size": "0.004297",
+        #                 "price24hPcnt": "0.02002"
+        #             }
+        #         ],
+        #         "ts": 1753230479687
+        #     }
+        #
         arg = self.safe_value(message, 'arg', {})
         data = self.safe_value(message, 'data', [])
         ticker = self.safe_value(data, 0, {})
-        timestamp = self.safe_integer(ticker, 'ts')
-        instType = self.safe_string(arg, 'instType')
-        marketType = 'spot' if (instType == 'SPOT') else 'contract'
-        marketId = self.safe_string(ticker, 'instId')
+        utaTimestamp = self.safe_integer(message, 'ts')
+        timestamp = self.safe_integer(ticker, 'ts', utaTimestamp)
+        instType = self.safe_string_lower(arg, 'instType')
+        marketType = 'spot' if (instType == 'spot') else 'contract'
+        utaMarketId = self.safe_string(arg, 'symbol')
+        marketId = self.safe_string(ticker, 'instId', utaMarketId)
         market = self.safe_market(marketId, market, None, marketType)
-        close = self.safe_string(ticker, 'lastPr')
-        changeDecimal = self.safe_string(ticker, 'change24h')
-        change = Precise.string_mul(changeDecimal, '100')
+        close = self.safe_string_2(ticker, 'lastPr', 'lastPrice')
+        changeDecimal = self.safe_string(ticker, 'change24h', '')
+        change = self.safe_string(ticker, 'price24hPcnt', Precise.string_mul(changeDecimal, '100'))
         return self.safe_ticker({
             'symbol': market['symbol'],
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
-            'high': self.safe_string(ticker, 'high24h'),
-            'low': self.safe_string(ticker, 'low24h'),
-            'bid': self.safe_string(ticker, 'bidPr'),
-            'bidVolume': self.safe_string(ticker, 'bidSz'),
-            'ask': self.safe_string(ticker, 'askPr'),
-            'askVolume': self.safe_string(ticker, 'askSz'),
+            'high': self.safe_string_2(ticker, 'high24h', 'highPrice24h'),
+            'low': self.safe_string_2(ticker, 'low24h', 'lowPrice24h'),
+            'bid': self.safe_string_2(ticker, 'bidPr', 'bid1Price'),
+            'bidVolume': self.safe_string_2(ticker, 'bidSz', 'bid1Size'),
+            'ask': self.safe_string_2(ticker, 'askPr', 'ask1Price'),
+            'askVolume': self.safe_string_2(ticker, 'askSz', 'ask1Size'),
             'vwap': None,
-            'open': self.safe_string(ticker, 'open24h'),
+            'open': self.safe_string_2(ticker, 'open24h', 'openPrice24h'),
             'close': close,
             'last': close,
             'previousClose': None,
             'change': None,
             'percentage': change,
             'average': None,
-            'baseVolume': self.safe_string(ticker, 'baseVolume'),
-            'quoteVolume': self.safe_string(ticker, 'quoteVolume'),
+            'baseVolume': self.safe_string_2(ticker, 'baseVolume', 'volume24h'),
+            'quoteVolume': self.safe_string_2(ticker, 'quoteVolume', 'turnover24h'),
             'info': ticker,
         }, market)
 
     async def watch_bids_asks(self, symbols: Strings = None, params={}) -> Tickers:
         """
+        watches best bid & ask for symbols
 
         https://www.bitget.com/api-doc/spot/websocket/public/Tickers-Channel
         https://www.bitget.com/api-doc/contract/websocket/public/Tickers-Channel
+        https://www.bitget.com/api-doc/uta/websocket/public/Tickers-Channel
 
-        watches best bid & ask for symbols
         :param str[] symbols: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param boolean [params.uta]: set to True for the unified trading account(uta), defaults to False
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
         """
         await self.load_markets()
         symbols = self.market_symbols(symbols, None, False)
         market = self.market(symbols[0])
         instType = None
-        instType, params = self.get_inst_type(market, params)
+        uta = None
+        uta, params = self.handle_option_and_params(params, 'watchBidsAsks', 'uta', False)
+        instType, params = self.get_inst_type(market, uta, params)
         topics = []
         messageHashes = []
         for i in range(0, len(symbols)):
@@ -361,9 +436,11 @@ class bitget(bitgetAsync):
             marketInner = self.market(symbol)
             args: dict = {
                 'instType': instType,
-                'channel': 'ticker',
-                'instId': marketInner['id'],
             }
+            topicOrChannel = 'topic' if uta else 'channel'
+            symbolOrInstId = 'symbol' if uta else 'instId'
+            args[topicOrChannel] = 'ticker'
+            args[symbolOrInstId] = marketInner['id']
             topics.append(args)
             messageHashes.append('bidask:' + symbol)
         tickers = await self.watch_public_multiple(messageHashes, topics, params)
@@ -384,19 +461,21 @@ class bitget(bitgetAsync):
         arg = self.safe_value(message, 'arg', {})
         data = self.safe_value(message, 'data', [])
         ticker = self.safe_value(data, 0, {})
-        timestamp = self.safe_integer(ticker, 'ts')
-        instType = self.safe_string(arg, 'instType')
-        marketType = 'spot' if (instType == 'SPOT') else 'contract'
-        marketId = self.safe_string(ticker, 'instId')
+        utaTimestamp = self.safe_integer(message, 'ts')
+        timestamp = self.safe_integer(ticker, 'ts', utaTimestamp)
+        instType = self.safe_string_lower(arg, 'instType')
+        marketType = 'spot' if (instType == 'spot') else 'contract'
+        utaMarketId = self.safe_string(arg, 'symbol')
+        marketId = self.safe_string(ticker, 'instId', utaMarketId)
         market = self.safe_market(marketId, market, None, marketType)
         return self.safe_ticker({
             'symbol': market['symbol'],
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
-            'ask': self.safe_string(ticker, 'askPr'),
-            'askVolume': self.safe_string(ticker, 'askSz'),
-            'bid': self.safe_string(ticker, 'bidPr'),
-            'bidVolume': self.safe_string(ticker, 'bidSz'),
+            'ask': self.safe_string_2(ticker, 'askPr', 'ask1Price'),
+            'askVolume': self.safe_string_2(ticker, 'askSz', 'ask1Size'),
+            'bid': self.safe_string_2(ticker, 'bidPr', 'bid1Price'),
+            'bidVolume': self.safe_string_2(ticker, 'bidSz', 'bid1Size'),
             'info': ticker,
         }, market)
 
@@ -406,12 +485,14 @@ class bitget(bitgetAsync):
 
         https://www.bitget.com/api-doc/spot/websocket/public/Candlesticks-Channel
         https://www.bitget.com/api-doc/contract/websocket/public/Candlesticks-Channel
+        https://www.bitget.com/api-doc/uta/websocket/public/Candlesticks-Channel
 
         :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
         :param int [limit]: the maximum amount of candles to fetch
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param boolean [params.uta]: set to True for the unified trading account(uta), defaults to False
         :returns int[][]: A list of candles ordered, open, high, low, close, volume
         """
         await self.load_markets()
@@ -419,14 +500,24 @@ class bitget(bitgetAsync):
         symbol = market['symbol']
         timeframes = self.safe_value(self.options, 'timeframes')
         interval = self.safe_string(timeframes, timeframe)
-        messageHash = 'candles:' + timeframe + ':' + symbol
+        messageHash = None
         instType = None
-        instType, params = self.get_inst_type(market, params)
+        uta = None
+        uta, params = self.handle_option_and_params(params, 'watchOHLCV', 'uta', False)
+        instType, params = self.get_inst_type(market, uta, params)
         args: dict = {
             'instType': instType,
-            'channel': 'candle' + interval,
-            'instId': market['id'],
         }
+        if uta:
+            args['topic'] = 'kline'
+            args['symbol'] = market['id']
+            args['interval'] = interval
+            params['uta'] = True
+            messageHash = 'kline:' + symbol
+        else:
+            args['channel'] = 'candle' + interval
+            args['instId'] = market['id']
+            messageHash = 'candles:' + timeframe + ':' + symbol
         ohlcv = await self.watch_public(messageHash, args, params)
         if self.newUpdates:
             limit = ohlcv.getLimit(symbol, limit)
@@ -438,17 +529,43 @@ class bitget(bitgetAsync):
 
         https://www.bitget.com/api-doc/spot/websocket/public/Candlesticks-Channel
         https://www.bitget.com/api-doc/contract/websocket/public/Candlesticks-Channel
+        https://www.bitget.com/api-doc/uta/websocket/public/Candlesticks-Channel
 
         :param str symbol: unified symbol of the market to unwatch the ohlcv for
         :param str [timeframe]: the period for the ratio, default is 1 minute
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param boolean [params.uta]: set to True for the unified trading account(uta), defaults to False
         :returns dict: A dictionary of `order book structures <https://docs.ccxt.com/#/?id=order-book-structure>` indexed by market symbols
         """
         await self.load_markets()
         timeframes = self.safe_dict(self.options, 'timeframes')
         interval = self.safe_string(timeframes, timeframe)
-        channel = 'candle' + interval
-        return await self.un_watch_channel(symbol, channel, 'candles:' + timeframe, params)
+        channel = None
+        market = None
+        if symbol is not None:
+            market = self.market(symbol)
+        instType = None
+        messageHash = None
+        uta = None
+        uta, params = self.handle_option_and_params(params, 'unWatchOHLCV', 'uta', False)
+        instType, params = self.get_inst_type(market, uta, params)
+        args: dict = {
+            'instType': instType,
+        }
+        if uta:
+            channel = 'kline'
+            args['topic'] = channel
+            args['symbol'] = market['id']
+            args['interval'] = interval
+            params['uta'] = True
+            params['interval'] = interval
+            messageHash = channel + symbol
+        else:
+            channel = 'candle' + interval
+            args['channel'] = channel
+            args['instId'] = market['id']
+            messageHash = 'candles:' + interval
+        return await self.un_watch_channel(symbol, channel, messageHash, params)
 
     def handle_ohlcv(self, client: Client, message):
         #
@@ -484,15 +601,45 @@ class bitget(bitgetAsync):
         #         "ts": 1701901610417
         #     }
         #
+        # uta
+        #
+        #     {
+        #         "action": "snapshot",
+        #         "arg": {
+        #             "instType": "usdt-futures",
+        #             "topic": "kline",
+        #             "symbol": "BTCUSDT",
+        #             "interval": "1m"
+        #         },
+        #         "data": [
+        #             {
+        #                 "start": "1755564480000",
+        #                 "open": "116286",
+        #                 "close": "116256.2",
+        #                 "high": "116310.2",
+        #                 "low": "116232.8",
+        #                 "volume": "39.7062",
+        #                 "turnover": "4616746.46654"
+        #             },
+        #         ],
+        #         "ts": 1755594421877
+        #     }
+        #
         arg = self.safe_value(message, 'arg', {})
-        instType = self.safe_string(arg, 'instType')
-        marketType = 'spot' if (instType == 'SPOT') else 'contract'
-        marketId = self.safe_string(arg, 'instId')
+        instType = self.safe_string_lower(arg, 'instType')
+        marketType = 'spot' if (instType == 'spot') else 'contract'
+        marketId = self.safe_string_2(arg, 'instId', 'symbol')
         market = self.safe_market(marketId, None, None, marketType)
         symbol = market['symbol']
         self.ohlcvs[symbol] = self.safe_value(self.ohlcvs, symbol, {})
-        channel = self.safe_string(arg, 'channel')
-        interval = channel.replace('candle', '')
+        channel = self.safe_string_2(arg, 'channel', 'topic')
+        interval = self.safe_string(arg, 'interval')
+        isUta = None
+        if interval is None:
+            isUta = False
+            interval = channel.replace('candle', '')
+        else:
+            isUta = True
         timeframes = self.safe_value(self.options, 'timeframes')
         timeframe = self.find_timeframe(interval, timeframes)
         stored = self.safe_value(self.ohlcvs[symbol], timeframe)
@@ -504,7 +651,11 @@ class bitget(bitgetAsync):
         for i in range(0, len(data)):
             parsed = self.parse_ws_ohlcv(data[i], market)
             stored.append(parsed)
-        messageHash = 'candles:' + timeframe + ':' + symbol
+        messageHash = None
+        if isUta:
+            messageHash = 'kline:' + symbol
+        else:
+            messageHash = 'candles:' + timeframe + ':' + symbol
         client.resolve(stored, messageHash)
 
     def parse_ws_ohlcv(self, ohlcv, market=None) -> list:
@@ -520,14 +671,26 @@ class bitget(bitgetAsync):
         #         "437404.105512"  # USDT volume
         #     ]
         #
+        # uta
+        #
+        #     {
+        #         "start": "1755564480000",
+        #         "open": "116286",
+        #         "close": "116256.2",
+        #         "high": "116310.2",
+        #         "low": "116232.8",
+        #         "volume": "39.7062",
+        #         "turnover": "4616746.46654"
+        #     }
+        #
         volumeIndex = 6 if (market['inverse']) else 5
         return [
-            self.safe_integer(ohlcv, 0),
-            self.safe_number(ohlcv, 1),
-            self.safe_number(ohlcv, 2),
-            self.safe_number(ohlcv, 3),
-            self.safe_number(ohlcv, 4),
-            self.safe_number(ohlcv, volumeIndex),
+            self.safe_integer_2(ohlcv, 'start', 0),
+            self.safe_number_2(ohlcv, 'open', 1),
+            self.safe_number_2(ohlcv, 'high', 2),
+            self.safe_number_2(ohlcv, 'low', 3),
+            self.safe_number_2(ohlcv, 'close', 4),
+            self.safe_number_2(ohlcv, 'volume', volumeIndex),
         ]
 
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
@@ -569,12 +732,21 @@ class bitget(bitgetAsync):
         market = self.market(symbol)
         messageHash = 'unsubscribe:' + messageHashTopic + ':' + market['symbol']
         instType = None
-        instType, params = self.get_inst_type(market, params)
+        uta = None
+        uta, params = self.handle_option_and_params(params, 'unWatchChannel', 'uta', False)
+        instType, params = self.get_inst_type(market, uta, params)
         args: dict = {
             'instType': instType,
-            'channel': channel,
-            'instId': market['id'],
         }
+        if uta:
+            args['topic'] = channel
+            args['symbol'] = market['id']
+            args['interval'] = self.safe_string(params, 'interval', '1m')
+            params['uta'] = True
+            params = self.omit(params, 'interval')
+        else:
+            args['channel'] = channel
+            args['instId'] = market['id']
         return await self.un_watch_public(messageHash, args, params)
 
     async def watch_order_book_for_symbols(self, symbols: List[str], limit: Int = None, params={}) -> OrderBook:
@@ -602,7 +774,7 @@ class bitget(bitgetAsync):
             symbol = symbols[i]
             market = self.market(symbol)
             instType = None
-            instType, params = self.get_inst_type(market, params)
+            instType, params = self.get_inst_type(market, False, params)
             args: dict = {
                 'instType': instType,
                 'channel': channel,
@@ -760,7 +932,7 @@ class bitget(bitgetAsync):
             symbol = symbols[i]
             market = self.market(symbol)
             instType = None
-            instType, params = self.get_inst_type(market, params)
+            instType, params = self.get_inst_type(market, False, params)
             args: dict = {
                 'instType': instType,
                 'channel': 'trade',
@@ -944,7 +1116,7 @@ class bitget(bitgetAsync):
         symbols = self.market_symbols(symbols)
         if not self.is_empty(symbols):
             market = self.get_market_from_symbols(symbols)
-            instType, params = self.get_inst_type(market, params)
+            instType, params = self.get_inst_type(market, False, params)
         messageHash = instType + ':positions' + messageHash
         args: dict = {
             'instType': instType,
@@ -1139,7 +1311,7 @@ class bitget(bitgetAsync):
         if market is None and type == 'spot':
             instType = 'SPOT'
         else:
-            instType, params = self.get_inst_type(market, params)
+            instType, params = self.get_inst_type(market, False, params)
         if type == 'spot' and (symbol is not None):
             subscriptionHash = subscriptionHash + ':' + symbol
         if isTrigger:
@@ -1490,7 +1662,7 @@ class bitget(bitgetAsync):
         if market is None and type == 'spot':
             instType = 'spot'
         else:
-            instType, params = self.get_inst_type(market, params)
+            instType, params = self.get_inst_type(market, False, params)
         subscriptionHash = 'fill:' + instType
         args: dict = {
             'instType': instType,
@@ -1711,12 +1883,21 @@ class bitget(bitgetAsync):
         client.resolve(self.balance, messageHash)
 
     async def watch_public(self, messageHash, args, params={}):
-        url = self.urls['api']['ws']['public']
+        uta = None
+        url = None
+        uta, params = self.handle_option_and_params(params, 'watchPublic', 'uta', False)
+        if uta:
+            url = self.urls['api']['ws']['utaPublic']
+        else:
+            url = self.urls['api']['ws']['public']
         sandboxMode = self.safe_bool_2(self.options, 'sandboxMode', 'sandbox', False)
         if sandboxMode:
             instType = self.safe_string(args, 'instType')
             if (instType != 'SCOIN-FUTURES') and (instType != 'SUSDT-FUTURES') and (instType != 'SUSDC-FUTURES'):
-                url = self.urls['api']['demo']['public']
+                if uta:
+                    url = self.urls['api']['demo']['utaPublic']
+                else:
+                    url = self.urls['api']['demo']['public']
         request: dict = {
             'op': 'subscribe',
             'args': [args],
@@ -1725,12 +1906,21 @@ class bitget(bitgetAsync):
         return await self.watch(url, messageHash, message, messageHash)
 
     async def un_watch_public(self, messageHash, args, params={}):
-        url = self.urls['api']['ws']['public']
+        uta = None
+        url = None
+        uta, params = self.handle_option_and_params(params, 'unWatchPublic', 'uta', False)
+        if uta:
+            url = self.urls['api']['ws']['utaPublic']
+        else:
+            url = self.urls['api']['ws']['public']
         sandboxMode = self.safe_bool_2(self.options, 'sandboxMode', 'sandbox', False)
         if sandboxMode:
             instType = self.safe_string(args, 'instType')
             if (instType != 'SCOIN-FUTURES') and (instType != 'SUSDT-FUTURES') and (instType != 'SUSDC-FUTURES'):
-                url = self.urls['api']['demo']['public']
+                if uta:
+                    url = self.urls['api']['demo']['utaPublic']
+                else:
+                    url = self.urls['api']['demo']['public']
         request: dict = {
             'op': 'unsubscribe',
             'args': [args],
@@ -1739,13 +1929,22 @@ class bitget(bitgetAsync):
         return await self.watch(url, messageHash, message, messageHash)
 
     async def watch_public_multiple(self, messageHashes, argsArray, params={}):
-        url = self.urls['api']['ws']['public']
+        uta = None
+        url = None
+        uta, params = self.handle_option_and_params(params, 'watchPublicMultiple', 'uta', False)
+        if uta:
+            url = self.urls['api']['ws']['utaPublic']
+        else:
+            url = self.urls['api']['ws']['public']
         sandboxMode = self.safe_bool_2(self.options, 'sandboxMode', 'sandbox', False)
         if sandboxMode:
             argsArrayFirst = self.safe_dict(argsArray, 0, {})
             instType = self.safe_string(argsArrayFirst, 'instType')
             if (instType != 'SCOIN-FUTURES') and (instType != 'SUSDT-FUTURES') and (instType != 'SUSDC-FUTURES'):
-                url = self.urls['api']['demo']['public']
+                if uta:
+                    url = self.urls['api']['demo']['utaPublic']
+                else:
+                    url = self.urls['api']['demo']['public']
         request: dict = {
             'op': 'subscribe',
             'args': argsArray,
@@ -1874,6 +2073,41 @@ class bitget(bitgetAsync):
         #        ]
         #    }
         #
+        # uta
+        #
+        #     {
+        #         "action": "snapshot",
+        #         "arg": {"instType": "spot", topic: "ticker", symbol: "BTCUSDT"},
+        #         "data": [
+        #             {
+        #                 "highPrice24h": "120255.61",
+        #                 "lowPrice24h": "116145.88",
+        #                 "openPrice24h": "118919.38",
+        #                 "lastPrice": "119818.83",
+        #                 "turnover24h": "215859996.272276",
+        #                 "volume24h": "1819.756798",
+        #                 "bid1Price": "119811.26",
+        #                 "ask1Price": "119831.18",
+        #                 "bid1Size": "0.008732",
+        #                 "ask1Size": "0.004297",
+        #                 "price24hPcnt": "0.02002"
+        #             }
+        #         ],
+        #         "ts": 1753230479687
+        #     }
+        #
+        # unsubscribe
+        #
+        #     {
+        #         "event": "unsubscribe",
+        #         "arg": {
+        #             "instType": "spot",
+        #             "topic": "kline",
+        #             "symbol": "BTCUSDT",
+        #             "interval": "1m"
+        #         }
+        #     }
+        #
         if self.handle_error_message(client, message):
             return
         content = self.safe_string(message, 'message')
@@ -1906,9 +2140,10 @@ class bitget(bitgetAsync):
             'positions': self.handle_positions,
             'account-isolated': self.handle_balance,
             'account-crossed': self.handle_balance,
+            'kline': self.handle_ohlcv,
         }
         arg = self.safe_value(message, 'arg', {})
-        topic = self.safe_value(arg, 'channel', '')
+        topic = self.safe_value_2(arg, 'channel', 'topic', '')
         method = self.safe_value(methods, topic)
         if method is not None:
             method(client, message)
@@ -1984,7 +2219,7 @@ class bitget(bitgetAsync):
         arg = self.safe_dict(message, 'arg', {})
         instType = self.safe_string_lower(arg, 'instType')
         type = 'spot' if (instType == 'spot') else 'contract'
-        instId = self.safe_string(arg, 'instId')
+        instId = self.safe_string_2(arg, 'instId', 'symbol')
         market = self.safe_market(instId, None, None, type)
         symbol = market['symbol']
         messageHash = 'unsubscribe:ticker:' + market['symbol']
@@ -2003,18 +2238,34 @@ class bitget(bitgetAsync):
         #
         #    {"event":"unsubscribe","arg":{"instType":"SPOT","channel":"candle1m","instId":"BTCUSDT"}}
         #
+        # UTA
+        #
+        #    {"event":"unsubscribe","arg":{"instType":"spot","topic":"kline","symbol":"BTCUSDT","interval":"1m"}}
+        #
         arg = self.safe_dict(message, 'arg', {})
         instType = self.safe_string_lower(arg, 'instType')
         type = 'spot' if (instType == 'spot') else 'contract'
-        instId = self.safe_string(arg, 'instId')
-        channel = self.safe_string(arg, 'channel')
-        interval = channel.replace('candle', '')
+        instId = self.safe_string_2(arg, 'instId', 'symbol')
+        channel = self.safe_string_2(arg, 'channel', 'topic')
+        interval = self.safe_string(arg, 'interval')
+        isUta = None
+        if interval is None:
+            isUta = False
+            interval = channel.replace('candle', '')
+        else:
+            isUta = True
         timeframes = self.safe_value(self.options, 'timeframes')
         timeframe = self.find_timeframe(interval, timeframes)
         market = self.safe_market(instId, None, None, type)
         symbol = market['symbol']
-        messageHash = 'unsubscribe:candles:' + timeframe + ':' + market['symbol']
-        subMessageHash = 'candles:' + timeframe + ':' + symbol
+        messageHash = None
+        subMessageHash = None
+        if isUta:
+            messageHash = 'unsubscribe:kline:' + symbol
+            subMessageHash = 'kline:' + symbol
+        else:
+            messageHash = 'unsubscribe:candles:' + timeframe + ':' + symbol
+            subMessageHash = 'candles:' + timeframe + ':' + symbol
         if symbol in self.ohlcvs:
             if timeframe in self.ohlcvs[symbol]:
                 del self.ohlcvs[symbol][timeframe]
@@ -2045,7 +2296,7 @@ class bitget(bitgetAsync):
             argsList = [self.safe_dict(message, 'arg', {})]
         for i in range(0, len(argsList)):
             arg = argsList[i]
-            channel = self.safe_string(arg, 'channel')
+            channel = self.safe_string_2(arg, 'channel', 'topic')
             if channel == 'books':
                 # for now only unWatchOrderBook is supporteod
                 self.handle_order_book_un_subscription(client, message)
@@ -2055,4 +2306,6 @@ class bitget(bitgetAsync):
                 self.handle_ticker_un_subscription(client, message)
             elif channel.startswith('candle'):
                 self.handle_ohlcv_un_subscription(client, message)
+            elif channel.startswith('kline'):
+                self.handle_ohlcv_un_subscription(client, message)
         return message

{bitget-0.0.82.dist-info → bitget-0.0.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitget
-Version: 0.0.82
+Version: 0.0.84
 Summary: bitget crypto exchange api client
 Project-URL: Homepage, https://github.com/ccxt/ccxt
 Project-URL: Issues, https://github.com/ccxt/ccxt
@@ -780,7 +780,7 @@ You can also construct custom requests to available "implicit" endpoints
 ### WS Unified
 
 - `describe(self)`
-- `get_inst_type(self, market, params={})`
+- `get_inst_type(self, market, uta: bool = False, params={})`
 - `watch_ticker(self, symbol: str, params={})`
 - `un_watch_ticker(self, symbol: str, params={})`
 - `watch_tickers(self, symbols: Strings = None, params={})`

{bitget-0.0.82.dist-info → bitget-0.0.84.dist-info}/RECORD

@@ -1,11 +1,11 @@
 bitget/__init__.py,sha256=D5tG1_AjwXjMim3CPnCuWSheOXtq4vlSwVCS5ZG1bMQ,246
-bitget/ccxt/__init__.py,sha256=I9PUCJLUniiXrLxS2zqRjoHM6RuK2Ui31t33ItokWf8,6130
-bitget/ccxt/bitget.py,sha256=btIwpfkEJ1nXEMKHVxd1hykPMyivAwPj-ym2N_LdzlM,518995
+bitget/ccxt/__init__.py,sha256=bhjUppzTIV1pAkFw4voNhDr2x1V1H1U5FYk6GlRJqj4,6130
+bitget/ccxt/bitget.py,sha256=v7U-p48XIejR2OEV3xCBV4KkuifaJYqkhKILiWrxQas,518993
 bitget/ccxt/abstract/bitget.py,sha256=U3sRAK3oQJt2ujn-S0ci05HnOIHEad7CJvpDeTQfrYY,101038
-bitget/ccxt/async_support/__init__.py,sha256=ofKj3am3krc6247yqh0cRg5dGJR4lwg_tlZkcqWXXxg,4863
-bitget/ccxt/async_support/bitget.py,sha256=5LkBlqAw2FAK_qGza5hsVf0U0Hycxd6I4_SURsoJM74,521002
+bitget/ccxt/async_support/__init__.py,sha256=OrWNftRHccFCGxS1-vfed7yaul7GAyr3Yz5tvCkqbD0,4863
+bitget/ccxt/async_support/bitget.py,sha256=nxjRW9dJ5H7HHp-p9yf_ciwpKkXxK0IQY_ERTktNTXE,521000
 bitget/ccxt/async_support/base/__init__.py,sha256=aVYSsFi--b4InRs9zDN_wtCpj8odosAB726JdUHavrk,67
-bitget/ccxt/async_support/base/exchange.py,sha256=YMd_vhLNV7Ay-PhgjeEmksr2-wUhQk6TSj_gsaJhLYg,121268
+bitget/ccxt/async_support/base/exchange.py,sha256=f8NMSn7dvE2ZuL71iRKyinVbyafvacm5Zj4WcQ4TWck,121268
 bitget/ccxt/async_support/base/throttler.py,sha256=tvDVcdRUVYi8fZRlEcnqtgzcgB_KMUMRs5Pu8tuU-tU,1847
 bitget/ccxt/async_support/base/ws/__init__.py,sha256=uockzpLuwntKGZbs5EOWFe-Zg-k6Cj7GhNJLc_RX0so,1791
 bitget/ccxt/async_support/base/ws/cache.py,sha256=xf2VOtfUwloxSlIQ39M1RGZHWQzyS9IGhB5NX6cDcAc,8370
@@ -17,11 +17,11 @@ bitget/ccxt/async_support/base/ws/order_book_side.py,sha256=GhnGUt78pJ-AYL_Dq9pr
 bitget/ccxt/base/__init__.py,sha256=eTx1OE3HJjspFUQjGm6LBhaQiMKJnXjkdP-JUXknyQ0,1320
 bitget/ccxt/base/decimal_to_precision.py,sha256=3XI30u9YudHbTA438397u5rkdlXa3atxwZEfUus3C4k,6803
 bitget/ccxt/base/errors.py,sha256=OGhWNvNtRlJOzFx-n1x3ZjTnaPpfWH0Vc0xACS-MeDw,5012
-bitget/ccxt/base/exchange.py,sha256=W1B4s4X8fIXF9lvAte_LmBb8FYHtFF0qATcJgBfXEYA,334124
+bitget/ccxt/base/exchange.py,sha256=wXcblsdBqxUWtSbKu1hDTey2mOUhXe05MT7b91Mztno,334337
 bitget/ccxt/base/precise.py,sha256=koce64Yrp6vFbGijJtUt-QQ6XhJgeGTCksZ871FPp_A,8886
 bitget/ccxt/base/types.py,sha256=Gvbogh9i7pPH7Z18xesYeDPribqqwq8uKpOv-YODFBs,11505
-bitget/ccxt/pro/__init__.py,sha256=8n9Kb_Y5ZxS938L_8sGb2ldWUL5Z4Clx1D0Tp3RYYLs,4177
-bitget/ccxt/pro/bitget.py,sha256=t0wi3SrGCpHBz3jT8wLpD5bRnZhSe2PCdpFfEn2f-9w,90386
+bitget/ccxt/pro/__init__.py,sha256=aclE2S1jDsTNzAhGI_S75WZVCYLRnRO5helH8RmJuqk,4177
+bitget/ccxt/pro/bitget.py,sha256=p4XPcaqmc581alL-UoX08RMgGQYN6Zz0nRoUaP1qmKM,101076
 bitget/ccxt/static_dependencies/README.md,sha256=3TCvhhn09_Cqf9BDDpao1V7EfKHDpQ6k9oWRsLFixpU,18
 bitget/ccxt/static_dependencies/__init__.py,sha256=tzFje8cloqmiIE6kola3EaYC0SnD1izWnri69hzHsSw,168
 bitget/ccxt/static_dependencies/ecdsa/__init__.py,sha256=Xaj0G79BLtBt2YZcOOMV8qOlQZ7fIJznNiHhiEEZfQA,594
@@ -281,6 +281,6 @@ bitget/ccxt/static_dependencies/toolz/curried/exceptions.py,sha256=gKFOHDIayAWnX
 bitget/ccxt/static_dependencies/toolz/curried/operator.py,sha256=ML92mknkAwzBl2NCm-4werSUmJEtSHNY9NSzhseNM9s,525
 bitget/ccxt/static_dependencies/typing_inspect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bitget/ccxt/static_dependencies/typing_inspect/typing_inspect.py,sha256=5gIWomLPfuDpgd3gX1GlnX0MuXM3VorR4j2W2qXORiQ,28269
-bitget-0.0.82.dist-info/METADATA,sha256=_Bl1m9wpYuhgV_4s8mxEtxv49hNZI6eAxW70ahwbKvY,44855
-bitget-0.0.82.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bitget-0.0.82.dist-info/RECORD,,
+bitget-0.0.84.dist-info/METADATA,sha256=T2WyP5f7a_Zf3IPcpO44AuB6LgTSIuDF29xa4WH4jZs,44874
+bitget-0.0.84.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bitget-0.0.84.dist-info/RECORD,,