crypticorn 2.17.0rc1__py3-none-any.whl → 2.17.0rc2__py3-none-any.whl

crypticorn/trade/client/models/__init__.py

@@ -24,6 +24,7 @@ from crypticorn.trade.client.models.bot_update import BotUpdate
 from crypticorn.trade.client.models.exception_detail import ExceptionDetail
 from crypticorn.trade.client.models.exchange import Exchange
 from crypticorn.trade.client.models.exchange_key import ExchangeKey
+from crypticorn.trade.client.models.exchange_key_balance import ExchangeKeyBalance
 from crypticorn.trade.client.models.exchange_key_create import ExchangeKeyCreate
 from crypticorn.trade.client.models.exchange_key_update import ExchangeKeyUpdate
 from crypticorn.trade.client.models.execution_ids import ExecutionIds
@@ -41,6 +42,7 @@ from crypticorn.trade.client.models.notification_update import NotificationUpdat
 from crypticorn.trade.client.models.order import Order
 from crypticorn.trade.client.models.order_status import OrderStatus
 from crypticorn.trade.client.models.post_futures_action import PostFuturesAction
+from crypticorn.trade.client.models.spot_balance import SpotBalance
 from crypticorn.trade.client.models.spot_trading_action_create import (
     SpotTradingActionCreate,
 )

crypticorn/trade/client/models/exchange.py

@@ -20,7 +20,7 @@ from typing_extensions import Self
 
 class Exchange(str, Enum):
     """
-    Supported exchanges for trading
+    All exchanges used in the crypticorn ecosystem. Refer to the APIs for support for a specific usecase (data, trading, etc.).
     """
 
     """
@@ -28,7 +28,12 @@ class Exchange(str, Enum):
     """
     KUCOIN = "kucoin"
     BINGX = "bingx"
+    BINANCE = "binance"
+    BYBIT = "bybit"
     HYPERLIQUID = "hyperliquid"
+    BITGET = "bitget"
+    GATEIO = "gateio"
+    BITSTAMP = "bitstamp"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

crypticorn/trade/client/models/exchange_key_balance.py

@@ -0,0 +1,111 @@
+# coding: utf-8
+
+"""
+Trading API
+
+API for automated trading and exchange interface. This API is used to trade on the exchange and manage bots, API keys, orders, and more.
+
+The version of the OpenAPI document: 1.0.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List
+from crypticorn.trade.client.models.futures_balance import FuturesBalance
+from crypticorn.trade.client.models.spot_balance import SpotBalance
+from typing import Optional, Set
+from typing_extensions import Self
+
+
+class ExchangeKeyBalance(BaseModel):
+    """
+    ExchangeKeyBalance
+    """  # noqa: E501
+
+    api_key_id: StrictStr = Field(description="API key ID.")
+    futures: FuturesBalance = Field(description="Futures balance information.")
+    spot: List[SpotBalance] = Field(description="Spot balance information.")
+    __properties: ClassVar[List[str]] = ["api_key_id", "futures", "spot"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of ExchangeKeyBalance from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of futures
+        if self.futures:
+            _dict["futures"] = self.futures.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in spot (list)
+        _items = []
+        if self.spot:
+            for _item_spot in self.spot:
+                if _item_spot:
+                    _items.append(_item_spot.to_dict())
+            _dict["spot"] = _items
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of ExchangeKeyBalance from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate(
+            {
+                "api_key_id": obj.get("api_key_id"),
+                "futures": (
+                    FuturesBalance.from_dict(obj["futures"])
+                    if obj.get("futures") is not None
+                    else None
+                ),
+                "spot": (
+                    [SpotBalance.from_dict(_item) for _item in obj["spot"]]
+                    if obj.get("spot") is not None
+                    else None
+                ),
+            }
+        )
+        return _obj

crypticorn/trade/client/models/futures_balance.py

@@ -28,29 +28,35 @@ class FuturesBalance(BaseModel):
     Model for futures balance
     """  # noqa: E501
 
-    api_key_id: StrictStr = Field(description="API key ID", alias="apiKeyId")
-    asset: StrictStr = Field(description="Asset/Currency code")
-    balance: Union[StrictFloat, StrictInt] = Field(description="Total balance/equity")
+    asset: StrictStr = Field(description="Asset the balance values are in")
+    equity: Union[StrictFloat, StrictInt] = Field(
+        description="Net asset value including unrealized profit and loss"
+    )
+    balance: Union[StrictFloat, StrictInt] = Field(
+        description="Actual account balance (equity - unrealized)"
+    )
     available: Union[StrictFloat, StrictInt] = Field(
         description="Available balance for trading/withdrawal"
     )
-    unrealized_pnl: Union[StrictFloat, StrictInt] = Field(
-        description="Unrealized profit and loss", alias="unrealizedPnl"
+    unrealized: Union[StrictFloat, StrictInt] = Field(
+        description="Unrealized profit and loss"
     )
-    used_margin: Optional[Union[StrictFloat, StrictInt]] = Field(
-        default=None, alias="usedMargin"
+    used: Union[StrictFloat, StrictInt] = Field(
+        description="Margin used in open positions"
     )
-    frozen_amount: Optional[Union[StrictFloat, StrictInt]] = Field(
-        default=None, alias="frozenAmount"
+    frozen: Union[StrictFloat, StrictInt] = Field(
+        description="Frozen funds not available for use"
     )
+    allocated: Optional[Union[StrictFloat, StrictInt]] = None
     __properties: ClassVar[List[str]] = [
-        "apiKeyId",
         "asset",
+        "equity",
         "balance",
         "available",
-        "unrealizedPnl",
-        "usedMargin",
-        "frozenAmount",
+        "unrealized",
+        "used",
+        "frozen",
+        "allocated",
     ]
 
     model_config = ConfigDict(
@@ -90,15 +96,10 @@ class FuturesBalance(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # set to None if used_margin (nullable) is None
-        # and model_fields_set contains the field
-        if self.used_margin is None and "used_margin" in self.model_fields_set:
-            _dict["usedMargin"] = None
-
-        # set to None if frozen_amount (nullable) is None
+        # set to None if allocated (nullable) is None
         # and model_fields_set contains the field
-        if self.frozen_amount is None and "frozen_amount" in self.model_fields_set:
-            _dict["frozenAmount"] = None
+        if self.allocated is None and "allocated" in self.model_fields_set:
+            _dict["allocated"] = None
 
         return _dict
 
@@ -113,13 +114,14 @@ class FuturesBalance(BaseModel):
 
         _obj = cls.model_validate(
             {
-                "apiKeyId": obj.get("apiKeyId"),
                 "asset": obj.get("asset"),
+                "equity": obj.get("equity"),
                 "balance": obj.get("balance"),
                 "available": obj.get("available"),
-                "unrealizedPnl": obj.get("unrealizedPnl"),
-                "usedMargin": obj.get("usedMargin"),
-                "frozenAmount": obj.get("frozenAmount"),
+                "unrealized": obj.get("unrealized"),
+                "used": obj.get("used"),
+                "frozen": obj.get("frozen"),
+                "allocated": obj.get("allocated"),
             }
         )
         return _obj

crypticorn/trade/client/models/spot_balance.py

@@ -0,0 +1,110 @@
+# coding: utf-8
+
+"""
+Trading API
+
+API for automated trading and exchange interface. This API is used to trade on the exchange and manage bots, API keys, orders, and more.
+
+The version of the OpenAPI document: 1.0.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+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
+
+
+class SpotBalance(BaseModel):
+    """
+    Model for spot balance
+    """  # noqa: E501
+
+    asset: StrictStr = Field(description="Asset/Currency code")
+    balance: Union[StrictFloat, StrictInt] = Field(description="Balance of the asset")
+    available: Union[StrictFloat, StrictInt] = Field(
+        description="Available balance for trading/withdrawal"
+    )
+    frozen: Union[StrictFloat, StrictInt] = Field(
+        description="Frozen funds not available for use"
+    )
+    allocated: Optional[Union[StrictFloat, StrictInt]] = None
+    __properties: ClassVar[List[str]] = [
+        "asset",
+        "balance",
+        "available",
+        "frozen",
+        "allocated",
+    ]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of SpotBalance from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # set to None if allocated (nullable) is None
+        # and model_fields_set contains the field
+        if self.allocated is None and "allocated" in self.model_fields_set:
+            _dict["allocated"] = None
+
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of SpotBalance from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate(
+            {
+                "asset": obj.get("asset"),
+                "balance": obj.get("balance"),
+                "available": obj.get("available"),
+                "frozen": obj.get("frozen"),
+                "allocated": obj.get("allocated"),
+            }
+        )
+        return _obj

crypticorn/trade/client/models/strategy.py

@@ -50,14 +50,16 @@ class Strategy(BaseModel):
         description="Whether the strategy is enabled. If false, no bots will be created or updated for this strategy, open trades will be rejected. Existing bots will be marked as stopping."
     )
     performance_fee: Union[
-        Annotated[float, Field(le=1.0, strict=True)],
-        Annotated[int, Field(le=1, strict=True)],
+        Annotated[float, Field(le=1.0, strict=True, ge=0.0)],
+        Annotated[int, Field(le=1, strict=True, ge=0)],
     ] = Field(description="Performance fee for the strategy")
     identifier: StrictStr = Field(
         description="Unique human readable identifier for the strategy e.g. 'daily_trend_momentum'"
     )
     margin_mode: Optional[MarginMode] = None
-    leverage: StrictInt = Field(description="Leverage for the strategy")
+    leverage: Annotated[int, Field(strict=True, ge=1)] = Field(
+        description="Leverage for the strategy"
+    )
     market_type: MarketType = Field(description="Market of operation of the strategy")
     __properties: ClassVar[List[str]] = [
         "created_at",

crypticorn/trade/client/models/strategy_create.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing_extensions import Annotated
 from crypticorn.trade.client.models.margin_mode import MarginMode
@@ -41,14 +41,16 @@ class StrategyCreate(BaseModel):
         description="Whether the strategy is enabled. If false, no bots will be created or updated for this strategy, open trades will be rejected. Existing bots will be marked as stopping."
     )
     performance_fee: Union[
-        Annotated[float, Field(le=1.0, strict=True)],
-        Annotated[int, Field(le=1, strict=True)],
+        Annotated[float, Field(le=1.0, strict=True, ge=0.0)],
+        Annotated[int, Field(le=1, strict=True, ge=0)],
     ] = Field(description="Performance fee for the strategy")
     identifier: StrictStr = Field(
         description="Unique human readable identifier for the strategy e.g. 'daily_trend_momentum'"
     )
     margin_mode: Optional[MarginMode] = None
-    leverage: StrictInt = Field(description="Leverage for the strategy")
+    leverage: Annotated[int, Field(strict=True, ge=1)] = Field(
+        description="Leverage for the strategy"
+    )
     market_type: MarketType = Field(description="Market of operation of the strategy")
     __properties: ClassVar[List[str]] = [
         "name",

crypticorn/trade/client/models/strategy_exchange_info.py

@@ -17,8 +17,8 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictInt
-from typing import Any, ClassVar, Dict, List
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
 from crypticorn.trade.client.models.exchange import Exchange
 from typing import Optional, Set
 from typing_extensions import Self
@@ -30,10 +30,14 @@ class StrategyExchangeInfo(BaseModel):
     """  # noqa: E501
 
     exchange: Exchange = Field(description="Exchange name. Of type Exchange")
+    base_asset: Optional[StrictStr] = Field(
+        default="USDT",
+        description="Base asset for the strategy. This is the asset that will be used to trade with. Default is USDT.",
+    )
     min_amount: StrictInt = Field(
         description="Minimum amount for the strategy on the exchange"
     )
-    __properties: ClassVar[List[str]] = ["exchange", "min_amount"]
+    __properties: ClassVar[List[str]] = ["exchange", "base_asset", "min_amount"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -84,6 +88,14 @@ class StrategyExchangeInfo(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate(
-            {"exchange": obj.get("exchange"), "min_amount": obj.get("min_amount")}
+            {
+                "exchange": obj.get("exchange"),
+                "base_asset": (
+                    obj.get("base_asset")
+                    if obj.get("base_asset") is not None
+                    else "USDT"
+                ),
+                "min_amount": obj.get("min_amount"),
+            }
         )
         return _obj

crypticorn/trade/client/models/strategy_update.py

@@ -36,8 +36,8 @@ class StrategyUpdate(BaseModel):
     enabled: Optional[StrictBool] = None
     performance_fee: Optional[
         Union[
-            Annotated[float, Field(le=1.0, strict=True)],
-            Annotated[int, Field(le=1, strict=True)],
+            Annotated[float, Field(le=1.0, strict=True, ge=0.0)],
+            Annotated[int, Field(le=1, strict=True, ge=0)],
         ]
     ] = None
     __properties: ClassVar[List[str]] = [

crypticorn/trade/client/rest.py

@@ -77,6 +77,7 @@ class RESTClientObject:
 
         self.pool_manager: Optional[aiohttp.ClientSession] = None
         self.retry_client: Optional[aiohttp_retry.RetryClient] = None
+        self.is_sync: bool = False  # Track whether this is sync or async mode
 
     async def close(self) -> None:
         if self.pool_manager:
@@ -170,7 +171,9 @@ class RESTClientObject:
 
         pool_manager: Union[aiohttp.ClientSession, aiohttp_retry.RetryClient]
 
-        # https pool manager
+        # For sync operations, always use a fresh session
+        should_close_session = False
+
         if self.pool_manager is None:
             self.pool_manager = aiohttp.ClientSession(
                 connector=aiohttp.TCPConnector(
@@ -178,6 +181,9 @@ class RESTClientObject:
                 ),
                 trust_env=True,
             )
+            # Only close session automatically in sync mode
+            should_close_session = self.is_sync
+
         pool_manager = self.pool_manager
 
         if self.retries is not None and method in ALLOW_RETRY_METHODS:
@@ -193,6 +199,19 @@ class RESTClientObject:
                 )
             pool_manager = self.retry_client
 
-        r = await pool_manager.request(**args)
-
-        return RESTResponse(r)
+        try:
+            r = await pool_manager.request(**args)
+            # For sessions we're about to close, read the data immediately
+            if should_close_session:
+                response = RESTResponse(r)
+                await response.read()  # Read data before closing session
+                return response
+            else:
+                return RESTResponse(r)
+        finally:
+            if should_close_session:
+                if self.retry_client is not None:
+                    await self.retry_client.close()
+                    self.retry_client = None
+                await self.pool_manager.close()
+                self.pool_manager = None

crypticorn/trade/main.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Optional
-from crypticorn.trade import (
+from crypticorn.trade.client import (
     ApiClient,
     APIKeysApi,
     BotsApi,
     Configuration,
     ExchangesApi,
-    FuturesTradingPanelApi,
     NotificationsApi,
     OrdersApi,
     StatusApi,
@@ -26,19 +25,23 @@ class TradeClient:
     config_class = Configuration
 
     def __init__(
-        self, config: Configuration, http_client: Optional[ClientSession] = None
+        self,
+        config: Configuration,
+        http_client: Optional[ClientSession] = None,
+        is_sync: bool = False,
     ):
         self.config = config
         self.base_client = ApiClient(configuration=self.config)
         if http_client is not None:
             self.base_client.rest_client.pool_manager = http_client
+        # Pass sync context to REST client for proper session management
+        self.base_client.rest_client.is_sync = is_sync
         # Instantiate all the endpoint clients
-        self.bots = BotsApi(self.base_client)
-        self.exchanges = ExchangesApi(self.base_client)
-        self.notifications = NotificationsApi(self.base_client)
-        self.orders = OrdersApi(self.base_client)
-        self.status = StatusApi(self.base_client)
-        self.strategies = StrategiesApi(self.base_client)
-        self.actions = TradingActionsApi(self.base_client)
-        self.futures = FuturesTradingPanelApi(self.base_client)
-        self.keys = APIKeysApi(self.base_client)
+        self.bots = BotsApi(self.base_client, is_sync=is_sync)
+        self.exchanges = ExchangesApi(self.base_client, is_sync=is_sync)
+        self.notifications = NotificationsApi(self.base_client, is_sync=is_sync)
+        self.orders = OrdersApi(self.base_client, is_sync=is_sync)
+        self.status = StatusApi(self.base_client, is_sync=is_sync)
+        self.strategies = StrategiesApi(self.base_client, is_sync=is_sync)
+        self.actions = TradingActionsApi(self.base_client, is_sync=is_sync)
+        self.keys = APIKeysApi(self.base_client, is_sync=is_sync)