crypticorn 2.5.0rc5__py3-none-any.whl → 2.5.2__py3-none-any.whl

crypticorn/metrics/client/rest.py

@@ -3,7 +3,7 @@
 """
 Marketcap Service API
 
-     API for retrieving historical marketcap data, available exchanges, and indicators.          ## Features     - Historical marketcap data     - OHLCV data with marketcap     - Technical indicators (KER, SMA)     - Exchange and symbol mappings     - Error logs
+API for retrieving historical marketcap data, available exchanges, and indicators.
 
 The version of the OpenAPI document: 1.0.0
 Generated by OpenAPI Generator (https://openapi-generator.tech)

crypticorn/metrics/main.py

@@ -3,18 +3,14 @@ from crypticorn.metrics import (
     ApiClient,
     Configuration,
     ExchangesApi,
-    HealthCheckApi,
+    StatusApi,
     IndicatorsApi,
     LogsApi,
     MarketcapApi,
     MarketsApi,
     TokensApi,
-    MarketType,
 )
 from crypticorn.common import optional_import
-from pydantic import StrictStr, StrictInt, Field
-from typing_extensions import Annotated
-from typing import Optional
 
 
 class MetricsClient:
@@ -22,6 +18,8 @@ class MetricsClient:
     A client for interacting with the Crypticorn Metrics API.
     """
 
+    config_class = Configuration
+
     def __init__(
         self,
         config: Configuration,
@@ -29,7 +27,7 @@ class MetricsClient:
         self.config = config
         self.base_client = ApiClient(configuration=self.config)
         # Instantiate all the endpoint clients
-        self.status = HealthCheckApi(self.base_client)
+        self.status = StatusApi(self.base_client)
         self.indicators = IndicatorsApi(self.base_client)
         self.logs = LogsApi(self.base_client)
         self.marketcap = MarketcapApiWrapper(self.base_client)
@@ -43,42 +41,18 @@ class MarketcapApiWrapper(MarketcapApi):
     A wrapper for the MarketcapApi class.
     """
 
-    async def get_marketcap_symbols_fmt(
-        self,
-        start_timestamp: Annotated[
-            Optional[StrictInt], Field(description="Start timestamp")
-        ] = None,
-        end_timestamp: Annotated[
-            Optional[StrictInt], Field(description="End timestamp")
-        ] = None,
-        interval: Annotated[
-            Optional[StrictStr],
-            Field(description="Interval for which to fetch symbols and marketcap data"),
-        ] = None,
-        market: Annotated[
-            Optional[MarketType],
-            Field(description="Market for which to fetch symbols and marketcap data"),
-        ] = None,
-        exchange: Annotated[
-            Optional[StrictStr],
-            Field(description="Exchange for which to fetch symbols and marketcap data"),
-        ] = None,
-    ) -> pd.DataFrame:
+    async def get_marketcap_symbols_fmt(self, *args, **kwargs) -> pd.DataFrame:  # type: ignore
         """
         Get the marketcap symbols in a pandas dataframe
         """
         pd = optional_import("pandas", "extra")
-        response = await self.get_marketcap_symbols(
-            start_timestamp=start_timestamp,
-            end_timestamp=end_timestamp,
-            interval=interval,
-            market=market,
-            exchange=exchange,
+        response = await self.get_marketcap_symbols_without_preload_content(
+            *args, **kwargs
         )
+        response.raise_for_status()
         json_response = await response.json()
         df = pd.DataFrame(json_response["data"])
         df.rename(columns={df.columns[0]: "timestamp"}, inplace=True)
-        df["timestamp"] = pd.to_datetime(df["timestamp"]).astype("int64") // 10**9
         return df
 
 
@@ -87,19 +61,53 @@ class TokensApiWrapper(TokensApi):
     A wrapper for the TokensApi class.
     """
 
-    async def get_tokens_fmt(
-        self,
-        token_type: Annotated[
-            StrictStr,
-            Field(description="Type of tokens to fetch"),
-        ],
-    ) -> pd.DataFrame:
+    async def get_stable_and_wrapped_tokens_fmt(self, *args, **kwargs) -> pd.DataFrame:  # type: ignore
         """
         Get the tokens in a pandas dataframe
         """
         pd = optional_import("pandas", "extra")
         response = await self.get_stable_and_wrapped_tokens_without_preload_content(
-            token_type=token_type
+            *args, **kwargs
+        )
+        response.raise_for_status()
+        json_data = await response.json()
+        return pd.DataFrame(json_data)
+
+
+class ExchangesApiWrapper(ExchangesApi):
+    """
+    A wrapper for the ExchangesApi class.
+    """
+
+    async def get_exchanges_fmt(self, *args, **kwargs) -> pd.DataFrame:  # type: ignore
+        """
+        Get the exchanges in a pandas dataframe
+        """
+        pd = optional_import("pandas", "extra")
+        response = await self.get_available_exchanges_without_preload_content(
+            *args, **kwargs
         )
+        response.raise_for_status()
         json_data = await response.json()
-        return pd.DataFrame(json_data["data"])
+        processed_results = []
+        for row in json_data:
+            data = {"timestamp": row["timestamp"]}
+            data.update(row["exchanges"])
+            processed_results.append(data)
+
+        # Create DataFrame and sort columns
+        df = pd.DataFrame(processed_results)
+        cols = ["timestamp"] + sorted([col for col in df.columns if col != "timestamp"])
+        df = df[cols]
+
+        # Convert timestamp to unix timestamp
+        df["timestamp"] = pd.to_datetime(df["timestamp"]).astype("int64") // 10**9
+
+        # Convert exchange availability to boolean integers (0/1)
+        df = df.astype(
+            {
+                "timestamp": "int64",
+                **{col: "int8" for col in df.columns if col != "timestamp"},
+            }
+        )
+        return df

crypticorn/pay/main.py

@@ -13,6 +13,8 @@ class PayClient:
     A client for interacting with the Crypticorn Pay API.
     """
 
+    config_class = Configuration
+
     def __init__(
         self,
         config: Configuration,

crypticorn/trade/client/__init__.py

@@ -40,23 +40,19 @@ from crypticorn.trade.client.exceptions import ApiException
 
 # import models into sdk package
 from crypticorn.trade.client.models.action_model import ActionModel
-from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
-from crypticorn.trade.client.models.api_error_level import ApiErrorLevel
-from crypticorn.trade.client.models.api_error_type import ApiErrorType
 from crypticorn.trade.client.models.bot_model import BotModel
 from crypticorn.trade.client.models.bot_status import BotStatus
-from crypticorn.trade.client.models.exchange import Exchange
 from crypticorn.trade.client.models.exchange_key_model import ExchangeKeyModel
 from crypticorn.trade.client.models.execution_ids import ExecutionIds
 from crypticorn.trade.client.models.futures_balance import FuturesBalance
 from crypticorn.trade.client.models.futures_trading_action import FuturesTradingAction
 from crypticorn.trade.client.models.http_validation_error import HTTPValidationError
 from crypticorn.trade.client.models.margin_mode import MarginMode
-from crypticorn.trade.client.models.market_type import MarketType
 from crypticorn.trade.client.models.notification_model import NotificationModel
 from crypticorn.trade.client.models.order_model import OrderModel
 from crypticorn.trade.client.models.order_status import OrderStatus
 from crypticorn.trade.client.models.post_futures_action import PostFuturesAction
+from crypticorn.trade.client.models.spot_trading_action import SpotTradingAction
 from crypticorn.trade.client.models.strategy_exchange_info import StrategyExchangeInfo
 from crypticorn.trade.client.models.strategy_model_input import StrategyModelInput
 from crypticorn.trade.client.models.strategy_model_output import StrategyModelOutput

crypticorn/trade/client/api/exchanges_api.py

@@ -16,8 +16,8 @@ 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 StrictStr
 from typing import List
-from crypticorn.trade.client.models.exchange import Exchange
 
 from crypticorn.trade.client.api_client import ApiClient, RequestSerialized
 from crypticorn.trade.client.api_response import ApiResponse
@@ -50,7 +50,7 @@ class ExchangesApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[Exchange]:
+    ) -> List[str]:
         """Get Exchanges
 
 
@@ -84,7 +84,7 @@ class ExchangesApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[Exchange]",
+            "200": "List[str]",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -109,7 +109,7 @@ class ExchangesApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[Exchange]]:
+    ) -> ApiResponse[List[str]]:
         """Get Exchanges
 
 
@@ -143,7 +143,7 @@ class ExchangesApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[Exchange]",
+            "200": "List[str]",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -202,7 +202,7 @@ class ExchangesApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[Exchange]",
+            "200": "List[str]",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout

crypticorn/trade/client/api/trading_actions_api.py

@@ -21,6 +21,7 @@ from typing import Any, List, Optional
 from crypticorn.trade.client.models.action_model import ActionModel
 from crypticorn.trade.client.models.futures_trading_action import FuturesTradingAction
 from crypticorn.trade.client.models.post_futures_action import PostFuturesAction
+from crypticorn.trade.client.models.spot_trading_action import SpotTradingAction
 
 from crypticorn.trade.client.api_client import ApiClient, RequestSerialized
 from crypticorn.trade.client.api_response import ApiResponse
@@ -558,7 +559,7 @@ class TradingActionsApi:
     @validate_call
     async def post_spot_action(
         self,
-        futures_trading_action: FuturesTradingAction,
+        spot_trading_action: SpotTradingAction,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -574,8 +575,8 @@ class TradingActionsApi:
         """Post Spot Action
 
 
-        :param futures_trading_action: (required)
-        :type futures_trading_action: FuturesTradingAction
+        :param spot_trading_action: (required)
+        :type spot_trading_action: SpotTradingAction
         :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
@@ -599,7 +600,7 @@ class TradingActionsApi:
         """  # noqa: E501
 
         _param = self._post_spot_action_serialize(
-            futures_trading_action=futures_trading_action,
+            spot_trading_action=spot_trading_action,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -622,7 +623,7 @@ class TradingActionsApi:
     @validate_call
     async def post_spot_action_with_http_info(
         self,
-        futures_trading_action: FuturesTradingAction,
+        spot_trading_action: SpotTradingAction,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -638,8 +639,8 @@ class TradingActionsApi:
         """Post Spot Action
 
 
-        :param futures_trading_action: (required)
-        :type futures_trading_action: FuturesTradingAction
+        :param spot_trading_action: (required)
+        :type spot_trading_action: SpotTradingAction
         :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
@@ -663,7 +664,7 @@ class TradingActionsApi:
         """  # noqa: E501
 
         _param = self._post_spot_action_serialize(
-            futures_trading_action=futures_trading_action,
+            spot_trading_action=spot_trading_action,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -686,7 +687,7 @@ class TradingActionsApi:
     @validate_call
     async def post_spot_action_without_preload_content(
         self,
-        futures_trading_action: FuturesTradingAction,
+        spot_trading_action: SpotTradingAction,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -702,8 +703,8 @@ class TradingActionsApi:
         """Post Spot Action
 
 
-        :param futures_trading_action: (required)
-        :type futures_trading_action: FuturesTradingAction
+        :param spot_trading_action: (required)
+        :type spot_trading_action: SpotTradingAction
         :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
@@ -727,7 +728,7 @@ class TradingActionsApi:
         """  # noqa: E501
 
         _param = self._post_spot_action_serialize(
-            futures_trading_action=futures_trading_action,
+            spot_trading_action=spot_trading_action,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -745,7 +746,7 @@ class TradingActionsApi:
 
     def _post_spot_action_serialize(
         self,
-        futures_trading_action,
+        spot_trading_action,
         _request_auth,
         _content_type,
         _headers,
@@ -770,8 +771,8 @@ class TradingActionsApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
-        if futures_trading_action is not None:
-            _body_params = futures_trading_action
+        if spot_trading_action is not None:
+            _body_params = spot_trading_action
 
         # set the HTTP header `Accept`
         if "Accept" not in _header_params:

crypticorn/trade/client/models/__init__.py

@@ -15,23 +15,19 @@ Do not edit the class manually.
 
 # import models into model package
 from crypticorn.trade.client.models.action_model import ActionModel
-from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
-from crypticorn.trade.client.models.api_error_level import ApiErrorLevel
-from crypticorn.trade.client.models.api_error_type import ApiErrorType
 from crypticorn.trade.client.models.bot_model import BotModel
 from crypticorn.trade.client.models.bot_status import BotStatus
-from crypticorn.trade.client.models.exchange import Exchange
 from crypticorn.trade.client.models.exchange_key_model import ExchangeKeyModel
 from crypticorn.trade.client.models.execution_ids import ExecutionIds
 from crypticorn.trade.client.models.futures_balance import FuturesBalance
 from crypticorn.trade.client.models.futures_trading_action import FuturesTradingAction
 from crypticorn.trade.client.models.http_validation_error import HTTPValidationError
 from crypticorn.trade.client.models.margin_mode import MarginMode
-from crypticorn.trade.client.models.market_type import MarketType
 from crypticorn.trade.client.models.notification_model import NotificationModel
 from crypticorn.trade.client.models.order_model import OrderModel
 from crypticorn.trade.client.models.order_status import OrderStatus
 from crypticorn.trade.client.models.post_futures_action import PostFuturesAction
+from crypticorn.trade.client.models.spot_trading_action import SpotTradingAction
 from crypticorn.trade.client.models.strategy_exchange_info import StrategyExchangeInfo
 from crypticorn.trade.client.models.strategy_model_input import StrategyModelInput
 from crypticorn.trade.client.models.strategy_model_output import StrategyModelOutput

crypticorn/trade/client/models/action_model.py

@@ -29,7 +29,6 @@ from pydantic import (
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing_extensions import Annotated
 from crypticorn.trade.client.models.margin_mode import MarginMode
-from crypticorn.trade.client.models.market_type import MarketType
 from crypticorn.trade.client.models.tpsl import TPSL
 from crypticorn.trade.client.models.trading_action_type import TradingActionType
 from typing import Optional, Set
@@ -48,7 +47,7 @@ class ActionModel(BaseModel):
     open_order_execution_id: Optional[StrictStr] = None
     client_order_id: Optional[StrictStr] = None
     action_type: TradingActionType = Field(description="The type of action.")
-    market_type: MarketType = Field(description="The type of market the action is for.")
+    market_type: StrictStr = Field(description="Market types")
     strategy_id: StrictStr = Field(description="UID for the strategy.")
     symbol: StrictStr = Field(
         description="Trading symbol or asset pair in format: 'symbol/quote_currency' (see market service for valid symbols)"

crypticorn/trade/client/models/bot_model.py

@@ -19,7 +19,6 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
 from crypticorn.trade.client.models.bot_status import BotStatus
 from typing import Optional, Set
 from typing_extensions import Self
@@ -40,7 +39,9 @@ class BotModel(BaseModel):
     api_key_id: StrictStr = Field(description="UID for the API key")
     allocation: StrictInt = Field(description="Initial allocation for the bot")
     status: BotStatus = Field(description="Status of the bot")
-    status_code: Optional[ApiErrorIdentifier] = None
+    status_code: Optional[StrictStr] = Field(
+        default=None, description="API error identifiers"
+    )
     user_id: Optional[StrictStr] = None
     current_allocation: Optional[Union[StrictFloat, StrictInt]] = None
     current_exposure: Optional[Union[StrictFloat, StrictInt]] = None
@@ -111,11 +112,6 @@ class BotModel(BaseModel):
         if self.id is None and "id" in self.model_fields_set:
             _dict["id"] = None
 
-        # set to None if status_code (nullable) is None
-        # and model_fields_set contains the field
-        if self.status_code is None and "status_code" in self.model_fields_set:
-            _dict["status_code"] = None
-
         # set to None if user_id (nullable) is None
         # and model_fields_set contains the field
         if self.user_id is None and "user_id" in self.model_fields_set:

crypticorn/trade/client/models/exchange_key_model.py

@@ -17,9 +17,8 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from crypticorn.trade.client.models.exchange import Exchange
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -32,12 +31,11 @@ class ExchangeKeyModel(BaseModel):
     created_at: Optional[StrictInt] = None
     updated_at: Optional[StrictInt] = None
     id: Optional[StrictStr] = None
-    exchange: Exchange = Field(description="Exchange name")
+    exchange: StrictStr = Field(description="Supported exchanges for trading")
     api_key: Optional[StrictStr] = None
     secret: Optional[StrictStr] = None
     passphrase: Optional[StrictStr] = None
     label: StrictStr = Field(description="Label for the API key")
-    enabled: Optional[StrictBool] = None
     user_id: Optional[StrictStr] = None
     __properties: ClassVar[List[str]] = [
         "created_at",
@@ -48,7 +46,6 @@ class ExchangeKeyModel(BaseModel):
         "secret",
         "passphrase",
         "label",
-        "enabled",
         "user_id",
     ]
 
@@ -119,11 +116,6 @@ class ExchangeKeyModel(BaseModel):
         if self.passphrase is None and "passphrase" in self.model_fields_set:
             _dict["passphrase"] = None
 
-        # set to None if enabled (nullable) is None
-        # and model_fields_set contains the field
-        if self.enabled is None and "enabled" in self.model_fields_set:
-            _dict["enabled"] = None
-
         # set to None if user_id (nullable) is None
         # and model_fields_set contains the field
         if self.user_id is None and "user_id" in self.model_fields_set:
@@ -150,7 +142,6 @@ class ExchangeKeyModel(BaseModel):
                 "secret": obj.get("secret"),
                 "passphrase": obj.get("passphrase"),
                 "label": obj.get("label"),
-                "enabled": obj.get("enabled"),
                 "user_id": obj.get("user_id"),
             }
         )

crypticorn/trade/client/models/execution_ids.py

@@ -28,7 +28,7 @@ class ExecutionIds(BaseModel):
     ExecutionIds
     """  # noqa: E501
 
-    main: List[StrictStr] = Field(description="Main execution ID. List with one item.")
+    main: StrictStr = Field(description="Main execution ID.")
     sl: List[StrictStr] = Field(
         description="Stop loss execution IDs. List with multiple items ordered by the next stop loss, e.g. price = 10000 => SLs: ['900', '700', '500']."
     )

crypticorn/trade/client/models/futures_trading_action.py

@@ -29,7 +29,6 @@ from pydantic import (
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing_extensions import Annotated
 from crypticorn.trade.client.models.margin_mode import MarginMode
-from crypticorn.trade.client.models.market_type import MarketType
 from crypticorn.trade.client.models.tpsl import TPSL
 from crypticorn.trade.client.models.trading_action_type import TradingActionType
 from typing import Optional, Set
@@ -46,7 +45,7 @@ class FuturesTradingAction(BaseModel):
     open_order_execution_id: Optional[StrictStr] = None
     client_order_id: Optional[StrictStr] = None
     action_type: TradingActionType = Field(description="The type of action.")
-    market_type: MarketType = Field(description="The type of market the action is for.")
+    market_type: StrictStr = Field(description="Market types")
     strategy_id: StrictStr = Field(description="UID for the strategy.")
     symbol: StrictStr = Field(
         description="Trading symbol or asset pair in format: 'symbol/quote_currency' (see market service for valid symbols)"

crypticorn/trade/client/models/notification_model.py

@@ -19,9 +19,6 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
-from crypticorn.trade.client.models.api_error_level import ApiErrorLevel
-from crypticorn.trade.client.models.api_error_type import ApiErrorType
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -34,15 +31,9 @@ class NotificationModel(BaseModel):
     created_at: Optional[StrictInt] = None
     updated_at: Optional[StrictInt] = None
     id: Optional[StrictStr] = None
-    identifier: ApiErrorIdentifier = Field(
-        description="Identifier string. Must match the mapping key in the frontend."
-    )
-    level: ApiErrorLevel = Field(
-        description="Level of the notification. Of type ApiErrorLevel"
-    )
-    type: ApiErrorType = Field(
-        description="Type of the notification. Of type ApiErrorType"
-    )
+    identifier: StrictStr = Field(description="API error identifiers")
+    level: StrictStr = Field(description="API error levels")
+    type: StrictStr = Field(description="Type of API error")
     user_id: Optional[StrictStr] = None
     viewed: Optional[StrictBool] = Field(
         default=False, description="Whether the notification has been marked as seen"

crypticorn/trade/client/models/order_model.py

@@ -19,10 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
-from crypticorn.trade.client.models.exchange import Exchange
 from crypticorn.trade.client.models.margin_mode import MarginMode
-from crypticorn.trade.client.models.market_type import MarketType
 from crypticorn.trade.client.models.order_status import OrderStatus
 from crypticorn.trade.client.models.trading_action_type import TradingActionType
 from typing import Optional, Set
@@ -45,14 +42,18 @@ class OrderModel(BaseModel):
     user_id: Optional[StrictStr] = None
     bot_id: Optional[StrictStr] = None
     client_order_id: Optional[StrictStr] = None
-    exchange: Optional[Exchange] = None
+    exchange: Optional[StrictStr] = Field(
+        default=None, description="Supported exchanges for trading"
+    )
     symbol: Optional[StrictStr] = None
     common_symbol: Optional[StrictStr] = None
     price: Optional[Union[StrictFloat, StrictInt]] = None
     action_type: Optional[TradingActionType] = None
-    market_type: Optional[MarketType] = None
+    market_type: Optional[StrictStr] = Field(default=None, description="Market types")
     margin_mode: Optional[MarginMode] = None
-    status_code: Optional[ApiErrorIdentifier] = None
+    status_code: Optional[StrictStr] = Field(
+        default=None, description="API error identifiers"
+    )
     status: Optional[OrderStatus] = None
     filled_perc: Optional[Union[StrictFloat, StrictInt]] = None
     filled_qty: Optional[Union[StrictFloat, StrictInt]] = None
@@ -194,11 +195,6 @@ class OrderModel(BaseModel):
         if self.client_order_id is None and "client_order_id" in self.model_fields_set:
             _dict["client_order_id"] = None
 
-        # set to None if exchange (nullable) is None
-        # and model_fields_set contains the field
-        if self.exchange is None and "exchange" in self.model_fields_set:
-            _dict["exchange"] = None
-
         # set to None if symbol (nullable) is None
         # and model_fields_set contains the field
         if self.symbol is None and "symbol" in self.model_fields_set:
@@ -219,21 +215,11 @@ class OrderModel(BaseModel):
         if self.action_type is None and "action_type" in self.model_fields_set:
             _dict["action_type"] = None
 
-        # set to None if market_type (nullable) is None
-        # and model_fields_set contains the field
-        if self.market_type is None and "market_type" in self.model_fields_set:
-            _dict["market_type"] = 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 status_code (nullable) is None
-        # and model_fields_set contains the field
-        if self.status_code is None and "status_code" in self.model_fields_set:
-            _dict["status_code"] = None
-
         # set to None if status (nullable) is None
         # and model_fields_set contains the field
         if self.status is None and "status" in self.model_fields_set: