From ca9f0cbc98074e58ddc32ad5741483ccc936fc24 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Sat, 28 Feb 2026 17:15:45 -1000 Subject: [PATCH 1/2] Re-establishing tests --- wfcommons/wfinstances/logs/ro_crate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wfcommons/wfinstances/logs/ro_crate.py b/wfcommons/wfinstances/logs/ro_crate.py index c6627c13..ac99f93c 100644 --- a/wfcommons/wfinstances/logs/ro_crate.py +++ b/wfcommons/wfinstances/logs/ro_crate.py @@ -213,11 +213,13 @@ def _add_dependencies(self, files, instruments): # source_parameters = parameter_connection["sourceParameter"] # if not isinstance(source_parameters, list): # source_parameters = [source_parameters] + # for item in source_parameters: # source = item["@id"] # source = source.rsplit("#", 1)[0] # Trim to get instrument # # target = parameter_connection["targetParameter"]["@id"] # target = target.rsplit("#", 1)[0] # Trim to get instrument + # print("source", source, "----> target", target) # # for parent in instruments.get(source, []): # for child in instruments.get(target, []): From 785f7d3b452dc47d5fbad110d25fa86cc4bcaee7 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Sun, 1 Mar 2026 10:38:51 -1000 Subject: [PATCH 2/2] Ensure Task ID uniqueness in RO-Crate parser --- wfcommons/wfinstances/logs/ro_crate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wfcommons/wfinstances/logs/ro_crate.py b/wfcommons/wfinstances/logs/ro_crate.py index ac99f93c..ecb1775b 100644 --- a/wfcommons/wfinstances/logs/ro_crate.py +++ b/wfcommons/wfinstances/logs/ro_crate.py @@ -159,8 +159,8 @@ def _create_tasks(self, create_actions, main_workflow_id): task = Task(name=create_action['name'], - task_id=create_action['name'], - # task_id=create_action['name'] + "_" + create_action['@id'], + # task_id=create_action['name'], + task_id=create_action['name'] + "_" + create_action['@id'], task_type=TaskType.COMPUTE, runtime=self._time_diff(create_action['startTime'], create_action['endTime']), executed_at=create_action['startTime'], @@ -168,8 +168,8 @@ def _create_tasks(self, create_actions, main_workflow_id): output_files=self._get_file_objects(output_files), logger=self.logger) self.workflow.add_task(task) - self.task_id_name_map[create_action['@id']] = create_action['name'] - # self.task_id_name_map[create_action['@id']] = create_action['name'] + "_" + create_action['@id'] + # self.task_id_name_map[create_action['@id']] = create_action['name'] + self.task_id_name_map[create_action['@id']] = create_action['name'] + "_" + create_action['@id'] # For each file, track which task(s) it is in/output for for infile in input_files: