onesecondtrader 0.14.1__py3-none-any.whl → 0.14.2__py3-none-any.whl

onesecondtrader/core/portfolio.py

@@ -47,8 +47,9 @@ class Portfolio:
             self._symbol_owner (dict[str, base_strategy.Strategy]): Exclusive symbol
                 ownership map; each symbol is owned by at most one strategy instance at
                 a time.
-            self._removal_pending (set[base_strategy.Strategy]): Set of strategies that
-                are still active but marked for removal once all symbols are released.
+            self.strategy_removal_pending (set[base_strategy.Strategy]): Set of
+                strategies that are still active but marked for removal once all symbols
+                are released.
             self.broker (base_broker.BaseBroker | None): Instantiated broker; may be
                 disconnected if connect failed.
         """
@@ -69,11 +70,12 @@ class Portfolio:
         # KEEP TRACK OF STRATEGIES AND SYMBOL OWNERSHIP
         # ------------------------------------------------------------------------------
         self._strategies: set[base_strategy.Strategy] = set()
+        self.strategy_removal_pending: set[base_strategy.Strategy] = set()
         self._symbol_owner: dict[str, base_strategy.Strategy] = {}
-        self._removal_pending: set[base_strategy.Strategy] = set()
 
         # INITIALIZE BROKER
         # ------------------------------------------------------------------------------
+        # TODO Decouple by also doing this via an event
         self.broker: base_broker.BaseBroker | None = None
         if broker_class is None or not issubclass(broker_class, base_broker.BaseBroker):
             broker_name = (
@@ -167,13 +169,23 @@ class Portfolio:
                         "use Portfolio.assign_symbols(...) after resolving. "
                         f"non_conflicting={non_conflicting}, conflicts={conflicting}"
                     )
+                    return False
                 else:
-                    self.assign_symbols(strategy_instance, symbols_list)
+                    for sym in symbols_list:
+                        self._symbol_owner[sym] = strategy_instance
+                    self.event_bus.publish(
+                        events.Strategy.SymbolAssignment(
+                            strategy=strategy_instance,
+                            symbol_list=symbols_list,
+                        )
+                    )
+                    return True
+
         return True
 
     def remove_strategy(
         self,
-        strategy: base_strategy.Strategy,
+        strategy_instance: base_strategy.Strategy,
         shutdown_mode: StrategyShutdownMode = StrategyShutdownMode.SOFT,
     ) -> bool:
         """
@@ -182,93 +194,90 @@ class Portfolio:
         for open positions to close naturally and release symbols once they are flat).
 
         Args:
-            strategy (base_strategy.Strategy): Strategy instance to remove.
+            strategy_instance (base_strategy.Strategy): Strategy instance to remove.
             shutdown_mode (StrategyShutdownMode): Shutdown mode to use. Defaults to
                 StrategyShutdownMode.SOFT.
         """
 
-        # IF STRATEGY IS REGISTERED, MARK IT FOR REMOVAL
+        # IF STRATEGY IS REGISTERED, MARK IT FOR REMOVAL AND PUBLISH STOP TRADING EVENT
         # ------------------------------------------------------------------------------
         with self._lock:
-            if strategy not in self._strategies:
+            if strategy_instance not in self._strategies:
                 console.logger.warning("remove_strategy: strategy not registered")
                 return False
-            self._removal_pending.add(strategy)
+            self.strategy_removal_pending.add(strategy_instance)
 
-        try:
-            strategy.request_close(shutdown_mode)
-        except Exception:
-            console.logger.warning(
-                "remove_strategy: strategy does not support request_close; proceeding to flatness check"
-            )
-
-        try:
-            if bool(strategy.is_flat()):
-                # If the strategy is already flat and owns no symbols, deregister now
-                with self._lock:
-                    has_owned_left = any(
-                        owner is strategy for owner in self._symbol_owner.values()
-                    )
-                    if not has_owned_left:
-                        if strategy in self._strategies:
-                            self._strategies.remove(strategy)
-                        self._removal_pending.discard(strategy)
-                        console.logger.info(
-                            f"Strategy {getattr(strategy, 'name', type(strategy).__name__)} removed: flat and no symbols owned"
-                        )
-                        return True
-        except Exception:
-            console.logger.warning(
-                "remove_strategy: strategy does not implement is_flat; will wait for symbol releases"
+        # PUBLISH STOP TRADING REQUEST TO EVENT BUS
+        # ------------------------------------------------------------------------------
+        self.event_bus.publish(
+            events.Strategy.StopTrading(
+                strategy=strategy_instance,
+                shutdown_mode=shutdown_mode,
             )
-        return False
+        )
+        return True
 
     def assign_symbols(
-        self,
-        strategy: base_strategy.Strategy,
-        symbols: Iterable[str],
-    ) -> tuple[list[str], list[str]]:
+        self, strategy_instance: base_strategy.Strategy, symbols: Iterable[str]
+    ):
         """
-        Assign symbols to a strategy with exclusivity enforcement.
+        Assign a list of symbols to a strategy.
 
-        Returns:
-            tuple[list[str], list[str]]: (accepted, conflicts)
+        Args:
+            strategy_instance (base_strategy.Strategy): Strategy instance to assign
+                symbols to.
+            symbols (Iterable[str]): List of symbols to assign.
         """
-        if not isinstance(strategy, base_strategy.Strategy):
-            console.logger.error("assign_symbols: strategy must inherit from Strategy")
-            return [], list(symbols)
-        symbols_list = list(
-            dict.fromkeys(s.strip() for s in symbols if s and s.strip())
-        )
-        if not symbols_list:
-            return [], []
-        accepted: list[str] = []
-        conflicts: list[str] = []
+        # IF STRATEGY IS REGISTERED, MARK IT FOR REMOVAL AND PUBLISH STOP TRADING EVENT
+        # ------------------------------------------------------------------------------
         with self._lock:
-            for sym in symbols_list:
-                current = self._symbol_owner.get(sym)
-                if current is None or current is strategy:
-                    self._symbol_owner[sym] = strategy
-                    accepted.append(sym)
-                else:
-                    conflicts.append(sym)
-        if accepted:
-            strategy.add_symbols(accepted)
-        if conflicts:
-            console.logger.warning(
-                f"assign_symbols: conflicts for {len(conflicts)} symbol(s): {conflicts}"
+            if strategy_instance not in self._strategies:
+                console.logger.warning("remove_strategy: strategy not registered")
+                return False
+            self.strategy_removal_pending.add(strategy_instance)
+
+        # ASSIGN SYMBOLS IF PROVIDED AND NO CONFLICTS EXIST, ELSE LOG WARNING
+        # ------------------------------------------------------------------------------
+        # TODO This is an repetition of the same logic as in add_strategy; refactor
+
+        if symbols is not None:
+            # Create an ordered list of unique, non-empty, trimmed symbols
+            symbols_list = list(
+                dict.fromkeys(s.strip() for s in symbols if s and s.strip())
             )
-        return accepted, conflicts
+
+            # Check for conflicts, claim symbols for strategy if no conflicts arise
+            if symbols_list:
+                non_conflicting: list[str] = []
+                conflicting: list[str] = []
+                with self._lock:
+                    for sym in symbols_list:
+                        owner = self._symbol_owner.get(sym)
+                        if owner is None or owner is strategy_instance:
+                            non_conflicting.append(sym)
+                        else:
+                            conflicting.append(sym)
+                if conflicting:
+                    console.logger.warning(
+                        "assign_symbols: symbols not assigned due to conflicts; "
+                        "use Portfolio.assign_symbols(...) after resolving. "
+                        f"non_conflicting={non_conflicting}, conflicts={conflicting}"
+                    )
+                    return False
+                else:
+                    for sym in symbols_list:
+                        self._symbol_owner[sym] = strategy_instance
+                    self.event_bus.publish(
+                        events.Strategy.SymbolAssignment(
+                            strategy=strategy_instance,
+                            symbol_list=symbols_list,
+                        )
+                    )
+                    return True
 
     def unassign_symbols(
         self, strategy: base_strategy.Strategy, symbols: Iterable[str]
     ) -> list[str]:
-        """
-        Release symbol ownership from a strategy.
-
-        Returns:
-            list[str]: Symbols actually unassigned.
-        """
         if not isinstance(strategy, base_strategy.Strategy):
             console.logger.error(
                 "unassign_symbols: strategy must inherit from Strategy"
@@ -296,23 +305,38 @@ class Portfolio:
         with self._lock:
             return self._symbol_owner.get(symbol)
 
-    def release_symbols_from_strategy(
-        self, strategy: base_strategy.Strategy, symbols: Iterable[str]
-    ) -> list[str]:
+    def on_symbol_release(self, event: events.Base.Event) -> None:
         """
-        Release symbols from the given strategy.
+        Handle symbol release events. Ignores unrelated event types.
 
-        If the strategy was previously marked for removal and ends up with no owned
-        symbols after this call, and the strategy is flat, it will be automatically
-        deregistered.
+        If a symbol is released, it is unassigned from the strategy that owns it
+        (inside the symbol_owner registry). If the strategy is marked for removal and
+        has no more symbols assigned to it, it is automatically deregistered.
         """
-        removed = self.unassign_symbols(strategy, symbols)
+
+        # IGNORE UNRELATED EVENT TYPES
+        # ------------------------------------------------------------------------------
+        if not isinstance(event, events.Strategy.SymbolRelease):
+            return
+
+        # IF STRATEGY IS REGISTERED, RELEASE SYMBOL FROM STRATEGY
+        # ------------------------------------------------------------------------------
+        # TODO This needs reworking; this will be the same logic as unassig_symbols
+        strategy = event.strategy
+        with self._lock:
+            if strategy not in self._strategies:
+                console.logger.warning("on_symbol_release: strategy not registered")
+                return
+        removed = self.unassign_symbols(strategy, [event.symbol])
         if not removed:
-            return removed
-        # Auto-deregister if pending removal and no more owned symbols
+            console.logger.warning(
+                f"on_symbol_release: symbol {event.symbol} not owned by "
+                f"{getattr(event.strategy, 'name', type(event.strategy).__name__)}"
+            )
+            return
         pending = False
         with self._lock:
-            pending = strategy in self._removal_pending
+            pending = strategy in self.strategy_removal_pending
             has_owned_left = any(
                 owner is strategy for owner in self._symbol_owner.values()
             )
@@ -322,27 +346,14 @@ class Portfolio:
                     with self._lock:
                         if strategy in self._strategies:
                             self._strategies.remove(strategy)
-                        self._removal_pending.discard(strategy)
+                        self.strategy_removal_pending.discard(strategy)
                     console.logger.info(
-                        f"Strategy {getattr(strategy, 'name', type(strategy).__name__)} removed: all symbols released and flat"
+                        f"Strategy {getattr(strategy, 'name', type(strategy).__name__)} "
+                        f"removed: all symbols released and flat"
                     )
             except Exception:
                 pass
-        return removed
-
-    def on_symbol_release(self, event: events.Base.Event) -> None:
-        """
-        Handle symbol release events. Ignores unrelated event types.
-        """
-        if not isinstance(event, events.Strategy.SymbolRelease):
-            return
-        strategy = event.strategy
-        with self._lock:
-            if strategy not in self._strategies:
-                console.logger.warning("on_symbol_release: strategy not registered")
-                return
-        removed = self.release_symbols_from_strategy(strategy, [event.symbol])
-        if not removed:
-            console.logger.warning(
-                f"on_symbol_release: symbol {event.symbol} not owned by {getattr(event.strategy, 'name', type(event.strategy).__name__)}"
-            )
+        console.logger.info(
+            f"on_symbol_release: symbol {event.symbol} released from "
+            f"{getattr(event.strategy, 'name', type(event.strategy).__name__)}"
+        )

onesecondtrader/messaging/events.py

@@ -86,13 +86,16 @@ Dataclass field validation logic is grouped under the `_Validate` namespace.
     style D1 fill:#6F42C1,fill-opacity:0.3
 
     E1[events.Strategy.SymbolRelease]
-    E2[events.Strategy.StopTrading]
+    E2[events.Strategy.SymbolAssignment]
+    E3[events.Strategy.StopTrading]
 
     R5 --> E1
     R5 --> E2
+    R5 --> E3
 
     style E1 fill:#6F42C1,fill-opacity:0.3
     style E2 fill:#6F42C1,fill-opacity:0.3
+    style E3 fill:#6F42C1,fill-opacity:0.3
 
     subgraph Market ["Market Update Event Messages"]
         R1
@@ -159,10 +162,12 @@ Dataclass field validation logic is grouped under the `_Validate` namespace.
         R5
         E1
         E2
+        E3
 
         subgraph StrategyNamespace ["events.Strategy Namespace"]
             E1
             E2
+            E3
         end
 
     end
@@ -778,6 +783,29 @@ class Strategy:
             super().__post_init__()
             _Validate.symbol(self.symbol, "Strategy.SymbolRelease")
 
+    @dataclasses.dataclass(kw_only=True, frozen=True)
+    class SymbolAssignment(Base.Strategy):
+        """
+        Event message to indicate that a symbol should be assigned to a strategy.
+
+        Attributes:
+            symbol_list (list[str]): List of symbols to be assigned.
+
+        Examples:
+            >>> from onesecondtrader.messaging import events
+            >>> event = events.Strategy.SymbolAssignment(
+            ...     strategy=my_strategy,
+            ...     symbol=["AAPL"],
+            ... )
+        """
+
+        symbol_list: list[str]
+
+        def __post_init__(self) -> None:
+            super().__post_init__()
+            for symbol in self.symbol_list:
+                _Validate.symbol(symbol, "Strategy.SymbolAssignment")
+
     @dataclasses.dataclass(kw_only=True, frozen=True)
     class StopTrading(Base.Strategy):
         """

{onesecondtrader-0.14.1.dist-info → onesecondtrader-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onesecondtrader
-Version: 0.14.1
+Version: 0.14.2
 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.14.1.dist-info → onesecondtrader-0.14.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ onesecondtrader/brokers/base_broker.py,sha256=PtLyFEXY5VisnFqJabOkRGEsSS05SUSTc7
 onesecondtrader/brokers/simulated_broker.py,sha256=ptbDkGG7NDKpqPn5ZkthALI2p533J9twS9hDQCaMeOY,242
 onesecondtrader/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onesecondtrader/core/models.py,sha256=fPI9gpgAhd2JREoo77jwf2x-QZTrSLg8_SWYKLSqwGQ,4721
-onesecondtrader/core/portfolio.py,sha256=pysRGNZmjUf2kholg-2s1yW85GcT5dtj4vUW-bLMM9s,14851
+onesecondtrader/core/portfolio.py,sha256=7MOASfqz6qykMSadu2cfYAzLTZrtOw5q6b04hk4tt-0,15950
 onesecondtrader/core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onesecondtrader/datafeeds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onesecondtrader/datafeeds/base_datafeed.py,sha256=WViw7tzsVoZku-V-DxbqKSjNPkvaiA8G-J5Rs9eKKn8,1299
@@ -14,14 +14,14 @@ onesecondtrader/indicators/base_indicator.py,sha256=eGv5_WYOSsuLXX8MbnyE3_Y8owH-
 onesecondtrader/indicators/moving_averages.py,sha256=ddZy640Z2aVgeiZ4SFRWsHDFaOBCW7u3mqBmc1wZrmQ,4678
 onesecondtrader/messaging/__init__.py,sha256=8LMFnw7KsnctDxyC8ZybDHgcdMB8fSy56Fad9Ozj6Bw,243
 onesecondtrader/messaging/eventbus.py,sha256=sEp5ebYNRHiqTRXaTqytZ2PV2wKDXj5NlWNi1OKn2_4,19447
-onesecondtrader/messaging/events.py,sha256=duC1nFPwJubT0t8DDSorIPPQeib7UFQTCMRvz98QeY0,26500
+onesecondtrader/messaging/events.py,sha256=ggP5wDTqeFxLijTukEoDEMnH4VZsVaYjHny-XXKsnls,27377
 onesecondtrader/monitoring/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onesecondtrader/monitoring/console.py,sha256=1mrojXkyL4ro7ebkvDMGNQiCL-93WEylRuwnfmEKzVs,299
 onesecondtrader/monitoring/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onesecondtrader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onesecondtrader/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 onesecondtrader/strategies/base_strategy.py,sha256=chmJyX8jVe-H24zmFDKeqClrGv-EJFtBlKzLcQe5mmM,1650
-onesecondtrader-0.14.1.dist-info/METADATA,sha256=MscQM1dnnZToJJ-tp8ZDyFGQpUsEpuhN4L1FJolfLzY,9638
-onesecondtrader-0.14.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-onesecondtrader-0.14.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-onesecondtrader-0.14.1.dist-info/RECORD,,
+onesecondtrader-0.14.2.dist-info/METADATA,sha256=1Qvu0gEoIIrQSGGqWCvEzKEVdye_p-hgPbNyvsy7Hh4,9638
+onesecondtrader-0.14.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+onesecondtrader-0.14.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+onesecondtrader-0.14.2.dist-info/RECORD,,