Serialize step tool_uuid as string, not UUID class instance

Author: mvdbeek

lib/galaxy/managers/workflows.py

@@ -1308,6 +1308,7 @@ def _workflow_to_dict_editor(self, trans, stored, workflow, tooltip=True, is_sub
             if isinstance(module, ToolModule) and module.tool:
                 # Serialize tool version
                 step_dict["tool_version"] = module.tool.version
+                step_dict["tool_uuid"] = str(step.tool_uuid) if step.tool_uuid else None
                 # Determine full (prefixed) names of valid input datasets
                 data_input_names = {}
 
@@ -1559,7 +1560,7 @@ def _workflow_to_dict_export(self, trans, stored=None, workflow=None, internal=F
             }
             if step.type == "tool":
                 step_dict["tool_id"] = content_id if allow_upgrade else step.tool_id
-                step_dict["tool_uuid"] = step.tool_uuid
+                step_dict["tool_uuid"] = str(step.tool_uuid) if step.tool_uuid else None
             # Add tool shed repository information and post-job actions to step dict.
             if isinstance(module, ToolModule):
                 if module.tool and module.tool.tool_shed:
@@ -1744,7 +1745,7 @@ def _workflow_to_dict_instance(self, trans, stored, workflow, legacy=True):
                 "id": step_id,
                 "type": step_type,
                 "tool_id": step.tool_id,
-                "tool_uuid": step.tool_uuid,
+                "tool_uuid": str(step.tool_uuid) if step.tool_uuid else None,
                 "tool_version": step.tool_version,
                 "annotation": self.get_item_annotation_str(sa_session, stored.user, step),
                 "tool_inputs": step.tool_inputs,
@@ -2064,10 +2065,14 @@ def get_all_tools(self, workflow):
                     if {
                         "tool_id": step.tool_id,
                         "tool_version": step.tool_version,
-                        "tool_uuid": step.tool_uuid,
+                        "tool_uuid": str(step.tool_uuid) if step.tool_uuid else None,
                     } not in tools:
                         tools.append(
-                            {"tool_id": step.tool_id, "tool_version": step.tool_version, "tool_uuid": step.tool_uuid}
+                            {
+                                "tool_id": step.tool_id,
+                                "tool_version": step.tool_version,
+                                "tool_uuid": str(step.tool_uuid) if step.tool_uuid else None,
+                            }
                         )
             elif step.type == "subworkflow":
                 tools.extend(self.get_all_tools(step.subworkflow))