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

unicex/binance/uni_websocket_manager.py

@@ -5,7 +5,7 @@ from typing import Any
 
 from unicex._abc import IUniWebsocketManager
 from unicex._base import Websocket
-from unicex.enums import Exchange, Timeframe
+from unicex.enums import Exchange, MarketType, Timeframe
 from unicex.types import LoggerLike
 
 from .adapter import Adapter
@@ -57,7 +57,7 @@ class UniWebsocketManager(IUniWebsocketManager):
             callback=wrapper,
             symbol=symbol,
             symbols=symbols,
-            interval=timeframe.to_exchange_format(Exchange.BINANCE),  # type: ignore
+            interval=timeframe.to_exchange_format(Exchange.BINANCE, MarketType.SPOT),
         )
 
     def futures_klines(
@@ -85,7 +85,7 @@ class UniWebsocketManager(IUniWebsocketManager):
             callback=wrapper,
             symbol=symbol,
             symbols=symbols,
-            interval=timeframe.to_exchange_format(Exchange.BINANCE),  # type: ignore
+            interval=timeframe.to_exchange_format(Exchange.BINANCE, MarketType.FUTURES),
         )
 
     def trades(

unicex/bybit/client.py

@@ -7,7 +7,7 @@ from typing import Any, Literal
 from unicex._base import BaseClient
 from unicex.exceptions import NotAuthorized
 from unicex.types import RequestMethod
-from unicex.utils import filter_params, generate_hmac_sha256_signature
+from unicex.utils import dict_to_query_string, filter_params, generate_hmac_sha256_signature
 
 
 class Client(BaseClient):
@@ -35,7 +35,7 @@ class Client(BaseClient):
             headers["X-BAPI-TIMESTAMP"] = timestamp
         return headers
 
-    def _generate_signature(self, timestamp: str, payload: dict) -> str:
+    def _generate_signature(self, timestamp: str, payload: dict, method: RequestMethod) -> str:
         """Генерация подписи.
 
         Источник: https://github.com/bybit-exchange/api-usage-examples/blob/master/V5_demo/api_demo/Encryption_HMAC.py
@@ -44,9 +44,16 @@ class Client(BaseClient):
         if not self.is_authorized():
             raise NotAuthorized("Api key and api secret is required to private endpoints")
 
-        dumped_payload = json.dumps(payload)
-        prepared_query_string = timestamp + self._api_key + self._RECV_WINDOW + dumped_payload  # type: ignore[attrDefined]
-        return generate_hmac_sha256_signature(self._api_secret, prepared_query_string)  # type: ignore[attrDefined]
+        if method == "POST":
+            # timestamp+api_key+recv_window+jsonBodyString
+            dumped_payload = json.dumps(payload)
+            prepared_query_string = timestamp + self._api_key + self._RECV_WINDOW + dumped_payload  # type: ignore[attrDefined]
+            return generate_hmac_sha256_signature(self._api_secret, prepared_query_string)  # type: ignore[attrDefined]
+        else:
+            # timestamp+api_key+recv_window+queryString
+            query_string = dict_to_query_string(payload)
+            prepared_query_string = timestamp + self._api_key + self._RECV_WINDOW + query_string  # type: ignore[attrDefined]
+            return generate_hmac_sha256_signature(self._api_secret, prepared_query_string)  # type: ignore[attrDefined]
 
     async def _make_request(
         self,
@@ -94,7 +101,7 @@ class Client(BaseClient):
         payload = params
 
         # Генерируем строку для подписи
-        signature = self._generate_signature(timestamp, payload)
+        signature = self._generate_signature(timestamp, payload, method)
 
         # Генерируем заголовки (вкл. в себя подпись и апи ключ)
         headers = self._get_headers(timestamp, signature)
@@ -110,7 +117,7 @@ class Client(BaseClient):
             return await super()._make_request(
                 method=method,
                 url=url,
-                params=payload,
+                params=params,
                 headers=headers,
             )
 

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

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

{unicex-0.13.7.dist-info → unicex-0.13.9.dist-info}/RECORD

@@ -17,7 +17,7 @@ unicex/binance/adapter.py,sha256=JbUFyjnDAFtyuYYrh90YeOvQOZQ6faim0nWS6U0NxXw,879
 unicex/binance/client.py,sha256=1qPx0uRT4prC6saLBQ55pXDWcWTCKhYEwVIysiihPgU,60984
 unicex/binance/exchange_info.py,sha256=LNDkgBC5HB3JxtIBi39puqDg6LIVWqIWjT-6akDxtMs,2437
 unicex/binance/uni_client.py,sha256=W4yxiU0kkJKPJjimhv4KAWreuEBwt7GgrWXefcw5BEA,8365
-unicex/binance/uni_websocket_manager.py,sha256=FywEuUt3CiDcAQPo3ItdW2pPgbLDvVpVYFM2D_QscPU,8679
+unicex/binance/uni_websocket_manager.py,sha256=HYHs6PYOTxBqN31AuOzbzs6o4oLBsZPMccqbjJiMu_4,8696
 unicex/binance/user_websocket.py,sha256=HJ_3VZV0Bil0vfsdLrZElXm-gUqd8mGzXzfQ0_sHjFc,7861
 unicex/binance/websocket_manager.py,sha256=Idrq0Qzi14QgpIG5d77S-r1h_BvRXphcxY2BT2IOQXA,45511
 unicex/bitget/__init__.py,sha256=8govSOEyWjA62js-ZTQIiSYWSmcEUFSC9hVTpS8eosk,929
@@ -30,7 +30,7 @@ unicex/bitget/user_websocket.py,sha256=tlkv7Rmsw_FSfCJnEMOK_9jRsXRk2Ah_slqG8C-uh
 unicex/bitget/websocket_manager.py,sha256=2OhH2gKy2gN03oYeCFvf3_l6RA29dDOvpajGhbXI9Zw,9886
 unicex/bybit/__init__.py,sha256=SrMBh6K5zUt4JheWUpNUYNb1NCDr2ujTFv4IDguaGZI,926
 unicex/bybit/adapter.py,sha256=U6QP2eGefZqfXq7H4P1G9M23HieAjmylb5FnrHISn5s,8147
-unicex/bybit/client.py,sha256=U1mCcF-Mg2spiKlp0ucIA-kDOisYLO0edRS6XC16iNo,61014
+unicex/bybit/client.py,sha256=csOCEl1FhJLuCGd012TLgPvA83QDATDfx2Nu0gEQyx0,61539
 unicex/bybit/exchange_info.py,sha256=6DySi-61kyU1Wpfp7G-5Zu7G1bFfcR4qo2oO5d0YutI,2200
 unicex/bybit/uni_client.py,sha256=0wmIRRgofuJXWvZMB1gHwuIEfoWuPhLJXthmK1f9w40,8382
 unicex/bybit/uni_websocket_manager.py,sha256=OpnvWD0xZ8T_By0HZCSg3jWoZqScRATAsku4IIBqhlw,10252
@@ -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.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,,
+unicex-0.13.9.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.13.9.dist-info/METADATA,sha256=8XqWJLJgeXSuVjvYjvBcRQSWED-P0U_2xQQ725aewwA,11752
+unicex-0.13.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.13.9.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.13.9.dist-info/RECORD,,