[Order] handle is_synchronization_enabled for tasks and group sync

Author: GuillaumeDSM

octobot_trading/personal_data/orders/order.py

@@ -477,7 +477,8 @@ async def _ensure_inactive_order_watcher(self):
         if self.active_trigger is None:
             logging.get_logger(self.get_logger_name()).error("self.active_trigger is None")
             return
-        await self.active_trigger.create_watcher(self.exchange_manager, self.symbol, self.creation_time)
+        if self.is_synchronization_enabled():
+            await self.active_trigger.create_watcher(self.exchange_manager, self.symbol, self.creation_time)
 
     @contextlib.contextmanager
     def order_state_creation(self):
@@ -1042,6 +1043,12 @@ def _update_taker_maker(self):
                 else enums.ExchangeConstantsMarketPropertyColumns.MAKER
             ).value
 
+    def is_synchronization_enabled(self):
+        return (
+            self.exchange_manager is not None and
+            self.exchange_manager.exchange_personal_data.orders_manager.enable_order_auto_synchronization
+        )
+
     def to_dict(self):
         filled_price = self.filled_price if self.filled_price > 0 else self.origin_price
         return {

octobot_trading/personal_data/orders/order_group.py

@@ -80,8 +80,14 @@ async def enable(self, enabled):
     def get_group_open_orders(self):
         return [
             order
-            for order in self.orders_manager.get_order_from_group(self.name)
-            if order.is_open() and not order.is_cancelling()
+            for order in (
+                open_order
+                for open_order in self.orders_manager.get_order_from_group(self.name)
+                if open_order.is_open() and not (open_order.is_cancelling())
+            )
+            # when is_synchronization_enabled is disabled, orders' state might not be set and executed, also ensure
+            # orders are not filled or closed
+            if order.is_synchronization_enabled() or not (order.is_filled() or order.is_closed())
         ]
 
     def clear(self):

octobot_trading/personal_data/orders/order_state.py

@@ -152,10 +152,7 @@ def ensure_not_cleared(order):
             raise octobot_trading.errors.InvalidOrderState(f"Order has already been cleared. Order: {order}")
 
     def _is_synchronization_enabled(self):
-        return (
-            self.order.exchange_manager is not None and
-            self.order.exchange_manager.exchange_personal_data.orders_manager.enable_order_auto_synchronization
-        )
+        return self.order.is_synchronization_enabled()
 
     def clear(self):
         """

octobot_trading/personal_data/orders/types/limit/limit_order.py

@@ -85,7 +85,8 @@ def _create_hit_event(self, price_time):
             new_event(self.origin_price, price_time, self.trigger_above, self.allow_instant_fill)
 
     def _create_hit_task(self):
-        self.wait_for_hit_event_task = asyncio.create_task(self.wait_for_price_hit())
+        if self.is_synchronization_enabled():
+            self.wait_for_hit_event_task = asyncio.create_task(self.wait_for_price_hit())
 
     def _reset_events(self, price_time):
         """

tests/personal_data/orders/test_order.py

@@ -599,6 +599,23 @@ async def test_ensure_inactive_order_watcher_and_sub_functions(trader_simulator)
     assert base_order.active_trigger._trigger_task is None
     assert len(exchange_manager_inst.exchange_symbols_data.get_exchange_symbol_data(base_order.symbol).price_events_manager.events) == 0
 
+    base_order = personal_data.Order(trader_inst)
+    base_order.is_active = False
+    assert base_order.active_trigger is None
+    base_order.use_active_trigger(order_util.create_order_price_trigger(base_order, decimal.Decimal(1), True))
+    # now is_synchronization_enabled returns False
+    exchange_manager_inst.exchange_personal_data.orders_manager.enable_order_auto_synchronization = False
+    await base_order._ensure_inactive_order_watcher()
+    assert base_order.active_trigger._trigger_event is None
+    assert base_order.active_trigger._trigger_task is None
+    assert len(exchange_manager_inst.exchange_symbols_data.get_exchange_symbol_data(base_order.symbol).price_events_manager.events) == 0
+
+    base_order.clear()
+    # event and task are removed
+    assert base_order.active_trigger._trigger_event is None
+    assert base_order.active_trigger._trigger_task is None
+    assert len(exchange_manager_inst.exchange_symbols_data.get_exchange_symbol_data(base_order.symbol).price_events_manager.events) == 0
+
 
 def test_should_become_active(trader_simulator):
     config, exchange_manager_inst, trader_inst = trader_simulator