bitget 0.0.83__tar.gz → 0.0.84__tar.gz

{bitget-0.0.83 → bitget-0.0.84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitget
-Version: 0.0.83
+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

{bitget-0.0.83 → bitget-0.0.84}/pyproject.toml

@@ -11,7 +11,7 @@ only-include = ["src/bitget"]
 
 [project]
 name = "bitget"
-version = "0.0.83"
+version = "0.0.84"
 authors = [
     { name="CCXT", email="info@ccxt.trade" },
 ]

{bitget-0.0.83 → bitget-0.0.84}/src/bitget/ccxt/__init__.py

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

{bitget-0.0.83 → bitget-0.0.84}/src/bitget/ccxt/async_support/__init__.py

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

{bitget-0.0.83 → bitget-0.0.84}/src/bitget/ccxt/async_support/base/exchange.py

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

{bitget-0.0.83 → bitget-0.0.84}/src/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-0.0.83 → bitget-0.0.84}/src/bitget/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.5.1'
+__version__ = '4.5.2'
 
 # -----------------------------------------------------------------------------
 

{bitget-0.0.83 → bitget-0.0.84}/src/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-0.0.83 → bitget-0.0.84}/src/bitget/ccxt/pro/__init__.py

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

{bitget-0.0.83 → bitget-0.0.84}/src/bitget/ccxt/pro/bitget.py

@@ -71,6 +71,7 @@ class bitget(bitgetAsync):
                 # WS timeframes differ from REST timeframes
                 'timeframes': {
                     '1m': '1m',
+                    '3m': '3m',
                     '5m': '5m',
                     '15m': '15m',
                     '30m': '30m',
@@ -484,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()
@@ -497,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, False, 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)
@@ -516,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):
         #
@@ -562,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)
@@ -582,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:
@@ -598,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:
@@ -647,12 +732,21 @@ class bitget(bitgetAsync):
         market = self.market(symbol)
         messageHash = 'unsubscribe:' + messageHashTopic + ':' + market['symbol']
         instType = None
-        instType, params = self.get_inst_type(market, False, 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:
@@ -2002,6 +2096,18 @@ class bitget(bitgetAsync):
         #         "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')
@@ -2034,6 +2140,7 @@ 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_2(arg, 'channel', 'topic', '')
@@ -2131,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]
@@ -2183,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