From c84fefe6a6d392bd985d71d572f372979cca5799 Mon Sep 17 00:00:00 2001 From: David Brazda Date: Thu, 23 Nov 2023 12:40:07 +0100 Subject: [PATCH] bugfix --- v2realbot/controller/services.py | 6 +++--- v2realbot/reporting/metricstoolsimage.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/v2realbot/controller/services.py b/v2realbot/controller/services.py index fdbf266..11a8ead 100644 --- a/v2realbot/controller/services.py +++ b/v2realbot/controller/services.py @@ -469,10 +469,10 @@ def batch_run_manager(id: UUID, runReq: RunRequest, rundays: list[RunDay]): print("Entering BATCH RUN MANAGER") print("generated batch_ID", batch_id) - #sort rundays according to start atttibute - print("RUNDAYS before sort:", rundays) + #SORT RUNDAYS according to start atttibute + #print("RUNDAYS before sort:", rundays) rundays.sort(key=lambda x: x.start) - print("RUNDAYS after sort:", rundays) + #print("RUNDAYS after sort:", rundays) cnt_max = len(rundays) cnt = 0 diff --git a/v2realbot/reporting/metricstoolsimage.py b/v2realbot/reporting/metricstoolsimage.py index 1f8465f..dd62d5b 100644 --- a/v2realbot/reporting/metricstoolsimage.py +++ b/v2realbot/reporting/metricstoolsimage.py @@ -37,7 +37,8 @@ def generate_trading_report_image(runner_ids: list = None, batch_id: str = None, return -1, f"no batch {batch_id} found" trades = [] - + symbol = None + mode = None sada_list = [] for id in runner_ids: #get runner @@ -50,6 +51,8 @@ def generate_trading_report_image(runner_ids: list = None, batch_id: str = None, #print(sada) sada_list.append(sada) + symbol = sada.symbol + mode = sada.mode # Parse trades trades_dicts = sada.metrics["prescr_trades"] @@ -62,9 +65,6 @@ def generate_trading_report_image(runner_ids: list = None, batch_id: str = None, print(trades) - symbol = sada.symbol - mode = sada.mode - #get from to dates #calculate start a end z min a max dni - jelikoz muze byt i seznam runner_ids a nejenom batch, pripadne testovaci sady if mode in [Mode.BT,Mode.PREP]: