Fix: event handlers shouldn't be shared across all instances of RithmicClient

Author: rundef

async_rithmic/client.py

@@ -23,23 +23,6 @@ def _setup_ssl_context():
     return ssl_context
 
 class RithmicClient(DelegateMixin):
-    # Connection events
-    on_connected = Event()
-    on_disconnected = Event()
-
-    # Real-time market updates events
-    on_tick = Event()
-    on_time_bar = Event()
-
-    # Order updates events
-    on_rithmic_order_notification = Event()
-    on_exchange_order_notification = Event()
-    on_bracket_update = Event()
-
-    # Historical data events
-    on_historical_tick = Event()
-    on_historical_time_bar = Event()
-
     def __init__(
         self,
         user: str,
@@ -50,6 +33,23 @@ def __init__(
         gateway: Gateway = Gateway.TEST,
         **kwargs
     ):
+        # Connection events
+        self.on_connected = Event()
+        self.on_disconnected = Event()
+
+        # Real-time market updates events
+        self.on_tick = Event()
+        self.on_time_bar = Event()
+
+        # Order updates events
+        self.on_rithmic_order_notification = Event()
+        self.on_exchange_order_notification = Event()
+        self.on_bracket_update = Event()
+
+        # Historical data events
+        self.on_historical_tick = Event()
+        self.on_historical_time_bar = Event()
+
         self.credentials = dict(
             user=user,
             password=password,

async_rithmic/plants/history.py

@@ -159,6 +159,9 @@ async def unsubscribe_from_time_bar_data(
         bar_type: TimeBarType,
         bar_type_periods: int
     ):
+        sub = (symbol, exchange, bar_type, bar_type_periods)
+        self._subscriptions["time_bar"].discard(sub)
+
         return await self._send_and_recv_immediate(
             template_id=200,
             symbol=symbol,

async_rithmic/plants/ticker.py

@@ -67,6 +67,9 @@ async def unsubscribe_from_market_data(
     ):
         update_bits = data_type.value if isinstance(data_type, DataType) else int(data_type)
 
+        sub = (symbol, exchange, update_bits)
+        self._subscriptions["market_data"].discard(sub)
+
         await self._send_request(
             template_id=100,
             symbol=symbol,