unicex 0.16.4__py3-none-any.whl → 0.16.6__py3-none-any.whl

unicex/_abc/uni_websocket_manager.py

@@ -8,6 +8,7 @@ from loguru import logger as _logger
 
 from unicex._base import BaseClient, Websocket
 from unicex.enums import Timeframe
+from unicex.exceptions import AdapterError
 from unicex.types import LoggerLike
 
 from .uni_client import IUniClient
@@ -41,6 +42,13 @@ class IUniWebsocketManager(ABC):
             try:
                 adapted = adapter_func(raw_msg)
             except Exception as e:
+                if isinstance(e, AdapterError):
+                    try:
+                        if self._is_service_message(raw_msg):
+                            return
+                    except Exception as err:
+                        self._logger.error(f"Failed to handle adapter error: {e}")
+                        raise err from e
                 self._logger.warning(f"Failed to adapt message: {e}")
                 return
             if isinstance(adapted, list):
@@ -51,6 +59,13 @@ class IUniWebsocketManager(ABC):
 
         return _wrapper
 
+    def _is_service_message(self, raw_msg: Any) -> bool:
+        """Дополнительно обрабатывает ошибку адаптации сообщения на случай, если это сервисное сообщение, например `ping` или `subscribe`.
+
+        Переопределяется в каждом наследнике в связи с разным форматом входящих данных.
+        """
+        return False
+
     @overload
     def klines(
         self,

unicex/_base/websocket.py

@@ -103,6 +103,11 @@ class Websocket:
         await asyncio.sleep(self._reconnect_timeout)
         await self.start()
 
+    @property
+    def running(self) -> bool:
+        """Возвращает статус вебсокета."""
+        return self._running
+
     async def _connect(self) -> None:
         """Подключается к вебсокету и настраивает соединение."""
         self._logger.debug(f"Establishing connection with {self._url}")

unicex/bybit/uni_websocket_manager.py

@@ -36,6 +36,12 @@ class UniWebsocketManager(IUniWebsocketManager):
         self._websocket_manager = WebsocketManager(self._client, **ws_kwargs)  # type: ignore
         self._adapter = Adapter()
 
+    def _is_service_message(self, raw_msg: Any) -> bool:
+        """Дополнительно обрабатывает ошибку адаптации сообщения с вебсокета Bybit."""
+        if raw_msg.get("op") == "subscribe":
+            return True
+        return False
+
     @overload
     def klines(
         self,

{unicex-0.16.4.dist-info → unicex-0.16.6.dist-info}/METADATA

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

{unicex-0.16.4.dist-info → unicex-0.16.6.dist-info}/RECORD

@@ -8,10 +8,10 @@ unicex/utils.py,sha256=1iK-ifZ-hUaU4Z-YCLoZsjAZREfJO7amYsjzG70JEk8,9963
 unicex/_abc/__init__.py,sha256=fxZjNFJFeFwWTXz8iSDe7eCWwE6xfFwFwAuG6l-TI8A,289
 unicex/_abc/exchange_info.py,sha256=TP_theOj1JS3Dcx5hqGT1yma1Jed776N4okOKXB7ePw,9537
 unicex/_abc/uni_client.py,sha256=-kFVA2W2Nm50ZbTzxzrRqbh_To3vSrPNE9IxdfxCCVI,14946
-unicex/_abc/uni_websocket_manager.py,sha256=ojAsQFViX6UjREQOg6aSvvw9pHLFhN4T-gorplODlFw,9882
+unicex/_abc/uni_websocket_manager.py,sha256=fhZh2e2EDnt7YejCa0Uk3oqmg0OOcL8Kp5Ts0F9tpco,10744
 unicex/_base/__init__.py,sha256=0TmevATGnRB3qow6tkCR8dQKNZCWKeib6YQjNJ4a1b0,236
 unicex/_base/client.py,sha256=GuWfNNO6jVLAN-YUNKLmd-W5AfRelJIgKUe7vIQ12Qk,9318
-unicex/_base/websocket.py,sha256=J_okxWq1CiDqU64_GlcwE7Vgq8LZKsSRYpCoXVazJGk,13279
+unicex/_base/websocket.py,sha256=F6fwFeDkn6GLI0IC0g_SNOrfCJw4RR3Uqo8JMWkCApc,13422
 unicex/binance/__init__.py,sha256=sDk4ZjakRdpFMaMSpOCfqjf6ZPfAS9tlrt4WlDHtDkw,932
 unicex/binance/adapter.py,sha256=adRi2XxF-VyU0nmjgigx6I1MiQHHtsGPtSxzx3_bX9I,8220
 unicex/binance/client.py,sha256=LXHZJpX7HpaUTlQcjuGEjm3qin4mczemJnCay1LncZo,62444
@@ -41,7 +41,7 @@ unicex/bybit/adapter.py,sha256=yxdcn9wLcwQClnEL2kTHoPPkGiEDBNgeQ3J5qFHqcng,8174
 unicex/bybit/client.py,sha256=TB69fwMgvmKmkTFcO9Wf8S_Fe4JJGOM_208AlL4Dh8A,61673
 unicex/bybit/exchange_info.py,sha256=S5IrN5c-jW0QbuO4LGH5rluO6qo7ib-wL-8LJWNOZgI,2422
 unicex/bybit/uni_client.py,sha256=0wmIRRgofuJXWvZMB1gHwuIEfoWuPhLJXthmK1f9w40,8382
-unicex/bybit/uni_websocket_manager.py,sha256=wRiaB42RliHmqR6ek3CJw69u7MgZ2qifyLCSya_PA3w,11737
+unicex/bybit/uni_websocket_manager.py,sha256=6Stzcr1ii97zLhE7Jam1254VNsUwNFmtfv2u6XKPLG4,12031
 unicex/bybit/user_websocket.py,sha256=IGGEnwyWs5jOppgK_R7SisBDvsiF1_piTswBrdQOgDg,128
 unicex/bybit/websocket_manager.py,sha256=SYe2gGoPZvhasCehR7K2DOw_2nbewauF3BBIKYN88FQ,14463
 unicex/gate/__init__.py,sha256=dsKvhQhDcw4_w0S4c9IjKkCoOg4DCUtSecEUOlfstug,929
@@ -102,8 +102,8 @@ unicex/okx/uni_client.py,sha256=E_Wod0JSGt1K6k1mAIWnOv350pELbv-nic7g1KgOuos,8694
 unicex/okx/uni_websocket_manager.py,sha256=wrROl5RmxCJC8o_k6mc1UufbNsOKTRhIFqq5yinXUBQ,11626
 unicex/okx/user_websocket.py,sha256=8c9kpm-xVa729pW93OKUGLHaE9MY0uzEpjIgNIFRF80,126
 unicex/okx/websocket_manager.py,sha256=3sXjN0BJGyj2aK05J4WJ_-hhwaSX9PvzhaZri86OlZg,25038
-unicex-0.16.4.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.16.4.dist-info/METADATA,sha256=QJmZcuFhoiz3LQtIvSApwEL0scuIdbOVFvte9iGBafQ,11972
-unicex-0.16.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.16.4.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.16.4.dist-info/RECORD,,
+unicex-0.16.6.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.16.6.dist-info/METADATA,sha256=rYx7QJeKoxUGOqAOOgK774-_Vl9rQW8LC672G-5Imgs,11972
+unicex-0.16.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.16.6.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.16.6.dist-info/RECORD,,