crypticorn 2.17.0rc4__py3-none-any.whl → 2.17.0rc5__py3-none-any.whl

crypticorn/trade/client/api/orders_api.py

@@ -16,9 +16,10 @@ from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
-from pydantic import StrictInt
+from pydantic import Field, StrictStr, field_validator
 from typing import List, Optional
-from crypticorn.trade.client.models.order import Order
+from typing_extensions import Annotated
+from crypticorn.trade.client.models.orders_count import OrdersCount
 
 from crypticorn.trade.client.api_client import ApiClient, RequestSerialized
 from crypticorn.trade.client.api_response import ApiResponse
@@ -57,10 +58,20 @@ class OrdersApi:
         self.is_sync = is_sync
 
     @validate_call
-    def get_orders(
+    def get_orders_count(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -72,15 +83,16 @@ class OrdersApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[Order]:
-        """Get Orders
+    ) -> List[OrdersCount]:
+        """Get Orders Count
 
         This method can work in both sync and async modes based on the is_sync flag.
         """
         if self.is_sync:
-            return self._get_orders_sync(
-                limit=limit,
-                offset=offset,
+            return self._get_orders_count_sync(
+                sort_order=sort_order,
+                sort_by=sort_by,
+                group_by=group_by,
                 _request_timeout=_request_timeout,
                 _request_auth=_request_auth,
                 _content_type=_content_type,
@@ -89,9 +101,10 @@ class OrdersApi:
             )
 
         else:
-            return self._get_orders_async(
-                limit=limit,
-                offset=offset,
+            return self._get_orders_count_async(
+                sort_order=sort_order,
+                sort_by=sort_by,
+                group_by=group_by,
                 _request_timeout=_request_timeout,
                 _request_auth=_request_auth,
                 _content_type=_content_type,
@@ -100,10 +113,20 @@ class OrdersApi:
             )
 
     @validate_call
-    def get_orders_with_http_info(
+    def get_orders_count_with_http_info(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -115,15 +138,16 @@ class OrdersApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[Order]]:
-        """Get Orders with HTTP info
+    ) -> ApiResponse[List[OrdersCount]]:
+        """Get Orders Count with HTTP info
 
         This method can work in both sync and async modes based on the is_sync flag.
         """
         if self.is_sync:
-            return self._get_orders_sync_with_http_info(
-                limit=limit,
-                offset=offset,
+            return self._get_orders_count_sync_with_http_info(
+                sort_order=sort_order,
+                sort_by=sort_by,
+                group_by=group_by,
                 _request_timeout=_request_timeout,
                 _request_auth=_request_auth,
                 _content_type=_content_type,
@@ -132,9 +156,10 @@ class OrdersApi:
             )
 
         else:
-            return self._get_orders_async_with_http_info(
-                limit=limit,
-                offset=offset,
+            return self._get_orders_count_async_with_http_info(
+                sort_order=sort_order,
+                sort_by=sort_by,
+                group_by=group_by,
                 _request_timeout=_request_timeout,
                 _request_auth=_request_auth,
                 _content_type=_content_type,
@@ -143,10 +168,20 @@ class OrdersApi:
             )
 
     @validate_call
-    def get_orders_without_preload_content(
+    def get_orders_count_without_preload_content(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -159,14 +194,15 @@ class OrdersApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Get Orders without preloading content
+        """Get Orders Count without preloading content
 
         This method can work in both sync and async modes based on the is_sync flag.
         """
         if self.is_sync:
-            return self._get_orders_sync_without_preload_content(
-                limit=limit,
-                offset=offset,
+            return self._get_orders_count_sync_without_preload_content(
+                sort_order=sort_order,
+                sort_by=sort_by,
+                group_by=group_by,
                 _request_timeout=_request_timeout,
                 _request_auth=_request_auth,
                 _content_type=_content_type,
@@ -175,9 +211,10 @@ class OrdersApi:
             )
 
         else:
-            return self._get_orders_async_without_preload_content(
-                limit=limit,
-                offset=offset,
+            return self._get_orders_count_async_without_preload_content(
+                sort_order=sort_order,
+                sort_by=sort_by,
+                group_by=group_by,
                 _request_timeout=_request_timeout,
                 _request_auth=_request_auth,
                 _content_type=_content_type,
@@ -187,10 +224,20 @@ class OrdersApi:
 
     # Private async implementation methods
     @validate_call
-    async def _get_orders_async(
+    async def _get_orders_count_async(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -202,15 +249,17 @@ class OrdersApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[Order]:
-        """Get Orders
+    ) -> List[OrdersCount]:
+        """Get Orders Count
 
-        Get all orders for a user
+        Get the number of orders for all users by day, week, month, or year. The default sort is `timestamp` and the default order is `asc`..
 
-        :param limit:
-        :type limit: int
-        :param offset:
-        :type offset: int
+        :param sort_order: The order to sort by
+        :type sort_order: str
+        :param sort_by: The field to sort by
+        :type sort_by: str
+        :param group_by: The group by period for the orders count. Defaults to day.
+        :type group_by: str
         :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
@@ -233,9 +282,10 @@ class OrdersApi:
         :return: Returns the result object.
         """  # noqa: E501
 
-        _param = self._get_orders_serialize(
-            limit=limit,
-            offset=offset,
+        _param = self._get_orders_count_serialize(
+            sort_order=sort_order,
+            sort_by=sort_by,
+            group_by=group_by,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -243,7 +293,7 @@ class OrdersApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[Order]",
+            "200": "List[OrdersCount]",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -255,10 +305,20 @@ class OrdersApi:
         ).data
 
     @validate_call
-    async def _get_orders_async_with_http_info(
+    async def _get_orders_count_async_with_http_info(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -270,15 +330,17 @@ class OrdersApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[Order]]:
-        """Get Orders
+    ) -> ApiResponse[List[OrdersCount]]:
+        """Get Orders Count
 
-        Get all orders for a user
+        Get the number of orders for all users by day, week, month, or year. The default sort is `timestamp` and the default order is `asc`..
 
-        :param limit:
-        :type limit: int
-        :param offset:
-        :type offset: int
+        :param sort_order: The order to sort by
+        :type sort_order: str
+        :param sort_by: The field to sort by
+        :type sort_by: str
+        :param group_by: The group by period for the orders count. Defaults to day.
+        :type group_by: str
         :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
@@ -301,9 +363,10 @@ class OrdersApi:
         :return: Returns the result object.
         """  # noqa: E501
 
-        _param = self._get_orders_serialize(
-            limit=limit,
-            offset=offset,
+        _param = self._get_orders_count_serialize(
+            sort_order=sort_order,
+            sort_by=sort_by,
+            group_by=group_by,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -311,7 +374,7 @@ class OrdersApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[Order]",
+            "200": "List[OrdersCount]",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -322,10 +385,20 @@ class OrdersApi:
         )
 
     @validate_call
-    async def _get_orders_async_without_preload_content(
+    async def _get_orders_count_async_without_preload_content(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -338,14 +411,16 @@ class OrdersApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Get Orders
+        """Get Orders Count
 
-        Get all orders for a user
+        Get the number of orders for all users by day, week, month, or year. The default sort is `timestamp` and the default order is `asc`..
 
-        :param limit:
-        :type limit: int
-        :param offset:
-        :type offset: int
+        :param sort_order: The order to sort by
+        :type sort_order: str
+        :param sort_by: The field to sort by
+        :type sort_by: str
+        :param group_by: The group by period for the orders count. Defaults to day.
+        :type group_by: str
         :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
@@ -368,9 +443,10 @@ class OrdersApi:
         :return: Returns the result object.
         """  # noqa: E501
 
-        _param = self._get_orders_serialize(
-            limit=limit,
-            offset=offset,
+        _param = self._get_orders_count_serialize(
+            sort_order=sort_order,
+            sort_by=sort_by,
+            group_by=group_by,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -378,7 +454,7 @@ class OrdersApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[Order]",
+            "200": "List[OrdersCount]",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -387,10 +463,20 @@ class OrdersApi:
 
     # Private sync implementation methods
     @validate_call
-    def _get_orders_sync(
+    def _get_orders_count_sync(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -402,11 +488,12 @@ class OrdersApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[Order]:
-        """Synchronous version of get_orders"""
-        return async_to_sync(self._get_orders_async)(
-            limit=limit,
-            offset=offset,
+    ) -> List[OrdersCount]:
+        """Synchronous version of get_orders_count"""
+        return async_to_sync(self._get_orders_count_async)(
+            sort_order=sort_order,
+            sort_by=sort_by,
+            group_by=group_by,
             _request_timeout=_request_timeout,
             _request_auth=_request_auth,
             _content_type=_content_type,
@@ -415,10 +502,20 @@ class OrdersApi:
         )
 
     @validate_call
-    def _get_orders_sync_with_http_info(
+    def _get_orders_count_sync_with_http_info(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -430,11 +527,12 @@ class OrdersApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[Order]]:
-        """Synchronous version of get_orders_with_http_info"""
-        return async_to_sync(self._get_orders_async_with_http_info)(
-            limit=limit,
-            offset=offset,
+    ) -> ApiResponse[List[OrdersCount]]:
+        """Synchronous version of get_orders_count_with_http_info"""
+        return async_to_sync(self._get_orders_count_async_with_http_info)(
+            sort_order=sort_order,
+            sort_by=sort_by,
+            group_by=group_by,
             _request_timeout=_request_timeout,
             _request_auth=_request_auth,
             _content_type=_content_type,
@@ -443,10 +541,20 @@ class OrdersApi:
         )
 
     @validate_call
-    def _get_orders_sync_without_preload_content(
+    def _get_orders_count_sync_without_preload_content(
         self,
-        limit: Optional[StrictInt] = None,
-        offset: Optional[StrictInt] = None,
+        sort_order: Annotated[
+            Optional[StrictStr], Field(description="The order to sort by")
+        ] = None,
+        sort_by: Annotated[
+            Optional[StrictStr], Field(description="The field to sort by")
+        ] = None,
+        group_by: Annotated[
+            Optional[StrictStr],
+            Field(
+                description="The group by period for the orders count. Defaults to day."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -459,10 +567,11 @@ class OrdersApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Synchronous version of get_orders_without_preload_content"""
-        return async_to_sync(self._get_orders_async_without_preload_content)(
-            limit=limit,
-            offset=offset,
+        """Synchronous version of get_orders_count_without_preload_content"""
+        return async_to_sync(self._get_orders_count_async_without_preload_content)(
+            sort_order=sort_order,
+            sort_by=sort_by,
+            group_by=group_by,
             _request_timeout=_request_timeout,
             _request_auth=_request_auth,
             _content_type=_content_type,
@@ -470,10 +579,11 @@ class OrdersApi:
             _host_index=_host_index,
         )
 
-    def _get_orders_serialize(
+    def _get_orders_count_serialize(
         self,
-        limit,
-        offset,
+        sort_order,
+        sort_by,
+        group_by,
         _request_auth,
         _content_type,
         _headers,
@@ -495,13 +605,17 @@ class OrdersApi:
 
         # process the path parameters
         # process the query parameters
-        if limit is not None:
+        if sort_order is not None:
+
+            _query_params.append(("sort_order", sort_order))
+
+        if sort_by is not None:
 
-            _query_params.append(("limit", limit))
+            _query_params.append(("sort_by", sort_by))
 
-        if offset is not None:
+        if group_by is not None:
 
-            _query_params.append(("offset", offset))
+            _query_params.append(("group_by", group_by))
 
         # process the header parameters
         # process the form parameters
@@ -518,7 +632,7 @@ class OrdersApi:
 
         return self.api_client.param_serialize(
             method="GET",
-            resource_path="/orders",
+            resource_path="/orders/count",
             path_params=_path_params,
             query_params=_query_params,
             header_params=_header_params,

crypticorn/trade/client/configuration.py

@@ -215,7 +215,7 @@ class Configuration:
         debug: Optional[bool] = None,
     ) -> None:
         """Constructor"""
-        self._base_path = "http://localhost/v1/trade" if host is None else host
+        self._base_path = "http://localhost:8000/v1/trade" if host is None else host
         """Default Base url
         """
         self.server_index = 0 if server_index is None and host is None else server_index
@@ -557,7 +557,7 @@ class Configuration:
         """
         return [
             {
-                "url": "http://localhost/v1/trade",
+                "url": "http://localhost:8000/v1/trade",
                 "description": "No description provided",
             }
         ]

crypticorn/trade/client/models/__init__.py

@@ -41,6 +41,11 @@ from crypticorn.trade.client.models.notification_create import NotificationCreat
 from crypticorn.trade.client.models.notification_update import NotificationUpdate
 from crypticorn.trade.client.models.order import Order
 from crypticorn.trade.client.models.order_status import OrderStatus
+from crypticorn.trade.client.models.orders_count import OrdersCount
+from crypticorn.trade.client.models.paginated_response_order import (
+    PaginatedResponseOrder,
+)
+from crypticorn.trade.client.models.pn_l import PnL
 from crypticorn.trade.client.models.post_futures_action import PostFuturesAction
 from crypticorn.trade.client.models.spot_balance import SpotBalance
 from crypticorn.trade.client.models.spot_trading_action_create import (

crypticorn/trade/client/models/bot.py

@@ -18,8 +18,7 @@ import re  # noqa: F401
 import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
-from typing import Any, ClassVar, Dict, List, Optional, Union
-from typing_extensions import Annotated
+from typing import Any, ClassVar, Dict, List, Optional
 from crypticorn.trade.client.models.api_error_identifier import ApiErrorIdentifier
 from crypticorn.trade.client.models.bot_status import BotStatus
 from typing import Optional, Set
@@ -49,22 +48,12 @@ class Bot(BaseModel):
     )
     api_key_id: StrictStr = Field(description="UID for the API key")
     status_code: Optional[ApiErrorIdentifier] = None
-    current_allocation: Optional[
-        Union[
-            Annotated[float, Field(strict=True, ge=0.0)],
-            Annotated[int, Field(strict=True, ge=0)],
-        ]
-    ] = Field(
-        default=0,
+    current_allocation: Optional[StrictStr] = Field(
+        default="0",
         description="Initial allocation for the bot + accumulated PnL of the orders after the last allocation change",
     )
-    current_exposure: Optional[
-        Union[
-            Annotated[float, Field(strict=True, ge=0.0)],
-            Annotated[int, Field(strict=True, ge=0)],
-        ]
-    ] = Field(
-        default=0,
+    current_exposure: Optional[StrictStr] = Field(
+        default="0",
         description="Current exposure of the bot, aka. the sum of the absolute values of the open positions",
     )
     __properties: ClassVar[List[str]] = [
@@ -150,12 +139,12 @@ class Bot(BaseModel):
                 "current_allocation": (
                     obj.get("current_allocation")
                     if obj.get("current_allocation") is not None
-                    else 0
+                    else "0"
                 ),
                 "current_exposure": (
                     obj.get("current_exposure")
                     if obj.get("current_exposure") is not None
-                    else 0
+                    else "0"
                 ),
             }
         )