From 28181f696f6528d30555293b4bab00b125b6c4f7 Mon Sep 17 00:00:00 2001 From: cgutierr Date: Wed, 16 Nov 2022 08:25:03 +0100 Subject: [PATCH 1/2] Fix 'init() takes exactly 2 arguments (3 given)' during graph generation --- autosubmit_api/autosubmit_legacy/job/job_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autosubmit_api/autosubmit_legacy/job/job_list.py b/autosubmit_api/autosubmit_legacy/job/job_list.py index cba04ff..1748ebe 100644 --- a/autosubmit_api/autosubmit_legacy/job/job_list.py +++ b/autosubmit_api/autosubmit_legacy/job/job_list.py @@ -2374,7 +2374,7 @@ class JobList: # Update Level allJobs = self.get_all() # Validate if the graph data should be updated - graph_drawing_data = ExperimentGraphDrawing(self.expid, BasicConfig).get_validated_data(self.get_all()) + graph_drawing_data = ExperimentGraphDrawing(self.expid).get_validated_data(self.get_all()) if not graph_drawing_data or len(allJobs) > 1000: # print('Start Traverse Update.') start_time = time() -- GitLab From bb828c9d37ca7141a6d39c8b474415d9b834543e Mon Sep 17 00:00:00 2001 From: cgutierr Date: Wed, 16 Nov 2022 08:45:16 +0100 Subject: [PATCH 2/2] Fix treeview 'NoneType object has no attribute strip' error in a55y experiment --- autosubmit_api/experiment/common_requests.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/autosubmit_api/experiment/common_requests.py b/autosubmit_api/experiment/common_requests.py index 8b746cc..6e47b36 100644 --- a/autosubmit_api/experiment/common_requests.py +++ b/autosubmit_api/experiment/common_requests.py @@ -801,17 +801,12 @@ def get_experiment_tree_structured(expid, log): notransitive = False BasicConfig.read() - # TODO: Encapsulate this following 2 lines or move to the parent function in app.py - curr_exp_as_version = db_common.get_autosubmit_version(expid) - main, secondary = common_utils.parse_version_number(curr_exp_as_version) - if main >= "4": - # TODO: new YAML parser - test = 1 - else: - log.info("EXPERIMENT VERSION = " + str(curr_exp_as_version)) - as_conf = AutosubmitConfig(expid, BasicConfig, ConfigParserFactory()) - as_conf.reload() + # TODO: (AUTOSUBMIT 4) Encapsulate this following 2 lines or move to the parent function in app.py + # curr_exp_as_version = db_common.get_autosubmit_version(expid) + # main, secondary = common_utils.parse_version_number(curr_exp_as_version) + as_conf = AutosubmitConfig(expid, BasicConfig, ConfigParserFactory()) + as_conf.reload() # If version is higher than 3.13, we can perform the new tree representation algorithm try: -- GitLab