crypticorn 2.12.1__py3-none-any.whl → 2.13.1__py3-none-any.whl

crypticorn/trade/client/api/strategies_api.py

@@ -16,8 +16,9 @@ from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
-from pydantic import StrictInt, StrictStr
-from typing import List, Optional
+from pydantic import Field, StrictInt, StrictStr
+from typing import Any, List, Optional
+from typing_extensions import Annotated
 from crypticorn.trade.client.models.strategy import Strategy
 from crypticorn.trade.client.models.strategy_create import StrategyCreate
 from crypticorn.trade.client.models.strategy_update import StrategyUpdate
@@ -57,6 +58,7 @@ class StrategiesApi:
     ) -> Strategy:
         """Create Strategy
 
+        Creates a new strategy.
 
         :param strategy_create: (required)
         :type strategy_create: StrategyCreate
@@ -120,6 +122,7 @@ class StrategiesApi:
     ) -> ApiResponse[Strategy]:
         """Create Strategy
 
+        Creates a new strategy.
 
         :param strategy_create: (required)
         :type strategy_create: StrategyCreate
@@ -183,6 +186,7 @@ class StrategiesApi:
     ) -> RESTResponseType:
         """Create Strategy
 
+        Creates a new strategy.
 
         :param strategy_create: (required)
         :type strategy_create: StrategyCreate
@@ -291,8 +295,18 @@ class StrategiesApi:
     @validate_call
     async def get_strategies(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        limit: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Limit the number of strategies returned. 0 means no limit."
+            ),
+        ] = None,
+        offset: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Offset the number of strategies returned. 0 means no offset."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -307,10 +321,11 @@ class StrategiesApi:
     ) -> List[Strategy]:
         """Get Strategies
 
+        Get all strategies.
 
-        :param limit:
+        :param limit: Limit the number of strategies returned. 0 means no limit.
         :type limit: int
-        :param offset:
+        :param offset: Offset the number of strategies returned. 0 means no offset.
         :type offset: int
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -358,8 +373,18 @@ class StrategiesApi:
     @validate_call
     async def get_strategies_with_http_info(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        limit: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Limit the number of strategies returned. 0 means no limit."
+            ),
+        ] = None,
+        offset: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Offset the number of strategies returned. 0 means no offset."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -374,10 +399,11 @@ class StrategiesApi:
     ) -> ApiResponse[List[Strategy]]:
         """Get Strategies
 
+        Get all strategies.
 
-        :param limit:
+        :param limit: Limit the number of strategies returned. 0 means no limit.
         :type limit: int
-        :param offset:
+        :param offset: Offset the number of strategies returned. 0 means no offset.
         :type offset: int
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -425,8 +451,18 @@ class StrategiesApi:
     @validate_call
     async def get_strategies_without_preload_content(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        limit: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Limit the number of strategies returned. 0 means no limit."
+            ),
+        ] = None,
+        offset: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Offset the number of strategies returned. 0 means no offset."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -441,10 +477,11 @@ class StrategiesApi:
     ) -> RESTResponseType:
         """Get Strategies
 
+        Get all strategies.
 
-        :param limit:
+        :param limit: Limit the number of strategies returned. 0 means no limit.
         :type limit: int
-        :param offset:
+        :param offset: Offset the number of strategies returned. 0 means no offset.
         :type offset: int
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -546,10 +583,237 @@ class StrategiesApi:
             _request_auth=_request_auth,
         )
 
+    @validate_call
+    async def get_strategy_usage(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]
+            ],
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> List[List[object]]:
+        """Get Strategy Usage
+
+        Get the usage count of each strategy.
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """  # noqa: E501
+
+        _param = self._get_strategy_usage_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index,
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            "200": "List[List[object]]",
+        }
+        response_data = await self.api_client.call_api(
+            *_param, _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+    @validate_call
+    async def get_strategy_usage_with_http_info(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]
+            ],
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[List[List[object]]]:
+        """Get Strategy Usage
+
+        Get the usage count of each strategy.
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """  # noqa: E501
+
+        _param = self._get_strategy_usage_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index,
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            "200": "List[List[object]]",
+        }
+        response_data = await self.api_client.call_api(
+            *_param, _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+    @validate_call
+    async def get_strategy_usage_without_preload_content(
+        self,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]
+            ],
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Get Strategy Usage
+
+        Get the usage count of each strategy.
+
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """  # noqa: E501
+
+        _param = self._get_strategy_usage_serialize(
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index,
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            "200": "List[List[object]]",
+        }
+        response_data = await self.api_client.call_api(
+            *_param, _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+    def _get_strategy_usage_serialize(
+        self,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {}
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[
+            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
+        ] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+        # set the HTTP header `Accept`
+        if "Accept" not in _header_params:
+            _header_params["Accept"] = self.api_client.select_header_accept(
+                ["application/json"]
+            )
+
+        # authentication setting
+        _auth_settings: List[str] = ["APIKeyHeader", "HTTPBearer"]
+
+        return self.api_client.param_serialize(
+            method="GET",
+            resource_path="/strategies/usage",
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth,
+        )
+
     @validate_call
     async def kill_strategy(
         self,
-        id: StrictStr,
+        id: Annotated[StrictStr, Field(description="The ID of the strategy to kill.")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -566,7 +830,7 @@ class StrategiesApi:
 
         Kills a strategy by disabling it and deleting all bots associated with it.
 
-        :param id: (required)
+        :param id: The ID of the strategy to kill. (required)
         :type id: str
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -613,7 +877,7 @@ class StrategiesApi:
     @validate_call
     async def kill_strategy_with_http_info(
         self,
-        id: StrictStr,
+        id: Annotated[StrictStr, Field(description="The ID of the strategy to kill.")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -630,7 +894,7 @@ class StrategiesApi:
 
         Kills a strategy by disabling it and deleting all bots associated with it.
 
-        :param id: (required)
+        :param id: The ID of the strategy to kill. (required)
         :type id: str
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -677,7 +941,7 @@ class StrategiesApi:
     @validate_call
     async def kill_strategy_without_preload_content(
         self,
-        id: StrictStr,
+        id: Annotated[StrictStr, Field(description="The ID of the strategy to kill.")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -694,7 +958,7 @@ class StrategiesApi:
 
         Kills a strategy by disabling it and deleting all bots associated with it.
 
-        :param id: (required)
+        :param id: The ID of the strategy to kill. (required)
         :type id: str
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
@@ -791,7 +1055,9 @@ class StrategiesApi:
     @validate_call
     async def update_strategy(
         self,
-        id: StrictStr,
+        id: Annotated[
+            StrictStr, Field(description="The ID of the strategy to update.")
+        ],
         strategy_update: StrategyUpdate,
         _request_timeout: Union[
             None,
@@ -809,7 +1075,7 @@ class StrategiesApi:
 
         Updates a strategy. If the strategy is being disabled, all bots associated with it will be set to stopping.
 
-        :param id: (required)
+        :param id: The ID of the strategy to update. (required)
         :type id: str
         :param strategy_update: (required)
         :type strategy_update: StrategyUpdate
@@ -859,7 +1125,9 @@ class StrategiesApi:
     @validate_call
     async def update_strategy_with_http_info(
         self,
-        id: StrictStr,
+        id: Annotated[
+            StrictStr, Field(description="The ID of the strategy to update.")
+        ],
         strategy_update: StrategyUpdate,
         _request_timeout: Union[
             None,
@@ -877,7 +1145,7 @@ class StrategiesApi:
 
         Updates a strategy. If the strategy is being disabled, all bots associated with it will be set to stopping.
 
-        :param id: (required)
+        :param id: The ID of the strategy to update. (required)
         :type id: str
         :param strategy_update: (required)
         :type strategy_update: StrategyUpdate
@@ -927,7 +1195,9 @@ class StrategiesApi:
     @validate_call
     async def update_strategy_without_preload_content(
         self,
-        id: StrictStr,
+        id: Annotated[
+            StrictStr, Field(description="The ID of the strategy to update.")
+        ],
         strategy_update: StrategyUpdate,
         _request_timeout: Union[
             None,
@@ -945,7 +1215,7 @@ class StrategiesApi:
 
         Updates a strategy. If the strategy is being disabled, all bots associated with it will be set to stopping.
 
-        :param id: (required)
+        :param id: The ID of the strategy to update. (required)
         :type id: str
         :param strategy_update: (required)
         :type strategy_update: StrategyUpdate

crypticorn/trade/client/api/trading_actions_api.py

@@ -285,7 +285,7 @@ class TradingActionsApi:
             )
 
         # authentication setting
-        _auth_settings: List[str] = ["APIKeyHeader", "HTTPBearer"]
+        _auth_settings: List[str] = ["HTTPBearer"]
 
         return self.api_client.param_serialize(
             method="GET",
@@ -320,7 +320,7 @@ class TradingActionsApi:
     ) -> PostFuturesAction:
         """Post Futures Action
 
-        Endpoint to receive futures trading actions. The action is queued for processing and the response is returned immediately.
+        Endpoint to send futures trading actions. The action is queued for processing and the response is returned immediately. Only API key authentication is supported.
 
         :param futures_trading_action_create: (required)
         :type futures_trading_action_create: FuturesTradingActionCreate
@@ -384,7 +384,7 @@ class TradingActionsApi:
     ) -> ApiResponse[PostFuturesAction]:
         """Post Futures Action
 
-        Endpoint to receive futures trading actions. The action is queued for processing and the response is returned immediately.
+        Endpoint to send futures trading actions. The action is queued for processing and the response is returned immediately. Only API key authentication is supported.
 
         :param futures_trading_action_create: (required)
         :type futures_trading_action_create: FuturesTradingActionCreate
@@ -448,7 +448,7 @@ class TradingActionsApi:
     ) -> RESTResponseType:
         """Post Futures Action
 
-        Endpoint to receive futures trading actions. The action is queued for processing and the response is returned immediately.
+        Endpoint to send futures trading actions. The action is queued for processing and the response is returned immediately. Only API key authentication is supported.
 
         :param futures_trading_action_create: (required)
         :type futures_trading_action_create: FuturesTradingActionCreate

crypticorn/trade/client/models/__init__.py

@@ -49,4 +49,5 @@ from crypticorn.trade.client.models.strategy_create import StrategyCreate
 from crypticorn.trade.client.models.strategy_exchange_info import StrategyExchangeInfo
 from crypticorn.trade.client.models.strategy_update import StrategyUpdate
 from crypticorn.trade.client.models.tpsl import TPSL
+from crypticorn.trade.client.models.tpsl_create import TPSLCreate
 from crypticorn.trade.client.models.trading_action_type import TradingActionType

crypticorn/trade/client/models/api_error_identifier.py

@@ -33,6 +33,7 @@ class ApiErrorIdentifier(str, Enum):
     BOT_DISABLED = "bot_disabled"
     BOT_STOPPING_COMPLETED = "bot_stopping_completed"
     BOT_STOPPING_STARTED = "bot_stopping_started"
+    CANCELLED_OPEN_ORDER = "cancelled_open_order"
     CLIENT_ORDER_ID_ALREADY_EXISTS = "client_order_id_already_exists"
     INVALID_CONTENT_TYPE = "invalid_content_type"
     DELETE_BOT_ERROR = "delete_bot_error"
@@ -55,6 +56,7 @@ class ApiErrorIdentifier(str, Enum):
     EXCHANGE_USER_ACCOUNT_IS_FROZEN = "exchange_user_account_is_frozen"
     API_KEY_EXPIRED = "api_key_expired"
     BEARER_TOKEN_EXPIRED = "bearer_token_expired"
+    OPEN_ORDER_EXPIRED = "open_order_expired"
     FORBIDDEN = "forbidden"
     HEDGE_MODE_NOT_ACTIVE = "hedge_mode_not_active"
     HTTP_REQUEST_ERROR = "http_request_error"
@@ -68,7 +70,7 @@ class ApiErrorIdentifier(str, Enum):
     INVALID_EXCHANGE_KEY = "invalid_exchange_key"
     INVALID_MARGIN_MODE = "invalid_margin_mode"
     INVALID_MODEL_NAME = "invalid_model_name"
-    INVALID_PARAMETER_PROVIDED = "invalid_parameter_provided"
+    INVALID_PARAMETER_PROVIDED = "exchange_invalid_parameter"
     LEVERAGE_LIMIT_EXCEEDED = "leverage_limit_exceeded"
     ORDER_VIOLATES_LIQUIDATION_PRICE_CONSTRAINTS = (
         "order_violates_liquidation_price_constraints"
@@ -90,6 +92,8 @@ class ApiErrorIdentifier(str, Enum):
     ORDER_PRICE_IS_INVALID = "order_price_is_invalid"
     ORDER_SIZE_TOO_LARGE = "order_size_too_large"
     ORDER_SIZE_TOO_SMALL = "order_size_too_small"
+    ORPHAN_OPEN_ORDER = "orphan_open_order"
+    ORPHAN_CLOSE_ORDER = "orphan_close_order"
     POSITION_LIMIT_EXCEEDED = "position_limit_exceeded"
     POSITION_DOES_NOT_EXIST = "position_does_not_exist"
     POSITION_OPENING_TEMPORARILY_SUSPENDED = "position_opening_temporarily_suspended"
@@ -105,7 +109,7 @@ class ApiErrorIdentifier(str, Enum):
     SUCCESS = "success"
     SYMBOL_DOES_NOT_EXIST = "symbol_does_not_exist"
     TRADING_ACTION_EXPIRED = "trading_action_expired"
-    TRADING_ACTION_SKIPPED = "trading_action_skipped"
+    TRADING_ACTION_SKIPPED_BOT_STOPPING = "TRADING_ACTION_SKIPPED_BOT_STOPPING"
     TRADING_HAS_BEEN_LOCKED = "trading_has_been_locked"
     TRADING_IS_SUSPENDED = "trading_is_suspended"
     UNKNOWN_ERROR_OCCURRED = "unknown_error_occurred"

crypticorn/trade/client/models/futures_trading_action.py

@@ -17,16 +17,8 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    StrictBool,
-    StrictFloat,
-    StrictInt,
-    StrictStr,
-)
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from crypticorn.trade.client.models.margin_mode import MarginMode
 from crypticorn.trade.client.models.market_type import MarketType
@@ -41,6 +33,8 @@ class FuturesTradingAction(BaseModel):
     Model for futures trading actions
     """  # noqa: E501
 
+    leverage: Optional[Annotated[int, Field(strict=True, ge=1)]]
+    margin_mode: Optional[MarginMode] = None
     created_at: Optional[StrictInt] = Field(
         default=None, description="Timestamp of creation"
     )
@@ -59,24 +53,18 @@ class FuturesTradingAction(BaseModel):
         description="Trading symbol or asset pair in format: 'symbol/quote_currency' (see market service for valid symbols)"
     )
     is_limit: Optional[StrictBool] = None
-    limit_price: Optional[Union[StrictFloat, StrictInt]] = None
-    allocation: Optional[
-        Union[
-            Annotated[float, Field(le=1.0, strict=True)],
-            Annotated[int, Field(le=1, strict=True)],
-        ]
-    ] = Field(
-        default=None,
-        description="How much of bot's balance to use for the order (for open actions). How much of the reference open order (open_order_execution_id) to close (for close actions). 0=0%, 1=100%.",
+    limit_price: Optional[StrictStr] = None
+    allocation: StrictStr = Field(
+        description="How much of bot's balance to use for the order (for open actions). How much of the reference open order (open_order_execution_id) to close (for close actions). 0=0%, 1=100%."
     )
     take_profit: Optional[List[TPSL]] = None
     stop_loss: Optional[List[TPSL]] = None
     expiry_timestamp: Optional[StrictInt] = None
     client_order_id: Optional[StrictStr] = None
     position_id: Optional[StrictStr] = None
-    leverage: Optional[Annotated[int, Field(strict=True, ge=1)]]
-    margin_mode: Optional[MarginMode] = None
     __properties: ClassVar[List[str]] = [
+        "leverage",
+        "margin_mode",
         "created_at",
         "updated_at",
         "id",
@@ -94,8 +82,6 @@ class FuturesTradingAction(BaseModel):
         "expiry_timestamp",
         "client_order_id",
         "position_id",
-        "leverage",
-        "margin_mode",
     ]
 
     model_config = ConfigDict(
@@ -149,6 +135,16 @@ class FuturesTradingAction(BaseModel):
                 if _item_stop_loss:
                     _items.append(_item_stop_loss.to_dict())
             _dict["stop_loss"] = _items
+        # set to None if leverage (nullable) is None
+        # and model_fields_set contains the field
+        if self.leverage is None and "leverage" in self.model_fields_set:
+            _dict["leverage"] = None
+
+        # set to None if margin_mode (nullable) is None
+        # and model_fields_set contains the field
+        if self.margin_mode is None and "margin_mode" in self.model_fields_set:
+            _dict["margin_mode"] = None
+
         # set to None if execution_id (nullable) is None
         # and model_fields_set contains the field
         if self.execution_id is None and "execution_id" in self.model_fields_set:
@@ -200,16 +196,6 @@ class FuturesTradingAction(BaseModel):
         if self.position_id is None and "position_id" in self.model_fields_set:
             _dict["position_id"] = None
 
-        # set to None if leverage (nullable) is None
-        # and model_fields_set contains the field
-        if self.leverage is None and "leverage" in self.model_fields_set:
-            _dict["leverage"] = None
-
-        # set to None if margin_mode (nullable) is None
-        # and model_fields_set contains the field
-        if self.margin_mode is None and "margin_mode" in self.model_fields_set:
-            _dict["margin_mode"] = None
-
         return _dict
 
     @classmethod
@@ -223,6 +209,10 @@ class FuturesTradingAction(BaseModel):
 
         _obj = cls.model_validate(
             {
+                "leverage": (
+                    obj.get("leverage") if obj.get("leverage") is not None else 1
+                ),
+                "margin_mode": obj.get("margin_mode"),
                 "created_at": obj.get("created_at"),
                 "updated_at": obj.get("updated_at"),
                 "id": obj.get("id"),
@@ -248,10 +238,6 @@ class FuturesTradingAction(BaseModel):
                 "expiry_timestamp": obj.get("expiry_timestamp"),
                 "client_order_id": obj.get("client_order_id"),
                 "position_id": obj.get("position_id"),
-                "leverage": (
-                    obj.get("leverage") if obj.get("leverage") is not None else 1
-                ),
-                "margin_mode": obj.get("margin_mode"),
             }
         )
         return _obj