crypticorn 2.15.0__py3-none-any.whl → 2.17.0rc1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- crypticorn/common/__init__.py +2 -0
- crypticorn/common/metrics.py +20 -0
- crypticorn/common/middleware.py +41 -0
- crypticorn/common/pagination.py +7 -5
- crypticorn/common/router/admin_router.py +12 -2
- crypticorn/common/scopes.py +2 -0
- crypticorn/common/warnings.py +7 -0
- crypticorn/trade/client/models/api_error_identifier.py +7 -7
- crypticorn/trade/client/models/futures_trading_action.py +6 -28
- crypticorn/trade/client/models/futures_trading_action_create.py +10 -13
- crypticorn/trade/client/models/order.py +2 -14
- crypticorn/trade/client/models/spot_trading_action_create.py +4 -1
- crypticorn/trade/client/models/tpsl.py +0 -8
- {crypticorn-2.15.0.dist-info → crypticorn-2.17.0rc1.dist-info}/METADATA +2 -1
- {crypticorn-2.15.0.dist-info → crypticorn-2.17.0rc1.dist-info}/RECORD +19 -18
- {crypticorn-2.15.0.dist-info → crypticorn-2.17.0rc1.dist-info}/WHEEL +0 -0
- {crypticorn-2.15.0.dist-info → crypticorn-2.17.0rc1.dist-info}/entry_points.txt +0 -0
- {crypticorn-2.15.0.dist-info → crypticorn-2.17.0rc1.dist-info}/licenses/LICENSE +0 -0
- {crypticorn-2.15.0.dist-info → crypticorn-2.17.0rc1.dist-info}/top_level.txt +0 -0
crypticorn/common/__init__.py
CHANGED
@@ -13,5 +13,7 @@ from crypticorn.common.ansi_colors import *
|
|
13
13
|
from crypticorn.common.middleware import *
|
14
14
|
from crypticorn.common.warnings import *
|
15
15
|
from crypticorn.common.openapi import *
|
16
|
+
from crypticorn.common.metrics import *
|
16
17
|
from crypticorn.common.router.status_router import router as status_router
|
17
18
|
from crypticorn.common.router.admin_router import router as admin_router
|
19
|
+
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# metrics/registry.py
|
2
|
+
from prometheus_client import (
|
3
|
+
Counter, Gauge, Histogram, Summary, CollectorRegistry
|
4
|
+
)
|
5
|
+
|
6
|
+
registry = CollectorRegistry()
|
7
|
+
|
8
|
+
http_requests_total = Counter(
|
9
|
+
"http_requests_total",
|
10
|
+
"Total HTTP requests",
|
11
|
+
["method", "endpoint", "status_code"],
|
12
|
+
registry=registry
|
13
|
+
)
|
14
|
+
|
15
|
+
http_request_duration_seconds = Histogram(
|
16
|
+
"http_request_duration_seconds",
|
17
|
+
"HTTP request duration in seconds",
|
18
|
+
["endpoint"],
|
19
|
+
registry=registry
|
20
|
+
)
|
crypticorn/common/middleware.py
CHANGED
@@ -1,10 +1,50 @@
|
|
1
|
+
import time
|
1
2
|
from fastapi import FastAPI
|
2
3
|
from fastapi.middleware.cors import CORSMiddleware
|
4
|
+
from starlette.middleware.base import BaseHTTPMiddleware
|
5
|
+
from starlette.requests import Request
|
3
6
|
from crypticorn.common.logging import configure_logging
|
4
7
|
from contextlib import asynccontextmanager
|
8
|
+
from typing_extensions import deprecated
|
9
|
+
import warnings
|
10
|
+
from crypticorn.common.warnings import CrypticornDeprecatedSince217
|
11
|
+
from crypticorn.common.metrics import http_requests_total, http_request_duration_seconds
|
5
12
|
|
13
|
+
class PrometheusMiddleware(BaseHTTPMiddleware):
|
14
|
+
async def dispatch(self, request, call_next):
|
15
|
+
start = time.perf_counter()
|
16
|
+
response = await call_next(request)
|
17
|
+
duration = time.perf_counter() - start
|
6
18
|
|
19
|
+
http_requests_total.labels(
|
20
|
+
method=request.method,
|
21
|
+
endpoint=request.url.path,
|
22
|
+
status_code=response.status_code
|
23
|
+
).inc()
|
24
|
+
|
25
|
+
http_request_duration_seconds.labels(
|
26
|
+
endpoint=request.url.path
|
27
|
+
).observe(duration)
|
28
|
+
|
29
|
+
return response
|
30
|
+
|
31
|
+
|
32
|
+
@deprecated("Use add_middleware instead", category=None)
|
7
33
|
def add_cors_middleware(app: "FastAPI"):
|
34
|
+
warnings.warn("add_cors_middleware is deprecated. Use add_middleware instead.", CrypticornDeprecatedSince217)
|
35
|
+
app.add_middleware(
|
36
|
+
CORSMiddleware,
|
37
|
+
allow_origins=[
|
38
|
+
"http://localhost:5173", # vite dev server
|
39
|
+
"http://localhost:4173", # vite preview server
|
40
|
+
],
|
41
|
+
allow_origin_regex="^https://([a-zA-Z0-9-]+.)*crypticorn.(dev|com)/?$", # matches (multiple or no) subdomains of crypticorn.dev and crypticorn.com
|
42
|
+
allow_credentials=True,
|
43
|
+
allow_methods=["*"],
|
44
|
+
allow_headers=["*"],
|
45
|
+
)
|
46
|
+
|
47
|
+
def add_middleware(app: "FastAPI"):
|
8
48
|
app.add_middleware(
|
9
49
|
CORSMiddleware,
|
10
50
|
allow_origins=[
|
@@ -16,6 +56,7 @@ def add_cors_middleware(app: "FastAPI"):
|
|
16
56
|
allow_methods=["*"],
|
17
57
|
allow_headers=["*"],
|
18
58
|
)
|
59
|
+
app.add_middleware(PrometheusMiddleware)
|
19
60
|
|
20
61
|
|
21
62
|
@asynccontextmanager
|
crypticorn/common/pagination.py
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
"""Utilities for handling paginated API responses and cursor-based pagination."""
|
2
2
|
|
3
|
-
from typing import Generic, Type, TypeVar,
|
3
|
+
from typing import Generic, Type, TypeVar, Optional, Literal
|
4
4
|
from pydantic import BaseModel, Field, model_validator
|
5
5
|
|
6
6
|
T = TypeVar("T")
|
@@ -11,7 +11,7 @@ class PaginatedResponse(BaseModel, Generic[T]):
|
|
11
11
|
>>> PaginatedResponse[ItemModel](data=items, total=total_items, page=1, size=10, prev=None, next=2)
|
12
12
|
"""
|
13
13
|
|
14
|
-
data:
|
14
|
+
data: list[T]
|
15
15
|
total: int = Field(description="The total number of items")
|
16
16
|
page: int = Field(description="The current page number")
|
17
17
|
size: int = Field(description="The number of items per page")
|
@@ -28,9 +28,7 @@ class PaginationParams(BaseModel, Generic[T]):
|
|
28
28
|
|
29
29
|
page: int = Field(default=1, description="The current page number")
|
30
30
|
size: int = Field(default=10, description="The number of items per page")
|
31
|
-
order: Literal["asc", "desc"] = Field(
|
32
|
-
default="asc", description="The order to sort by"
|
33
|
-
)
|
31
|
+
order: Optional[Literal["asc", "desc"]] = Field(None, description="The order to sort by")
|
34
32
|
sort: Optional[str] = Field(None, description="The field to sort by")
|
35
33
|
|
36
34
|
@model_validator(mode="after")
|
@@ -48,4 +46,8 @@ class PaginationParams(BaseModel, Generic[T]):
|
|
48
46
|
raise ValueError(
|
49
47
|
f"Invalid sort field: '{self.sort}' — must be one of: {list(model.model_fields)}"
|
50
48
|
)
|
49
|
+
if self.order and self.order not in ["asc", "desc"]:
|
50
|
+
raise ValueError(f"Invalid order: '{self.order}' — must be one of: ['asc', 'desc']")
|
51
|
+
if self.order and not self.sort or self.sort and not self.order:
|
52
|
+
raise ValueError("Sort and order must be provided together")
|
51
53
|
return self
|
@@ -11,10 +11,12 @@ import threading
|
|
11
11
|
import time
|
12
12
|
import psutil
|
13
13
|
import re
|
14
|
-
|
14
|
+
import logging
|
15
15
|
from typing import Literal
|
16
|
+
from fastapi import APIRouter, Query, Response
|
17
|
+
from prometheus_client import generate_latest, CONTENT_TYPE_LATEST
|
16
18
|
from crypticorn.common.logging import LogLevel
|
17
|
-
import
|
19
|
+
from crypticorn.common.metrics import registry
|
18
20
|
|
19
21
|
router = APIRouter(tags=["Admin"], prefix="/admin")
|
20
22
|
|
@@ -104,3 +106,11 @@ def list_installed_packages(
|
|
104
106
|
or any(re.match(pattern, dist.metadata["Name"]) for pattern in include)
|
105
107
|
}
|
106
108
|
return dict(sorted(packages.items()))
|
109
|
+
|
110
|
+
|
111
|
+
@router.get("/metrics", operation_id="getMetrics")
|
112
|
+
def metrics():
|
113
|
+
"""
|
114
|
+
Get Prometheus metrics for the application. Returns plain text.
|
115
|
+
"""
|
116
|
+
return Response(generate_latest(registry), media_type=CONTENT_TYPE_LATEST)
|
crypticorn/common/scopes.py
CHANGED
@@ -16,6 +16,7 @@ class Scope(StrEnum):
|
|
16
16
|
|
17
17
|
# Scopes that can be purchased - these actually exist in the jwt token
|
18
18
|
READ_PREDICTIONS = "read:predictions"
|
19
|
+
READ_DEXSIGNALS = "read:dexsignals"
|
19
20
|
|
20
21
|
# Hive scopes
|
21
22
|
READ_HIVE_MODEL = "read:hive:model"
|
@@ -87,4 +88,5 @@ class Scope(StrEnum):
|
|
87
88
|
cls.READ_METRICS_MARKETS,
|
88
89
|
cls.READ_KLINES,
|
89
90
|
cls.READ_SENTIMENT,
|
91
|
+
cls.READ_DEXSIGNALS,
|
90
92
|
]
|
crypticorn/common/warnings.py
CHANGED
@@ -55,12 +55,19 @@ class CrypticornDeprecatedSince28(CrypticornDeprecationWarning):
|
|
55
55
|
def __init__(self, message: str, *args: object) -> None:
|
56
56
|
super().__init__(message, *args, since=(2, 8), expected_removal=(3, 0))
|
57
57
|
|
58
|
+
|
58
59
|
class CrypticornDeprecatedSince215(CrypticornDeprecationWarning):
|
59
60
|
"""A specific `CrypticornDeprecationWarning` subclass defining functionality deprecated since Crypticorn 2.15."""
|
60
61
|
|
61
62
|
def __init__(self, message: str, *args: object) -> None:
|
62
63
|
super().__init__(message, *args, since=(2, 15), expected_removal=(3, 0))
|
63
64
|
|
65
|
+
class CrypticornDeprecatedSince217(CrypticornDeprecationWarning):
|
66
|
+
"""A specific `CrypticornDeprecationWarning` subclass defining functionality deprecated since Crypticorn 2.17."""
|
67
|
+
|
68
|
+
def __init__(self, message: str, *args: object) -> None:
|
69
|
+
super().__init__(message, *args, since=(2, 17), expected_removal=(3, 0))
|
70
|
+
|
64
71
|
|
65
72
|
class CrypticornExperimentalWarning(Warning):
|
66
73
|
"""A Crypticorn specific experimental functionality warning.
|
@@ -28,15 +28,17 @@ class ApiErrorIdentifier(str, Enum):
|
|
28
28
|
"""
|
29
29
|
ALLOCATION_BELOW_CURRENT_EXPOSURE = "allocation_below_current_exposure"
|
30
30
|
ALLOCATION_BELOW_MIN_AMOUNT = "allocation_below_min_amount"
|
31
|
+
ALLOCATION_LIMIT_EXCEEDED = "allocation_limit_exceeded"
|
31
32
|
BLACK_SWAN = "black_swan"
|
32
33
|
BOT_ALREADY_DELETED = "bot_already_deleted"
|
33
|
-
BOT_DISABLED = "bot_disabled"
|
34
34
|
BOT_STOPPING_COMPLETED = "bot_stopping_completed"
|
35
35
|
BOT_STOPPING_STARTED = "bot_stopping_started"
|
36
36
|
CANCELLED_OPEN_ORDER = "cancelled_open_order"
|
37
37
|
CLIENT_ORDER_ID_ALREADY_EXISTS = "client_order_id_already_exists"
|
38
38
|
INVALID_CONTENT_TYPE = "invalid_content_type"
|
39
39
|
DELETE_BOT_ERROR = "delete_bot_error"
|
40
|
+
EXCHANGE_HTTP_REQUEST_ERROR = "exchange_http_request_error"
|
41
|
+
EXCHANGE_INVALID_PARAMETER = "exchange_invalid_parameter"
|
40
42
|
EXCHANGE_INVALID_SIGNATURE = "exchange_invalid_signature"
|
41
43
|
EXCHANGE_INVALID_TIMESTAMP = "exchange_invalid_timestamp"
|
42
44
|
EXCHANGE_IP_ADDRESS_IS_NOT_AUTHORIZED = "exchange_ip_address_is_not_authorized"
|
@@ -56,10 +58,9 @@ class ApiErrorIdentifier(str, Enum):
|
|
56
58
|
EXCHANGE_USER_ACCOUNT_IS_FROZEN = "exchange_user_account_is_frozen"
|
57
59
|
API_KEY_EXPIRED = "api_key_expired"
|
58
60
|
BEARER_TOKEN_EXPIRED = "bearer_token_expired"
|
59
|
-
|
61
|
+
FAILED_OPEN_ORDER = "failed_open_order"
|
60
62
|
FORBIDDEN = "forbidden"
|
61
63
|
HEDGE_MODE_NOT_ACTIVE = "hedge_mode_not_active"
|
62
|
-
HTTP_REQUEST_ERROR = "http_request_error"
|
63
64
|
INSUFFICIENT_BALANCE = "insufficient_balance"
|
64
65
|
INSUFFICIENT_MARGIN = "insufficient_margin"
|
65
66
|
INSUFFICIENT_SCOPES = "insufficient_scopes"
|
@@ -68,15 +69,15 @@ class ApiErrorIdentifier(str, Enum):
|
|
68
69
|
INVALID_DATA = "invalid_data"
|
69
70
|
INVALID_DATA_RESPONSE = "invalid_data_response"
|
70
71
|
INVALID_EXCHANGE_KEY = "invalid_exchange_key"
|
71
|
-
INVALID_MARGIN_MODE = "invalid_margin_mode"
|
72
72
|
INVALID_MODEL_NAME = "invalid_model_name"
|
73
|
-
INVALID_PARAMETER_PROVIDED = "exchange_invalid_parameter"
|
74
73
|
LEVERAGE_LIMIT_EXCEEDED = "leverage_limit_exceeded"
|
75
74
|
ORDER_VIOLATES_LIQUIDATION_PRICE_CONSTRAINTS = (
|
76
75
|
"order_violates_liquidation_price_constraints"
|
77
76
|
)
|
78
77
|
MARGIN_MODE_CLASH = "margin_mode_clash"
|
79
78
|
NAME_NOT_UNIQUE = "name_not_unique"
|
79
|
+
NO_API_KEY = "no_api_key"
|
80
|
+
NO_BEARER = "no_bearer"
|
80
81
|
NO_CREDENTIALS = "no_credentials"
|
81
82
|
NOW_API_DOWN = "now_api_down"
|
82
83
|
OBJECT_ALREADY_EXISTS = "object_already_exists"
|
@@ -102,14 +103,13 @@ class ApiErrorIdentifier(str, Enum):
|
|
102
103
|
RISK_LIMIT_EXCEEDED = "risk_limit_exceeded"
|
103
104
|
RPC_TIMEOUT = "rpc_timeout"
|
104
105
|
SYSTEM_SETTLEMENT_IN_PROCESS = "system_settlement_in_process"
|
105
|
-
STRATEGY_ALREADY_EXISTS = "strategy_already_exists"
|
106
106
|
STRATEGY_DISABLED = "strategy_disabled"
|
107
107
|
STRATEGY_LEVERAGE_MISMATCH = "strategy_leverage_mismatch"
|
108
108
|
STRATEGY_NOT_SUPPORTING_EXCHANGE = "strategy_not_supporting_exchange"
|
109
109
|
SUCCESS = "success"
|
110
110
|
SYMBOL_DOES_NOT_EXIST = "symbol_does_not_exist"
|
111
111
|
TRADING_ACTION_EXPIRED = "trading_action_expired"
|
112
|
-
TRADING_ACTION_SKIPPED_BOT_STOPPING = "
|
112
|
+
TRADING_ACTION_SKIPPED_BOT_STOPPING = "trading_action_skipped_bot_stopping"
|
113
113
|
TRADING_HAS_BEEN_LOCKED = "trading_has_been_locked"
|
114
114
|
TRADING_IS_SUSPENDED = "trading_is_suspended"
|
115
115
|
UNKNOWN_ERROR_OCCURRED = "unknown_error_occurred"
|
@@ -33,8 +33,12 @@ class FuturesTradingAction(BaseModel):
|
|
33
33
|
Model for futures trading actions
|
34
34
|
""" # noqa: E501
|
35
35
|
|
36
|
-
leverage: Optional[Annotated[int, Field(strict=True, ge=1)]]
|
37
|
-
|
36
|
+
leverage: Optional[Annotated[int, Field(strict=True, ge=1)]] = Field(
|
37
|
+
default=1, description="Leverage to use for futures trades. Default is 1."
|
38
|
+
)
|
39
|
+
margin_mode: Optional[MarginMode] = Field(
|
40
|
+
default=None, description="Margin mode for futures trades. Default is isolated."
|
41
|
+
)
|
38
42
|
created_at: Optional[StrictInt] = Field(
|
39
43
|
default=None, description="Timestamp of creation"
|
40
44
|
)
|
@@ -60,8 +64,6 @@ class FuturesTradingAction(BaseModel):
|
|
60
64
|
take_profit: Optional[List[TPSL]] = None
|
61
65
|
stop_loss: Optional[List[TPSL]] = None
|
62
66
|
expiry_timestamp: Optional[StrictInt] = None
|
63
|
-
client_order_id: Optional[StrictStr] = None
|
64
|
-
position_id: Optional[StrictStr] = None
|
65
67
|
__properties: ClassVar[List[str]] = [
|
66
68
|
"leverage",
|
67
69
|
"margin_mode",
|
@@ -80,8 +82,6 @@ class FuturesTradingAction(BaseModel):
|
|
80
82
|
"take_profit",
|
81
83
|
"stop_loss",
|
82
84
|
"expiry_timestamp",
|
83
|
-
"client_order_id",
|
84
|
-
"position_id",
|
85
85
|
]
|
86
86
|
|
87
87
|
model_config = ConfigDict(
|
@@ -135,16 +135,6 @@ class FuturesTradingAction(BaseModel):
|
|
135
135
|
if _item_stop_loss:
|
136
136
|
_items.append(_item_stop_loss.to_dict())
|
137
137
|
_dict["stop_loss"] = _items
|
138
|
-
# set to None if leverage (nullable) is None
|
139
|
-
# and model_fields_set contains the field
|
140
|
-
if self.leverage is None and "leverage" in self.model_fields_set:
|
141
|
-
_dict["leverage"] = None
|
142
|
-
|
143
|
-
# set to None if margin_mode (nullable) is None
|
144
|
-
# and model_fields_set contains the field
|
145
|
-
if self.margin_mode is None and "margin_mode" in self.model_fields_set:
|
146
|
-
_dict["margin_mode"] = None
|
147
|
-
|
148
138
|
# set to None if execution_id (nullable) is None
|
149
139
|
# and model_fields_set contains the field
|
150
140
|
if self.execution_id is None and "execution_id" in self.model_fields_set:
|
@@ -186,16 +176,6 @@ class FuturesTradingAction(BaseModel):
|
|
186
176
|
):
|
187
177
|
_dict["expiry_timestamp"] = None
|
188
178
|
|
189
|
-
# set to None if client_order_id (nullable) is None
|
190
|
-
# and model_fields_set contains the field
|
191
|
-
if self.client_order_id is None and "client_order_id" in self.model_fields_set:
|
192
|
-
_dict["client_order_id"] = None
|
193
|
-
|
194
|
-
# set to None if position_id (nullable) is None
|
195
|
-
# and model_fields_set contains the field
|
196
|
-
if self.position_id is None and "position_id" in self.model_fields_set:
|
197
|
-
_dict["position_id"] = None
|
198
|
-
|
199
179
|
return _dict
|
200
180
|
|
201
181
|
@classmethod
|
@@ -236,8 +216,6 @@ class FuturesTradingAction(BaseModel):
|
|
236
216
|
else None
|
237
217
|
),
|
238
218
|
"expiry_timestamp": obj.get("expiry_timestamp"),
|
239
|
-
"client_order_id": obj.get("client_order_id"),
|
240
|
-
"position_id": obj.get("position_id"),
|
241
219
|
}
|
242
220
|
)
|
243
221
|
return _obj
|
@@ -33,12 +33,19 @@ class FuturesTradingActionCreate(BaseModel):
|
|
33
33
|
Model for sending futures trading actions
|
34
34
|
""" # noqa: E501
|
35
35
|
|
36
|
-
leverage: Optional[Annotated[int, Field(strict=True, ge=1)]]
|
37
|
-
|
36
|
+
leverage: Optional[Annotated[int, Field(strict=True, ge=1)]] = Field(
|
37
|
+
default=1, description="Leverage to use for futures trades. Default is 1."
|
38
|
+
)
|
39
|
+
margin_mode: Optional[MarginMode] = Field(
|
40
|
+
default=None, description="Margin mode for futures trades. Default is isolated."
|
41
|
+
)
|
38
42
|
execution_id: Optional[StrictStr] = None
|
39
43
|
open_order_execution_id: Optional[StrictStr] = None
|
40
44
|
action_type: TradingActionType = Field(description="The type of action.")
|
41
|
-
market_type: MarketType = Field(
|
45
|
+
market_type: Optional[MarketType] = Field(
|
46
|
+
default=None,
|
47
|
+
description="The type of market the action is for. Must be set to futures.",
|
48
|
+
)
|
42
49
|
strategy_id: StrictStr = Field(description="UID for the strategy.")
|
43
50
|
symbol: StrictStr = Field(
|
44
51
|
description="Trading symbol or asset pair in format: 'symbol/quote_currency' (see market service for valid symbols)"
|
@@ -119,16 +126,6 @@ class FuturesTradingActionCreate(BaseModel):
|
|
119
126
|
if _item_stop_loss:
|
120
127
|
_items.append(_item_stop_loss.to_dict())
|
121
128
|
_dict["stop_loss"] = _items
|
122
|
-
# set to None if leverage (nullable) is None
|
123
|
-
# and model_fields_set contains the field
|
124
|
-
if self.leverage is None and "leverage" in self.model_fields_set:
|
125
|
-
_dict["leverage"] = None
|
126
|
-
|
127
|
-
# set to None if margin_mode (nullable) is None
|
128
|
-
# and model_fields_set contains the field
|
129
|
-
if self.margin_mode is None and "margin_mode" in self.model_fields_set:
|
130
|
-
_dict["margin_mode"] = None
|
131
|
-
|
132
129
|
# set to None if execution_id (nullable) is None
|
133
130
|
# and model_fields_set contains the field
|
134
131
|
if self.execution_id is None and "execution_id" in self.model_fields_set:
|
@@ -65,7 +65,7 @@ class Order(BaseModel):
|
|
65
65
|
sent_qty: Optional[StrictStr] = None
|
66
66
|
fee: Optional[StrictStr] = None
|
67
67
|
leverage: Optional[StrictInt] = None
|
68
|
-
order_details: Optional[Any] = Field(
|
68
|
+
order_details: Optional[Dict[str, Any]] = Field(
|
69
69
|
default=None, description="Exchange specific details of the order"
|
70
70
|
)
|
71
71
|
pnl: Optional[StrictStr] = None
|
@@ -138,9 +138,6 @@ class Order(BaseModel):
|
|
138
138
|
exclude=excluded_fields,
|
139
139
|
exclude_none=True,
|
140
140
|
)
|
141
|
-
# override the default output from pydantic by calling `to_dict()` of order_details
|
142
|
-
if self.order_details:
|
143
|
-
_dict["order_details"] = self.order_details.to_dict()
|
144
141
|
# set to None if trading_action_id (nullable) is None
|
145
142
|
# and model_fields_set contains the field
|
146
143
|
if (
|
@@ -257,11 +254,6 @@ class Order(BaseModel):
|
|
257
254
|
if self.leverage is None and "leverage" in self.model_fields_set:
|
258
255
|
_dict["leverage"] = None
|
259
256
|
|
260
|
-
# set to None if order_details (nullable) is None
|
261
|
-
# and model_fields_set contains the field
|
262
|
-
if self.order_details is None and "order_details" in self.model_fields_set:
|
263
|
-
_dict["order_details"] = None
|
264
|
-
|
265
257
|
# set to None if pnl (nullable) is None
|
266
258
|
# and model_fields_set contains the field
|
267
259
|
if self.pnl is None and "pnl" in self.model_fields_set:
|
@@ -310,11 +302,7 @@ class Order(BaseModel):
|
|
310
302
|
"sent_qty": obj.get("sent_qty"),
|
311
303
|
"fee": obj.get("fee"),
|
312
304
|
"leverage": obj.get("leverage"),
|
313
|
-
"order_details": (
|
314
|
-
AnyOf.from_dict(obj["order_details"])
|
315
|
-
if obj.get("order_details") is not None
|
316
|
-
else None
|
317
|
-
),
|
305
|
+
"order_details": obj.get("order_details"),
|
318
306
|
"pnl": obj.get("pnl"),
|
319
307
|
"order_time": obj.get("order_time"),
|
320
308
|
}
|
@@ -34,7 +34,10 @@ class SpotTradingActionCreate(BaseModel):
|
|
34
34
|
execution_id: Optional[StrictStr] = None
|
35
35
|
open_order_execution_id: Optional[StrictStr] = None
|
36
36
|
action_type: TradingActionType = Field(description="The type of action.")
|
37
|
-
market_type: MarketType = Field(
|
37
|
+
market_type: Optional[MarketType] = Field(
|
38
|
+
default=None,
|
39
|
+
description="The type of market the action is for. Must be set to spot.",
|
40
|
+
)
|
38
41
|
strategy_id: StrictStr = Field(description="UID for the strategy.")
|
39
42
|
symbol: StrictStr = Field(
|
40
43
|
description="Trading symbol or asset pair in format: 'symbol/quote_currency' (see market service for valid symbols)"
|
@@ -34,13 +34,11 @@ class TPSL(BaseModel):
|
|
34
34
|
description="Percentage of the open order to sell. All allocations must sum up to 1. Use this allocation again when closing the order."
|
35
35
|
)
|
36
36
|
execution_id: Optional[StrictStr] = None
|
37
|
-
client_order_id: Optional[StrictStr] = None
|
38
37
|
__properties: ClassVar[List[str]] = [
|
39
38
|
"price_delta",
|
40
39
|
"price",
|
41
40
|
"allocation",
|
42
41
|
"execution_id",
|
43
|
-
"client_order_id",
|
44
42
|
]
|
45
43
|
|
46
44
|
model_config = ConfigDict(
|
@@ -95,11 +93,6 @@ class TPSL(BaseModel):
|
|
95
93
|
if self.execution_id is None and "execution_id" in self.model_fields_set:
|
96
94
|
_dict["execution_id"] = None
|
97
95
|
|
98
|
-
# set to None if client_order_id (nullable) is None
|
99
|
-
# and model_fields_set contains the field
|
100
|
-
if self.client_order_id is None and "client_order_id" in self.model_fields_set:
|
101
|
-
_dict["client_order_id"] = None
|
102
|
-
|
103
96
|
return _dict
|
104
97
|
|
105
98
|
@classmethod
|
@@ -117,7 +110,6 @@ class TPSL(BaseModel):
|
|
117
110
|
"price": obj.get("price"),
|
118
111
|
"allocation": obj.get("allocation"),
|
119
112
|
"execution_id": obj.get("execution_id"),
|
120
|
-
"client_order_id": obj.get("client_order_id"),
|
121
113
|
}
|
122
114
|
)
|
123
115
|
return _obj
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: crypticorn
|
3
|
-
Version: 2.
|
3
|
+
Version: 2.17.0rc1
|
4
4
|
Summary: Maximise Your Crypto Trading Profits with Machine Learning
|
5
5
|
Author-email: Crypticorn <timon@crypticorn.com>
|
6
6
|
License-Expression: MIT
|
@@ -25,6 +25,7 @@ Requires-Dist: click<9.0.0,>=8.0.0
|
|
25
25
|
Requires-Dist: psutil<8.0.0,>=7.0.0
|
26
26
|
Requires-Dist: setuptools<81.0.0,>=80.0.0
|
27
27
|
Requires-Dist: strenum
|
28
|
+
Requires-Dist: prometheus-client<1.0.0,>=0.22.0
|
28
29
|
Requires-Dist: urllib3<3.0.0,>=1.25.3
|
29
30
|
Requires-Dist: python_dateutil<3.0.0,>=2.8.2
|
30
31
|
Requires-Dist: aiohttp<4.0.0,>=3.8.4
|
@@ -65,7 +65,7 @@ crypticorn/cli/templates/auth.py,sha256=i27-Ts-Eiyv6_WRshOp7NV5OYUNbw2-kiN5Ll0k2
|
|
65
65
|
crypticorn/cli/templates/dependabot.yml,sha256=ct5ieB8KAV1KLzoYKUNm6dZ9wKG_P_JQHgRjZUfT54w,861
|
66
66
|
crypticorn/cli/templates/merge-env.sh,sha256=BNPrDTihII0yG2gehBkWwWj0GqHmb6xwmrAgwFpl8dA,554
|
67
67
|
crypticorn/cli/templates/ruff.yml,sha256=gWicFFTzC4nToSmRkIIGipos8CZ447YG0kebBCJhtJE,319
|
68
|
-
crypticorn/common/__init__.py,sha256=
|
68
|
+
crypticorn/common/__init__.py,sha256=Now08P5NDnIUQ2WWZ4MUo066FV58x7oOK95jpFT-kj8,793
|
69
69
|
crypticorn/common/ansi_colors.py,sha256=-tMlUTE8NI7TPv7uj0kGRe-SI2hGaUNPKBFI_dfiZy0,1392
|
70
70
|
crypticorn/common/auth.py,sha256=b7jhR8k7bQFfgokI_Eqji0MpfiyD4EhCoddefUSqs6Y,9925
|
71
71
|
crypticorn/common/decorators.py,sha256=t5Y3vSJ-gt0n2vOYYjYN0dtzNXvZxrJs2SEItpzG8oo,1127
|
@@ -73,15 +73,16 @@ crypticorn/common/enums.py,sha256=x-2xe0NUI8kB6DNg9GLjqAjYOsFAGwP-jdM1YgIt9AI,13
|
|
73
73
|
crypticorn/common/errors.py,sha256=qPCYpmxw0uZNmQw9RYj9vUsg-_R5aRn7fYE8qxTAnyA,30129
|
74
74
|
crypticorn/common/exceptions.py,sha256=4oT58wcL9zQuqYU8op_36uZ1Kzt7JRCccu-o_usgqtU,6392
|
75
75
|
crypticorn/common/logging.py,sha256=n-qaYreRNFVAFRUd91hzYoaTExNLysd9cgEXm-v6eJY,4440
|
76
|
-
crypticorn/common/
|
76
|
+
crypticorn/common/metrics.py,sha256=UDiWu9-B0BvePsCpcrN1EqxNRWxf_TimyUL8YfwJRco,461
|
77
|
+
crypticorn/common/middleware.py,sha256=nclyrDEBF2Ypw7CTYYCU_PXDkmtWnQOt-hknBEYIf-4,2573
|
77
78
|
crypticorn/common/mixins.py,sha256=l7XQrBISaee6fDZXy96k0HnQ18XYocjTUXlNpVxhaOY,2206
|
78
79
|
crypticorn/common/openapi.py,sha256=D8bCpCVVzYQptHrJ7SYOgCxI3R_d0cjW9KMOBq-x0xk,279
|
79
|
-
crypticorn/common/pagination.py,sha256=
|
80
|
-
crypticorn/common/scopes.py,sha256=
|
80
|
+
crypticorn/common/pagination.py,sha256=eD4S8t-NHECWYCFTu3taeDv07_AzPBbopoKSZRBSiCM,2621
|
81
|
+
crypticorn/common/scopes.py,sha256=ZreqkW_XshlyLJjciAfaIFmcy4HO6RnCsbbkjCw-fxc,2900
|
81
82
|
crypticorn/common/urls.py,sha256=v23H2gevTNZ6HMRXDPiuc8znBbNdNqj0JTAdm5Hhms8,1223
|
82
83
|
crypticorn/common/utils.py,sha256=LcWudhcjZtULg87yYghh5muTYdHvk3UmkEAXmX7xgLk,3073
|
83
|
-
crypticorn/common/warnings.py,sha256=
|
84
|
-
crypticorn/common/router/admin_router.py,sha256=
|
84
|
+
crypticorn/common/warnings.py,sha256=gg7_vqb30P91JWQfy3x8Ee9VrYUKuy6aEkeGuL6Mp7M,3083
|
85
|
+
crypticorn/common/router/admin_router.py,sha256=BcA-zRL5Nb5saSoGFgWEuYtPOKM8PJ60KLY3yiD5S2E,4094
|
85
86
|
crypticorn/common/router/status_router.py,sha256=NpLaCF2a1jApo95iolKzzUKuyHbpf4Xwc0sM7dxQ9DE,873
|
86
87
|
crypticorn/hive/__init__.py,sha256=hRfTlEzEql4msytdUC_04vfaHzVKG5CGZle1M-9QFgY,81
|
87
88
|
crypticorn/hive/main.py,sha256=bSOY2PBi4VV_mvN1c0FQAI-En28f8HnmoZDm3g9X6lU,3103
|
@@ -246,7 +247,7 @@ crypticorn/trade/client/api/status_api.py,sha256=YtSZh7xuOl_vq9xfPqdnfuOEA9EpftO
|
|
246
247
|
crypticorn/trade/client/api/strategies_api.py,sha256=L3BlHboDnDtsWf70_kGBU839zy4lGveF-NP1h0bogJQ,53156
|
247
248
|
crypticorn/trade/client/api/trading_actions_api.py,sha256=9S5KbugtgkJAuGjujgs-ZvE5MV-4orhABkbIJxKcjsw,32735
|
248
249
|
crypticorn/trade/client/models/__init__.py,sha256=KoJgwPzyY4gzwmIZuwmKyQx0Enn2-qcy7J0ahBjXIAc,2789
|
249
|
-
crypticorn/trade/client/models/api_error_identifier.py,sha256=
|
250
|
+
crypticorn/trade/client/models/api_error_identifier.py,sha256=vOnj2swcFn3qU5brKTmd4BJEOkBLaeE07iMzLnFLogE,5282
|
250
251
|
crypticorn/trade/client/models/api_error_level.py,sha256=8Sau6q3K29fg-EIGnex0yrw7gXJZLmyGTicYIXcehmY,816
|
251
252
|
crypticorn/trade/client/models/api_error_type.py,sha256=34NBgCP296pQx8doVpeqlhopPfBfRH1I-135YVtN19Y,855
|
252
253
|
crypticorn/trade/client/models/bot.py,sha256=8A6rbg_HW4NWhXknOyHmHEHxzfhRC1TqODOLh6BHrm0,5513
|
@@ -260,28 +261,28 @@ crypticorn/trade/client/models/exchange_key_create.py,sha256=n6yiomatf9FGB5GQpB2
|
|
260
261
|
crypticorn/trade/client/models/exchange_key_update.py,sha256=6rBpzKIAzRq7Wg_P-nNSOJKoljTm3Lq3B8cVkZtM50E,3725
|
261
262
|
crypticorn/trade/client/models/execution_ids.py,sha256=0MHzL43PX-aMjKxCkcLTPbszG5q0KruZPwlColEZW58,2963
|
262
263
|
crypticorn/trade/client/models/futures_balance.py,sha256=BePXd2bngkHjcKtZButMFcsU4RS7MU1QkvzF46q8X6U,4191
|
263
|
-
crypticorn/trade/client/models/futures_trading_action.py,sha256=
|
264
|
-
crypticorn/trade/client/models/futures_trading_action_create.py,sha256=
|
264
|
+
crypticorn/trade/client/models/futures_trading_action.py,sha256=5zGeKBTwHsHC3aQkM7fDE98yH__bC9kw-PtALhrumKI,8551
|
265
|
+
crypticorn/trade/client/models/futures_trading_action_create.py,sha256=Aho_Do2h-Wegaq-tCWJGD3kRpueISnfkdp5c9KvTi9A,8149
|
265
266
|
crypticorn/trade/client/models/log_level.py,sha256=Fv2WlajyWZTiXBRNyFQ1x0xqh5nrzKL_0k7fyt92bHA,813
|
266
267
|
crypticorn/trade/client/models/margin_mode.py,sha256=kG1ElFka5OYQI6YQOH1JhGY3qo-ZQhdMTqIYDpqPlgs,777
|
267
268
|
crypticorn/trade/client/models/market_type.py,sha256=OkEE5lAPw2FAudw_98BLcyglEXQhb2uhFeP82W7WFPM,755
|
268
269
|
crypticorn/trade/client/models/notification.py,sha256=QbvFkWGjolyba7trkG8SdJE1gfzdUftfywCMUe1IDwQ,4416
|
269
270
|
crypticorn/trade/client/models/notification_create.py,sha256=iXkqvDhFYGoKW4yCWkJP7_5q-DPpJpE0FqWKqK21CE8,3749
|
270
271
|
crypticorn/trade/client/models/notification_update.py,sha256=a1tpTjKWA2kOqBJxxeyheMdIOZ_2NtAYu9X7R5h1M3c,3034
|
271
|
-
crypticorn/trade/client/models/order.py,sha256=
|
272
|
+
crypticorn/trade/client/models/order.py,sha256=AQu1qV9GkbLqckgY8AW9m_hd6YDpStAIFJCEUmMewZw,11883
|
272
273
|
crypticorn/trade/client/models/order_status.py,sha256=dQkbXtPSW4bVGQOVL0M9-Q_fMpAUa4v3uwuuUwXNcnY,852
|
273
274
|
crypticorn/trade/client/models/post_futures_action.py,sha256=KBI3lPayQQNfQP8Attow9tkuo9zimJk19cKQQb9JK-w,3123
|
274
|
-
crypticorn/trade/client/models/spot_trading_action_create.py,sha256=
|
275
|
+
crypticorn/trade/client/models/spot_trading_action_create.py,sha256=g6Puv6BTLhgtTYqeE-QhC9WqM4wfoNQOLFsqEXZC0aQ,7494
|
275
276
|
crypticorn/trade/client/models/strategy.py,sha256=Jlgt4oxseebVkbhthQDH3ayOLO2muYnyP6Kg23W02ic,5797
|
276
277
|
crypticorn/trade/client/models/strategy_create.py,sha256=jtr1lUcafFzqYQKiuSXWEqfhLiT4WPj9yw63jtVW6kI,5285
|
277
278
|
crypticorn/trade/client/models/strategy_exchange_info.py,sha256=xRUX4vY4HTZP2hq6joaCvO01MVRbZul_qYGrvzdZpr4,2801
|
278
279
|
crypticorn/trade/client/models/strategy_update.py,sha256=f7UsKSlNardj5h6uqHYbacjWWQscXkFDqcLOoefa28M,5048
|
279
|
-
crypticorn/trade/client/models/tpsl.py,sha256=
|
280
|
+
crypticorn/trade/client/models/tpsl.py,sha256=iuHwBxHaUdtJn7NhcTE6Skzv4nmoSF8jEnf7_bTglwk,3730
|
280
281
|
crypticorn/trade/client/models/tpsl_create.py,sha256=nX4i2BGWv5rmu3SLgRngfvEMFOWa3CIy0G3fyoxI-e4,3351
|
281
282
|
crypticorn/trade/client/models/trading_action_type.py,sha256=BysUEOl85zs79EA2zOcDN1EExcpQdABaJ4Jz08_z8VU,857
|
282
|
-
crypticorn-2.
|
283
|
-
crypticorn-2.
|
284
|
-
crypticorn-2.
|
285
|
-
crypticorn-2.
|
286
|
-
crypticorn-2.
|
287
|
-
crypticorn-2.
|
283
|
+
crypticorn-2.17.0rc1.dist-info/licenses/LICENSE,sha256=HonAVvzFXkP2C1d7D3ByIKPwjGH8NcHTAQvKH7uvOHQ,1856
|
284
|
+
crypticorn-2.17.0rc1.dist-info/METADATA,sha256=LQz-vbKaperW4olSKyppd4LKSLEsGRfg95STN9vjv58,10044
|
285
|
+
crypticorn-2.17.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
286
|
+
crypticorn-2.17.0rc1.dist-info/entry_points.txt,sha256=d_xHsGvUTebPveVUK0SrpDFQ5ZRSjlI7lNCc11sn2PM,59
|
287
|
+
crypticorn-2.17.0rc1.dist-info/top_level.txt,sha256=EP3NY216qIBYfmvGl0L2Zc9ItP0DjGSkiYqd9xJwGcM,11
|
288
|
+
crypticorn-2.17.0rc1.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|