unicex 0.13.5__py3-none-any.whl → 0.13.7__py3-none-any.whl

unicex/_base/websocket.py

@@ -179,18 +179,25 @@ class Websocket:
 
     async def _after_disconnect(self) -> None:
         """Вызывается после отключения от вебсокета."""
-        # Останавливаем воркеров
+        current_task = asyncio.current_task()
+
+        # Останавливаем воркеров, исключая задачу, которая уже выполняет остановку
+        tasks_to_wait: list[asyncio.Task] = []
         for task in self._tasks:
+            if task is current_task:
+                continue
+
             task.cancel()
+            tasks_to_wait.append(task)
 
         # Дожидаемся завершения задач (в т.ч. воркеров)
-        for task in self._tasks:
-            try:
-                await task
-            except asyncio.CancelledError:
-                pass
-            except Exception as e:
-                self._logger.warning(f"Worker raised during shutdown: {e}")
+        if tasks_to_wait:
+            results = await asyncio.gather(*tasks_to_wait, return_exceptions=True)
+            for task_result in results:
+                if isinstance(task_result, asyncio.CancelledError):
+                    continue
+                if isinstance(task_result, Exception):
+                    self._logger.warning(f"Worker raised during shutdown: {task_result}")
 
         self._tasks.clear()
 

unicex/hyperliquid/websocket_manager.py

@@ -99,24 +99,38 @@ class WebsocketManager:
             **self._ws_kwargs,
         )
 
-    def candle(self, callback: CallbackType, coin: str, interval: str) -> Websocket:
+    def candle(
+        self,
+        callback: CallbackType,
+        interval: str,
+        coin: str | None = None,
+        coins: list[str] | None = None,
+    ) -> Websocket:
         """Создает вебсокет для получения свечей.
 
         Параметры:
             callback (`CallbackType`): Асинхронная функция обратного вызова для обработки сообщений.
             coin (`str`): Символ монеты.
+            coins (`list[str]`): Список символов монет для мультиплекс подключения.
             interval (`str`): Интервал свечей ("1m", "3m", "5m", "15m", "30m", "1h", "2h", "4h", "8h", "12h", "1d", "3d", "1w", "1M").
 
         Возвращает:
             `Websocket`: Объект для управления вебсокет соединением.
         """
-        subscription_message = self._create_subscription_message(
-            "candle", coin=coin, interval=interval
-        )
+        if coin and coins:
+            raise ValueError("Parameters coin and coins cannot be used together")
+        if not (coin or coins):
+            raise ValueError("Either coin or coins must be provided")
+        if coin:
+            coins = [coin]
+        subscription_messages = [
+            self._create_subscription_message("candle", coin=coin, interval=interval)
+            for coin in coins  # type: ignore
+        ]
         return Websocket(
             callback=callback,
             url=self._URL,
-            subscription_messages=[subscription_message],
+            subscription_messages=subscription_messages,
             **self._ws_kwargs,
         )
 
@@ -152,21 +166,33 @@ class WebsocketManager:
             **self._ws_kwargs,
         )
 
-    def trades(self, callback: CallbackType, coin: str) -> Websocket:
+    def trades(
+        self, callback: CallbackType, coin: str | None = None, coins: list[str] | None = None
+    ) -> Websocket:
         """Создает вебсокет для получения сделок.
 
         Параметры:
             callback (`CallbackType`): Асинхронная функция обратного вызова для обработки сообщений.
-            coin (`str`): Символ монеты.
+            coin (`str | None`): Символ монеты.
+            coins (`list[str] | None`): Список символов монет для мультиплекс подключения.
 
         Возвращает:
             `Websocket`: Объект для управления вебсокет соединением.
         """
-        subscription_message = self._create_subscription_message("trades", coin=coin)
+        if coin and coins:
+            raise ValueError("Parameters coin and coins cannot be used together")
+        if not (coin or coins):
+            raise ValueError("Either coin or coins must be provided")
+        if coin:
+            coins = [coin]
+        subscription_messages = [
+            self._create_subscription_message("trades", coin=coin)
+            for coin in coins  # type: ignore
+        ]
         return Websocket(
             callback=callback,
             url=self._URL,
-            subscription_messages=[subscription_message],
+            subscription_messages=subscription_messages,
             **self._ws_kwargs,
         )
 

{unicex-0.13.5.dist-info → unicex-0.13.7.dist-info}/METADATA

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

{unicex-0.13.5.dist-info → unicex-0.13.7.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=Q7kbBEOAlPHL8S3y1KZmQghxMGq4hkjZ3ZepZqm47oA,12115
+unicex/_base/websocket.py,sha256=haSV3dSgkT352n8knpLm_iI4ZlUGWWKFCB3k5Ua2esU,12542
 unicex/binance/__init__.py,sha256=sDk4ZjakRdpFMaMSpOCfqjf6ZPfAS9tlrt4WlDHtDkw,932
 unicex/binance/adapter.py,sha256=JbUFyjnDAFtyuYYrh90YeOvQOZQ6faim0nWS6U0NxXw,8799
 unicex/binance/client.py,sha256=1qPx0uRT4prC6saLBQ55pXDWcWTCKhYEwVIysiihPgU,60984
@@ -51,7 +51,7 @@ unicex/hyperliquid/exchange_info.py,sha256=D1h1fvH9DycRq-xDTZ_-Y1NC2JCp165IyWMXs
 unicex/hyperliquid/uni_client.py,sha256=4jv2uC076PBeq-EzCKvwaEEMk_M3HpsWA6iwNepJg7E,15674
 unicex/hyperliquid/uni_websocket_manager.py,sha256=AzR_8Aq98NkCA1oc2IiH02ysMOYLaisEmcuuaafeaJw,9334
 unicex/hyperliquid/user_websocket.py,sha256=BKD9ap2bx5DwpkkwwecfOTVedrZBR9eMAITgCBgg02w,134
-unicex/hyperliquid/websocket_manager.py,sha256=GNBQT4ihk1XsTAaas8lxAfo3ASBGs_8EVrSR1_N9D-U,16820
+unicex/hyperliquid/websocket_manager.py,sha256=7z_P2I4YHJ91nfn--CX7VB2QX9A__imL4ca5Tt0Wld8,17871
 unicex/mexc/__init__.py,sha256=lltANqM_2P-fmF5j8o5-pjmORPuK6C5sVjcQhuUU_R0,923
 unicex/mexc/adapter.py,sha256=uaJ6157wTrMuf72thIggDJHiaeRVYyH0qMIn1x5Mrp8,9820
 unicex/mexc/client.py,sha256=oJSpz-8hvA1WMCN2B7oqI2lXEx1_VJLAn8jbzhW8mF0,30950
@@ -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.13.5.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.13.5.dist-info/METADATA,sha256=faWjzNhcaHx7lkzBFI-SSmH_35Dd1pGumzi87UCtMNQ,11752
-unicex-0.13.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.13.5.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.13.5.dist-info/RECORD,,
+unicex-0.13.7.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.13.7.dist-info/METADATA,sha256=s1fo3iBF1O5boIO2BF86NNvOXdhp0BAMoPO-JyzjqQA,11752
+unicex-0.13.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.13.7.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.13.7.dist-info/RECORD,,