unicex 0.10.3__py3-none-any.whl → 0.11.0__py3-none-any.whl

unicex/__init__.py

@@ -26,6 +26,7 @@ __all__ = [
     "OpenInterestItem",
     "TickerInfoItem",
     "TickersInfoDict",
+    "LiquidationDict",
     # Interfaces
     "IUniClient",
     "IUniWebsocketManager",
@@ -93,7 +94,21 @@ from ._base import BaseClient, Websocket
 # enums, mappers, types
 from .enums import Exchange, MarketType, Side, Timeframe
 from .mapper import get_uni_client, get_uni_websocket_manager, get_exchange_info
-from .types import *
+from .types import (
+    TickerDailyDict,
+    TickerDailyItem,
+    KlineDict,
+    TradeDict,
+    AggTradeDict,
+    RequestMethod,
+    LoggerLike,
+    AccountType,
+    OpenInterestDict,
+    OpenInterestItem,
+    TickerInfoItem,
+    TickersInfoDict,
+    LiquidationDict,
+)
 
 # exchanges
 

unicex/_base/websocket.py

@@ -41,7 +41,7 @@ class Websocket:
         pong_message: str | Callable | None = None,
         no_message_reconnect_timeout: int | float | None = 60,
         reconnect_timeout: int | float | None = 5,
-        worker_count: int = 2,
+        worker_count: int = 1,
         logger: LoggerLike | None = None,
         decoder: type[_DecoderProtocol] = _JsonDecoder,
         **kwargs: Any,  # Не дадим сломаться, если юзер передал ненужные аргументы
@@ -238,3 +238,7 @@ class Websocket:
                 await self.restart()
                 return
             await asyncio.sleep(1)
+
+    def __repr__(self) -> str:
+        """Репрезентация вебсокета."""
+        return f"<Websocket(url={self._url[:15]}...)>"

unicex/bybit/adapter.py

@@ -4,6 +4,7 @@ from typing import Any
 
 from unicex.types import (
     KlineDict,
+    LiquidationDict,
     OpenInterestDict,
     OpenInterestItem,
     TickerDailyDict,
@@ -130,6 +131,14 @@ class Adapter:
 
     @staticmethod
     def Klines_message(raw_msg: Any) -> list[KlineDict]:
+        """Преобразует вебсокет-сообщение с данными о свечах в унифицированный формат.
+
+        Параметры:
+        raw_msg (`Any`): Сырое сообщение из вебсокета Bybit.
+
+        Возвращает:
+          `list[KlineDict]`: Список свечей в унифицированном формате.
+        """
         symbol = raw_msg["topic"].split(".")[-1]
         return [
             KlineDict(
@@ -144,11 +153,56 @@ class Adapter:
                 T=kline["end"],
                 x=kline["confirm"],
             )
-            for kline in raw_msg["data"]
+            for kline in sorted(
+                raw_msg["data"],
+                key=lambda x: int(x["start"]),
+            )
         ]
 
     @staticmethod
-    def aggtrades_message(raw_msg: Any) -> list[TradeDict]: ...
+    def trades_message(raw_msg: Any) -> list[TradeDict]:
+        """Преобразует вебсокет-сообщение с данными о сделках в унифицированный формат.
+
+        Параметры:
+        raw_msg (`Any`): Сырое сообщение из вебсокета Bybit.
+
+        Возвращает:
+          `list[TradeDict]`: Список сделок в унифицированном формате.
+        """
+        return [
+            TradeDict(
+                t=trade["T"],
+                s=trade["s"],
+                S=trade["S"].upper(),
+                p=float(trade["p"]),
+                v=float(trade["v"]),
+            )
+            for trade in sorted(
+                raw_msg["data"],
+                key=lambda x: int(x["T"]),
+            )
+        ]
 
     @staticmethod
-    def trades_message(raw_msg: Any) -> list[TradeDict]: ...
+    def liquidations_message(raw_msg: Any) -> list[LiquidationDict]:
+        """Преобразует вебсокет-сообщение с данными о ликвидациях в унифицированный формат.
+
+        Параметры:
+        raw_msg (`Any`): Сырое сообщение из вебсокета Bybit.
+
+        Возвращает:
+          `list[LiquidationDict]`: Список ликвидаций в унифицированном формате.
+        """
+        return [
+            LiquidationDict(
+                t=liquidation["T"],
+                s=liquidation["s"],
+                S=liquidation["S"].upper(),
+                v=float(liquidation["v"]),
+                p=float(liquidation["p"]),
+            )
+            for liquidation in sorted(
+                raw_msg["data"],
+                key=lambda x: int(x["T"]),
+            )
+        ]

unicex/bybit/uni_websocket_manager.py

@@ -72,7 +72,7 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета для управления соединением.
         """
-        return self._websocket_manager.klines(
+        return self._websocket_manager.kline(
             callback=self._make_wrapper(self._adapter.Klines_message, callback),
             category="spot",
             interval=timeframe.to_exchange_format(Exchange.BYBIT),  # type: ignore
@@ -120,7 +120,7 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        return self._websocket_manager.klines(
+        return self._websocket_manager.kline(
             callback=self._make_wrapper(self._adapter.Klines_message, callback),
             category="linear",
             interval=timeframe.to_exchange_format(Exchange.BYBIT),  # type: ignore
@@ -164,7 +164,12 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        return self._websocket_manager.trade(
+            callback=self._make_wrapper(self._adapter.trades_message, callback),
+            category="spot",
+            symbol=symbol,
+            symbols=symbols,
+        )
 
     @overload
     def aggtrades(
@@ -240,7 +245,12 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        return self._websocket_manager.trade(
+            callback=self._make_wrapper(self._adapter.trades_message, callback),
+            category="linear",
+            symbol=symbol,
+            symbols=symbols,
+        )
 
     @overload
     def futures_aggtrades(

unicex/bybit/websocket_manager.py

@@ -126,7 +126,7 @@ class WebsocketManager:
             **self._ws_kwargs,
         )
 
-    def klines(
+    def kline(
         self,
         callback: CallbackType,
         category: Literal["spot", "linear", "inverse", "option"],
@@ -170,7 +170,7 @@ class WebsocketManager:
             **self._ws_kwargs,
         )
 
-    def public_trade(
+    def trade(
         self,
         callback: CallbackType,
         category: Literal["spot", "linear", "inverse", "option"],

unicex/types.py

@@ -13,6 +13,7 @@ __all__ = [
     "OpenInterestItem",
     "TickerInfoItem",
     "TickersInfoDict",
+    "LiquidationDict",
 ]
 
 from logging import Logger as LoggingLogger
@@ -117,6 +118,23 @@ type OpenInterestDict = dict[str, OpenInterestItem]
 """Модель открытого интереса."""
 
 
+class LiquidationDict(TypedDict):
+    t: int
+    """Время. В миллисекундах."""
+
+    s: str
+    """Символ."""
+
+    S: Literal["BUY", "SELL"]
+    """Сторона."""
+
+    v: float
+    """Объем ликвидации. В монетах."""
+
+    p: float
+    """Цена ликвидации."""
+
+
 type AccountType = Literal["SPOT", "FUTURES"]
 """Тип аккаунта."""
 

{unicex-0.10.3.dist-info → unicex-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unicex
-Version: 0.10.3
+Version: 0.11.0
 Summary: Unified Crypto Exchange API 
 Author-email: LoveBloodAndDiamonds <ayazshakirzyanov27@gmail.com>
 License: BSD 3-Clause License
@@ -57,7 +57,7 @@ Dynamic: license-file
 |-----------------|--------|------|------------|---------|------------|----------------|--------------|
 | **Binance**     | ✓      | ✓    | ✓          | ✓       | ✓          | ✓              |              |
 | **Bitget**      | ✓      | ✓    | ✓          |         | ✓          |                |              |
-| **Bybit**       | ✓      | ✓    | ✓          |         | ✓          |                |              |
+| **Bybit**       | ✓      | ✓    | ✓          |         | ✓          | ✓              |              |
 | **Gateio**      | ✓      | ✓    | ✓          |         | ✓          |                |              |
 | **Hyperliquid** | ✓      | ✓    | ✓          | ✓       | ✓          |                |              |
 | **Mexc**        | ✓      | ✓    | ✓          |         | ✓          |                |              |

{unicex-0.10.3.dist-info → unicex-0.11.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-unicex/__init__.py,sha256=J9UDSWyAS8ozDxSWFXgN4002fqHVUb1Ol-YtafNtJgs,5533
+unicex/__init__.py,sha256=v3yO0P9GqC88cV4L-YSJ6h2YzlyOTnt1NPNLSJwhIRE,5806
 unicex/enums.py,sha256=8E_Nb57kriOif57XSLnW8joFufbthZTJ7tcExKWf1Wg,9633
 unicex/exceptions.py,sha256=r-xZzX78VuxVnI5pe99AM8FIiGcdIUDcF5CaTkQ4NE0,2213
 unicex/extra.py,sha256=MZRSsDRok05KZCqKur-hjOexZuoZ-tC9J6e-EIZr_lw,13824
 unicex/mapper.py,sha256=zOuInRQGJnSnwRI5yJ_axx-0svGn-nOqgLr7XXSlq14,4915
-unicex/types.py,sha256=NMitdbyD-_pRvR_gm2aapHU7wwL8CZCaqWFIuCAYMgA,4291
+unicex/types.py,sha256=cfuS07QVOgAhZsdME6CeY4lqO8KBBfrf_CJMN9DMB_s,4638
 unicex/utils.py,sha256=dwU1VYuP2xcMpzaETtNQerL1V8Y_JH8H8EsLJ__-M4s,8050
 unicex/_abc/__init__.py,sha256=fxZjNFJFeFwWTXz8iSDe7eCWwE6xfFwFwAuG6l-TI8A,289
 unicex/_abc/exchange_info.py,sha256=j0nbTeF9-_LwHGDZLBHYF2Dd1DYBCQ-DlUO5N5tZgEY,7541
@@ -11,7 +11,7 @@ unicex/_abc/uni_client.py,sha256=ZjxK8aqCGLUUYy1UQTM9EvWn1IXwMkH2Db8sZrs1e_I,137
 unicex/_abc/uni_websocket_manager.py,sha256=yYKypPkIe3rKfWBuTsS8rkwIPljpd1588CYDkeTOYqE,9905
 unicex/_base/__init__.py,sha256=0TmevATGnRB3qow6tkCR8dQKNZCWKeib6YQjNJ4a1b0,236
 unicex/_base/client.py,sha256=asIIQLZlRwwmUDvxveSv7aCvth54iiSRJdz19bxGorI,8904
-unicex/_base/websocket.py,sha256=6dFGFFspHfMGtmQtuCZHrfWFHWIWVs2l9Lim_XJJyZE,11282
+unicex/_base/websocket.py,sha256=7IUIO2-KyjTswK3nTkRI7uQkNq6NYS_EhaG7tJQCPeg,11430
 unicex/binance/__init__.py,sha256=sDk4ZjakRdpFMaMSpOCfqjf6ZPfAS9tlrt4WlDHtDkw,932
 unicex/binance/adapter.py,sha256=JbUFyjnDAFtyuYYrh90YeOvQOZQ6faim0nWS6U0NxXw,8799
 unicex/binance/client.py,sha256=1qPx0uRT4prC6saLBQ55pXDWcWTCKhYEwVIysiihPgU,60984
@@ -29,13 +29,13 @@ unicex/bitget/uni_websocket_manager.py,sha256=y-HXrREy_ruNeUzdRv5nHwBZQgbupxzp1U
 unicex/bitget/user_websocket.py,sha256=tlkv7Rmsw_FSfCJnEMOK_9jRsXRk2Ah_slqG8C-uhuo,129
 unicex/bitget/websocket_manager.py,sha256=2OhH2gKy2gN03oYeCFvf3_l6RA29dDOvpajGhbXI9Zw,9886
 unicex/bybit/__init__.py,sha256=SrMBh6K5zUt4JheWUpNUYNb1NCDr2ujTFv4IDguaGZI,926
-unicex/bybit/adapter.py,sha256=DkQwm28Ujyw04Ppgl-Itck-J73J0AIx7NOGsYH4M_TI,6008
+unicex/bybit/adapter.py,sha256=U6QP2eGefZqfXq7H4P1G9M23HieAjmylb5FnrHISn5s,8147
 unicex/bybit/client.py,sha256=U1mCcF-Mg2spiKlp0ucIA-kDOisYLO0edRS6XC16iNo,61014
 unicex/bybit/exchange_info.py,sha256=36WiJ49TxpSdZpeMwZdjQIkRdf2wJXahdkNxVaNjNRE,351
 unicex/bybit/uni_client.py,sha256=0wmIRRgofuJXWvZMB1gHwuIEfoWuPhLJXthmK1f9w40,8382
-unicex/bybit/uni_websocket_manager.py,sha256=1Y0m0ulH7W-18pSl0smlX2lXIeegy9FFqzrActCgZR0,9880
+unicex/bybit/uni_websocket_manager.py,sha256=OpnvWD0xZ8T_By0HZCSg3jWoZqScRATAsku4IIBqhlw,10252
 unicex/bybit/user_websocket.py,sha256=IGGEnwyWs5jOppgK_R7SisBDvsiF1_piTswBrdQOgDg,128
-unicex/bybit/websocket_manager.py,sha256=ZBSwa_nXFvXoq2MoxE7llCYeKGyPdrXDOZXoyxbROt4,15412
+unicex/bybit/websocket_manager.py,sha256=ePHvngoqoVPr6p-BayoEGhCuRK-cJ69CAPzF94qTalQ,15404
 unicex/gateio/__init__.py,sha256=dsKvhQhDcw4_w0S4c9IjKkCoOg4DCUtSecEUOlfstug,929
 unicex/gateio/adapter.py,sha256=PE5lXQORAKLhzFZBtxcarNIt2xEcDrPrphxWS0k0wEk,6842
 unicex/gateio/client.py,sha256=LS-g44vSY8FHCnDjFKzM8gIoPwWpKv15JxQIgwSietI,53732
@@ -86,8 +86,8 @@ unicex/okx/uni_client.py,sha256=E_Wod0JSGt1K6k1mAIWnOv350pELbv-nic7g1KgOuos,8694
 unicex/okx/uni_websocket_manager.py,sha256=b4f_QjA64DJmENQdIGb5IOVc7kvit7KMCdWeCmRbxGY,9326
 unicex/okx/user_websocket.py,sha256=8c9kpm-xVa729pW93OKUGLHaE9MY0uzEpjIgNIFRF80,126
 unicex/okx/websocket_manager.py,sha256=wROXTUDqKzOE-wDnCtXso_MC4SzfPuPols5aPg_Z3y4,26027
-unicex-0.10.3.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.10.3.dist-info/METADATA,sha256=VGwB7Lbj31tw3BQTvZgL5exL3kKjPHIyD72tHPmqAnM,9146
-unicex-0.10.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.10.3.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.10.3.dist-info/RECORD,,
+unicex-0.11.0.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.11.0.dist-info/METADATA,sha256=w8bEftaxRniVPd4owyacH8aW6_usW0XoFA7k8oIbxRA,9148
+unicex-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.11.0.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.11.0.dist-info/RECORD,,