ctrader-api-client 0.1.0__tar.gz → 0.1.2__tar.gz

{ctrader_api_client-0.1.0 → ctrader_api_client-0.1.2}/PKG-INFO

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

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

{ctrader_api_client-0.1.0 → ctrader_api_client-0.1.2}/src/ctrader_api_client/auth/manager.py

@@ -39,7 +39,7 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 TokenRefreshCallback = Callable[[AccountCredentials], Awaitable[None]]
-AccountReadyCallback = Callable[[int, bool], Awaitable[None]]  # (account_id, is_reconnect)
+AccountReadyCallback = Callable[[int, bool, bool], Awaitable[None]]  # (account_id, is_reconnect, is_reauth)
 
 
 class AuthManager:
@@ -179,10 +179,7 @@ class AuthManager:
         return response
 
     async def authenticate_account(
-        self,
-        credentials: AccountCredentials,
-        timeout: float = 30.0,
-        reauth: bool = False,
+        self, credentials: AccountCredentials, timeout: float = 30.0, reauth: bool = False, reconnect: bool = False
     ) -> ProtoOAAccountAuthRes:
         """Authenticate a trading account.
 
@@ -192,6 +189,8 @@ class AuthManager:
             credentials: The account credentials including tokens.
             timeout: Request timeout in seconds.
             reauth: Whether this is a re-authentication (token refresh) or initial auth.
+            reconnect: Whether this authentication is happening during a connection reconnect. This can be used
+                to differentiate between a token refresh and a full reconnect scenario in the account ready callback.
 
         Returns:
             The authentication response from the server.
@@ -225,7 +224,7 @@ class AuthManager:
         # Notify callback
         if self._on_account_ready is not None:
             try:
-                await self._on_account_ready(credentials.account_id, reauth)
+                await self._on_account_ready(credentials.account_id, reconnect, reauth)
             except Exception as e:
                 logger.warning(
                     "Account ready callback failed for account %d: %s",

{ctrader_api_client-0.1.0 → ctrader_api_client-0.1.2}/src/ctrader_api_client/client.py

@@ -264,6 +264,7 @@ class CTraderClient:
         await self._transport.connect()
         await self._protocol.start()
         await self._heartbeat.start()
+        await self._auth.start()
         self._router.start()
 
         self._connected = True
@@ -289,15 +290,22 @@ class CTraderClient:
         self._connected = False
         logger.info("Connection closed")
 
-    async def _emit_ready_event(self, account_id: int, is_reconnect: bool) -> None:
+    async def _emit_ready_event(self, account_id: int, is_reconnect: bool, is_reauth: bool) -> None:
         """Emit ReadyEvent when an account is authenticated.
 
         Called by AuthManager after successful account authentication.
 
+        Does NOT emit if this is a re-auth with no reconnection (e.g. token refresh), since subscriptions
+        are not lost in that case and users don't need to restore them.
+
         Args:
             account_id: The authenticated account ID.
             is_reconnect: True if this is a re-authentication after reconnection.
         """
+        if is_reauth and not is_reconnect:
+            # Don't emit ReadyEvent for token refresh re-auth, since subscriptions are not lost
+            return
+
         await self._emitter.emit(ReadyEvent(account_id=account_id, is_reconnect=is_reconnect))
 
     async def _handle_reconnect(self) -> None:
@@ -336,7 +344,7 @@ class CTraderClient:
         # Re-authenticate all previously authenticated accounts
         for account_id, credentials in list(self._auth._accounts.items()):
             try:
-                await self._auth.authenticate_account(credentials, reauth=True)
+                await self._auth.authenticate_account(credentials, reconnect=True)
                 restored.append(account_id)
                 logger.info("Re-authenticated account %d", account_id)
             except Exception as e:

{ctrader_api_client-0.1.0 → ctrader_api_client-0.1.2}/src/ctrader_api_client/config.py

@@ -43,7 +43,7 @@ class ClientConfig(BaseModel):
 
     # Heartbeat settings
     heartbeat_interval: float = Field(default=10.0, gt=0)
-    heartbeat_timeout: float = Field(default=30.0, ge=0)
+    heartbeat_timeout: float = Field(default=0, ge=0)
 
     # Request settings
     request_timeout: float = Field(default=30.0, gt=0)

{ctrader_api_client-0.1.0 → ctrader_api_client-0.1.2}/uv.lock

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