onesecondtrader 0.25.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

onesecondtrader/messaging/__init__.py

@@ -1,7 +1,7 @@
 __all__ = [
     "EventBus",
-    "EventSubscriberLike",
+    "Subscriber",
 ]
 
 from .eventbus import EventBus
-from .contracts import EventSubscriberLike
+from .subscriber import Subscriber

onesecondtrader/messaging/eventbus.py

@@ -2,29 +2,32 @@ from __future__ import annotations
 
 import collections
 import threading
+import typing
 
 from onesecondtrader import events
-from . import contracts
+
+if typing.TYPE_CHECKING:
+    from .subscriber import Subscriber
 
 
 class EventBus:
     def __init__(self) -> None:
         self._per_event_subscriptions: collections.defaultdict[
-            type[events.bases.EventBase], set[contracts.EventSubscriberLike]
+            type[events.bases.EventBase], set[Subscriber]
         ] = collections.defaultdict(set)
-        self._subscribers: set[contracts.EventSubscriberLike] = set()
+        self._subscribers: set[Subscriber] = set()
         self._lock: threading.Lock = threading.Lock()
 
     def subscribe(
         self,
-        subscriber: contracts.EventSubscriberLike,
+        subscriber: Subscriber,
         event_type: type[events.bases.EventBase],
     ) -> None:
         with self._lock:
             self._subscribers.add(subscriber)
             self._per_event_subscriptions[event_type].add(subscriber)
 
-    def unsubscribe(self, subscriber: contracts.EventSubscriberLike) -> None:
+    def unsubscribe(self, subscriber: Subscriber) -> None:
         with self._lock:
             for set_of_event_subscribers in self._per_event_subscriptions.values():
                 set_of_event_subscribers.discard(subscriber)

onesecondtrader/messaging/subscriber.py

@@ -0,0 +1,67 @@
+import abc
+import queue
+import threading
+
+from onesecondtrader import events
+from .eventbus import EventBus
+
+
+class Subscriber(abc.ABC):
+    def __init__(self, event_bus: EventBus) -> None:
+        self._event_bus = event_bus
+        self._queue: queue.Queue[events.bases.EventBase | None] = queue.Queue()
+        self._running: threading.Event = threading.Event()
+        self._running.set()
+        self._thread = threading.Thread(
+            target=self._event_loop, name=self.__class__.__name__
+        )
+        self._thread.start()
+
+    def receive(self, event: events.bases.EventBase) -> None:
+        if self._running.is_set():
+            self._queue.put(event)
+
+    def wait_until_idle(self) -> None:
+        if not self._running.is_set():
+            return
+        self._queue.join()
+
+    def shutdown(self) -> None:
+        if not self._running.is_set():
+            return
+        self._event_bus.unsubscribe(self)
+        self._running.clear()
+        self._queue.put(None)
+        if threading.current_thread() is not self._thread:
+            self._thread.join()
+
+    def _subscribe(self, *event_types: type[events.bases.EventBase]) -> None:
+        # Call as last line of subclass __init__ to avoid receiving events before fully initialized
+        for event_type in event_types:
+            self._event_bus.subscribe(self, event_type)
+
+    def _event_loop(self) -> None:
+        while True:
+            event = self._queue.get()
+            if event is None:
+                self._queue.task_done()
+                break
+            try:
+                self._on_event(event)
+            except Exception as exc:
+                self._on_exception(exc)
+            finally:
+                self._queue.task_done()
+        self._cleanup()
+
+    def _on_exception(self, exc: Exception) -> None:
+        # Override in subclass to log or handle exceptions
+        pass
+
+    def _cleanup(self) -> None:
+        pass
+
+    @abc.abstractmethod
+    def _on_event(self, event: events.bases.EventBase) -> None:
+        # Must not block indefinitely; wait_until_idle() has no timeout
+        ...

{onesecondtrader-0.25.0.dist-info → onesecondtrader-0.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onesecondtrader
-Version: 0.25.0
+Version: 0.26.0
 Summary: The Trading Infrastructure Toolkit for Python. Research, simulate, and deploy algorithmic trading strategies — all in one place.
 License-File: LICENSE
 Author: Nils P. Kujath

{onesecondtrader-0.25.0.dist-info → onesecondtrader-0.26.0.dist-info}/RECORD

@@ -4,13 +4,13 @@ onesecondtrader/events/bases.py,sha256=g-ykq2jgcitIAueRurUlqAq0jINQwuhSWi_khAniP
 onesecondtrader/events/market.py,sha256=IfHuIGfp_IUiw-dFay4c4RYmkoNzshxbhuWTglBqfN0,509
 onesecondtrader/events/requests.py,sha256=2KXwSckiar9-fy8wkN3vcSIeOkeBfeo_XhUhrNKEd2Q,831
 onesecondtrader/events/responses.py,sha256=w_BH1nkkPyxQjh30EXEVFcUGDoMprFc2PuAaqpVrQ8A,1436
-onesecondtrader/messaging/__init__.py,sha256=9yLobI20ZmqipPHG_pwVgdGOEoj-sIAdGWhH17MKSu4,132
-onesecondtrader/messaging/contracts.py,sha256=_LCDtwqgCqNZ5Js1Ht5iFvqNqZUMzi83RVeJgXpTeno,267
-onesecondtrader/messaging/eventbus.py,sha256=J36tmuemRjDATHikSSzL3-7Kmx5fu_sX09X7tb94IF0,1522
+onesecondtrader/messaging/__init__.py,sha256=vMRDabHBgse_vZRTRFtnU8M8v2sY_o4pHjGzgu3hp3E,115
+onesecondtrader/messaging/eventbus.py,sha256=rTBDmtXKnUAVdOBeLyIn2pJmBLz9AszHGIcuOcVhEQI,1501
+onesecondtrader/messaging/subscriber.py,sha256=Vg8po_h47qMPm_qN6OauIBiCE179cszjy3NCd493__s,2103
 onesecondtrader/models/__init__.py,sha256=cH5xyniz78MQjM9_-fFdP1ZW6FFLTmayMwQauFO23bU,135
 onesecondtrader/models/data.py,sha256=TqUvTtjpmzTJT8ZdTYnlVoyI7Qck2IsseCazWZxJgD0,173
 onesecondtrader/models/orders.py,sha256=y6Ar-6fMqaOd_hRnRGvfWUF0Z13H_2hfTOW3ROOk0A8,254
-onesecondtrader-0.25.0.dist-info/METADATA,sha256=eWtsWhZOEqTGaEubNmJhXnWFtYxSfhYwJheci2HAwkI,9682
-onesecondtrader-0.25.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-onesecondtrader-0.25.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-onesecondtrader-0.25.0.dist-info/RECORD,,
+onesecondtrader-0.26.0.dist-info/METADATA,sha256=4JFvirUCpSuaYhLlTru35NFBcLc0M0kjEMTjRZPqe5w,9682
+onesecondtrader-0.26.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+onesecondtrader-0.26.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+onesecondtrader-0.26.0.dist-info/RECORD,,

onesecondtrader/messaging/contracts.py

@@ -1,11 +0,0 @@
-from __future__ import annotations
-
-import typing
-
-from onesecondtrader import events
-
-
-@typing.runtime_checkable
-class EventSubscriberLike(typing.Protocol):
-    def receive(self, event: events.bases.EventBase) -> None: ...
-    def wait_until_idle(self) -> None: ...