unicex 0.13.9__tar.gz → 0.13.11__tar.gz

{unicex-0.13.9/unicex.egg-info → unicex-0.13.11}/PKG-INFO

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

{unicex-0.13.9 → unicex-0.13.11}/pyproject.toml

@@ -4,7 +4,7 @@ name = "unicex"
 # •	PATCH (x.y.Z) → увеличивается при багфиксе, который не ломает совместимость.
 # •	MINOR (x.Y.z) → увеличивается при добавлении новой функциональности, но без ломающих изменений (backward-compatible).
 # •	MAJOR (X.y.z) → увеличивается при изменениях, которые ломают обратную совместимость.
-version = "0.13.9"
+version = "0.13.11"
 
 description = "Unified Crypto Exchange API "
 readme = "README.md"

{unicex-0.13.9 → unicex-0.13.11}/unicex/binance/client.py

@@ -23,16 +23,19 @@ class Client(BaseClient):
     _RECV_WINDOW: int = 5000
     """Стандартный интервал времени для получения ответа от сервера."""
 
-    def _get_headers(self) -> dict:
+    def _get_headers(self, method: RequestMethod) -> dict:
         """Возвращает заголовки для запросов к Binance API."""
         headers = {"Accept": "application/json"}
         if self._api_key:  # type: ignore[attr-defined]
             headers["X-MBX-APIKEY"] = self._api_key  # type: ignore[attr-defined]
+        if method in ["POST", "PUT", "DELETE"]:
+            headers.update({"Content-Type": "application/x-www-form-urlencoded"})
         return headers
 
     def _prepare_payload(
         self,
         *,
+        method: RequestMethod,
         signed: bool,
         params: dict[str, Any] | None,
         data: dict[str, Any] | None,
@@ -46,6 +49,7 @@ class Client(BaseClient):
             - возвращает только отфильтрованные params/data.
 
         Параметры:
+            method (`RequestMethod`): Метод запроса.
             signed (`bool`): Нужно ли подписывать запрос.
             params (`dict | None`): Параметры для query string.
             data (`dict | None`): Параметры для тела запроса.
@@ -78,7 +82,7 @@ class Client(BaseClient):
             "hex",
         )
 
-        headers = self._get_headers()
+        headers = self._get_headers(method)
         return payload, headers
 
     async def _make_request(
@@ -108,7 +112,9 @@ class Client(BaseClient):
         Возвращает:
             `dict`: Ответ в формате JSON.
         """
-        payload, headers = self._prepare_payload(signed=signed, params=params, data=data)
+        payload, headers = self._prepare_payload(
+            method=method, signed=signed, params=params, data=data
+        )
 
         if not signed:
             return await super()._make_request(method=method, url=url, **payload)
@@ -400,7 +406,8 @@ class Client(BaseClient):
             "selfTradePreventionMode": self_trade_prevention_mode,
         }
 
-        return await self._make_request("POST", url, True, data=data)
+        # return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=data)
 
     async def order_test(
         self,
@@ -484,42 +491,69 @@ class Client(BaseClient):
         self,
         symbol: str,
         side: str,
-        quantity: float,
-        price: float,
-        stop_price: float,
-        stop_limit_price: float | None = None,
+        quantity: str,
         list_client_order_id: str | None = None,
-        limit_client_order_id: str | None = None,
-        stop_client_order_id: str | None = None,
-        stop_limit_time_in_force: str | None = None,
+        # ABOVE ORDER
+        above_type: str = "TAKE_PROFIT_LIMIT",
+        above_client_order_id: str | None = None,
+        above_price: str | None = None,
+        above_stop_price: str | None = None,
+        above_trailing_delta: int | None = None,
+        above_time_in_force: str | None = None,
+        above_iceberg_qty: str | None = None,
+        above_strategy_id: int | None = None,
+        above_strategy_type: int | None = None,
+        # BELOW ORDER
+        below_type: str = "STOP_LOSS_LIMIT",
+        below_client_order_id: str | None = None,
+        below_price: str | None = None,
+        below_stop_price: str | None = None,
+        below_trailing_delta: int | None = None,
+        below_time_in_force: str | None = None,
+        below_iceberg_qty: str | None = None,
+        below_strategy_id: int | None = None,
+        below_strategy_type: int | None = None,
+        # EXTRA
         new_order_resp_type: str | None = None,
         self_trade_prevention_mode: str | None = None,
-        limit_iceberg_qty: float | None = None,
-        stop_iceberg_qty: float | None = None,
     ) -> dict:
-        """Создание OCO ордера.
+        """Создание OCO ордера (новая версия).
 
-        https://developers.binance.com/docs/binance-spot-api-docs/rest-api/spot-trading-endpoints#new-oco-trade
+        https://developers.binance.com/docs/binance-spot-api-docs/rest-api/trading-endpoints#new-order-list---oco-trade
         """
-        url = self._BASE_SPOT_URL + "/api/v3/order/oco"
+        url = self._BASE_SPOT_URL + "/api/v3/orderList/oco"
+
         data = {
             "symbol": symbol,
             "side": side,
             "quantity": quantity,
-            "price": price,
-            "stopPrice": stop_price,
-            "stopLimitPrice": stop_limit_price,
             "listClientOrderId": list_client_order_id,
-            "limitClientOrderId": limit_client_order_id,
-            "stopClientOrderId": stop_client_order_id,
-            "stopLimitTimeInForce": stop_limit_time_in_force,
+            # ABOVE
+            "aboveType": above_type,
+            "aboveClientOrderId": above_client_order_id,
+            "abovePrice": above_price,
+            "aboveStopPrice": above_stop_price,
+            "aboveTrailingDelta": above_trailing_delta,
+            "aboveTimeInForce": above_time_in_force,
+            "aboveIcebergQty": above_iceberg_qty,
+            "aboveStrategyId": above_strategy_id,
+            "aboveStrategyType": above_strategy_type,
+            # BELOW
+            "belowType": below_type,
+            "belowClientOrderId": below_client_order_id,
+            "belowPrice": below_price,
+            "belowStopPrice": below_stop_price,
+            "belowTrailingDelta": below_trailing_delta,
+            "belowTimeInForce": below_time_in_force,
+            "belowIcebergQty": below_iceberg_qty,
+            "belowStrategyId": below_strategy_id,
+            "belowStrategyType": below_strategy_type,
+            # EXTRA
             "newOrderRespType": new_order_resp_type,
             "selfTradePreventionMode": self_trade_prevention_mode,
-            "limitIcebergQty": limit_iceberg_qty,
-            "stopIcebergQty": stop_iceberg_qty,
         }
 
-        return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=data)
 
     async def oco_order_cancel(
         self,
@@ -1486,7 +1520,7 @@ class Client(BaseClient):
         )
         url = self._BASE_SPOT_URL + "/api/v3/userDataStream"
 
-        return await super()._make_request("POST", url, headers=self._get_headers())
+        return await super()._make_request("POST", url, headers=self._get_headers("POST"))
 
     async def renew_listen_key(self, listen_key: str) -> dict:
         """Обновление ключа прослушивания для подключения к пользовательскому вебсокету.
@@ -1501,7 +1535,9 @@ class Client(BaseClient):
         url = self._BASE_SPOT_URL + "/api/v3/userDataStream"
         params = {"listenKey": listen_key}
 
-        return await super()._make_request("PUT", url, params=params, headers=self._get_headers())
+        return await super()._make_request(
+            "PUT", url, params=params, headers=self._get_headers("PUT")
+        )
 
     async def close_listen_key(self, listen_key: str) -> dict:
         """Закрытие ключа прослушивания для подключения к пользовательскому вебсокету.
@@ -1517,7 +1553,7 @@ class Client(BaseClient):
         params = {"listenKey": listen_key}
 
         return await super()._make_request(
-            "DELETE", url, params=params, headers=self._get_headers()
+            "DELETE", url, params=params, headers=self._get_headers("DELETE")
         )
 
     # topic: futures user data streams
@@ -1529,7 +1565,7 @@ class Client(BaseClient):
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/listenKey"
 
-        return await super()._make_request("POST", url, headers=self._get_headers())
+        return await super()._make_request("POST", url, headers=self._get_headers("POST"))
 
     async def futures_renew_listen_key(self) -> dict:
         """Обновление ключа прослушивания для подключения к пользовательскому вебсокету.
@@ -1538,7 +1574,7 @@ class Client(BaseClient):
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/listenKey"
 
-        return await super()._make_request("PUT", url, headers=self._get_headers())
+        return await super()._make_request("PUT", url, headers=self._get_headers("PUT"))
 
     async def futures_close_listen_key(self) -> dict:
         """Закрытие ключа прослушивания для подключения к пользовательскому вебсокету.
@@ -1547,4 +1583,4 @@ class Client(BaseClient):
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/listenKey"
 
-        return await super()._make_request("DELETE", url, headers=self._get_headers())
+        return await super()._make_request("DELETE", url, headers=self._get_headers("DELETE"))

{unicex-0.13.9 → unicex-0.13.11/unicex.egg-info}/PKG-INFO

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