PyAlgoEngine 0.7.7a3__tar.gz → 0.7.7a5__tar.gz

{pyalgoengine-0.7.7a3 → pyalgoengine-0.7.7a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyAlgoEngine
-Version: 0.7.7a3
+Version: 0.7.7a5
 Summary: Basic algo engine
 Home-page: https://github.com/BolunHan/PyAlgoEngine
 Author: Bolun.Han

{pyalgoengine-0.7.7a3 → pyalgoengine-0.7.7a5}/PyAlgoEngine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyAlgoEngine
-Version: 0.7.7a3
+Version: 0.7.7a5
 Summary: Basic algo engine
 Home-page: https://github.com/BolunHan/PyAlgoEngine
 Author: Bolun.Han

{pyalgoengine-0.7.7a3 → pyalgoengine-0.7.7a5}/algo_engine/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.7.alpha3"
+__version__ = "0.7.7.alpha5"
 
 import logging
 import os

{pyalgoengine-0.7.7a3 → pyalgoengine-0.7.7a5}/algo_engine/apps/sim_input/client.py

@@ -25,7 +25,7 @@ class Action(object):
         self.name = name
         self.steps: list[Action.Step] = []
 
-    def append(self, name: str, action: Callable[[..., ...], None], args=None, kwargs=None, comments: str = None) -> None:
+    def append(self, name: str, action: Callable, args=None, kwargs=None, comments: str = None) -> None:
         step = Action.Step(name=name, procedure=action)
 
         if args is not None:
@@ -172,6 +172,9 @@ class AutoWorkClient(object, metaclass=abc.ABCMeta):
             # Simulate delay between steps
 
         # Wait 3 seconds, then close the test ground and restore the client window
+        input_history.insert("end", "-" * 50)
+        input_history.insert("active", f"Mocking {action.name} Completed! Exiting in {timeout} seconds...")
+
         time.sleep(timeout)
         testground.destroy()
         self.root.deiconify()
@@ -179,13 +182,27 @@ class AutoWorkClient(object, metaclass=abc.ABCMeta):
     def toggle_auto_work(self):
         """Toggle the daemon thread to start or stop auto work."""
         if not self.running:
-            self.running = True
-            self.layout['button_takeover'].config(text="Release Control")
-            self.worker_thread = Thread(target=self.auto_work, daemon=True)
-            self.worker_thread.start()
+            self.takeover_control()
         else:
-            self.running = False
-            self.layout['button_takeover'].config(text="Takeover Input")
+            self.release_control()
+
+    def takeover_control(self):
+        if self.running:
+            LOGGER.info('Autoworker already running!')
+            return
+
+        self.running = True
+        self.layout['button_takeover'].config(text="Release Control")
+        self.worker_thread = Thread(target=self.auto_work, daemon=True)
+        self.worker_thread.start()
+
+    def release_control(self):
+        if not self.running:
+            LOGGER.info('Autoworker already stopped!')
+            return
+
+        self.running = False
+        self.layout['button_takeover'].config(text="Takeover Input")
 
     def toggle_mock(self):
         """Mock the action selected in the dropdown."""
@@ -342,6 +359,7 @@ class AutoWorkClient(object, metaclass=abc.ABCMeta):
 
         testground.bind("<Escape>", exit_record)
 
+
 class ExampleClient(AutoWorkClient):
     """An example implementation of the AutoWorkClient."""
     dummy_signal = 0

{pyalgoengine-0.7.7a3 → pyalgoengine-0.7.7a5}/algo_engine/backtest/replay.py

@@ -107,6 +107,7 @@ class ProgressiveReplay(Replay):
             **kwargs
     ):
         self.loader = loader
+        self.market_date: datetime.date | None = kwargs.pop('market_date', None)
         self.start_date: datetime.date | None = kwargs.pop('start_date', None)
         self.end_date: datetime.date | None = kwargs.pop('end_date', None)
         self.calendar: list[datetime.date] | None = kwargs.pop('calendar', None)
@@ -117,6 +118,7 @@ class ProgressiveReplay(Replay):
         self.replay_subscription = {}
         self.replay_calendar = []
         self.replay_task = []
+        self.replay_status = {}
 
         self.date_progress = 0
         self.task_progress = 0
@@ -182,8 +184,16 @@ class ProgressiveReplay(Replay):
         else:
             self.replay_calendar = self.calendar
 
+        if self.market_date is None:
+            self.market_date = self.replay_calendar[0] if self.replay_calendar else self.start_date
+        else:
+            date_to_replay = [_ for _ in self.replay_calendar if _ >= self.market_date]
+            self.market_date = date_to_replay[0] if date_to_replay else self.end_date
+
+        self.replay_status = {market_date: 'skipped' if market_date < self.market_date else 'idle' for market_date in self.replay_calendar}
+
         self.task_progress = 0
-        self.date_progress = sum([1 for _ in self.replay_calendar if _ < self.start_date])
+        self.date_progress = sum([1 for _ in self.replay_calendar if _ < self.market_date])
         self.progress.reset()
 
         if self.date_progress:
@@ -191,7 +201,8 @@ class ProgressiveReplay(Replay):
 
     def next_trade_day(self):
         if self.date_progress < len(self.replay_calendar):
-            market_date = self.replay_calendar[self.date_progress]
+            market_date = self.market_date = self.replay_calendar[self.date_progress]
+            self.replay_status[market_date] = 'started'
             self.progress.prompt = f'Replay {market_date:%Y-%m-%d} ({self.date_progress + 1} / {len(self.replay_calendar)}):'
             for topic in self.replay_subscription:
                 ticker, dtype = self.replay_subscription[topic]
@@ -214,8 +225,9 @@ class ProgressiveReplay(Replay):
             data = self.replay_task[self.task_progress]
             self.task_progress += 1
         else:
-            if self.eod is not None and self.date_progress and (self.date_progress >= len(self.replay_calendar) or self.replay_calendar[self.date_progress] > self.start_date):
-                self.eod(market_date=self.replay_calendar[self.date_progress - 1], replay=self)
+            if self.eod is not None and self.replay_status[self.market_date] == 'started':
+                self.eod(market_date=self.market_date, replay=self)
+                self.replay_status[self.market_date] = 'done'
 
             self.replay_task.clear()
             self.task_progress = 0
@@ -223,6 +235,7 @@ class ProgressiveReplay(Replay):
             if self.bod is not None and self.date_progress < len(self.replay_calendar):
                 self.bod(market_date=self.replay_calendar[self.date_progress], replay=self)
 
+            # this is by designed, to load the new data after the bod is done.
             self.next_trade_day()
 
             #  the bod process should be moved here!