unicex 0.14.2__py3-none-any.whl → 0.14.7__py3-none-any.whl

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,4 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        return self.futures_trades(callback=callback, symbol=symbol, symbols=symbols)  # type: ignore

unicex/enums.py

@@ -176,6 +176,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",

unicex/gate/client.py

@@ -8,7 +8,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
 
 
@@ -328,8 +328,8 @@ class Client(BaseClient):
     async def cross_liquidate_orders(
         self,
         currency_pair: str,
-        amount: str,
-        price: str,
+        amount: NumberLike,
+        price: NumberLike,
         text: str | None = None,
         action_mode: str | None = None,
     ) -> dict:
@@ -353,11 +353,11 @@ class Client(BaseClient):
         self,
         currency_pair: str,
         side: str,
-        amount: str,
+        amount: NumberLike,
         text: str | None = None,
         type: str | None = None,
         account: str | None = None,
-        price: str | None = None,
+        price: NumberLike | None = None,
         time_in_force: str | None = None,
         iceberg: str | None = None,
         auto_borrow: bool | None = None,
@@ -479,8 +479,8 @@ class Client(BaseClient):
         order_id: str,
         currency_pair: str | None = None,
         account: str | None = None,
-        amount: str | None = None,
-        price: str | None = None,
+        amount: NumberLike | None = None,
+        price: NumberLike | None = None,
         amend_text: str | None = None,
         action_mode: str | None = None,
     ) -> dict:
@@ -1344,8 +1344,8 @@ class Client(BaseClient):
         self,
         settle: str,
         order_id: str,
-        size: int | None = None,
-        price: str | None = None,
+        size: NumberLike | None = None,
+        price: NumberLike | None = None,
         amend_text: str | None = None,
         text: str | None = None,
     ) -> dict:

unicex/gate/uni_client.py

@@ -173,8 +173,7 @@ class UniClient(IUniClient[Client]):
         raw_data = await self._client.futures_tickers(settle="usdt", contract=symbol)
         items = raw_data if isinstance(raw_data, list) else [raw_data]
         adapted_data = Adapter.funding_rate(raw_data=items)  # type: ignore[reportArgumentType]
-        if symbol:
-            return adapted_data[symbol]
+        return adapted_data[symbol] if symbol else adapted_data
         return adapted_data
 
     @overload

unicex/gate/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`): Клиент Gateio или унифицированный клиент. Нужен для подключения к приватным топикам.
             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

unicex/hyperliquid/client.py

@@ -13,7 +13,7 @@ from eth_utils.crypto import keccak
 
 from unicex._base import BaseClient
 from unicex.exceptions import NotAuthorized
-from unicex.types import LoggerLike
+from unicex.types import LoggerLike, NumberLike
 from unicex.utils import filter_params
 
 # Authentication
@@ -1184,11 +1184,11 @@ class Client(BaseClient):
         self,
         asset: int,
         is_buy: bool,
-        size: str,
+        size: NumberLike,
         reduce_only: bool,
         order_type: Literal["limit", "trigger"],
         order_body: dict,
-        price: str | None = None,
+        price: NumberLike | None = None,
         client_order_id: str | None = None,
         grouping: Literal["na", "normalTpsl", "positionTpsl"] = "na",
         builder_address: str | None = None,
@@ -1478,8 +1478,8 @@ class Client(BaseClient):
         order_id: int | str,
         asset: int,
         is_buy: bool,
-        price: str | float,
-        size: str | float,
+        price: NumberLike,
+        size: NumberLike,
         reduce_only: bool,
         order_type: Literal["limit", "trigger"],
         order_body: dict[str, Any],
@@ -1668,7 +1668,7 @@ class Client(BaseClient):
         hyperliquid_chain: Literal["Mainnet", "Testnet"],
         signature_chain_id: str,
         destination: str,
-        amount: str,
+        amount: NumberLike,
         time_ms: int,
         nonce: int | None = None,
     ) -> dict:
@@ -1711,7 +1711,7 @@ class Client(BaseClient):
         signature_chain_id: str,
         destination: str,
         token: str,
-        amount: str,
+        amount: NumberLike,
         time_ms: int,
         nonce: int | None = None,
     ) -> dict:
@@ -1753,7 +1753,7 @@ class Client(BaseClient):
         self,
         hyperliquid_chain: Literal["Mainnet", "Testnet"],
         signature_chain_id: str,
-        amount: str,
+        amount: NumberLike,
         time_ms: int,
         destination: str,
         nonce: int | None = None,
@@ -1795,7 +1795,7 @@ class Client(BaseClient):
         self,
         hyperliquid_chain: Literal["Mainnet", "Testnet"],
         signature_chain_id: str,
-        amount: str,
+        amount: NumberLike,
         to_perp: bool,
         subaccount: str | None = None,
     ) -> dict:
@@ -1845,7 +1845,7 @@ class Client(BaseClient):
         source_dex: str,
         destination_dex: str,
         token: str,
-        amount: str,
+        amount: NumberLike,
         from_subaccount: str,
         nonce_value: int,
         nonce: int | None = None,
@@ -2015,7 +2015,7 @@ class Client(BaseClient):
         self,
         vault_address: str,
         is_deposit: bool,
-        usd: int,
+        usd: NumberLike,
         nonce: int | None = None,
         expires_after: int | None = None,
         signing_vault_address: str | None = None,
@@ -2147,7 +2147,7 @@ class Client(BaseClient):
         self,
         asset: int,
         is_buy: bool,
-        size: str | float,
+        size: NumberLike,
         reduce_only: bool,
         minutes: int,
         randomize: bool,

unicex/hyperliquid/uni_client.py

@@ -1,6 +1,5 @@
 __all__ = ["UniClient"]
 
-import time
 from typing import Self, overload
 
 import aiohttp
@@ -217,15 +216,14 @@ class UniClient(IUniClient[Client]):
             list[KlineDict]: Список свечей для тикера.
         """
         if not limit and not all([start_time, end_time]):
-            raise ValueError("limit and (start_time and end_time) must be provided")
+            raise ValueError("limit or (start_time and end_time) must be provided")
 
         if limit:  # Перезаписываем start_time и end_time если указан limit, т.к. по умолчанию HyperLiquid не принимают этот параметр
             if not isinstance(interval, Timeframe):
                 raise ValueError("interval must be a Timeframe if limit param provided")
-            end_time = int(time.time() * 1000)
-            start_time = end_time - (limit * interval.to_seconds * 1000)  # type: ignore[reportOptionalOperand]
+            start_time, end_time = self.limit_to_start_and_end_time(interval, limit)
         interval = (
-            interval.to_exchange_format(Exchange.HYPERLIQUID, MarketType.SPOT)
+            interval.to_exchange_format(Exchange.HYPERLIQUID)
             if isinstance(interval, Timeframe)
             else interval
         )
@@ -263,8 +261,7 @@ class UniClient(IUniClient[Client]):
         if limit:  # Перезаписываем start_time и end_time если указан limit, т.к. по умолчанию HyperLiquid не принимают этот параметр
             if not isinstance(interval, Timeframe):
                 raise ValueError("interval must be a Timeframe if limit param provided")
-            end_time = int(time.time() * 1000)
-            start_time = end_time - (limit * interval.to_seconds * 1000)  # type: ignore[reportOptionalOperand]
+            start_time, end_time = self.limit_to_start_and_end_time(interval, limit)
         interval = (
             interval.to_exchange_format(Exchange.HYPERLIQUID, MarketType.FUTURES)
             if isinstance(interval, Timeframe)

unicex/hyperliquid/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`): Клиент Hyperliquid или унифицированный клиент. Нужен для подключения к приватным топикам.
             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

unicex/kucoin/adapter.py

@@ -2,7 +2,13 @@ __all__ = ["Adapter"]
 
 from typing import Any
 
-from unicex.types import OpenInterestDict, OpenInterestItem, TickerDailyDict, TickerDailyItem
+from unicex.types import (
+    KlineDict,
+    OpenInterestDict,
+    OpenInterestItem,
+    TickerDailyDict,
+    TickerDailyItem,
+)
 from unicex.utils import catch_adapter_errors, decorate_all_methods
 
 from .exchange_info import ExchangeInfo
@@ -16,6 +22,23 @@ class Adapter:
     def tickers(raw_data: dict, only_usdt: bool) -> list[str]:
         """Преобразует сырой ответ, в котором содержатся данные о тикерах в список тикеров.
 
+        Параметры:
+            raw_data (dict): Сырой ответ с биржи.
+            only_usdt (bool): Флаг, указывающий, нужно ли включать только тикеры в паре к USDT.
+
+        Возвращает:
+            list[str]: Список тикеров.
+        """
+        return [
+            item["symbol"]
+            for item in raw_data["data"]["list"]
+            if item["symbol"].endswith("USDT") or not only_usdt
+        ]
+
+    @staticmethod
+    def futures_tickers(raw_data: dict, only_usdt: bool) -> list[str]:
+        """Преобразует сырой ответ, в котором содержатся данные о тикерах в список тикеров.
+
         Параметры:
             raw_data (dict): Сырой ответ с биржи.
             only_usdt (bool): Флаг, указывающий, нужно ли включать только тикеры в паре к USDT.
@@ -39,18 +62,39 @@ class Adapter:
         Возвращает:
             TickerDailyDict: Словарь, где ключ - тикер, а значение - статистика за последние 24 часа.
         """
-        return {
-            item["symbol"]: TickerDailyItem(
-                p=(
-                    round((float(item["lastPrice"]) / float(item["open"]) - 1) * 100, 2)
-                    if float(item["open"]) != 0
-                    else 0.0
-                ),
-                v=float(item["baseVolume"]),
-                q=float(item["quoteVolume"]),
+
+        def safe_float(value: object, default: float = 0.0) -> float:
+            try:
+                if value is None:
+                    return default
+                return float(value)  # type: ignore
+            except (TypeError, ValueError):
+                return default
+
+        result: dict[str, TickerDailyItem] = {}
+
+        for item in raw_data["data"]["list"]:
+            symbol = item.get("symbol")
+            if not symbol:
+                continue
+
+            last_price = safe_float(item.get("lastPrice"))
+            open_price = safe_float(item.get("open"))
+            base_volume = safe_float(item.get("baseVolume"))
+            quote_volume = safe_float(item.get("quoteVolume"))
+
+            if open_price > 0:
+                p = round((last_price / open_price - 1) * 100, 2)
+            else:
+                p = 0.0
+
+            result[symbol] = TickerDailyItem(
+                p=p,
+                v=base_volume,
+                q=quote_volume,
             )
-            for item in raw_data["data"]["list"]
-        }
+
+        return result
 
     @staticmethod
     def last_price(raw_data: dict) -> dict[str, float]:
@@ -62,7 +106,11 @@ class Adapter:
         Возвращает:
             dict[str, float]: Словарь, где ключ - тикер, а значение - последняя цена.
         """
-        return {item["symbol"]: float(item["lastPrice"]) for item in raw_data["data"]["list"]}
+        return {
+            item["symbol"]: float(item["lastPrice"])
+            for item in raw_data["data"]["list"]
+            if item["lastPrice"]
+        }
 
     @staticmethod
     def open_interest(raw_data: dict[str, Any]) -> OpenInterestDict:
@@ -82,6 +130,24 @@ class Adapter:
             for item in raw_data["data"]
         }
 
+    @staticmethod
+    def funding_rate(raw_data: dict) -> dict[str, float]:
+        """Преобразует историю ставок финансирования в унифицированный формат.
+
+        Параметры:
+            raw_data (dict): Сырой ответ с биржи.
+
+        Возвращает:
+            dict[str, float]: Словарь, где ключ - тикер, а значение - актуальная ставка финансирования.
+        """
+        symbol = raw_data["data"]["symbol"]
+        history = raw_data["data"]["list"]
+        if not history:
+            return {}
+
+        last_point = max(history, key=lambda item: int(item["ts"]))
+        return {symbol: float(last_point["fundingRate"]) * 100}
+
     @staticmethod
     def _get_contract_size(symbol: str) -> float:
         """Возвращает размер контракта для указанного символа тикера."""
@@ -89,3 +155,32 @@ class Adapter:
             return ExchangeInfo.get_futures_ticker_info(symbol)["contract_size"] or 1
         except:  # noqa
             return 1
+
+    @staticmethod
+    def klines(raw_data: dict, symbol: str) -> list[KlineDict]:
+        """Преобразует данные о свечах в унифицированный формат.
+
+        Параметры:
+            raw_data (dict): Сырой ответ с биржи.
+            symbol (str): Символ тикера.
+
+        Возвращает:
+            list[KlineDict]: Список свечей.
+        """
+        klines: list[KlineDict] = []
+        for item in sorted(raw_data["data"]["list"], key=lambda x: int(float(x[0]))):
+            klines.append(  # noqa: PERF401
+                KlineDict(
+                    s=symbol,
+                    t=item[0],
+                    o=float(item[1]),
+                    h=float(item[3]),
+                    l=float(item[4]),
+                    c=float(item[2]),
+                    v=float(item[5]),
+                    q=float(item[6]),
+                    T=None,
+                    x=None,
+                )
+            )
+        return klines

unicex/kucoin/client.py

@@ -4,6 +4,8 @@ __all__ = ["Client"]
 from typing import Any, Literal
 
 from unicex._base import BaseClient
+from unicex.types import RequestMethod
+from unicex.utils import filter_params
 
 
 class Client(BaseClient):
@@ -12,6 +14,36 @@ class Client(BaseClient):
     _BASE_URL: str = "https://api.kucoin.com"
     """Базовый URL для запросов."""
 
+    async def _make_request(
+        self,
+        method: RequestMethod,
+        endpoint: str,
+        *,
+        params: dict[str, Any] | None = None,
+    ) -> dict[str, Any]:
+        """Выполняет HTTP-запрос к эндпоинтам Kucoin API.
+
+        Параметры:
+            method (str): HTTP метод запроса ("GET", "POST", "DELETE" и т.д.).
+            endpoint (str): URL эндпоинта Kucoin API.
+            params (dict | None): Параметры запроса.
+
+        Возвращает:
+            dict: Ответ в формате JSON.
+        """
+        # Составляем URL для запроса
+        url = self._BASE_URL + endpoint
+
+        # Фильтруем параметры от None значений
+        params = filter_params(params) if params else {}
+
+        # Выполняем запрос
+        return await super()._make_request(
+            method=method,
+            url=url,
+            params=params,
+        )
+
     async def symbol(
         self,
         trade_type: Literal["SPOT", "FUTURES", "ISOLATED", "CROSS"],
@@ -21,12 +53,9 @@ class Client(BaseClient):
 
         https://www.kucoin.com/docs-new/rest/ua/get-symbol
         """
-        url = self._BASE_URL + "/api/ua/v1/market/instrument"
-        params = {"tradeType": trade_type}
-        if symbol:
-            params["symbol"] = symbol
+        params = {"tradeType": trade_type, "symbol": symbol}
 
-        return await self._make_request("GET", url, params=params)
+        return await self._make_request("GET", "/api/ua/v1/market/instrument", params=params)
 
     async def ticker(
         self,
@@ -37,18 +66,57 @@ class Client(BaseClient):
 
         https://www.kucoin.com/docs-new/rest/ua/get-ticker
         """
-        url = self._BASE_URL + "/api/ua/v1/market/ticker"
-        params = {"tradeType": trade_type}
-        if symbol:
-            params["symbol"] = symbol
+        params = {"tradeType": trade_type, "symbol": symbol}
 
-        return await self._make_request("GET", url, params=params)
+        return await self._make_request("GET", "/api/ua/v1/market/ticker", params=params)
 
     async def open_interest(self) -> dict[str, Any]:
         """Получение открытого интереса.
 
         https://www.kucoin.com/docs-new/3476287e0
         """
-        url = self._BASE_URL + "/api/ua/v1/market/open-interest"
+        return await self._make_request("GET", "/api/ua/v1/market/open-interest")
+
+    async def kline(
+        self,
+        trade_type: Literal["SPOT", "FUTURES"],
+        symbol: str,
+        interval: str,
+        start_at: int | None = None,
+        end_at: int | None = None,
+    ) -> dict[str, Any]:
+        """Получение списка свечей.
+
+        https://www.kucoin.com/docs-new/rest/ua/get-klines
+        """
+        params = {
+            "tradeType": trade_type,
+            "symbol": symbol,
+            "interval": interval,
+            "startAt": start_at,
+            "endAt": end_at,
+        }
+
+        return await self._make_request("GET", "/api/ua/v1/market/kline", params=params)
+
+    async def funding_rate_history(
+        self,
+        symbol: str,
+        start_at: int,
+        end_at: int,
+    ) -> dict[str, Any]:
+        """Получение истории ставок финансирования.
+
+        https://www.kucoin.com/docs-new/rest/ua/get-history-funding-rate
+        """
+        params = {
+            "symbol": symbol,
+            "startAt": start_at,
+            "endAt": end_at,
+        }
 
-        return await self._make_request("GET", url)
+        return await self._make_request(
+            "GET",
+            "/api/ua/v1/market/funding-rate-history",
+            params=params,
+        )

unicex/kucoin/exchange_info.py

@@ -22,9 +22,9 @@ class ExchangeInfo(IExchangeInfo):
         for el in exchange_info["data"]["list"]:
             tickers_info[el["symbol"]] = TickerInfoItem(
                 tick_precision=None,
-                tick_step=None,
+                tick_step=float(el["tickSize"]),
                 size_precision=None,
-                size_step=None,
+                size_step=float(el["baseOrderStep"]),
                 contract_size=1,
             )
 
@@ -36,12 +36,15 @@ class ExchangeInfo(IExchangeInfo):
         tickers_info = {}
         exchange_info = await Client(session).symbol("FUTURES")
         for el in exchange_info["data"]["list"]:
-            tickers_info[el["symbol"]] = TickerInfoItem(
-                tick_precision=None,
-                tick_step=None,
-                size_precision=None,
-                size_step=None,
-                contract_size=float(el["unitSize"]),
-            )
+            try:
+                tickers_info[el["symbol"]] = TickerInfoItem(
+                    tick_precision=None,
+                    tick_step=float(el["tickSize"]),
+                    size_precision=None,
+                    size_step=float(el["lotSize"]),
+                    contract_size=float(el["unitSize"]),
+                )
+            except Exception as e:
+                cls._logger.error(f"Error loading ticker info for {el}: {e}")
 
         cls._futures_tickers_info = tickers_info