From a9b9badff01577d6b67411e45a316a1a29caf54c Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 29 Aug 2024 15:49:05 -0400
Subject: [PATCH] Refactor tool expansion checks for reuse in tool request
 branch.

---
 lib/galaxy/tools/__init__.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 6933b09d1809..7aa703d7bc78 100644
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -1827,18 +1827,7 @@ def expand_incoming(
         collection_info: Optional[MatchingCollections]
         expanded_incomings, collection_info = expand_meta_parameters(request_context, self, incoming)
 
-        # Remapping a single job to many jobs doesn't make sense, so disable
-        # remap if multi-runs of tools are being used.
-        produces_multiple_jobs = len(expanded_incomings) > 1
-        if rerun_remap_job_id and produces_multiple_jobs:
-            raise exceptions.RequestParameterInvalidException(
-                f"Failure executing tool with id '{self.id}' (cannot create multiple jobs when remapping existing job)."
-            )
-
-        if self.input_translator and produces_multiple_jobs:
-            raise exceptions.RequestParameterInvalidException(
-                f"Failure executing tool with id '{self.id}' (cannot create multiple jobs with this type of data source tool)."
-            )
+        self._ensure_expansion_is_valid(expanded_incomings, rerun_remap_job_id)
 
         # Process incoming data
         validation_timer = self.app.execution_timer_factory.get_timer(
@@ -1857,6 +1846,25 @@ def expand_incoming(
         log.info(validation_timer)
         return all_params, all_errors, rerun_remap_job_id, collection_info
 
+    def _ensure_expansion_is_valid(
+        self, expanded_incomings: List[ToolStateJobInstanceT], rerun_remap_job_id: Optional[int]
+    ) -> None:
+        """If the request corresponds to multiple jobs but this doesn't work with request configuration - raise an error.
+
+        In particular check if this is a data source job or if we're remapping a single job - in either case we should
+        not have any expansion occuring.
+        """
+        produces_multiple_jobs = len(expanded_incomings) > 1
+        if rerun_remap_job_id and produces_multiple_jobs:
+            raise exceptions.RequestParameterInvalidException(
+                f"Failure executing tool with id '{self.id}' (cannot create multiple jobs when remapping existing job)."
+            )
+
+        if self.input_translator and produces_multiple_jobs:
+            raise exceptions.RequestParameterInvalidException(
+                f"Failure executing tool with id '{self.id}' (cannot create multiple jobs with this type of data source tool)."
+            )
+
     def _populate(
         self, request_context, expanded_incoming: ToolStateJobInstanceT, input_format: InputFormatT
     ) -> Tuple[ToolStateJobInstancePopulatedT, ParameterValidationErrorsT]: