ctrader-api-client 0.3.0__tar.gz → 0.4.0__tar.gz

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctrader-api-client
-Version: 0.3.0
+Version: 0.4.0
 Summary: API Client to interact with the cTrader Open API spec
 Author-email: Elio <elioachukri@pm.me>
 License-File: LICENSE

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/docs/api/events.md

@@ -52,7 +52,7 @@ await client.market_data.subscribe_trendbars(account_id, 270, TrendbarPeriod.M1)
 
 @client.on(SpotEvent, symbol_id=270)
 async def on_spot(event: SpotEvent):
-    # Prices are floats
+    # Prices are Decimals
     print(f"Bid: {event.bid}, Ask: {event.ask}")
 
     # Trendbar is included when subscribed

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/docs/api/market-data.md

@@ -30,7 +30,7 @@ from ctrader_api_client.events import SpotEvent
 await client.market_data.subscribe_spots(account_id, [270, 271])
 
 
-# Handle price updates - bid/ask are floats
+# Handle price updates - bid/ask are Decimals
 @client.on(SpotEvent, symbol_id=270)
 async def on_price(event: SpotEvent):
     print(f"Bid: {event.bid}, Ask: {event.ask}")
@@ -86,7 +86,7 @@ trendbars = await client.market_data.get_trendbars(
     to_timestamp=datetime.now(UTC),
 )
 
-# OHLC values are already floats (converted from raw integers)
+# OHLC values are already Decimals (converted from raw integers)
 for bar in trendbars:
     print(f"{bar.timestamp}: O={bar.open} H={bar.high} L={bar.low} C={bar.close} V={bar.volume}")
 ```
@@ -104,7 +104,7 @@ ticks = await client.market_data.get_tick_data(
     quote_type="BID",  # or "ASK"
 )
 
-# Price is already a float
+# Price is already a Decimal
 for tick in ticks:
     print(f"{tick.timestamp}: {tick.price}")
 ```

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/docs/api/models.md

@@ -166,30 +166,30 @@ symbol = await client.symbols.get_by_id(account_id, 270)
 volume = symbol.lots_to_volume(0.1)  # Returns volume in cents
 
 # Convert volume to lots for display
-lots = symbol.volume_to_lots(position.volume)  # Returns lots as float
+lots = symbol.volume_to_lots(position.volume)  # Returns lots as Decimal
 ```
 
 ## Price Values
 
-Prices in events and models (bid, ask, OHLC, execution prices, etc.) are returned as **floats** - no conversion needed:
+Prices in events and models (bid, ask, OHLC, execution prices, etc.) are returned as **Decimals** - no conversion needed:
 
 ```python
 @client.on(SpotEvent)
 async def on_price(event: SpotEvent):
-    # bid and ask are already floats
+    # bid and ask are already Decimals
     spread = event.ask - event.bid
     print(f"Spread: {spread}")
 
-# Trendbar OHLC are floats
+# Trendbar OHLC are Decimals
 for bar in trendbars:
     range_size = bar.high - bar.low
     print(f"Range: {range_size}")
 
-# Account balance is a float
+# Account balance is a Decimal
 account = await client.accounts.get_trader(account_id)
 print(f"Balance: {account.balance}")
 
-# Position values are floats
+# Position values are Decimals
 for pos in positions:
     print(f"Swap: {pos.swap}, Commission: {pos.commission}")
 ```

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/docs/index.md

@@ -41,7 +41,7 @@ client = CTraderClient(config)
 
 @client.on(SpotEvent, symbol_id=270)  # Filter by symbol
 async def on_price(event: SpotEvent):
-    # bid and ask are floats
+    # bid and ask are Decimals
     print(f"Price update: {event.bid}/{event.ask}")
 
 

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ctrader-api-client"
-version = "0.3.0"
+version = "0.4.0"
 description = "API Client to interact with the cTrader Open API spec"
 readme = "README.md"
 authors = [
@@ -51,6 +51,8 @@ select = [
     "C4",   # comprehensions
     "ARG",  # Flags unused function arguments
     "RUF022", # Unsorted __all__ blocks
+    "FURB157",  # Check unnecessary casts in Decimal constructors
+    "RUF032",  # Check for Decimal calls passing a float literal
 ]
 
 [tool.ruff.lint.per-file-ignores]

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/api/trading.py

@@ -194,8 +194,8 @@ class TradingAPI:
         return [
             PositionUnrealizedPnL(
                 position_id=p.position_id,
-                gross_unrealized_pnl=p.gross_unrealized_pn_l / divisor,
-                net_unrealized_pnl=p.net_unrealized_pn_l / divisor,
+                gross_unrealized_pnl=Decimal(p.gross_unrealized_pn_l) / divisor,
+                net_unrealized_pnl=Decimal(p.net_unrealized_pn_l) / divisor,
             )
             for p in response.position_unrealized_pn_l
         ]

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/client.py

@@ -454,6 +454,65 @@ class CTraderClient:
 
         return decorator
 
+    @overload
+    def register_handler(
+        self,
+        event_type: type[T_BothFilters],
+        handler: EventHandler[T_BothFilters],
+        *,
+        account_id: int | None = ...,
+        symbol_id: int | None = ...,
+    ) -> None: ...
+
+    @overload
+    def register_handler(
+        self,
+        event_type: type[T_AccountIdOnly],
+        handler: EventHandler[T_AccountIdOnly],
+        *,
+        account_id: int | None = ...,
+    ) -> None: ...
+
+    @overload
+    def register_handler(
+        self,
+        event_type: type[T_NoFilters],
+        handler: EventHandler[T_NoFilters],
+    ) -> None: ...
+
+    def register_handler(
+        self,
+        event_type: type[T],
+        handler: EventHandler[T],
+        *,
+        account_id: int | None = None,
+        symbol_id: int | None = None,
+    ) -> None:
+        """Register an event handler.
+
+        Same as the on() decorator but as a regular method for dynamic registration.
+
+        Args:
+            event_type: The event class to listen for.
+            handler: The async function to call when the event arrives.
+            account_id: Only receive events for this account (optional).
+            symbol_id: Only receive events for this symbol (optional).
+        Example:
+            ```python
+            async def on_eurusd(event: SpotEvent) -> None:
+                print(f"EURUSD: {event.bid}/{event.ask}")
+
+
+            client.register_handler(SpotEvent, on_eurusd, symbol_id=270)
+            ```
+        """
+        self._emitter.subscribe(
+            event_type,
+            handler,
+            account_id=account_id,
+            symbol_id=symbol_id,
+        )
+
     def off(
         self,
         event_type: type[T],

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/events/router.py

@@ -183,10 +183,12 @@ class EventRouter:
         event = SpotEvent(
             account_id=proto.ctid_trader_account_id,
             symbol_id=proto.symbol_id,
-            bid=proto.bid / 1e5 if proto.bid else None,
-            ask=proto.ask / 1e5 if proto.ask else None,
+            bid=proto.bid / Decimal(100000) if proto.bid else None,
+            ask=proto.ask / Decimal(100000) if proto.ask else None,
             timestamp=self._timestamp_to_datetime(proto.timestamp) if proto.timestamp else datetime.now(UTC),
-            trendbar=Trendbar.from_proto(proto.trendbar[0], bid_price=proto.bid) if proto.trendbar else None,
+            trendbar=(
+                Trendbar.from_proto(proto.trendbar[0], bid_price=Decimal(str(proto.bid))) if proto.trendbar else None
+            ),
         )
         await self._emitter.emit(event)
 

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/events/types.py

@@ -30,8 +30,8 @@ class SpotEvent:
 
     account_id: int
     symbol_id: int
-    bid: float | None
-    ask: float | None
+    bid: Decimal | None
+    ask: Decimal | None
     trendbar: Trendbar | None
     timestamp: datetime
 

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/models/account.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime
+from decimal import Decimal
 from typing import TYPE_CHECKING
 
 from .._internal.proto import ProtoOAAccessRights, ProtoOAAccountType
@@ -107,7 +108,7 @@ class Account(FrozenModel):
 
     account_id: int
     trader_login: int
-    balance: float
+    balance: Decimal
     leverage_in_cents: int
     account_type: AccountType
     access_rights: AccessRights
@@ -120,9 +121,9 @@ class Account(FrozenModel):
     # Optional fields
     max_leverage: int | None = None
     balance_version: int | None = None
-    manager_bonus: float | None = None
-    ib_bonus: float | None = None
-    non_withdrawable_bonus: float | None = None
+    manager_bonus: Decimal | None = None
+    ib_bonus: Decimal | None = None
+    non_withdrawable_bonus: Decimal | None = None
 
     def get_leverage(self) -> str:
         """Get leverage as human-readable string.
@@ -148,7 +149,7 @@ class Account(FrozenModel):
         return cls(
             account_id=proto.ctid_trader_account_id,
             trader_login=proto.trader_login,
-            balance=proto.balance / divisor,
+            balance=Decimal(proto.balance) / divisor,
             leverage_in_cents=proto.leverage_in_cents,
             account_type=_ACCOUNT_TYPE_MAP.get(proto.account_type, AccountType.HEDGED),
             access_rights=_ACCESS_RIGHTS_MAP.get(proto.access_rights, AccessRights.FULL_ACCESS),
@@ -161,7 +162,9 @@ class Account(FrozenModel):
             ),
             max_leverage=proto.max_leverage if proto.max_leverage else None,
             balance_version=proto.balance_version if proto.balance_version else None,
-            manager_bonus=proto.manager_bonus / divisor if proto.manager_bonus else None,
-            ib_bonus=proto.ib_bonus / divisor if proto.ib_bonus else None,
-            non_withdrawable_bonus=proto.non_withdrawable_bonus / divisor if proto.non_withdrawable_bonus else None,
+            manager_bonus=Decimal(proto.manager_bonus) / divisor if proto.manager_bonus else None,
+            ib_bonus=Decimal(proto.ib_bonus) / divisor if proto.ib_bonus else None,
+            non_withdrawable_bonus=Decimal(proto.non_withdrawable_bonus) / divisor
+            if proto.non_withdrawable_bonus
+            else None,
         )

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/models/deal.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime
+from decimal import Decimal
 from typing import TYPE_CHECKING
 
 from .._internal.proto import ProtoOADealStatus
@@ -45,14 +46,14 @@ class CloseDetail(FrozenModel):
         balance_version: Version number for balance updates.
     """
 
-    entry_price: float
+    entry_price: Decimal
     closed_volume: int
-    gross_profit: float
-    swap: float
-    commission: float
-    balance: float
-    pnl_conversion_fee: float = 0
-    quote_to_deposit_rate: float | None = None
+    gross_profit: Decimal
+    swap: Decimal
+    commission: Decimal
+    balance: Decimal
+    pnl_conversion_fee: Decimal = Decimal(0)
+    quote_to_deposit_rate: Decimal | None = None
     balance_version: int | None = None
 
     @classmethod
@@ -68,14 +69,14 @@ class CloseDetail(FrozenModel):
         money_digits = proto.money_digits if proto.money_digits else 2
         divisor = 10**money_digits
         return cls(
-            entry_price=proto.entry_price,
+            entry_price=Decimal(str(proto.entry_price)),
             closed_volume=proto.closed_volume,
-            gross_profit=proto.gross_profit / divisor,
-            swap=proto.swap / divisor,
-            commission=proto.commission / divisor,
-            balance=proto.balance / divisor,
-            pnl_conversion_fee=proto.pnl_conversion_fee / divisor if proto.pnl_conversion_fee else 0,
-            quote_to_deposit_rate=proto.quote_to_deposit_conversion_rate
+            gross_profit=Decimal(proto.gross_profit) / divisor,
+            swap=Decimal(proto.swap) / divisor,
+            commission=Decimal(proto.commission) / divisor,
+            balance=Decimal(proto.balance) / divisor,
+            pnl_conversion_fee=Decimal(proto.pnl_conversion_fee) / divisor if proto.pnl_conversion_fee else Decimal(0),
+            quote_to_deposit_rate=Decimal(str(proto.quote_to_deposit_conversion_rate))
             if proto.quote_to_deposit_conversion_rate
             else None,
             balance_version=proto.balance_version if proto.balance_version else None,
@@ -114,16 +115,16 @@ class Deal(FrozenModel):
     side: OrderSide
     volume: int
     filled_volume: int
-    execution_price: float
+    execution_price: Decimal
     execution_timestamp: datetime
     status: DealStatus
-    commission: float
+    commission: Decimal
 
     # Optional
     create_timestamp: datetime | None = None
     last_update_timestamp: datetime | None = None
-    margin_rate: float | None = None
-    base_to_usd_rate: float | None = None
+    margin_rate: Decimal | None = None
+    base_to_usd_rate: Decimal | None = None
     close_detail: CloseDetail | None = None
 
     @property
@@ -163,15 +164,17 @@ class Deal(FrozenModel):
             side=side,
             volume=proto.volume,
             filled_volume=proto.filled_volume,
-            execution_price=proto.execution_price,
+            execution_price=Decimal(str(proto.execution_price)),
             execution_timestamp=_timestamp_to_datetime(proto.execution_timestamp),
             status=_DEAL_STATUS_MAP.get(proto.deal_status, DealStatus.FILLED),
-            commission=proto.commission / divisor if proto.commission else 0,
+            commission=Decimal(proto.commission) / divisor if proto.commission else Decimal(0),
             create_timestamp=_timestamp_to_datetime(proto.create_timestamp) if proto.create_timestamp else None,
             last_update_timestamp=(
                 _timestamp_to_datetime(proto.utc_last_update_timestamp) if proto.utc_last_update_timestamp else None
             ),
-            margin_rate=proto.margin_rate if proto.margin_rate else None,
-            base_to_usd_rate=proto.base_to_usd_conversion_rate if proto.base_to_usd_conversion_rate else None,
+            margin_rate=Decimal(str(proto.margin_rate)) if proto.margin_rate else None,
+            base_to_usd_rate=(
+                Decimal(str(proto.base_to_usd_conversion_rate)) if proto.base_to_usd_conversion_rate else None
+            ),
             close_detail=close_detail,
         )

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/models/market_data.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Sequence
 from datetime import UTC, datetime
+from decimal import Decimal
 from typing import TYPE_CHECKING
 
 from .._internal.proto import ProtoOATrendbarPeriod
@@ -49,14 +50,14 @@ class Trendbar(FrozenModel):
 
     timestamp: datetime
     period: TrendbarPeriod
-    open: float
-    high: float
-    low: float
-    close: float
+    open: Decimal
+    high: Decimal
+    low: Decimal
+    close: Decimal
     volume: int
 
     @classmethod
-    def from_proto(cls, proto: ProtoOATrendbar, bid_price: float | None = None, historical: bool = False) -> Trendbar:
+    def from_proto(cls, proto: ProtoOATrendbar, bid_price: Decimal | None = None, historical: bool = False) -> Trendbar:
         """Create a Trendbar from a proto message.
 
         Args:
@@ -89,13 +90,14 @@ class Trendbar(FrozenModel):
                 )
             close = low + proto.delta_close
 
+        divisor = Decimal(100000)
         return cls(
             timestamp=ts,
             period=_PERIOD_MAP.get(proto.period, TrendbarPeriod.M1),
-            low=low / 1e5,
-            open=open_price / 1e5,
-            high=high / 1e5,
-            close=close / 1e5,
+            low=Decimal(low) / divisor,
+            open=Decimal(open_price) / divisor,
+            high=Decimal(high) / divisor,
+            close=Decimal(close) / divisor,
             volume=proto.volume,
         )
 
@@ -111,13 +113,13 @@ class TickData(FrozenModel):
     """
 
     timestamp: datetime
-    price: float
+    price: Decimal
 
     @classmethod
     def from_proto(cls, proto: ProtoOATickData) -> TickData:
         """Create TickData from proto message.
 
-        Note that price needs to be converted from a raw integer to a float by dividing by 1e5.
+        Note that price needs to be converted from a raw integer to a Decimal by dividing by 100000.
 
         Args:
             proto: The proto message.
@@ -128,7 +130,7 @@ class TickData(FrozenModel):
         # Proto timestamp is delta from base in milliseconds
         return cls(
             timestamp=datetime.fromtimestamp(proto.timestamp / 1000, tz=UTC),
-            price=proto.tick / 1e5,
+            price=Decimal(proto.tick) / Decimal(100000),
         )
 
     @classmethod
@@ -139,7 +141,7 @@ class TickData(FrozenModel):
         the first data point being an absolute value.
         This method converts them to absolute values.
 
-        Additionally, price needs to be converted from a raw integer to a float by dividing by 1e5.
+        Additionally, price needs to be converted from a raw integer to a Decimal by dividing by 100000.
 
         Args:
             protos: List of proto tick data messages.
@@ -161,7 +163,7 @@ class TickData(FrozenModel):
             ticks.append(
                 cls(
                     timestamp=datetime.fromtimestamp(current_timestamp / 1000, tz=UTC),
-                    price=current_price / 1e5,
+                    price=Decimal(current_price) / Decimal(100000),
                 )
             )
 

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/models/order.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime
+from decimal import Decimal
 from typing import TYPE_CHECKING
 
 from .._internal.proto import ProtoOAOrderStatus, ProtoOAOrderTriggerMethod, ProtoOAOrderType, ProtoOATimeInForce
@@ -65,11 +66,11 @@ class Order(FrozenModel):
         volume: Order volume in cents.
         time_in_force: Order duration type.
         open_timestamp: When the order was created.
-        limit_price: Limit price as float, or None.
-        stop_price: Stop trigger price as float, or None.
-        stop_loss: Stop loss price as float, or None.
-        take_profit: Take profit price as float, or None.
-        execution_price: Average fill price as float, or None.
+        limit_price: Limit price, or None.
+        stop_price: Stop trigger price, or None.
+        stop_loss: Stop loss price, or None.
+        take_profit: Take profit price, or None.
+        execution_price: Average fill price, or None.
         executed_volume: Volume that has been filled, in cents.
         expiration_timestamp: When the order expires, or None.
         position_id: Associated position ID, or None.
@@ -97,12 +98,12 @@ class Order(FrozenModel):
     time_in_force: TimeInForce
     open_timestamp: datetime
 
-    # Prices (as float from API)
-    limit_price: float | None = None
-    stop_price: float | None = None
-    stop_loss: float | None = None
-    take_profit: float | None = None
-    execution_price: float | None = None
+    # Prices
+    limit_price: Decimal | None = None
+    stop_price: Decimal | None = None
+    stop_loss: Decimal | None = None
+    take_profit: Decimal | None = None
+    execution_price: Decimal | None = None
 
     # Execution
     executed_volume: int = 0
@@ -110,7 +111,7 @@ class Order(FrozenModel):
     position_id: int | None = None
 
     # Slippage
-    base_slippage_price: float | None = None
+    base_slippage_price: Decimal | None = None
     slippage_in_points: int | None = None
 
     # Relative SL/TP (in points)
@@ -171,17 +172,17 @@ class Order(FrozenModel):
             volume=trade_data.volume if trade_data else 0,
             time_in_force=_TIME_IN_FORCE_MAP.get(proto.time_in_force, TimeInForce.GOOD_TILL_CANCEL),
             open_timestamp=open_ts,
-            limit_price=proto.limit_price if proto.limit_price else None,
-            stop_price=proto.stop_price if proto.stop_price else None,
-            stop_loss=proto.stop_loss if proto.stop_loss else None,
-            take_profit=proto.take_profit if proto.take_profit else None,
-            execution_price=proto.execution_price if proto.execution_price else None,
+            limit_price=Decimal(str(proto.limit_price)) if proto.limit_price else None,
+            stop_price=Decimal(str(proto.stop_price)) if proto.stop_price else None,
+            stop_loss=Decimal(str(proto.stop_loss)) if proto.stop_loss else None,
+            take_profit=Decimal(str(proto.take_profit)) if proto.take_profit else None,
+            execution_price=Decimal(str(proto.execution_price)) if proto.execution_price else None,
             executed_volume=proto.executed_volume if proto.executed_volume else 0,
             expiration_timestamp=(
                 _timestamp_to_datetime(proto.expiration_timestamp) if proto.expiration_timestamp else None
             ),
             position_id=proto.position_id if proto.position_id else None,
-            base_slippage_price=proto.base_slippage_price if proto.base_slippage_price else None,
+            base_slippage_price=Decimal(str(proto.base_slippage_price)) if proto.base_slippage_price else None,
             slippage_in_points=proto.slippage_in_points if proto.slippage_in_points else None,
             relative_stop_loss=proto.relative_stop_loss if proto.relative_stop_loss else None,
             relative_take_profit=proto.relative_take_profit if proto.relative_take_profit else None,

{ctrader_api_client-0.3.0 → ctrader_api_client-0.4.0}/src/ctrader_api_client/models/position.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime
+from decimal import Decimal
 from typing import TYPE_CHECKING
 
 from .._internal.proto import ProtoOAOrderTriggerMethod, ProtoOAPositionStatus
@@ -43,12 +44,12 @@ class Position(FrozenModel):
         symbol_id: The symbol being traded.
         side: Position direction (BUY/SELL).
         volume: Position volume in cents.
-        entry_price: Entry price as float from API.
+        entry_price: Entry price as Decimal from API.
         status: Current position status.
         open_timestamp: When the position was opened.
         money_digits: Decimal places for monetary values.
-        stop_loss: Stop loss price as float, or None if not set.
-        take_profit: Take profit price as float, or None if not set.
+        stop_loss: Stop loss price as Decimal, or None if not set.
+        take_profit: Take profit price as Decimal, or None if not set.
         trailing_stop_loss: Whether trailing stop is enabled.
         guaranteed_stop_loss: Whether guaranteed stop loss is enabled.
         stop_loss_trigger_method: Method for triggering stop loss.
@@ -66,23 +67,23 @@ class Position(FrozenModel):
     symbol_id: int
     side: OrderSide
     volume: int
-    entry_price: float
+    entry_price: Decimal
     status: PositionStatus
     open_timestamp: datetime
     money_digits: int
 
     # Protection orders
-    stop_loss: float | None = None
-    take_profit: float | None = None
+    stop_loss: Decimal | None = None
+    take_profit: Decimal | None = None
     trailing_stop_loss: bool = False
     guaranteed_stop_loss: bool = False
     stop_loss_trigger_method: StopTriggerMethod = StopTriggerMethod.TRADE
 
     # Financial
-    swap: float = 0
-    commission: float = 0
-    used_margin: float = 0
-    margin_rate: float | None = None
+    swap: Decimal = Decimal(0)
+    commission: Decimal = Decimal(0)
+    used_margin: Decimal = Decimal(0)
+    margin_rate: Decimal | None = None
 
     # Metadata
     label: str = ""
@@ -120,19 +121,19 @@ class Position(FrozenModel):
             symbol_id=trade_data.symbol_id if trade_data else 0,
             side=side,
             volume=trade_data.volume if trade_data else 0,
-            entry_price=proto.price if proto.price else 0.0,
+            entry_price=Decimal(str(proto.price)) if proto.price else Decimal(0),
             status=_POSITION_STATUS_MAP.get(proto.position_status, PositionStatus.OPEN),
             open_timestamp=open_ts,
             money_digits=proto.money_digits if proto.money_digits else 2,
-            stop_loss=proto.stop_loss if proto.stop_loss else None,
-            take_profit=proto.take_profit if proto.take_profit else None,
+            stop_loss=Decimal(str(proto.stop_loss)) if proto.stop_loss else None,
+            take_profit=Decimal(str(proto.take_profit)) if proto.take_profit else None,
             trailing_stop_loss=proto.trailing_stop_loss,
             guaranteed_stop_loss=proto.guaranteed_stop_loss,
             stop_loss_trigger_method=_TRIGGER_METHOD_MAP.get(proto.stop_loss_trigger_method, StopTriggerMethod.TRADE),
-            swap=proto.swap / divisor if proto.swap else 0,
-            commission=proto.commission / divisor if proto.commission else 0,
-            used_margin=proto.used_margin / divisor if proto.used_margin else 0,
-            margin_rate=proto.margin_rate if proto.margin_rate else None,
+            swap=Decimal(proto.swap) / divisor if proto.swap else Decimal(0),
+            commission=Decimal(proto.commission) / divisor if proto.commission else Decimal(0),
+            used_margin=Decimal(proto.used_margin) / divisor if proto.used_margin else Decimal(0),
+            margin_rate=Decimal(str(proto.margin_rate)) if proto.margin_rate else None,
             label=trade_data.label if trade_data else "",
             comment=trade_data.comment if trade_data else "",
             last_update_timestamp=(
@@ -157,5 +158,5 @@ class PositionUnrealizedPnL(FrozenModel):
     """
 
     position_id: int
-    gross_unrealized_pnl: float
-    net_unrealized_pnl: float
+    gross_unrealized_pnl: Decimal
+    net_unrealized_pnl: Decimal