unicex 0.13.17__py3-none-any.whl → 0.16.5__py3-none-any.whl

unicex/bitget/client.py

@@ -6,7 +6,7 @@ from typing import Any, Literal
 
 from unicex._base import BaseClient
 from unicex.exceptions import NotAuthorized
-from unicex.types import RequestMethod
+from unicex.types import NumberLike, RequestMethod
 from unicex.utils import (
     dict_to_query_string,
     filter_params,
@@ -434,18 +434,18 @@ class Client(BaseClient):
         side: str,
         order_type: str,
         force: str | None = None,
-        price: str | None = None,
-        size: str | None = None,
+        price: NumberLike | None = None,
+        size: NumberLike | None = None,
         client_oid: str | None = None,
-        trigger_price: str | None = None,
+        trigger_price: NumberLike | None = None,
         tpsl_type: str | None = None,
         request_time: str | None = None,
         receive_window: str | None = None,
         stp_mode: str | None = None,
-        preset_take_profit_price: str | None = None,
-        execute_take_profit_price: str | None = None,
-        preset_stop_loss_price: str | None = None,
-        execute_stop_loss_price: str | None = None,
+        preset_take_profit_price: NumberLike | None = None,
+        execute_take_profit_price: NumberLike | None = None,
+        preset_stop_loss_price: NumberLike | None = None,
+        execute_stop_loss_price: NumberLike | None = None,
     ) -> dict:
         """Размещение спотового ордера.
 
@@ -479,15 +479,15 @@ class Client(BaseClient):
     async def cancel_an_existing_order_and_send_a_new_order(
         self,
         symbol: str,
-        price: str,
-        size: str,
+        price: NumberLike,
+        size: NumberLike,
         order_id: str | None = None,
         client_oid: str | None = None,
         new_client_oid: str | None = None,
-        preset_take_profit_price: str | None = None,
-        execute_take_profit_price: str | None = None,
-        preset_stop_loss_price: str | None = None,
-        execute_stop_loss_price: str | None = None,
+        preset_take_profit_price: NumberLike | None = None,
+        execute_take_profit_price: NumberLike | None = None,
+        preset_stop_loss_price: NumberLike | None = None,
+        execute_stop_loss_price: NumberLike | None = None,
     ) -> dict:
         """Отмена существующего ордера и размещение нового.
 
@@ -716,11 +716,11 @@ class Client(BaseClient):
         self,
         symbol: str,
         side: str,
-        trigger_price: str,
+        trigger_price: NumberLike,
         order_type: str,
-        size: str | float,
+        size: NumberLike,
         trigger_type: str,
-        execute_price: str | None = None,
+        execute_price: NumberLike | None = None,
         plan_type: str | None = None,
         client_oid: str | None = None,
         stp_mode: str | None = None,
@@ -748,12 +748,12 @@ class Client(BaseClient):
 
     async def modify_plan_order(
         self,
-        trigger_price: str,
-        size: str | float,
+        trigger_price: NumberLike,
+        size: NumberLike,
         order_type: str,
         order_id: str | None = None,
         client_oid: str | None = None,
-        execute_price: str | None = None,
+        execute_price: NumberLike | None = None,
     ) -> dict:
         """Изменение планового ордера (trigger order).
 
@@ -950,7 +950,7 @@ class Client(BaseClient):
         self,
         from_type: str,
         to_type: str,
-        amount: str | float,
+        amount: NumberLike,
         coin: str,
         symbol: str,
         client_oid: str | None = None,
@@ -992,7 +992,7 @@ class Client(BaseClient):
         self,
         from_type: str,
         to_type: str,
-        amount: float,
+        amount: NumberLike,
         coin: str,
         symbol: str | None = None,
         client_oid: str | None = None,
@@ -1026,7 +1026,7 @@ class Client(BaseClient):
         inner_to_type: str | None = None,
         area_code: str | None = None,
         tag: str | None = None,
-        size: str | float | None = None,
+        size: NumberLike | None = None,
         remark: str | None = None,
         client_oid: str | None = None,
         member_code: str | None = None,
@@ -1480,8 +1480,8 @@ class Client(BaseClient):
         self,
         symbol: str,
         margin_coin: str,
-        open_amount: float,
-        open_price: float,
+        open_amount: NumberLike,
+        open_price: NumberLike,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
         leverage: int | None = 20,
     ) -> dict:
@@ -1575,7 +1575,7 @@ class Client(BaseClient):
         symbol: str,
         margin_coin: str,
         hold_side: str,
-        amount: str,
+        amount: NumberLike,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
     ) -> dict:
         """Добавить или уменьшить маржу для позиции (только для изолированной маржи).
@@ -1637,7 +1637,7 @@ class Client(BaseClient):
     async def futures_union_convert(
         self,
         coin: str,
-        amount: str,
+        amount: NumberLike,
     ) -> dict:
         """Конвертация активов в режиме объединенной маржи.
 
@@ -1826,19 +1826,19 @@ class Client(BaseClient):
         symbol: str,
         margin_mode: str,
         margin_coin: str,
-        size: str,
+        size: NumberLike,
         side: str,
         order_type: str,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
-        price: str | None = None,
+        price: NumberLike | None = None,
         trade_side: str | None = None,
         force: str | None = "gtc",
         client_oid: str | None = None,
         reduce_only: str | None = "NO",
-        preset_stop_surplus_price: str | None = None,
-        preset_stop_loss_price: str | None = None,
-        preset_stop_surplus_execute_price: str | None = None,
-        preset_stop_loss_execute_price: str | None = None,
+        preset_stop_surplus_price: NumberLike | None = None,
+        preset_stop_loss_price: NumberLike | None = None,
+        preset_stop_surplus_execute_price: NumberLike | None = None,
+        preset_stop_loss_execute_price: NumberLike | None = None,
         stp_mode: str | None = "none",
     ) -> dict:
         """Разместить ордер на фьючерсном рынке.
@@ -1875,7 +1875,7 @@ class Client(BaseClient):
         margin_coin: str,
         side: str,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
-        size: str | None = None,
+        size: NumberLike | None = None,
         trade_side: str | None = None,
         client_oid: str | None = None,
     ) -> dict:
@@ -1929,10 +1929,10 @@ class Client(BaseClient):
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
         order_id: str | None = None,
         client_oid: str | None = None,
-        new_size: str | None = None,
-        new_price: str | None = None,
-        new_preset_stop_surplus_price: str | None = None,
-        new_preset_stop_loss_price: str | None = None,
+        new_size: NumberLike | None = None,
+        new_price: NumberLike | None = None,
+        new_preset_stop_surplus_price: NumberLike | None = None,
+        new_preset_stop_loss_price: NumberLike | None = None,
     ) -> dict:
         """Модифицировать существующий ордер: цену, размер и/или TP/SL.
 
@@ -2212,12 +2212,12 @@ class Client(BaseClient):
         margin_coin: str,
         symbol: str,
         plan_type: str,
-        trigger_price: str,
+        trigger_price: NumberLike,
         hold_side: str,
-        size: str,
+        size: NumberLike,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
         trigger_type: str | None = None,
-        execute_price: str | None = None,
+        execute_price: NumberLike | None = None,
         range_rate: str | None = None,
         client_oid: str | None = None,
         stp_mode: str | None = None,
@@ -2251,14 +2251,14 @@ class Client(BaseClient):
         symbol: str,
         hold_side: str,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
-        stop_surplus_trigger_price: str | None = None,
-        stop_surplus_size: str | None = None,
+        stop_surplus_trigger_price: NumberLike | None = None,
+        stop_surplus_size: NumberLike | None = None,
         stop_surplus_trigger_type: str | None = None,
-        stop_surplus_execute_price: str | None = None,
-        stop_loss_trigger_price: str | None = None,
-        stop_loss_size: str | None = None,
+        stop_surplus_execute_price: NumberLike | None = None,
+        stop_loss_trigger_price: NumberLike | None = None,
+        stop_loss_size: NumberLike | None = None,
         stop_loss_trigger_type: str | None = None,
-        stop_loss_execute_price: str | None = None,
+        stop_loss_execute_price: NumberLike | None = None,
         stp_mode: str | None = None,
         stop_surplus_client_oid: str | None = None,
         stop_loss_client_oid: str | None = None,
@@ -2295,22 +2295,22 @@ class Client(BaseClient):
         symbol: str,
         margin_mode: str,
         margin_coin: str,
-        size: str,
+        size: NumberLike,
         side: str,
         order_type: str,
-        trigger_price: str,
+        trigger_price: NumberLike,
         trigger_type: str,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
         trade_side: str | None = None,
-        price: str | None = None,
+        price: NumberLike | None = None,
         callback_ratio: str | None = None,
         client_oid: str | None = None,
         reduce_only: str | None = None,
-        stop_surplus_trigger_price: str | None = None,
-        stop_surplus_execute_price: str | None = None,
+        stop_surplus_trigger_price: NumberLike | None = None,
+        stop_surplus_execute_price: NumberLike | None = None,
         stop_surplus_trigger_type: str | None = None,
-        stop_loss_trigger_price: str | None = None,
-        stop_loss_execute_price: str | None = None,
+        stop_loss_trigger_price: NumberLike | None = None,
+        stop_loss_execute_price: NumberLike | None = None,
         stop_loss_trigger_type: str | None = None,
         stp_mode: str | None = None,
     ) -> dict:
@@ -2351,13 +2351,13 @@ class Client(BaseClient):
         self,
         margin_coin: str,
         symbol: str,
-        trigger_price: str,
-        size: str,
+        trigger_price: NumberLike,
+        size: NumberLike,
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
         order_id: str | None = None,
         client_oid: str | None = None,
         trigger_type: str | None = None,
-        execute_price: str | None = None,
+        execute_price: NumberLike | None = None,
         range_rate: str | None = None,
     ) -> dict:
         """Изменить TP/SL ордер.
@@ -2386,16 +2386,16 @@ class Client(BaseClient):
         product_type: Literal["USDT-FUTURES", "USDC-FUTURES", "COIN-FUTURES"] = "USDT-FUTURES",
         order_id: str | None = None,
         client_oid: str | None = None,
-        new_size: str | None = None,
-        new_price: str | None = None,
+        new_size: NumberLike | None = None,
+        new_price: NumberLike | None = None,
         new_callback_ratio: str | None = None,
-        new_trigger_price: str | None = None,
+        new_trigger_price: NumberLike | None = None,
         new_trigger_type: str | None = None,
-        new_stop_surplus_trigger_price: str | None = None,
-        new_stop_surplus_execute_price: str | None = None,
+        new_stop_surplus_trigger_price: NumberLike | None = None,
+        new_stop_surplus_execute_price: NumberLike | None = None,
         new_stop_surplus_trigger_type: str | None = None,
-        new_stop_loss_trigger_price: str | None = None,
-        new_stop_loss_execute_price: str | None = None,
+        new_stop_loss_trigger_price: NumberLike | None = None,
+        new_stop_loss_execute_price: NumberLike | None = None,
         new_stop_loss_trigger_type: str | None = None,
     ) -> dict:
         """Изменить триггерный или трейлинг ордер, включая TP/SL.

unicex/bitget/uni_websocket_manager.py

@@ -5,7 +5,7 @@ from typing import Any, overload
 
 from unicex._abc import IUniWebsocketManager
 from unicex._base import Websocket
-from unicex.enums import Timeframe
+from unicex.enums import Exchange, MarketType, Timeframe
 from unicex.types import LoggerLike
 
 from .adapter import Adapter
@@ -20,16 +20,20 @@ class UniWebsocketManager(IUniWebsocketManager):
     """Реализация менеджера асинхронных унифицированных вебсокетов для биржи Bitget."""
 
     def __init__(
-        self, client: Client | UniClient | None = None, logger: LoggerLike | None = None
+        self,
+        client: Client | UniClient | None = None,
+        logger: LoggerLike | None = None,
+        **ws_kwargs: Any,
     ) -> None:
         """Инициализирует унифицированный менеджер вебсокетов.
 
         Параметры:
             client (`Client | UniClient | None`): Клиент Bitget или унифицированный клиент. Нужен для подключения к приватным топикам.
             logger (`LoggerLike | None`): Логгер для записи логов.
+            ws_kwargs (`dict[str, Any]`): Дополнительные параметры инициализации, которые будут переданы WebsocketManager/Websocket.
         """
         super().__init__(client=client, logger=logger)
-        self._websocket_manager = WebsocketManager(self._client)  # type: ignore
+        self._websocket_manager = WebsocketManager(self._client, **ws_kwargs)  # type: ignore
         self._adapter = Adapter()
 
     @overload
@@ -72,7 +76,17 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета для управления соединением.
         """
-        raise NotImplementedError()
+        wrapper = self._make_wrapper(self._adapter.klines_message, callback)
+        return self._websocket_manager.candlestick(
+            callback=wrapper,
+            market_type="SPOT",
+            symbol=symbol,
+            symbols=symbols,
+            interval=timeframe.to_exchange_format(
+                Exchange.BITGET,
+                MarketType.FUTURES,  # Тут пришлось поставить Futures, потому что:
+            ),  # кто бы мог подумать, что у Bitget на споте для вебсокетов и HTTP запросов совершенно разные перечисления. Тупые ублюдки.
+        )
 
     @overload
     def futures_klines(
@@ -114,7 +128,14 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        wrapper = self._make_wrapper(self._adapter.klines_message, callback)
+        return self._websocket_manager.candlestick(
+            callback=wrapper,
+            market_type="USDT-FUTURES",
+            symbol=symbol,
+            symbols=symbols,
+            interval=timeframe.to_exchange_format(Exchange.BITGET, MarketType.FUTURES),
+        )
 
     @overload
     def trades(
@@ -272,4 +293,4 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        return self.futures_trades(callback=callback, symbol=symbol, symbols=symbols)  # type: ignore[reportCallIssue]

unicex/bitget/websocket_manager.py

@@ -6,6 +6,7 @@ from collections.abc import Awaitable, Callable, Sequence
 from typing import Any, Literal
 
 from unicex._base import Websocket
+from unicex.utils import validate_single_symbol_args
 
 from .client import Client
 
@@ -46,10 +47,7 @@ class WebsocketManager:
         Возвращает:
             `str`: JSON-строка с сообщением для подписки на вебсокет.
         """
-        if symbol and symbols:
-            raise ValueError("Parameters symbol and symbols cannot be used together")
-        if not (symbol or symbols):
-            raise ValueError("Either symbol or symbols must be provided")
+        validate_single_symbol_args(symbol, symbols)
 
         tickers = [symbol] if symbol else symbols
         streams: list[dict] = [

unicex/bybit/adapter.py

@@ -68,6 +68,7 @@ class Adapter:
             item["symbol"]: OpenInterestItem(
                 t=raw_data["time"],
                 v=float(item["openInterest"]),
+                u="coins",
             )
             for item in raw_data["result"]["list"]
         }

unicex/bybit/client.py

@@ -610,7 +610,7 @@ class Client(BaseClient):
         close_on_trigger: bool | None = None,
         smp_type: str | None = None,
         mmp: bool | None = None,
-        tpsl_mode: str | None = None,
+        tpsl_mode: Literal["Full", "Partial"] | None = None,
         tp_limit_price: str | None = None,
         sl_limit_price: str | None = None,
         tp_order_type: str | None = None,
@@ -666,7 +666,7 @@ class Client(BaseClient):
         trigger_price: str | None = None,
         qty: str | None = None,
         price: str | None = None,
-        tpsl_mode: str | None = None,
+        tpsl_mode: Literal["Full", "Partial"] | None = None,
         take_profit: str | None = None,
         stop_loss: str | None = None,
         tp_trigger_by: str | None = None,
@@ -959,7 +959,7 @@ class Client(BaseClient):
         close_on_trigger: bool | None = None,
         smp_type: str | None = None,
         mmp: bool | None = None,
-        tpsl_mode: str | None = None,
+        tpsl_mode: Literal["Full", "Partial"] | None = None,
         tp_limit_price: str | None = None,
         sl_limit_price: str | None = None,
         tp_order_type: str | None = None,
@@ -1098,7 +1098,7 @@ class Client(BaseClient):
         self,
         category: Literal["linear", "inverse"],
         symbol: str,
-        tpsl_mode: str,
+        tpsl_mode: Literal["Full", "Partial"],
         position_idx: int,
         take_profit: str | None = None,
         stop_loss: str | None = None,

unicex/bybit/exchange_info.py

@@ -17,7 +17,7 @@ class ExchangeInfo(IExchangeInfo):
     @classmethod
     async def _load_spot_exchange_info(cls, session: aiohttp.ClientSession) -> None:
         """Загружает информацию о бирже для спотового рынка."""
-        exchange_info = await Client(session).instruments_info("spot")
+        exchange_info = await Client(session).instruments_info("spot", limit=1000)
         tickers_info: dict[str, TickerInfoItem] = {}
         for symbol_info in exchange_info["result"]["list"]:
             tickers_info[symbol_info["symbol"]] = TickerInfoItem(

unicex/bybit/uni_websocket_manager.py

@@ -20,16 +20,20 @@ class UniWebsocketManager(IUniWebsocketManager):
     """Реализация менеджера асинхронных унифицированных вебсокетов."""
 
     def __init__(
-        self, client: Client | UniClient | None = None, logger: LoggerLike | None = None
+        self,
+        client: Client | UniClient | None = None,
+        logger: LoggerLike | None = None,
+        **ws_kwargs: Any,
     ) -> None:
         """Инициализирует унифицированный менеджер вебсокетов.
 
         Параметры:
             client (`Client | UniClient | None`): Клиент Bybit или унифицированный клиент. Нужен для подключения к приватным топикам.
             logger (`LoggerLike | None`): Логгер для записи логов.
+            ws_kwargs (`dict[str, Any]`): Дополнительные параметры инициализации, которые будут переданы WebsocketManager/Websocket.
         """
         super().__init__(client=client, logger=logger)
-        self._websocket_manager = WebsocketManager(self._client)  # type: ignore
+        self._websocket_manager = WebsocketManager(self._client, **ws_kwargs)  # type: ignore
         self._adapter = Adapter()
 
     @overload
@@ -207,7 +211,7 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        return self.trades(callback=callback, symbol=symbol, symbols=symbols)  # type: ignore
 
     @overload
     def futures_trades(
@@ -288,4 +292,29 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        return self.futures_trades(callback=callback, symbol=symbol, symbols=symbols)  # type: ignore
+
+    def liquidations(
+        self,
+        callback: CallbackType,
+        symbol: str | None = None,
+        symbols: Sequence[str] | None = None,
+    ) -> Websocket:
+        """Открывает стрим ликвидаций (futures) с унификацией сообщений.
+
+        Параметры:
+            callback (`CallbackType`): Асинхронная функция обратного вызова для обработки сообщений.
+            symbol (`str | None`): Один символ для подписки.
+            symbols (`Sequence[str] | None`): Список символов для мультиплекс‑подключения.
+
+        Должен быть указан либо `symbol`, либо `symbols`.
+
+        Возвращает:
+            `Websocket`: Экземпляр вебсокета.
+        """
+        return self._websocket_manager.all_liquidation(
+            callback=self._make_wrapper(self._adapter.liquidations_message, callback),
+            category="linear",
+            symbol=symbol,
+            symbols=symbols,
+        )

unicex/bybit/websocket_manager.py

@@ -6,6 +6,7 @@ from collections.abc import Awaitable, Callable, Sequence
 from typing import Any, Literal
 
 from unicex._base import Websocket
+from unicex.utils import validate_single_symbol_args
 
 from .client import Client
 
@@ -108,10 +109,7 @@ class WebsocketManager:
         Возвращает:
             `Websocket`: Объект для управления вебсокет соединением.
         """
-        if symbol and symbols:
-            raise ValueError("Parameters symbol and symbols cannot be used together")
-        if not (symbol or symbols):
-            raise ValueError("Either symbol or symbols must be provided")
+        validate_single_symbol_args(symbol, symbols)
 
         tickers = [symbol] if symbol else symbols
         topics = [f"orderbook.{depth}.{ticker.upper()}" for ticker in tickers]  # type: ignore
@@ -152,10 +150,7 @@ class WebsocketManager:
         Возвращает:
             `Websocket`: Объект для управления вебсокет соединением.
         """
-        if symbol and symbols:
-            raise ValueError("Parameters symbol and symbols cannot be used together")
-        if not (symbol or symbols):
-            raise ValueError("Either symbol or symbols must be provided")
+        validate_single_symbol_args(symbol, symbols)
 
         tickers = [symbol] if symbol else symbols
         topics = [f"kline.{interval}.{ticker.upper()}" for ticker in tickers]  # type: ignore
@@ -192,10 +187,7 @@ class WebsocketManager:
         Возвращает:
             `Websocket`: Объект для управления вебсокет соединением.
         """
-        if symbol and symbols:
-            raise ValueError("Parameters symbol and symbols cannot be used together")
-        if not (symbol or symbols):
-            raise ValueError("Either symbol or symbols must be provided")
+        validate_single_symbol_args(symbol, symbols)
 
         tickers = [symbol] if symbol else symbols
         topics = [f"publicTrade.{ticker.upper()}" for ticker in tickers]  # type: ignore
@@ -232,10 +224,7 @@ class WebsocketManager:
         Возвращает:
             `Websocket`: Объект для управления вебсокет соединением.
         """
-        if symbol and symbols:
-            raise ValueError("Parameters symbol and symbols cannot be used together")
-        if not (symbol or symbols):
-            raise ValueError("Either symbol or symbols must be provided")
+        validate_single_symbol_args(symbol, symbols)
 
         tickers = [symbol] if symbol else symbols
         topics = [f"tickers.{ticker.upper()}" for ticker in tickers]  # type: ignore
@@ -280,10 +269,7 @@ class WebsocketManager:
             stacklevel=2,
         )
 
-        if symbol and symbols:
-            raise ValueError("Parameters symbol and symbols cannot be used together")
-        if not (symbol or symbols):
-            raise ValueError("Either symbol or symbols must be provided")
+        validate_single_symbol_args(symbol, symbols)
 
         tickers = [symbol] if symbol else symbols
         topics = [f"liquidation.{ticker.upper()}" for ticker in tickers]  # type: ignore
@@ -320,10 +306,7 @@ class WebsocketManager:
         Возвращает:
             `Websocket`: Объект для управления вебсокет соединением.
         """
-        if symbol and symbols:
-            raise ValueError("Parameters symbol and symbols cannot be used together")
-        if not (symbol or symbols):
-            raise ValueError("Either symbol or symbols must be provided")
+        validate_single_symbol_args(symbol, symbols)
 
         tickers = [symbol] if symbol else symbols
         topics = [f"allLiquidation.{ticker.upper()}" for ticker in tickers]  # type: ignore
@@ -335,5 +318,6 @@ class WebsocketManager:
             callback=callback,
             url=url,
             subscription_messages=subscription_messages,
+            no_message_reconnect_timeout=60 * 10,
             **self._ws_kwargs,
         )

unicex/enums.py

@@ -26,14 +26,13 @@ class Exchange(StrEnum):
 
     BINANCE = "BINANCE"
     BITGET = "BITGET"
-    BITUNIX = "BITUNIX"
     BYBIT = "BYBIT"
     GATE = "GATE"
     HYPERLIQUID = "HYPERLIQUID"
-    KCEX = "KCEX"
     MEXC = "MEXC"
     OKX = "OKX"
-    XT = "XT"
+    KUCOIN = "KUCOIN"
+    BINGX = "BINGX"
 
     def __add__(self, market_type: "MarketType") -> tuple["Exchange", "MarketType"]:
         """Возвращает кортеж из биржи и типа рынка."""
@@ -178,6 +177,23 @@ class Timeframe(StrEnum):
                 Timeframe.WEEK_1: "Week1",
                 Timeframe.MONTH_1: "Month1",
             },
+            Exchange.KUCOIN: {
+                Timeframe.MIN_1: "1min",
+                Timeframe.MIN_3: "3min",
+                Timeframe.MIN_5: "5min",
+                Timeframe.MIN_15: "15min",
+                Timeframe.MIN_30: "30min",
+                Timeframe.HOUR_1: "1hour",
+                Timeframe.HOUR_2: "2hour",
+                Timeframe.HOUR_4: "4hour",
+                Timeframe.HOUR_6: "6hour",
+                Timeframe.HOUR_8: "8hour",
+                Timeframe.HOUR_12: "12hour",
+                Timeframe.DAY_1: "1day",
+                Timeframe.DAY_3: "3day",
+                Timeframe.WEEK_1: "1week",
+                Timeframe.MONTH_1: "1month",
+            },
             Exchange.OKX: {
                 Timeframe.MIN_1: "1m",
                 Timeframe.MIN_3: "3m",