unicex 0.13.10__py3-none-any.whl → 0.13.12__py3-none-any.whl

unicex/binance/client.py

@@ -38,7 +38,6 @@ class Client(BaseClient):
         method: RequestMethod,
         signed: bool,
         params: dict[str, Any] | None,
-        data: dict[str, Any] | None,
     ) -> tuple[dict[str, Any], dict[str, Any] | None]:
         """Подготавливает payload и заголовки для запроса.
 
@@ -46,13 +45,12 @@ class Client(BaseClient):
             - добавляет подпись и все обязательные параметры в заголовки
 
         Если signed=False:
-            - возвращает только отфильтрованные params/data.
+            - возвращает только отфильтрованные params.
 
         Параметры:
             method (`RequestMethod`): Метод запроса.
             signed (`bool`): Нужно ли подписывать запрос.
             params (`dict | None`): Параметры для query string.
-            data (`dict | None`): Параметры для тела запроса.
 
         Возвращает:
             tuple:
@@ -61,16 +59,18 @@ class Client(BaseClient):
         """
         # Фильтруем параметры от None значений
         params = filter_params(params) if params else {}
-        data = filter_params(data) if data else {}
+
+        # Получаем заголовки для запроса
+        headers = self._get_headers(method)
 
         if not signed:
-            return {"params": params, "data": data}, None
+            return {"params": params}, headers
 
         if not self.is_authorized():
             raise NotAuthorized("Api key and api secret is required to private endpoints")
 
         # Объединяем все параметры в payload
-        payload = {**params, **data}
+        payload = {**params}
         payload["timestamp"] = int(time.time() * 1000)
         payload["recvWindow"] = self._RECV_WINDOW
 
@@ -82,7 +82,6 @@ class Client(BaseClient):
             "hex",
         )
 
-        headers = self._get_headers(method)
         return payload, headers
 
     async def _make_request(
@@ -92,13 +91,12 @@ class Client(BaseClient):
         signed: bool = False,
         *,
         params: dict[str, Any] | None = None,
-        data: dict[str, Any] | None = None,
     ) -> Any:
         """Выполняет HTTP-запрос к эндпоинтам Binance API.
 
         Если signed=True, формируется подпись для приватных endpoint'ов:
-            - Если переданы params — подпись добавляется в параметры запроса.
-            - Если передан data — подпись добавляется в тело запроса.
+            - Если метод запроса "GET" — подпись добавляется в параметры запроса.
+            - Если метод запроса "POST" | "PUT" | "DELETE" — подпись добавляется в тело запроса.
 
         Если signed=False, запрос отправляется как публичный.
 
@@ -107,22 +105,15 @@ class Client(BaseClient):
             url (`str`): Полный URL эндпоинта Binance API.
             signed (`bool`): Нужно ли подписывать запрос.
             params (`dict | None`): Query-параметры.
-            data (`dict | None`): Тело запроса.
 
         Возвращает:
             `dict`: Ответ в формате JSON.
         """
-        payload, headers = self._prepare_payload(
-            method=method, signed=signed, params=params, data=data
-        )
+        payload, headers = self._prepare_payload(method=method, signed=signed, params=params)
 
         if not signed:
             return await super()._make_request(method=method, url=url, **payload)
 
-        if data:
-            return await super()._make_request(
-                method=method, url=url, data=payload, headers=headers
-            )
         return await super()._make_request(method=method, url=url, params=payload, headers=headers)
 
     async def request(
@@ -391,7 +382,7 @@ class Client(BaseClient):
         https://developers.binance.com/docs/binance-spot-api-docs/rest-api/spot-trading-endpoints#new-order-trade
         """
         url = self._BASE_SPOT_URL + "/api/v3/order"
-        data = {
+        params = {
             "symbol": symbol,
             "side": side,
             "type": type,
@@ -406,8 +397,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, params=data)
+        # return await self._make_request("POST", url, True, params=params)
+        return await self._make_request("POST", url, True, params=params)
 
     async def order_test(
         self,
@@ -429,7 +420,7 @@ class Client(BaseClient):
         https://developers.binance.com/docs/binance-spot-api-docs/rest-api/spot-trading-endpoints#test-new-order-trade
         """
         url = self._BASE_SPOT_URL + "/api/v3/order/test"
-        data = {
+        params = {
             "symbol": symbol,
             "side": side,
             "type": type,
@@ -444,7 +435,7 @@ 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, params=params)
 
     async def order_cancel(
         self,
@@ -458,14 +449,14 @@ class Client(BaseClient):
         https://developers.binance.com/docs/binance-spot-api-docs/rest-api/spot-trading-endpoints#cancel-order-trade
         """
         url = self._BASE_SPOT_URL + "/api/v3/order"
-        data = {
+        params = {
             "symbol": symbol,
             "orderId": order_id,
             "origClientOrderId": orig_client_order_id,
             "newClientOrderId": new_client_order_id,
         }
 
-        return await self._make_request("DELETE", url, True, data=data)
+        return await self._make_request("DELETE", url, True, params=params)
 
     async def orders_cancel_all(self, symbol: str) -> list[dict]:
         """Отмена всех активных ордеров по символу.
@@ -473,9 +464,9 @@ class Client(BaseClient):
         https://developers.binance.com/docs/binance-spot-api-docs/rest-api/spot-trading-endpoints#cancel-all-open-orders-on-a-symbol-trade
         """
         url = self._BASE_SPOT_URL + "/api/v3/openOrders"
-        data = {"symbol": symbol}
+        params = {"symbol": symbol}
 
-        return await self._make_request("DELETE", url, True, data=data)
+        return await self._make_request("DELETE", url, True, params=params)
 
     async def orders_open(self, symbol: str | None = None) -> list[dict]:
         """Получение всех активных ордеров.
@@ -491,42 +482,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"
-        data = {
+        url = self._BASE_SPOT_URL + "/api/v3/orderList/oco"
+
+        params = {
             "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=params)
 
     async def oco_order_cancel(
         self,
@@ -540,14 +558,14 @@ class Client(BaseClient):
         https://developers.binance.com/docs/binance-spot-api-docs/rest-api/spot-trading-endpoints#cancel-oco-trade
         """
         url = self._BASE_SPOT_URL + "/api/v3/orderList"
-        data = {
+        params = {
             "symbol": symbol,
             "orderListId": order_list_id,
             "listClientOrderId": list_client_order_id,
             "newClientOrderId": new_client_order_id,
         }
 
-        return await self._make_request("DELETE", url, True, data=data)
+        return await self._make_request("DELETE", url, True, params=params)
 
     async def oco_order_get(
         self, order_list_id: int | None = None, orig_client_order_id: str | None = None
@@ -1088,9 +1106,9 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/account/rest-api/Change-Multi-Assets-Mode
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/multiAssetsMargin"
-        data = {"multiAssetsMargin": multi_assets_margin}
+        params = {"multiAssetsMargin": multi_assets_margin}
 
-        return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=params)
 
     async def futures_multi_asset_mode_get(self) -> dict:
         """Получение режима мультиактивной маржи.
@@ -1129,7 +1147,7 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api/New-Order
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/order"
-        data = {
+        params = {
             "symbol": symbol,
             "side": side,
             "type": type,
@@ -1150,7 +1168,7 @@ class Client(BaseClient):
             "goodTillDate": good_till_date,
         }
 
-        return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=params)
 
     async def futures_order_modify(
         self,
@@ -1167,7 +1185,7 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api/Modify-Order
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/order"
-        data = {
+        params = {
             "orderId": order_id,
             "origClientOrderId": orig_client_order_id,
             "symbol": symbol,
@@ -1177,7 +1195,7 @@ class Client(BaseClient):
             "priceMatch": price_match,
         }
 
-        return await self._make_request("PUT", url, True, data=data)
+        return await self._make_request("PUT", url, True, params=params)
 
     async def futures_order_get(
         self,
@@ -1237,9 +1255,9 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api/Cancel-All-Open-Orders
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/allOpenOrders"
-        data = {"symbol": symbol}
+        params = {"symbol": symbol}
 
-        return await self._make_request("DELETE", url, True, data=data)
+        return await self._make_request("DELETE", url, True, params=params)
 
     async def futures_countdown_cancel_all(
         self,
@@ -1251,12 +1269,12 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api/Auto-Cancel-All-Open-Orders
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/countdownCancelAll"
-        data = {
+        params = {
             "symbol": symbol,
             "countdownTime": countdown_time,
         }
 
-        return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=params)
 
     async def futures_position_info(self, symbol: str | None = None) -> list[dict]:
         """Получение информации о позициях на фьючерсах.
@@ -1320,9 +1338,9 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/account/rest-api/Change-Initial-Leverage
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/leverage"
-        data = {"symbol": symbol, "leverage": leverage}
+        params = {"symbol": symbol, "leverage": leverage}
 
-        return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=params)
 
     async def futures_margin_type_change(self, symbol: str, margin_type: str) -> dict:
         """Изменение типа маржи на фьючерсах.
@@ -1330,9 +1348,9 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/account/rest-api/Change-Margin-Type
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/marginType"
-        data = {"symbol": symbol, "marginType": margin_type}
+        params = {"symbol": symbol, "marginType": margin_type}
 
-        return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=params)
 
     async def futures_position_margin_modify(
         self,
@@ -1346,14 +1364,14 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/account/rest-api/Modify-Isolated-Position-Margin
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/positionMargin"
-        data = {
+        params = {
             "symbol": symbol,
             "positionSide": position_side,
             "amount": amount,
             "type": type,
         }
 
-        return await self._make_request("POST", url, True, data=data)
+        return await self._make_request("POST", url, True, params=params)
 
     async def futures_position_margin_history(
         self,
@@ -1438,13 +1456,13 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api/Cancel-Order
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/order"
-        data = {
+        params = {
             "symbol": symbol,
             "orderId": order_id,
             "origClientOrderId": orig_client_order_id,
         }
 
-        return await self._make_request("DELETE", url, data=data)
+        return await self._make_request("DELETE", url, params=params)
 
     async def futures_batch_orders_create(self, orders: list[dict]) -> list[dict]:
         """Создание множественных ордеров одновременно на фьючерсах.
@@ -1452,9 +1470,9 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api/Place-Multiple-Orders
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/batchOrders"
-        data = {"batchOrders": json.dumps(orders)}  # Нужен особый дамп
+        params = {"batchOrders": json.dumps(orders)}  # Нужен особый дамп
 
-        return await self._make_request("POST", url, signed=True, data=data)
+        return await self._make_request("POST", url, signed=True, params=params)
 
     async def futures_batch_orders_cancel(
         self,
@@ -1467,17 +1485,17 @@ class Client(BaseClient):
         https://developers.binance.com/docs/derivatives/usds-margined-futures/trade/rest-api/Cancel-Multiple-Orders
         """
         url = self._BASE_FUTURES_URL + "/fapi/v1/batchOrders"
-        data = {"symbol": symbol}
+        params = {"symbol": symbol}
 
         if order_id_list:
-            data["orderIdList"] = json.dumps(order_id_list)  # Нужен особый дамп
+            params["orderIdList"] = json.dumps(order_id_list)  # Нужен особый дамп
 
         if orig_client_order_id_list:
-            data["origClientOrderIdList"] = json.dumps(  # Нужен особый дамп
+            params["origClientOrderIdList"] = json.dumps(  # Нужен особый дамп
                 orig_client_order_id_list
             )
 
-        return await self._make_request("DELETE", url, signed=True, data=data)
+        return await self._make_request("DELETE", url, signed=True, params=params)
 
     # topic: user data streams
 

{unicex-0.13.10.dist-info → unicex-0.13.12.dist-info}/METADATA

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

{unicex-0.13.10.dist-info → unicex-0.13.12.dist-info}/RECORD

@@ -14,7 +14,7 @@ unicex/_base/client.py,sha256=asIIQLZlRwwmUDvxveSv7aCvth54iiSRJdz19bxGorI,8904
 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=MBTqIghKbSCr0DZ0aL_XZPyrIhLV3fMHERB7mbIk2Ks,61410
+unicex/binance/client.py,sha256=H_6xq3ahD55EPR_lBYak-7Gd0_bqbIJUf7TXm43ZI3A,62298
 unicex/binance/exchange_info.py,sha256=LNDkgBC5HB3JxtIBi39puqDg6LIVWqIWjT-6akDxtMs,2437
 unicex/binance/uni_client.py,sha256=W4yxiU0kkJKPJjimhv4KAWreuEBwt7GgrWXefcw5BEA,8365
 unicex/binance/uni_websocket_manager.py,sha256=HYHs6PYOTxBqN31AuOzbzs6o4oLBsZPMccqbjJiMu_4,8696
@@ -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.10.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
-unicex-0.13.10.dist-info/METADATA,sha256=BJmp2kdi-Jf54wKGBjPxov_LPmkryBjm7LT8rCj7NkY,11753
-unicex-0.13.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unicex-0.13.10.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
-unicex-0.13.10.dist-info/RECORD,,
+unicex-0.13.12.dist-info/licenses/LICENSE,sha256=lNNK4Vqak9cXm6qVJLhbqS7iR_BMj6k7fd7XQ6l1k54,1507
+unicex-0.13.12.dist-info/METADATA,sha256=VJOyBIHHQDlU0wbvaGEZBVEe2AXEyHfVNZJZILHGRk0,11753
+unicex-0.13.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unicex-0.13.12.dist-info/top_level.txt,sha256=_7rar-0OENIg4KRy6cgjWiebFYAJhjKEcMggAocGWG4,7
+unicex-0.13.12.dist-info/RECORD,,