Unverified Commit 92138e98 authored by Björn Grüning's avatar Björn Grüning Committed by GitHub
Browse files

Merge pull request #16569 from mvdbeek/fix_selection_of_interactive_tool_metadata_strategy 

[23.0] Make sure job_wrapper uses a consistent metadata strategy
parents 677e1edb 62677c95

lib/galaxy/jobs/__init__.py

+2 −1
Original line number Diff line number Diff line
@@ -1023,6 +1023,7 @@ class MinimalJobWrapper(HasResourceParameters): 
                self.job_id,

                metadata_strategy_override=self.metadata_strategy,

                tool_id=self.tool.id,

                tool_type=self.tool.tool_type,

            )

        return self.__external_output_metadata
@@ -1767,7 +1768,7 @@ class MinimalJobWrapper(HasResourceParameters): 
            # the tasks failed. So include the stderr, stdout, and exit code:

            return fail()



        extended_metadata = self.external_output_metadata.extended and not self.tool.tool_type == "interactive"

        extended_metadata = self.external_output_metadata.extended



        # We collect the stderr from tools that write their stderr to galaxy.json

        tool_provided_metadata = self.get_tool_provided_job_metadata()

lib/galaxy/metadata/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ except Exception: 
"""





def get_metadata_compute_strategy(config, job_id, metadata_strategy_override=None, tool_id=None):

def get_metadata_compute_strategy(config, job_id, metadata_strategy_override=None, tool_id=None, tool_type=None):

    metadata_strategy = metadata_strategy_override or config.metadata_strategy

    if metadata_strategy == "legacy":

        raise Exception("legacy metadata_strategy has been removed")

    elif "extended" in metadata_strategy and tool_id != "__SET_METADATA__":

    elif "extended" in metadata_strategy and tool_id != "__SET_METADATA__" and tool_type != "interactive":

        return ExtendedDirectoryMetadataGenerator(job_id)

    else:

        return PortableDirectoryMetadataGenerator(job_id)