crypticorn 2.2.2__tar.gz → 2.2.4__tar.gz

{crypticorn-2.2.2 → crypticorn-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.2.2
+Version: 2.2.4
 Summary: Maximise Your Crypto Trading Profits with AI Predictions
 Author-email: Crypticorn <timon@crypticorn.com>
 Project-URL: Homepage, https://crypticorn.com

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/auth/client/models/authorize_user_request.py

@@ -29,11 +29,17 @@ class AuthorizeUserRequest(BaseModel):
     AuthorizeUserRequest
     """  # noqa: E501
 
-    email: Annotated[str, Field(min_length=1, strict=True)]
-    password: Annotated[str, Field(min_length=1, strict=True)]
-    admin: Optional[StrictBool] = None
+    email: Annotated[str, Field(min_length=1, strict=True)] = Field(
+        description="Email of the user"
+    )
+    password: Annotated[str, Field(min_length=1, strict=True)] = Field(
+        description="Password of the user"
+    )
+    admin: Optional[StrictBool] = Field(
+        default=None, description="Whether the user is an admin"
+    )
     captcha_token: Annotated[str, Field(min_length=1, strict=True)] = Field(
-        alias="captchaToken"
+        description="Captcha token of the authorization request", alias="captchaToken"
     )
     __properties: ClassVar[List[str]] = ["email", "password", "admin", "captchaToken"]
 

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/auth/client/models/create_api_key_request.py

@@ -17,16 +17,9 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    StrictFloat,
-    StrictInt,
-    StrictStr,
-    field_validator,
-)
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from datetime import datetime
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from typing import Optional, Set
 from typing_extensions import Self
@@ -37,12 +30,18 @@ class CreateApiKeyRequest(BaseModel):
     CreateApiKeyRequest
     """  # noqa: E501
 
-    name: StrictStr
-    scopes: Annotated[List[StrictStr], Field(min_length=1)]
-    expires_in: Optional[Union[StrictFloat, StrictInt]] = Field(
-        default=None, alias="expiresIn"
+    name: StrictStr = Field(description="Name of the API key")
+    scopes: Annotated[List[StrictStr], Field(min_length=1)] = Field(
+        description="Scopes of the API key"
     )
-    __properties: ClassVar[List[str]] = ["name", "scopes", "expiresIn"]
+    expires_at: Optional[datetime] = Field(
+        default=None, description="Expiration time of the API key as a date"
+    )
+    ip_whitelist: Optional[List[StrictStr]] = Field(
+        default=None,
+        description="IP addresses that can access the API key. If empty, the API key will be accessible from any IP address.",
+    )
+    __properties: ClassVar[List[str]] = ["name", "scopes", "expires_at", "ip_whitelist"]
 
     @field_validator("scopes")
     def scopes_validate_enum(cls, value):
@@ -55,8 +54,8 @@ class CreateApiKeyRequest(BaseModel):
                     "write:hive:model",
                     "read:trade:bots",
                     "write:trade:bots",
-                    "read:trade:api_keys",
-                    "write:trade:api_keys",
+                    "read:trade:exchangekeys",
+                    "write:trade:exchangekeys",
                     "read:trade:orders",
                     "read:trade:actions",
                     "write:trade:actions",
@@ -76,7 +75,7 @@ class CreateApiKeyRequest(BaseModel):
                 ]
             ):
                 raise ValueError(
-                    "each list item must be one of ('read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:api_keys', 'write:trade:api_keys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:predictions')"
+                    "each list item must be one of ('read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:exchangekeys', 'write:trade:exchangekeys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:predictions')"
                 )
         return value
 
@@ -132,7 +131,8 @@ class CreateApiKeyRequest(BaseModel):
             {
                 "name": obj.get("name"),
                 "scopes": obj.get("scopes"),
-                "expiresIn": obj.get("expiresIn"),
+                "expires_at": obj.get("expires_at"),
+                "ip_whitelist": obj.get("ip_whitelist"),
             }
         )
         return _obj

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/auth/client/models/get_api_keys200_response_inner.py

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 from datetime import datetime
-from pydantic import BaseModel, ConfigDict, StrictStr, field_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
@@ -29,12 +29,18 @@ class GetApiKeys200ResponseInner(BaseModel):
     GetApiKeys200ResponseInner
     """  # noqa: E501
 
-    id: StrictStr
-    user_id: StrictStr
-    scopes: List[StrictStr]
-    name: StrictStr
-    expires_at: Optional[datetime] = None
-    created_at: datetime
+    id: StrictStr = Field(description="ID of the API key")
+    user_id: StrictStr = Field(description="User ID of the API key")
+    scopes: List[StrictStr] = Field(description="Scopes of the API key")
+    name: StrictStr = Field(description="Name of the API key")
+    expires_at: Optional[datetime] = Field(
+        default=None, description="Expiration time of the API key as a date"
+    )
+    created_at: datetime = Field(description="Creation time of the API key as a date")
+    ip_whitelist: Optional[List[StrictStr]] = Field(
+        default=None,
+        description="IP addresses that can access the API key. If empty, the API key will be accessible from any IP address.",
+    )
     __properties: ClassVar[List[str]] = [
         "id",
         "user_id",
@@ -42,6 +48,7 @@ class GetApiKeys200ResponseInner(BaseModel):
         "name",
         "expires_at",
         "created_at",
+        "ip_whitelist",
     ]
 
     @field_validator("scopes")
@@ -55,8 +62,8 @@ class GetApiKeys200ResponseInner(BaseModel):
                     "write:hive:model",
                     "read:trade:bots",
                     "write:trade:bots",
-                    "read:trade:api_keys",
-                    "write:trade:api_keys",
+                    "read:trade:exchangekeys",
+                    "write:trade:exchangekeys",
                     "read:trade:orders",
                     "read:trade:actions",
                     "write:trade:actions",
@@ -76,7 +83,7 @@ class GetApiKeys200ResponseInner(BaseModel):
                 ]
             ):
                 raise ValueError(
-                    "each list item must be one of ('read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:api_keys', 'write:trade:api_keys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:predictions')"
+                    "each list item must be one of ('read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:exchangekeys', 'write:trade:exchangekeys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:predictions')"
                 )
         return value
 
@@ -136,6 +143,7 @@ class GetApiKeys200ResponseInner(BaseModel):
                 "name": obj.get("name"),
                 "expires_at": obj.get("expires_at"),
                 "created_at": obj.get("created_at"),
+                "ip_whitelist": obj.get("ip_whitelist"),
             }
         )
         return _obj

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/auth/client/models/refresh_token_info200_response_user_session.py

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 from datetime import datetime
-from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
@@ -29,12 +29,16 @@ class RefreshTokenInfo200ResponseUserSession(BaseModel):
     RefreshTokenInfo200ResponseUserSession
     """  # noqa: E501
 
-    id: StrictStr
-    user_id: StrictStr
-    token: StrictStr
-    expires_at: datetime
-    client_ip: Optional[StrictStr] = None
-    user_agent: Optional[StrictStr] = None
+    id: StrictStr = Field(description="ID of the user session")
+    user_id: StrictStr = Field(description="User ID of the user session")
+    token: StrictStr = Field(description="Token of the user session")
+    expires_at: datetime = Field(description="Expiration time of the user session")
+    client_ip: Optional[StrictStr] = Field(
+        default=None, description="Client IP address of the user session"
+    )
+    user_agent: Optional[StrictStr] = Field(
+        default=None, description="User agent of the user session"
+    )
     __properties: ClassVar[List[str]] = [
         "id",
         "user_id",

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/auth/client/models/verify200_response.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictFloat, StrictInt, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing import Optional, Set
 from typing_extensions import Self
@@ -28,14 +28,20 @@ class Verify200Response(BaseModel):
     Verify200Response
     """  # noqa: E501
 
-    iss: Optional[StrictStr] = None
-    sub: Optional[StrictStr] = None
-    aud: Optional[StrictStr] = None
-    exp: Optional[Union[StrictFloat, StrictInt]] = None
-    nbf: Optional[Union[StrictFloat, StrictInt]] = None
-    iat: Optional[Union[StrictFloat, StrictInt]] = None
-    jti: Optional[StrictStr] = None
-    scopes: Optional[List[StrictStr]] = None
+    iss: Optional[StrictStr] = Field(default=None, description="Issuer")
+    sub: Optional[StrictStr] = Field(default=None, description="Subject")
+    aud: Optional[StrictStr] = Field(default=None, description="Audience")
+    exp: Optional[Union[StrictFloat, StrictInt]] = Field(
+        default=None, description="Expiration time"
+    )
+    nbf: Optional[Union[StrictFloat, StrictInt]] = Field(
+        default=None, description="Not valid before time"
+    )
+    iat: Optional[Union[StrictFloat, StrictInt]] = Field(
+        default=None, description="Issued at time"
+    )
+    jti: Optional[StrictStr] = Field(default=None, description="JWT ID")
+    scopes: Optional[List[StrictStr]] = Field(default=None, description="Scopes")
     __properties: ClassVar[List[str]] = [
         "iss",
         "sub",

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/auth/client/models/verify_email200_response_auth_auth.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictFloat, StrictInt, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing import Optional, Set
 from typing_extensions import Self
@@ -28,14 +28,20 @@ class VerifyEmail200ResponseAuthAuth(BaseModel):
     VerifyEmail200ResponseAuthAuth
     """  # noqa: E501
 
-    iss: Optional[StrictStr] = None
-    sub: Optional[StrictStr] = None
-    aud: Optional[StrictStr] = None
-    exp: Optional[Union[StrictFloat, StrictInt]] = None
-    nbf: Optional[Union[StrictFloat, StrictInt]] = None
-    iat: Optional[Union[StrictFloat, StrictInt]] = None
-    jti: Optional[StrictStr] = None
-    scopes: Optional[List[StrictStr]] = None
+    iss: Optional[StrictStr] = Field(default=None, description="Issuer")
+    sub: Optional[StrictStr] = Field(default=None, description="Subject")
+    aud: Optional[StrictStr] = Field(default=None, description="Audience")
+    exp: Optional[Union[StrictFloat, StrictInt]] = Field(
+        default=None, description="Expiration time"
+    )
+    nbf: Optional[Union[StrictFloat, StrictInt]] = Field(
+        default=None, description="Not valid before time"
+    )
+    iat: Optional[Union[StrictFloat, StrictInt]] = Field(
+        default=None, description="Issued at time"
+    )
+    jti: Optional[StrictStr] = Field(default=None, description="JWT ID")
+    scopes: Optional[List[StrictStr]] = Field(default=None, description="Scopes")
     __properties: ClassVar[List[str]] = [
         "iss",
         "sub",

crypticorn-2.2.4/crypticorn/common/enums.py

@@ -0,0 +1,26 @@
+from enum import StrEnum
+
+
+class Exchange(StrEnum):
+    """Supported exchanges for trading"""
+
+    KUCOIN = "kucoin"
+    BINGX = "bingx"
+
+
+class InternalExchange(Exchange):
+    """All exchanges we are using, including public (Exchange)"""
+
+    BINANCE = "binance"
+    BYBIT = "bybit"
+    HYPERLIQUID = "hyperliquid"
+    BITGET = "bitget"
+
+
+class MarketType(StrEnum):
+    """
+    Market types
+    """
+
+    SPOT = "spot"
+    FUTURES = "futures"

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/common/errors.py

@@ -1,4 +1,16 @@
-from enum import Enum
+from enum import Enum, EnumMeta
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class Fallback(EnumMeta):
+    def __getattr__(cls, name):
+        """Fallback to UNKNOWN_ERROR for error codes not yet published to PyPI."""
+        logger.warning(
+            f"Unknown error code '{name}' - update crypticorn package or check for typos"
+        )
+        return cls.UNKNOWN_ERROR
 
 
 class ApiErrorType(str, Enum):
@@ -17,7 +29,8 @@ class ApiErrorType(str, Enum):
 class ApiErrorIdentifier(str, Enum):
     """API error identifiers"""
 
-    API_KEY_ALREADY_EXISTS = "api_key_already_exists"
+    ALLOCATION_BELOW_EXPOSURE = "allocation_below_current_exposure"
+    ALLOCATION_BELOW_MINIMUM = "allocation_below_min_amount"
     BLACK_SWAN = "black_swan"
     BOT_ALREADY_DELETED = "bot_already_deleted"
     BOT_DISABLED = "bot_disabled"
@@ -25,18 +38,19 @@ class ApiErrorIdentifier(str, Enum):
     CLIENT_ORDER_ID_REPEATED = "client_order_id_already_exists"
     CONTENT_TYPE_ERROR = "invalid_content_type"
     DELETE_BOT_ERROR = "delete_bot_error"
-    EXCHANGE_API_KEY_IN_USE = "exchange_api_key_in_use"
     EXCHANGE_INVALID_SIGNATURE = "exchange_invalid_signature"
     EXCHANGE_INVALID_TIMESTAMP = "exchange_invalid_timestamp"
     EXCHANGE_IP_RESTRICTED = "exchange_ip_address_is_not_authorized"
+    EXCHANGE_KEY_ALREADY_EXISTS = "exchange_key_already_exists"
+    EXCHANGE_KEY_IN_USE = "exchange_key_in_use"
     EXCHANGE_MAINTENANCE = "exchange_system_under_maintenance"
     EXCHANGE_RATE_LIMIT = "exchange_rate_limit_exceeded"
+    EXCHANGE_PERMISSION_DENIED = "insufficient_permissions_spot_and_futures_required"
     EXCHANGE_SERVICE_UNAVAILABLE = "exchange_service_temporarily_unavailable"
     EXCHANGE_SYSTEM_BUSY = "exchange_system_is_busy"
     EXCHANGE_SYSTEM_CONFIG_ERROR = "exchange_system_configuration_error"
     EXCHANGE_SYSTEM_ERROR = "exchange_internal_system_error"
     EXCHANGE_USER_FROZEN = "exchange_user_account_is_frozen"
-    EXCHANGE_PERMISSION_DENIED = "insufficient_permissions_spot_and_futures_required"
     HEDGE_MODE_NOT_ACTIVE = "hedge_mode_not_active"
     HTTP_ERROR = "http_request_error"
     INSUFFICIENT_BALANCE = "insufficient_balance"
@@ -51,6 +65,7 @@ class ApiErrorIdentifier(str, Enum):
     LEVERAGE_EXCEEDED = "leverage_limit_exceeded"
     LIQUIDATION_PRICE_VIOLATION = "order_violates_liquidation_price_constraints"
     NO_CREDENTIALS = "no_credentials"
+    NOW_API_DOWN = "now_api_down"
     OBJECT_NOT_FOUND = "object_not_found"
     ORDER_ALREADY_FILLED = "order_is_already_filled"
     ORDER_IN_PROCESS = "order_is_being_processed"
@@ -68,11 +83,13 @@ class ApiErrorIdentifier(str, Enum):
     RPC_TIMEOUT = "rpc_timeout"
     SETTLEMENT_IN_PROGRESS = "system_settlement_in_process"
     STRATEGY_DISABLED = "strategy_disabled"
+    STRATEGY_LEVERAGE_MISMATCH = "strategy_leverage_mismatch"
+    STRATEGY_NOT_SUPPORTING_EXCHANGE = "strategy_not_supporting_exchange"
     SUCCESS = "success"
     SYMBOL_NOT_FOUND = "symbol_does_not_exist"
-    TRADING_LOCKED = "trading_has_been_locked"
     TRADING_ACTION_EXPIRED = "trading_action_expired"
     TRADING_ACTION_SKIPPED = "trading_action_skipped"
+    TRADING_LOCKED = "trading_has_been_locked"
     TRADING_SUSPENDED = "trading_is_suspended"
     UNKNOWN_ERROR = "unknown_error_occurred"
     URL_NOT_FOUND = "requested_resource_not_found"
@@ -87,11 +104,16 @@ class ApiErrorLevel(str, Enum):
     WARNING = "warning"
 
 
-class ApiError(Enum):
+class ApiError(Enum, metaclass=Fallback):
     """API error codes"""
 
-    API_KEY_ALREADY_EXISTS = (
-        ApiErrorIdentifier.API_KEY_ALREADY_EXISTS,
+    ALLOCATION_BELOW_EXPOSURE = (
+        ApiErrorIdentifier.ALLOCATION_BELOW_EXPOSURE,
+        ApiErrorType.USER_ERROR,
+        ApiErrorLevel.ERROR,
+    )
+    ALLOCATION_BELOW_MINIMUM = (
+        ApiErrorIdentifier.ALLOCATION_BELOW_MINIMUM,
         ApiErrorType.USER_ERROR,
         ApiErrorLevel.ERROR,
     )
@@ -145,8 +167,13 @@ class ApiError(Enum):
         ApiErrorType.SERVER_ERROR,
         ApiErrorLevel.ERROR,
     )
-    EXCHANGE_API_KEY_IN_USE = (
-        ApiErrorIdentifier.EXCHANGE_API_KEY_IN_USE,
+    EXCHANGE_KEY_ALREADY_EXISTS = (
+        ApiErrorIdentifier.EXCHANGE_KEY_ALREADY_EXISTS,
+        ApiErrorType.USER_ERROR,
+        ApiErrorLevel.ERROR,
+    )
+    EXCHANGE_KEY_IN_USE = (
+        ApiErrorIdentifier.EXCHANGE_KEY_IN_USE,
         ApiErrorType.SERVER_ERROR,
         ApiErrorLevel.ERROR,
     )
@@ -155,16 +182,16 @@ class ApiError(Enum):
         ApiErrorType.EXCHANGE_ERROR,
         ApiErrorLevel.ERROR,
     )
-    EXCHANGE_PERMISSION_DENIED = (
-        ApiErrorIdentifier.EXCHANGE_PERMISSION_DENIED,
-        ApiErrorType.USER_ERROR,
-        ApiErrorLevel.ERROR,
-    )
     EXCHANGE_RATE_LIMIT = (
         ApiErrorIdentifier.EXCHANGE_RATE_LIMIT,
         ApiErrorType.EXCHANGE_ERROR,
         ApiErrorLevel.ERROR,
     )
+    EXCHANGE_PERMISSION_DENIED = (
+        ApiErrorIdentifier.EXCHANGE_PERMISSION_DENIED,
+        ApiErrorType.USER_ERROR,
+        ApiErrorLevel.ERROR,
+    )
     EXCHANGE_SERVICE_UNAVAILABLE = (
         ApiErrorIdentifier.EXCHANGE_SERVICE_UNAVAILABLE,
         ApiErrorType.EXCHANGE_ERROR,
@@ -260,6 +287,11 @@ class ApiError(Enum):
         ApiErrorType.USER_ERROR,
         ApiErrorLevel.ERROR,
     )
+    NOW_API_DOWN = (
+        ApiErrorIdentifier.NOW_API_DOWN,
+        ApiErrorType.SERVER_ERROR,
+        ApiErrorLevel.ERROR,
+    )
     OBJECT_NOT_FOUND = (
         ApiErrorIdentifier.OBJECT_NOT_FOUND,
         ApiErrorType.SERVER_ERROR,
@@ -342,7 +374,17 @@ class ApiError(Enum):
     )
     STRATEGY_DISABLED = (
         ApiErrorIdentifier.STRATEGY_DISABLED,
-        ApiErrorType.SERVER_ERROR,
+        ApiErrorType.USER_ERROR,
+        ApiErrorLevel.ERROR,
+    )
+    STRATEGY_LEVERAGE_MISMATCH = (
+        ApiErrorIdentifier.STRATEGY_LEVERAGE_MISMATCH,
+        ApiErrorType.USER_ERROR,
+        ApiErrorLevel.ERROR,
+    )
+    STRATEGY_NOT_SUPPORTING_EXCHANGE = (
+        ApiErrorIdentifier.STRATEGY_NOT_SUPPORTING_EXCHANGE,
+        ApiErrorType.USER_ERROR,
         ApiErrorLevel.ERROR,
     )
     SUCCESS = (ApiErrorIdentifier.SUCCESS, ApiErrorType.NO_ERROR, ApiErrorLevel.SUCCESS)
@@ -393,3 +435,8 @@ class ApiError(Enum):
     @property
     def level(self) -> ApiErrorLevel:
         return self.value[2]
+
+
+assert len(list(ApiErrorIdentifier)) == len(
+    list(ApiError)
+), f"{len(list(ApiErrorIdentifier))} != {len(list(ApiError))}"

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/common/pydantic.py

@@ -7,6 +7,7 @@ from pydantic.fields import FieldInfo
 
 def partial_model(model: Type[BaseModel]) -> Type[BaseModel]:
     """Marks all fields of a model as optional. Useful for updating models.
+    Inherits all fields, docstrings, and the model name.
 
     >>> @partial_model
     >>> class Model(BaseModel):
@@ -29,6 +30,7 @@ def partial_model(model: Type[BaseModel]) -> Type[BaseModel]:
         model.__name__,
         __base__=model,
         __module__=model.__module__,
+        __doc__=model.__doc__,
         **{
             field_name: make_field_optional(field_info)
             for field_name, field_info in model.model_fields.items()

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/common/scopes.py

@@ -20,8 +20,8 @@ class Scope(StrEnum):
     # Trade scopes
     READ_TRADE_BOTS = "read:trade:bots"
     WRITE_TRADE_BOTS = "write:trade:bots"
-    READ_TRADE_APIKEYS = "read:trade:api_keys"
-    WRITE_TRADE_APIKEYS = "write:trade:api_keys"
+    READ_TRADE_EXCHANGEKEYS = "read:trade:exchangekeys"
+    WRITE_TRADE_EXCHANGEKEYS = "write:trade:exchangekeys"
     READ_TRADE_ORDERS = "read:trade:orders"
     READ_TRADE_ACTIONS = "read:trade:actions"
     WRITE_TRADE_ACTIONS = "write:trade:actions"
@@ -40,5 +40,5 @@ class Scope(StrEnum):
     READ_PAY_NOW = "read:pay:now"
     WRITE_PAY_NOW = "write:pay:now"
 
-    # Read projections
+    # Scopes that can be purchased - these actually exist in the jwt token
     READ_PREDICTIONS = "read:predictions"

{crypticorn-2.2.2 → crypticorn-2.2.4}/crypticorn/common/sorter.py

@@ -2,11 +2,11 @@ import re
 import pyperclip
 
 
-def sort_api_errors(file_content):
+def sort_api_errors(file_content, class_name="ApiErrorIdentifier"):
     # Find the start of the ApiError class definition
-    class_start = file_content.find("class ApiErrorIdentifier(str, Enum):")
+    class_start = file_content.find(f"class {class_name}(str, Enum):")
     if class_start == -1:
-        return "Could not find ApiErrorIdentifier class"
+        return f"Could not find {class_name} class"
 
     # Find all enum definitions
     enum_pattern = r'    ([A-Z_]+)\s*=\s*"([a-z_]+)"'
@@ -23,7 +23,7 @@ def sort_api_errors(file_content):
     sorted_entries = sorted(enum_entries, key=lambda x: x[0])
 
     # Reconstruct the class content
-    class_header = "class ApiErrorIdentifier(str, Enum):\n\n"
+    class_header = f"class {class_name}(str, Enum):\n\n"
     sorted_content = class_header + "\n    ".join(entry[1] for entry in sorted_entries)
 
     return sorted_content
@@ -34,5 +34,7 @@ if __name__ == "__main__":
     with open("python/crypticorn/common/errors.py", "r") as f:
         content = f.read()
 
-    sorted_content = sort_api_errors(content)
-    pyperclip.copy(sorted_content)
+    sorted_content = sort_api_errors(content, "ApiErrorIdentifier")
+    print(sorted_content)
+    sorted_content = sort_api_errors(content, "ApiError")
+    print(sorted_content)