crypticorn 1.0.1__py3-none-any.whl → 1.0.2rc2__py3-none-any.whl

crypticorn/trade/client/exceptions.py

@@ -0,0 +1,216 @@
+# coding: utf-8
+
+"""
+    FastAPI
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+from typing import Any, Optional
+from typing_extensions import Self
+
+class OpenApiException(Exception):
+    """The base exception class for all OpenAPIExceptions"""
+
+
+class ApiTypeError(OpenApiException, TypeError):
+    def __init__(self, msg, path_to_item=None, valid_classes=None,
+                 key_type=None) -> None:
+        """ Raises an exception for TypeErrors
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list): a list of keys an indices to get to the
+                                 current_item
+                                 None if unset
+            valid_classes (tuple): the primitive classes that current item
+                                   should be an instance of
+                                   None if unset
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a list
+                             None if unset
+        """
+        self.path_to_item = path_to_item
+        self.valid_classes = valid_classes
+        self.key_type = key_type
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiTypeError, self).__init__(full_msg)
+
+
+class ApiValueError(OpenApiException, ValueError):
+    def __init__(self, msg, path_to_item=None) -> None:
+        """
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (list) the path to the exception in the
+                received_data dict. None if unset
+        """
+
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiValueError, self).__init__(full_msg)
+
+
+class ApiAttributeError(OpenApiException, AttributeError):
+    def __init__(self, msg, path_to_item=None) -> None:
+        """
+        Raised when an attribute reference or assignment fails.
+
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        """
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiAttributeError, self).__init__(full_msg)
+
+
+class ApiKeyError(OpenApiException, KeyError):
+    def __init__(self, msg, path_to_item=None) -> None:
+        """
+        Args:
+            msg (str): the exception message
+
+        Keyword Args:
+            path_to_item (None/list) the path to the exception in the
+                received_data dict
+        """
+        self.path_to_item = path_to_item
+        full_msg = msg
+        if path_to_item:
+            full_msg = "{0} at {1}".format(msg, render_path(path_to_item))
+        super(ApiKeyError, self).__init__(full_msg)
+
+
+class ApiException(OpenApiException):
+
+    def __init__(
+        self, 
+        status=None, 
+        reason=None, 
+        http_resp=None,
+        *,
+        body: Optional[str] = None,
+        data: Optional[Any] = None,
+    ) -> None:
+        self.status = status
+        self.reason = reason
+        self.body = body
+        self.data = data
+        self.headers = None
+
+        if http_resp:
+            if self.status is None:
+                self.status = http_resp.status
+            if self.reason is None:
+                self.reason = http_resp.reason
+            if self.body is None:
+                try:
+                    self.body = http_resp.data.decode('utf-8')
+                except Exception:
+                    pass
+            self.headers = http_resp.getheaders()
+
+    @classmethod
+    def from_response(
+        cls, 
+        *, 
+        http_resp, 
+        body: Optional[str], 
+        data: Optional[Any],
+    ) -> Self:
+        if http_resp.status == 400:
+            raise BadRequestException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 401:
+            raise UnauthorizedException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 403:
+            raise ForbiddenException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 404:
+            raise NotFoundException(http_resp=http_resp, body=body, data=data)
+
+        # Added new conditions for 409 and 422
+        if http_resp.status == 409:
+            raise ConflictException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 422:
+            raise UnprocessableEntityException(http_resp=http_resp, body=body, data=data)
+
+        if 500 <= http_resp.status <= 599:
+            raise ServiceException(http_resp=http_resp, body=body, data=data)
+        raise ApiException(http_resp=http_resp, body=body, data=data)
+
+    def __str__(self):
+        """Custom error messages for exception"""
+        error_message = "({0})\n"\
+                        "Reason: {1}\n".format(self.status, self.reason)
+        if self.headers:
+            error_message += "HTTP response headers: {0}\n".format(
+                self.headers)
+
+        if self.data or self.body:
+            error_message += "HTTP response body: {0}\n".format(self.data or self.body)
+
+        return error_message
+
+
+class BadRequestException(ApiException):
+    pass
+
+
+class NotFoundException(ApiException):
+    pass
+
+
+class UnauthorizedException(ApiException):
+    pass
+
+
+class ForbiddenException(ApiException):
+    pass
+
+
+class ServiceException(ApiException):
+    pass
+
+
+class ConflictException(ApiException):
+    """Exception for HTTP 409 Conflict."""
+    pass
+
+
+class UnprocessableEntityException(ApiException):
+    """Exception for HTTP 422 Unprocessable Entity."""
+    pass
+
+
+def render_path(path_to_item):
+    """Returns a string representation of a path"""
+    result = ""
+    for pth in path_to_item:
+        if isinstance(pth, int):
+            result += "[{0}]".format(pth)
+        else:
+            result += "['{0}']".format(pth)
+    return result

crypticorn/trade/client/models/__init__.py

@@ -0,0 +1,38 @@
+# coding: utf-8
+
+# flake8: noqa
+"""
+    FastAPI
+
+    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+    The version of the OpenAPI document: 0.1.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+# import models into model package
+from crypticorn.trade.client.models.api_key_model import APIKeyModel
+from crypticorn.trade.client.models.action_model import ActionModel
+from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
+from crypticorn.trade.client.models.bot_model import BotModel
+from crypticorn.trade.client.models.exchange import Exchange
+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.notification_type import NotificationType
+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.strategy_exchange_info import StrategyExchangeInfo
+from crypticorn.trade.client.models.strategy_model import StrategyModel
+from crypticorn.trade.client.models.tpsl import TPSL
+from crypticorn.trade.client.models.trading_action_type import TradingActionType
+from crypticorn.trade.client.models.validation_error import ValidationError
+from crypticorn.trade.client.models.validation_error_loc_inner import ValidationErrorLocInner

crypticorn/{models → trade/client/models}/action_model.py

@@ -20,10 +20,10 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing_extensions import Annotated
-from crypticorn.models.margin_mode import MarginMode
-from crypticorn.models.market_type import MarketType
-from crypticorn.models.tpsl import TPSL
-from crypticorn.models.trading_action_type import TradingActionType
+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
 from typing_extensions import Self
 
@@ -31,10 +31,11 @@ class ActionModel(BaseModel):
     """
     ActionModel
     """ # noqa: E501
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     execution_id: Optional[StrictStr] = None
     open_order_execution_id: Optional[StrictStr] = None
-    position_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.")
@@ -46,10 +47,10 @@ class ActionModel(BaseModel):
     take_profit: Optional[List[TPSL]] = None
     stop_loss: Optional[List[TPSL]] = None
     expiry_timestamp: Optional[StrictInt] = None
+    position_id: Optional[StrictStr] = None
     leverage: Optional[Annotated[int, Field(strict=True, ge=1)]]
     margin_mode: Optional[MarginMode] = None
-    timestamp: Optional[StrictInt] = None
-    __properties: ClassVar[List[str]] = ["id", "execution_id", "open_order_execution_id", "position_id", "client_order_id", "action_type", "market_type", "strategy_id", "symbol", "is_limit", "limit_price", "allocation", "take_profit", "stop_loss", "expiry_timestamp", "leverage", "margin_mode", "timestamp"]
+    __properties: ClassVar[List[str]] = ["created_at", "updated_at", "id", "execution_id", "open_order_execution_id", "client_order_id", "action_type", "market_type", "strategy_id", "symbol", "is_limit", "limit_price", "allocation", "take_profit", "stop_loss", "expiry_timestamp", "position_id", "leverage", "margin_mode"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -119,11 +120,6 @@ class ActionModel(BaseModel):
         if self.open_order_execution_id is None and "open_order_execution_id" in self.model_fields_set:
             _dict['open_order_execution_id'] = None
 
-        # set to None if position_id (nullable) is None
-        # and model_fields_set contains the field
-        if self.position_id is None and "position_id" in self.model_fields_set:
-            _dict['position_id'] = None
-
         # set to None if client_order_id (nullable) is None
         # and model_fields_set contains the field
         if self.client_order_id is None and "client_order_id" in self.model_fields_set:
@@ -154,6 +150,11 @@ class ActionModel(BaseModel):
         if self.expiry_timestamp is None and "expiry_timestamp" in self.model_fields_set:
             _dict['expiry_timestamp'] = None
 
+        # set to None if position_id (nullable) is None
+        # and model_fields_set contains the field
+        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:
@@ -164,11 +165,6 @@ class ActionModel(BaseModel):
         if self.margin_mode is None and "margin_mode" in self.model_fields_set:
             _dict['margin_mode'] = None
 
-        # set to None if timestamp (nullable) is None
-        # and model_fields_set contains the field
-        if self.timestamp is None and "timestamp" in self.model_fields_set:
-            _dict['timestamp'] = None
-
         return _dict
 
     @classmethod
@@ -181,10 +177,11 @@ class ActionModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "execution_id": obj.get("execution_id"),
             "open_order_execution_id": obj.get("open_order_execution_id"),
-            "position_id": obj.get("position_id"),
             "client_order_id": obj.get("client_order_id"),
             "action_type": obj.get("action_type"),
             "market_type": obj.get("market_type"),
@@ -196,9 +193,9 @@ class ActionModel(BaseModel):
             "take_profit": [TPSL.from_dict(_item) for _item in obj["take_profit"]] if obj.get("take_profit") is not None else None,
             "stop_loss": [TPSL.from_dict(_item) for _item in obj["stop_loss"]] if obj.get("stop_loss") is not None else None,
             "expiry_timestamp": obj.get("expiry_timestamp"),
+            "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"),
-            "timestamp": obj.get("timestamp")
+            "margin_mode": obj.get("margin_mode")
         })
         return _obj
 

crypticorn/{models → trade/client/models}/api_error_identifier.py

@@ -68,10 +68,12 @@ class ApiErrorIdentifier(str, Enum):
     BLACK_SWAN = 'black_swan'
     TRADING_ACTION_EXPIRED = 'trading_action_expired'
     BOT_DISABLED = 'bot_disabled'
-    NEW_TRADING_ACTION = 'new_trading_action'
     ORDER_SIZE_TOO_SMALL = 'order_size_too_small'
     ORDER_SIZE_TOO_LARGE = 'order_size_too_large'
     HEDGE_MODE_NOT_ACTIVE = 'hedge_mode_not_active'
+    API_KEY_ALREADY_EXISTS = 'api_key_already_exists'
+    DELETE_BOT_ERROR = 'delete_bot_error'
+    JWT_EXPIRED = 'jwt_expired'
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

crypticorn/{models → trade/client/models}/api_key_model.py

@@ -26,6 +26,8 @@ class APIKeyModel(BaseModel):
     """
     APIKeyModel
     """ # noqa: E501
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     exchange: StrictStr = Field(description="Exchange name")
     api_key: Optional[StrictStr] = None
@@ -33,9 +35,8 @@ class APIKeyModel(BaseModel):
     passphrase: Optional[StrictStr] = None
     label: StrictStr = Field(description="Label for the API key")
     enabled: Optional[StrictBool] = None
-    created_at: Optional[StrictInt] = None
     user_id: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["id", "exchange", "api_key", "secret", "passphrase", "label", "enabled", "created_at", "user_id"]
+    __properties: ClassVar[List[str]] = ["created_at", "updated_at", "id", "exchange", "api_key", "secret", "passphrase", "label", "enabled", "user_id"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -101,11 +102,6 @@ class APIKeyModel(BaseModel):
         if self.enabled is None and "enabled" in self.model_fields_set:
             _dict['enabled'] = None
 
-        # set to None if created_at (nullable) is None
-        # and model_fields_set contains the field
-        if self.created_at is None and "created_at" in self.model_fields_set:
-            _dict['created_at'] = 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:
@@ -123,6 +119,8 @@ class APIKeyModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "exchange": obj.get("exchange"),
             "api_key": obj.get("api_key"),
@@ -130,7 +128,6 @@ class APIKeyModel(BaseModel):
             "passphrase": obj.get("passphrase"),
             "label": obj.get("label"),
             "enabled": obj.get("enabled"),
-            "created_at": obj.get("created_at"),
             "user_id": obj.get("user_id")
         })
         return _obj

crypticorn/{models → trade/client/models}/bot_model.py

@@ -26,16 +26,18 @@ class BotModel(BaseModel):
     """
     BotModel
     """ # noqa: E501
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     name: StrictStr = Field(description="Name of the bot")
     strategy_id: StrictStr = Field(description="UID for the trading strategy used by the bot")
     api_key_id: StrictStr = Field(description="UID for the API key")
-    initial_allocation: Union[StrictFloat, StrictInt] = Field(description="Initial allocation for the bot")
-    current_allocation: Optional[Union[StrictFloat, StrictInt]] = None
+    allocation: StrictInt = Field(description="Initial allocation for the bot")
     enabled: StrictBool = Field(description="Status of the bot")
     deleted: Optional[StrictBool] = Field(default=False, description="Whether the bot has been deleted")
     user_id: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["id", "name", "strategy_id", "api_key_id", "initial_allocation", "current_allocation", "enabled", "deleted", "user_id"]
+    current_allocation: Optional[Union[StrictFloat, StrictInt]] = None
+    __properties: ClassVar[List[str]] = ["created_at", "updated_at", "id", "name", "strategy_id", "api_key_id", "allocation", "enabled", "deleted", "user_id", "current_allocation"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -81,16 +83,16 @@ class BotModel(BaseModel):
         if self.id is None and "id" in self.model_fields_set:
             _dict['id'] = None
 
-        # set to None if current_allocation (nullable) is None
-        # and model_fields_set contains the field
-        if self.current_allocation is None and "current_allocation" in self.model_fields_set:
-            _dict['current_allocation'] = 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:
             _dict['user_id'] = None
 
+        # set to None if current_allocation (nullable) is None
+        # and model_fields_set contains the field
+        if self.current_allocation is None and "current_allocation" in self.model_fields_set:
+            _dict['current_allocation'] = None
+
         return _dict
 
     @classmethod
@@ -103,15 +105,17 @@ class BotModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "name": obj.get("name"),
             "strategy_id": obj.get("strategy_id"),
             "api_key_id": obj.get("api_key_id"),
-            "initial_allocation": obj.get("initial_allocation"),
-            "current_allocation": obj.get("current_allocation"),
+            "allocation": obj.get("allocation"),
             "enabled": obj.get("enabled"),
             "deleted": obj.get("deleted") if obj.get("deleted") is not None else False,
-            "user_id": obj.get("user_id")
+            "user_id": obj.get("user_id"),
+            "current_allocation": obj.get("current_allocation")
         })
         return _obj
 

crypticorn/{models → trade/client/models}/futures_trading_action.py

@@ -20,10 +20,10 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing_extensions import Annotated
-from crypticorn.models.margin_mode import MarginMode
-from crypticorn.models.market_type import MarketType
-from crypticorn.models.tpsl import TPSL
-from crypticorn.models.trading_action_type import TradingActionType
+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
 from typing_extensions import Self
 
@@ -34,7 +34,6 @@ class FuturesTradingAction(BaseModel):
     id: Optional[StrictStr] = None
     execution_id: Optional[StrictStr] = None
     open_order_execution_id: Optional[StrictStr] = None
-    position_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.")
@@ -46,9 +45,10 @@ class FuturesTradingAction(BaseModel):
     take_profit: Optional[List[TPSL]] = None
     stop_loss: Optional[List[TPSL]] = None
     expiry_timestamp: Optional[StrictInt] = None
+    position_id: Optional[StrictStr] = None
     leverage: Optional[Annotated[int, Field(strict=True, ge=1)]]
     margin_mode: Optional[MarginMode] = None
-    __properties: ClassVar[List[str]] = ["id", "execution_id", "open_order_execution_id", "position_id", "client_order_id", "action_type", "market_type", "strategy_id", "symbol", "is_limit", "limit_price", "allocation", "take_profit", "stop_loss", "expiry_timestamp", "leverage", "margin_mode"]
+    __properties: ClassVar[List[str]] = ["id", "execution_id", "open_order_execution_id", "client_order_id", "action_type", "market_type", "strategy_id", "symbol", "is_limit", "limit_price", "allocation", "take_profit", "stop_loss", "expiry_timestamp", "position_id", "leverage", "margin_mode"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -118,11 +118,6 @@ class FuturesTradingAction(BaseModel):
         if self.open_order_execution_id is None and "open_order_execution_id" in self.model_fields_set:
             _dict['open_order_execution_id'] = None
 
-        # set to None if position_id (nullable) is None
-        # and model_fields_set contains the field
-        if self.position_id is None and "position_id" in self.model_fields_set:
-            _dict['position_id'] = None
-
         # set to None if client_order_id (nullable) is None
         # and model_fields_set contains the field
         if self.client_order_id is None and "client_order_id" in self.model_fields_set:
@@ -153,6 +148,11 @@ class FuturesTradingAction(BaseModel):
         if self.expiry_timestamp is None and "expiry_timestamp" in self.model_fields_set:
             _dict['expiry_timestamp'] = None
 
+        # set to None if position_id (nullable) is None
+        # and model_fields_set contains the field
+        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:
@@ -178,7 +178,6 @@ class FuturesTradingAction(BaseModel):
             "id": obj.get("id"),
             "execution_id": obj.get("execution_id"),
             "open_order_execution_id": obj.get("open_order_execution_id"),
-            "position_id": obj.get("position_id"),
             "client_order_id": obj.get("client_order_id"),
             "action_type": obj.get("action_type"),
             "market_type": obj.get("market_type"),
@@ -190,6 +189,7 @@ class FuturesTradingAction(BaseModel):
             "take_profit": [TPSL.from_dict(_item) for _item in obj["take_profit"]] if obj.get("take_profit") is not None else None,
             "stop_loss": [TPSL.from_dict(_item) for _item in obj["stop_loss"]] if obj.get("stop_loss") is not None else None,
             "expiry_timestamp": obj.get("expiry_timestamp"),
+            "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")
         })

crypticorn/{models → trade/client/models}/http_validation_error.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict
 from typing import Any, ClassVar, Dict, List, Optional
-from crypticorn.models.validation_error import ValidationError
+from crypticorn.trade.client.models.validation_error import ValidationError
 from typing import Optional, Set
 from typing_extensions import Self
 

crypticorn/{models → trade/client/models}/notification_model.py

@@ -19,8 +19,8 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from crypticorn.models.api_error_identifier import ApiErrorIdentifier
-from crypticorn.models.notification_type import NotificationType
+from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
+from crypticorn.trade.client.models.notification_type import NotificationType
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -28,14 +28,15 @@ class NotificationModel(BaseModel):
     """
     NotificationModel
     """ # noqa: E501
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     identifier: ApiErrorIdentifier = Field(description="Identifier string. Must match the mapping key in the frontend.")
     user_id: Optional[StrictStr] = None
     viewed: Optional[StrictBool] = Field(default=False, description="Whether the notification has been marked as seen")
     sent: Optional[StrictBool] = Field(default=False, description="Whether the notification has been sent as an email")
     type: NotificationType = Field(description="The type of the notification.")
-    timestamp: Optional[StrictInt] = Field(default=1741716883, description="Timestamp of creation")
-    __properties: ClassVar[List[str]] = ["id", "identifier", "user_id", "viewed", "sent", "type", "timestamp"]
+    __properties: ClassVar[List[str]] = ["created_at", "updated_at", "id", "identifier", "user_id", "viewed", "sent", "type"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -98,13 +99,14 @@ class NotificationModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "identifier": obj.get("identifier"),
             "user_id": obj.get("user_id"),
             "viewed": obj.get("viewed") if obj.get("viewed") is not None else False,
             "sent": obj.get("sent") if obj.get("sent") is not None else False,
-            "type": obj.get("type"),
-            "timestamp": obj.get("timestamp") if obj.get("timestamp") is not None else 1741716883
+            "type": obj.get("type")
         })
         return _obj