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

unicex/_base/websocket.py

@@ -199,13 +199,12 @@ class Websocket:
             try:
                 data = await self._queue.get()  # Получаем сообщение
                 await self._callback(data)  # Передаем в callback
+                self._queue.task_done()
             except asyncio.exceptions.CancelledError:
                 break
             except Exception as e:
                 self._logger.error(f"Error({type(e)}) while processing message: {e}")
 
-            self._queue.task_done()
-
     def _generate_ws_kwargs(self) -> dict:
         """Генерирует аргументы для запуска вебсокета."""
         ws_kwargs = {}

unicex/bybit/adapter.py

@@ -1,5 +1,6 @@
 __all__ = ["Adapter"]
 
+from typing import Any
 
 from unicex.types import (
     KlineDict,
@@ -7,6 +8,7 @@ from unicex.types import (
     OpenInterestItem,
     TickerDailyDict,
     TickerDailyItem,
+    TradeDict,
 )
 from unicex.utils import catch_adapter_errors, decorate_all_methods
 
@@ -125,3 +127,28 @@ class Adapter:
                 key=lambda x: int(x[0]),
             )
         ]
+
+    @staticmethod
+    def Klines_message(raw_msg: Any) -> list[KlineDict]:
+        symbol = raw_msg["topic"].split(".")[-1]
+        return [
+            KlineDict(
+                s=symbol,
+                t=kline["start"],
+                o=float(kline["open"]),
+                h=float(kline["high"]),
+                l=float(kline["low"]),
+                c=float(kline["close"]),
+                v=float(kline["volume"]),
+                q=float(kline["turnover"]),
+                T=kline["end"],
+                x=kline["confirm"],
+            )
+            for kline in raw_msg["data"]
+        ]
+
+    @staticmethod
+    def aggtrades_message(raw_msg: Any) -> list[TradeDict]: ...
+
+    @staticmethod
+    def trades_message(raw_msg: Any) -> list[TradeDict]: ...

unicex/bybit/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, Timeframe
 from unicex.types import LoggerLike
 
 from .adapter import Adapter
@@ -72,7 +72,13 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета для управления соединением.
         """
-        raise NotImplementedError()
+        return self._websocket_manager.klines(
+            callback=self._make_wrapper(self._adapter.Klines_message, callback),
+            category="spot",
+            interval=timeframe.to_exchange_format(Exchange.BYBIT),  # type: ignore
+            symbol=symbol,
+            symbols=symbols,
+        )
 
     @overload
     def futures_klines(
@@ -114,7 +120,13 @@ class UniWebsocketManager(IUniWebsocketManager):
         Возвращает:
             `Websocket`: Экземпляр вебсокета.
         """
-        raise NotImplementedError()
+        return self._websocket_manager.klines(
+            callback=self._make_wrapper(self._adapter.Klines_message, callback),
+            category="linear",
+            interval=timeframe.to_exchange_format(Exchange.BYBIT),  # type: ignore
+            symbol=symbol,
+            symbols=symbols,
+        )
 
     @overload
     def trades(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unicex
-Version: 0.10.2
+Version: 0.10.3
 Summary: Unified Crypto Exchange API 
 Author-email: LoveBloodAndDiamonds <ayazshakirzyanov27@gmail.com>
 License: BSD 3-Clause License

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

@@ -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=aE68PzgiFWmqteBGDEImEe0g5ig1eAaxHhEO_bbD8gc,11279
+unicex/_base/websocket.py,sha256=6dFGFFspHfMGtmQtuCZHrfWFHWIWVs2l9Lim_XJJyZE,11282
 unicex/binance/__init__.py,sha256=sDk4ZjakRdpFMaMSpOCfqjf6ZPfAS9tlrt4WlDHtDkw,932
 unicex/binance/adapter.py,sha256=JbUFyjnDAFtyuYYrh90YeOvQOZQ6faim0nWS6U0NxXw,8799
 unicex/binance/client.py,sha256=1qPx0uRT4prC6saLBQ55pXDWcWTCKhYEwVIysiihPgU,60984
@@ -29,11 +29,11 @@ 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=ZgsH8jyR-fbMHSTJO6e4stT-7l5MszGuZqMJIAEOnXY,5203
+unicex/bybit/adapter.py,sha256=DkQwm28Ujyw04Ppgl-Itck-J73J0AIx7NOGsYH4M_TI,6008
 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=JQgZ_rl5qe30BOOMtzUYY2ZaAeQ-gYZj3HixQ1DiSpg,9328
+unicex/bybit/uni_websocket_manager.py,sha256=1Y0m0ulH7W-18pSl0smlX2lXIeegy9FFqzrActCgZR0,9880
 unicex/bybit/user_websocket.py,sha256=IGGEnwyWs5jOppgK_R7SisBDvsiF1_piTswBrdQOgDg,128
 unicex/bybit/websocket_manager.py,sha256=ZBSwa_nXFvXoq2MoxE7llCYeKGyPdrXDOZXoyxbROt4,15412
 unicex/gateio/__init__.py,sha256=dsKvhQhDcw4_w0S4c9IjKkCoOg4DCUtSecEUOlfstug,929
@@ -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.2.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.10.2.dist-info/METADATA,sha256=CQGI1PQSqsc4s0FZESmt6tcOWs8xhIgirUux3YFqMyo,9146
-unicex-0.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.10.2.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.10.2.dist-info/RECORD,,
+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,,