ctrader-api-client 0.4.1__tar.gz → 0.4.3__tar.gz

{ctrader_api_client-0.4.1 → ctrader_api_client-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctrader-api-client
-Version: 0.4.1
+Version: 0.4.3
 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.1 → ctrader_api_client-0.4.3}/pyproject.toml

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

{ctrader_api_client-0.4.1 → ctrader_api_client-0.4.3}/src/ctrader_api_client/auth/manager.py

@@ -159,7 +159,7 @@ class AuthManager:
             APIError: If authentication fails.
             CTraderConnectionTimeoutError: If request times out.
         """
-        logger.info("Authenticating application")
+        logger.debug("Authenticating application")
 
         request = ProtoOAApplicationAuthReq(
             client_id=self._client_id,
@@ -175,7 +175,7 @@ class AuthManager:
             )
 
         self._app_authenticated = True
-        logger.info("Application authenticated successfully")
+        logger.debug("Application authenticated successfully")
         return response
 
     async def authenticate_account(
@@ -200,9 +200,9 @@ class AuthManager:
             CTraderConnectionTimeoutError: If request times out.
         """
         if reauth:
-            logger.info("Re-authenticating account %d", credentials.account_id)
+            logger.debug("Re-authenticating account %d", credentials.account_id)
         else:
-            logger.info("Authenticating account %d", credentials.account_id)
+            logger.debug("Authenticating account %d", credentials.account_id)
 
         request = ProtoOAAccountAuthReq(
             ctid_trader_account_id=credentials.account_id,
@@ -219,7 +219,7 @@ class AuthManager:
 
         # Store credentials for refresh monitoring
         self._accounts[credentials.account_id] = credentials
-        logger.info("Account %d authenticated successfully", credentials.account_id)
+        logger.debug("Account %d authenticated successfully", credentials.account_id)
 
         # Notify callback
         if self._on_account_ready is not None:
@@ -339,7 +339,7 @@ class AuthManager:
             APIError: If authentication fails.
             CTraderConnectionTimeoutError: If request times out.
         """
-        logger.info("Authenticating by trader login %d", trader_login)
+        logger.debug("Authenticating by trader login %d", trader_login)
 
         # Resolve trader_login to account_id
         account_id = await self.resolve_account_id(access_token, trader_login, timeout=timeout)
@@ -368,7 +368,7 @@ class AuthManager:
         """
         if account_id in self._accounts:
             del self._accounts[account_id]
-            logger.info("Account %d removed from auth manager", account_id)
+            logger.debug("Account %d removed from auth manager", account_id)
             return True
         return False
 
@@ -417,7 +417,7 @@ class AuthManager:
                         continue
 
                     if credentials.expires_soon(self._refresh_buffer):
-                        logger.info(
+                        logger.debug(
                             "Token for account %d expires soon (%.0fs remaining), refreshing",
                             account_id,
                             credentials.time_until_expiry(),
@@ -481,7 +481,7 @@ class AuthManager:
                     )
                     self._accounts[account_id] = new_credentials
 
-                    logger.info(
+                    logger.debug(
                         "Token refreshed for account %d, new expiry in %ds",
                         account_id,
                         response.expires_in,

{ctrader_api_client-0.4.1 → ctrader_api_client-0.4.3}/src/ctrader_api_client/client.py

@@ -257,7 +257,7 @@ class CTraderClient:
         if self._connected:
             return
 
-        logger.info("Connecting to %s:%d", self._config.host, self._config.port)
+        logger.debug("Connecting to %s:%d", self._config.host, self._config.port)
 
         await self._transport.connect()
         await self._protocol.start()
@@ -266,7 +266,7 @@ class CTraderClient:
         self._router.start()
 
         self._connected = True
-        logger.info("Connected successfully")
+        logger.info("Connected to cTrader server at %s:%d", self._config.host, self._config.port)
 
     async def close(self) -> None:
         """Close the connection and clean up resources.
@@ -277,7 +277,7 @@ class CTraderClient:
         if not self._connected:
             return
 
-        logger.info("Closing connection")
+        logger.debug("Closing connection")
 
         self._router.stop()
         await self._auth.stop()
@@ -286,7 +286,7 @@ class CTraderClient:
         await self._transport.close()
 
         self._connected = False
-        logger.info("Connection closed")
+        logger.debug("Connection closed")
 
     async def _emit_ready_event(self, account_id: int, is_reconnect: bool, is_reauth: bool) -> None:
         """Emit ReadyEvent when an account is authenticated.
@@ -313,7 +313,7 @@ class CTraderClient:
         the app and all previously authenticated accounts, then emits
         a ReconnectedEvent so users can restore subscriptions.
         """
-        logger.info("Connection restored, re-authenticating...")
+        logger.debug("Connection restored, re-authenticating...")
 
         # Restart heartbeat monitoring
         await self._heartbeat.restart()
@@ -325,7 +325,7 @@ class CTraderClient:
         try:
             await self._auth.authenticate_app()
             app_auth_restored = True
-            logger.info("App re-authenticated successfully")
+            logger.debug("App re-authenticated successfully")
         except Exception as e:
             logger.error("Failed to re-authenticate app after reconnect: %s", e)
             app_auth_restored = False
@@ -344,7 +344,7 @@ class CTraderClient:
             try:
                 await self._auth.authenticate_account(credentials, reconnect=True)
                 restored.append(account_id)
-                logger.info("Re-authenticated account %d", account_id)
+                logger.debug("Re-authenticated account %d", account_id)
             except Exception as e:
                 logger.error("Failed to re-authenticate account %d: %s", account_id, e)
                 failed.append((account_id, str(e)))

{ctrader_api_client-0.4.1 → ctrader_api_client-0.4.3}/src/ctrader_api_client/connection/heartbeat.py

@@ -56,7 +56,7 @@ class HeartbeatManager:
         self._task_group = anyio.create_task_group()
         await self._task_group.__aenter__()
         self._task_group.start_soon(self._heartbeat_loop)
-        logger.info("Heartbeat monitor started (interval=%.1fs, timeout=%.1fs)", self._interval, self._timeout)
+        logger.debug("Heartbeat monitor started (interval=%.1fs, timeout=%.1fs)", self._interval, self._timeout)
 
     async def stop(self) -> None:
         """Stop heartbeat monitoring.
@@ -67,7 +67,7 @@ class HeartbeatManager:
             self._task_scope.cancel()
 
         if self._task_group is not None:
-            logger.info("Heartbeat monitor stopped")
+            logger.debug("Heartbeat monitor stopped")
             self._task_group.cancel_scope.cancel()
             try:
                 await self._task_group.__aexit__(None, None, None)
@@ -87,7 +87,7 @@ class HeartbeatManager:
         self._last_received = time.monotonic()
         if self._task_group is not None:
             self._task_group.start_soon(self._heartbeat_loop)
-        logger.info("Heartbeat monitor restarted")
+        logger.debug("Heartbeat monitor restarted")
 
     async def _record_activity(self, _message: betterproto.Message) -> None:
         """Reset the inactivity timer on any received server message."""

{ctrader_api_client-0.4.1 → ctrader_api_client-0.4.3}/src/ctrader_api_client/connection/protocol.py

@@ -358,7 +358,7 @@ class Protocol:
             reraise=True,
         ):
             with attempt:
-                logger.info(
+                logger.debug(
                     "Reconnection attempt %d/%d",
                     attempt.retry_state.attempt_number,
                     self._reconnect_attempts,

{ctrader_api_client-0.4.1 → ctrader_api_client-0.4.3}/src/ctrader_api_client/connection/transport.py

@@ -83,7 +83,7 @@ class Transport:
             raise CTraderConnectionFailedError(self._host, self._port, e) from e
 
         if self._ssl:
-            logger.info("Connected to %s:%d with SSL", self._host, self._port)
+            logger.debug("Connected to %s:%d with SSL", self._host, self._port)
         else:
             logger.warning("Connected to %s:%d without SSL (plaintext)", self._host, self._port)
 

{ctrader_api_client-0.4.1 → ctrader_api_client-0.4.3}/src/ctrader_api_client/events/router.py

@@ -136,7 +136,7 @@ class EventRouter:
         )
 
         self._started = True
-        logger.info("Event router started")
+        logger.debug("Event router started")
 
     def stop(self) -> None:
         """Idempotent. Unregister all proto event handlers."""
@@ -172,7 +172,7 @@ class EventRouter:
         )
 
         self._started = False
-        logger.info("Event router stopped")
+        logger.debug("Event router stopped")
 
     # -------------------------------------------------------------------------
     # Proto to Event Converters
@@ -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.1 → ctrader_api_client-0.4.3}/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.1 → ctrader_api_client-0.4.3}/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.1 → ctrader_api_client-0.4.3}/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.1 → ctrader_api_client-0.4.3}/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.1 → ctrader_api_client-0.4.3}/uv.lock

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