Shorten job_to_output_dataset_assocation.name for discovered outputs

by using an index instead of an arbitrary name. These outputs don't exist in the tool like output datasets, so I don't think the association name attribute matters.
galaxyproject · Dec 7, 2023 · 3c1e9f4 · 3c1e9f4
1 parent ac8cc32
commit 3c1e9f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/galaxy/job_execution/output_collect.py b/lib/galaxy/job_execution/output_collect.py
@@ -543,7 +543,7 @@ def collect_primary_datasets(job_context: Union[JobContext, SessionlessJobContex
                 storage_callbacks=storage_callbacks,
             )
             # Associate new dataset with job
-            job_context.add_output_dataset_association(f"__new_primary_file_{name}|{designation}__", primary_data)
+            job_context.add_output_dataset_association(f"__new_primary_file_{name}|{filename_index}__", primary_data)
             job_context.add_datasets_to_history([primary_data], for_output_dataset=outdata)
             # Add dataset to return dict
             primary_datasets[name][designation] = primary_data

diff --git a/lib/galaxy/model/store/discover.py b/lib/galaxy/model/store/discover.py
@@ -369,15 +369,16 @@ def _populate_elements(self, chunk, name, root_collection_builder, metadata_sour
             element_datasets["paths"].append(filename)
 
         self.add_tags_to_datasets(datasets=element_datasets["datasets"], tag_lists=element_datasets["tag_lists"])
-        for element_identifiers, dataset in zip(element_datasets["element_identifiers"], element_datasets["datasets"]):
+        for i, (element_identifiers, dataset) in enumerate(
+            zip(element_datasets["element_identifiers"], element_datasets["datasets"])
+        ):
             current_builder = root_collection_builder
             for element_identifier in element_identifiers[:-1]:
                 current_builder = current_builder.get_level(element_identifier)
             current_builder.add_dataset(element_identifiers[-1], dataset)
 
             # Associate new dataset with job
-            element_identifier_str = ":".join(element_identifiers)
-            association_name = f"__new_primary_file_{name}|{element_identifier_str}__"
+            association_name = f"__new_primary_file_{name}|{i}__"
             self.add_output_dataset_association(association_name, dataset)
 
         add_datasets_timer = ExecutionTimer()