Merge pull request #143 from wfcommons/streamflow-ro-crate

Streamflow/RO-Crate parse improvement

Author: henricasanova

wfcommons/wfinstances/logs/ro_crate.py

@@ -159,17 +159,17 @@ 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'],
                         input_files=self._get_file_objects(input_files),
                         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:
@@ -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, []):