More stuff for main commit?

jmchilton · Jan 29, 2024 · 6b63ca9 · 6b63ca9
1 parent 809bf93
commit 6b63ca9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
@@ -1933,7 +1933,15 @@ def expand_incoming(self, trans, incoming, request_context, input_format="legacy
         log.info(validation_timer)
         return all_params, all_errors, rerun_remap_job_id, collection_info
 
-    def handle_input_2(self, trans, tool_request: ToolRequest, history=None, use_cached_job=False):
+    def handle_input_2(
+        self,
+        trans,
+        tool_request: ToolRequest,
+        history=None,
+        use_cached_job=False,
+        preferred_object_store_id: Optional[str] = None,
+        input_format="legacy",
+    ):
         # TODO: original 1 added preferred object store on rebase, need to add it here.
         request_context = proxy_work_context_for_history(trans, history=history)
         tool_request_state = RequestInternalToolState(tool_request.request)
@@ -1953,11 +1961,12 @@ def handle_input_2(self, trans, tool_request: ToolRequest, history=None, use_cac
                 request_context,
                 self,
                 mapping_params,
-                history=history,
-                tool_request=tool_request,
-                rerun_remap_job_id=rerun_remap_job_id,
+                history,
+                tool_request,
+                completed_jobs,
+                rerun_remap_job_id,
+                preferred_object_store_id,
                 collection_info=collection_info,
-                completed_jobs=completed_jobs,
             )
 
     def handle_input(

diff --git a/lib/galaxy/tools/execute.py b/lib/galaxy/tools/execute.py
@@ -72,6 +72,7 @@ def execute_2(
     tool_request: ToolRequest,
     completed_jobs: Dict[int, Optional[model.Job]],
     rerun_remap_job_id: Optional[int] = None,
+    preferred_object_store_id: Optional[str] = None,
     collection_info: Optional[MatchingCollections] = None,
     workflow_invocation_uuid: Optional[str] = None,
     invocation_step: Optional[model.WorkflowInvocationStep] = None,
@@ -87,6 +88,7 @@ def execute_2(
         history,
         tool_request,
         rerun_remap_job_id,
+        preferred_object_store_id,
         collection_info,
         workflow_invocation_uuid,
         invocation_step,
@@ -126,6 +128,7 @@ def execute(
         history,
         None,
         rerun_remap_job_id,
+        preferred_object_store_id,
         collection_info,
         workflow_invocation_uuid,
         invocation_step,
@@ -144,6 +147,7 @@ def _execute(
     history: model.History,
     tool_request: Optional[model.ToolRequest],
     rerun_remap_job_id: Optional[int],
+    preferred_object_store_id: Optional[str],
     collection_info: Optional[MatchingCollections],
     workflow_invocation_uuid: Optional[str],
     invocation_step: Optional[model.WorkflowInvocationStep],