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

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "ctrader-api-client"
-version = "0.4.0"
+version = "0.4.2"
 description = "API Client to interact with the cTrader Open API spec"
 readme = "README.md"
 authors = [

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

@@ -180,15 +180,19 @@ class EventRouter:
 
     async def _handle_spot(self, proto: ProtoOASpotEvent) -> None:
         """Convert ProtoOASpotEvent to SpotEvent."""
+
+        # I don't trust the API
+        if proto.trendbar is None:
+            trendbars = []  # type: ignore[unreachable]
+        else:
+            trendbars = [Trendbar.from_proto(tb, bid_price=Decimal(proto.bid)) for tb in proto.trendbar]
         event = SpotEvent(
             account_id=proto.ctid_trader_account_id,
             symbol_id=proto.symbol_id,
             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=Decimal(str(proto.bid))) if proto.trendbar else None
-            ),
+            trendbar=trendbars,
         )
         await self._emitter.emit(event)
 

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

@@ -32,7 +32,7 @@ class SpotEvent:
     symbol_id: int
     bid: Decimal | None
     ask: Decimal | None
-    trendbar: Trendbar | None
+    trendbar: list[Trendbar]
     timestamp: datetime
 
 

{ctrader_api_client-0.4.0 → ctrader_api_client-0.4.2}/src/ctrader_api_client/models/symbol.py

@@ -137,6 +137,18 @@ class Symbol(FrozenModel):
         """
         return int(lots * self.lot_size)
 
+    def quantize_price(self, price: Decimal) -> Decimal:
+        """Quantize price to symbol's allowed decimal places
+
+        Args:
+            price: The price to quantize.
+
+        Returns:
+            Quantized price.
+        """
+        quantize_exp = Decimal(10) ** (-self.digits)
+        return price.quantize(quantize_exp)
+
     @classmethod
     def from_proto(cls, proto: ProtoOASymbol) -> Symbol:
         """Create Symbol from proto message.

{ctrader_api_client-0.4.0 → ctrader_api_client-0.4.2}/tests/unit/events/test_emitter.py

@@ -143,7 +143,7 @@ class TestEventEmitterEmit:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
         await emitter.emit(event)
@@ -164,7 +164,7 @@ class TestEventEmitterEmit:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
         await emitter.emit(event)
@@ -185,7 +185,7 @@ class TestEventEmitterEmit:
             symbol_id=2,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
         await emitter.emit(event)
@@ -205,7 +205,7 @@ class TestEventEmitterEmit:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
         await emitter.emit(event)
@@ -236,7 +236,7 @@ class TestEventEmitterEmit:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
         await emitter.emit(event)
@@ -262,7 +262,7 @@ class TestEventEmitterErrorHandling:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
         await emitter.emit(event)
@@ -286,7 +286,7 @@ class TestEventEmitterErrorHandling:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
         await emitter.emit(event)
@@ -311,7 +311,7 @@ class TestEventEmitterErrorHandling:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
 

{ctrader_api_client-0.4.0 → ctrader_api_client-0.4.2}/tests/unit/events/test_router.py

@@ -113,7 +113,7 @@ class TestSpotEventConversion:
         assert event.symbol_id == 1
         assert event.bid == Decimal("1.23")  # 123000 / 1e5
         assert event.ask == Decimal("1.2305")  # 123050 / 1e5
-        assert event.trendbar is None
+        assert len(event.trendbar) == 0
         assert event.timestamp == datetime(2021, 1, 1, 0, 0, 0, tzinfo=UTC)
 
     @pytest.mark.anyio
@@ -140,7 +140,7 @@ class TestSpotEventConversion:
         assert len(received_events) == 1
         assert received_events[0].bid is None
         assert received_events[0].ask is None
-        assert received_events[0].trendbar is None
+        assert len(received_events[0].trendbar) == 0
 
 
 class TestExecutionEventConversion:

{ctrader_api_client-0.4.0 → ctrader_api_client-0.4.2}/tests/unit/events/test_types.py

@@ -34,7 +34,7 @@ class TestSpotEvent:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=timestamp,
         )
 
@@ -42,7 +42,7 @@ class TestSpotEvent:
         assert event.symbol_id == 1
         assert event.bid == Decimal("1.23000")
         assert event.ask == Decimal("1.23050")
-        assert event.trendbar is None
+        assert len(event.trendbar) == 0
         assert event.timestamp == timestamp
 
     def test_spot_event_is_frozen(self) -> None:
@@ -52,7 +52,7 @@ class TestSpotEvent:
             symbol_id=1,
             bid=Decimal("1.23000"),
             ask=Decimal("1.23050"),
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
 
@@ -66,7 +66,7 @@ class TestSpotEvent:
             symbol_id=1,
             bid=None,
             ask=None,
-            trendbar=None,
+            trendbar=[],
             timestamp=datetime.now(UTC),
         )
 

{ctrader_api_client-0.4.0 → ctrader_api_client-0.4.2}/tests/unit/models/test_symbol.py

@@ -215,3 +215,22 @@ class TestSymbol:
         volume = symbol.lots_to_volume(original_lots)
         result = symbol.volume_to_lots(volume)
         assert result == original_lots
+
+    def test_quantize(self):
+        """Test that quantize correctly rounds to the symbol's digits."""
+        symbol = Symbol(
+            symbol_id=1,
+            digits=5,
+            pip_position=4,
+            lot_size=100000,
+            min_volume=1000,
+            max_volume=10000000,
+            step_volume=1000,
+            trading_mode=TradingMode.ENABLED,
+            swap_long=Decimal("0.0"),
+            swap_short=Decimal("0.0"),
+        )
+
+        assert symbol.quantize_price(Decimal("1.23456789")) == Decimal("1.23457")
+        assert symbol.quantize_price(Decimal("1.23456123")) == Decimal("1.23456")
+        assert symbol.quantize_price(Decimal("1.23456499")) == Decimal("1.23456")

{ctrader_api_client-0.4.0 → ctrader_api_client-0.4.2}/uv.lock

@@ -201,7 +201,7 @@ wheels = [
 
 [[package]]
 name = "ctrader-api-client"
-version = "0.4.0"
+version = "0.4.2"
 source = { editable = "." }
 dependencies = [
     { name = "anyio" },