cast app for using vault into StructuredApp

galaxyproject · Oct 31, 2024 · c74e8ce · c74e8ce
1 parent 437cee0
commit c74e8ce
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/galaxy/tools/evaluation.py b/lib/galaxy/tools/evaluation.py
@@ -9,6 +9,7 @@
 from typing import (
     Any,
     Callable,
+    cast,
     Dict,
     List,
     Optional,
@@ -31,6 +32,7 @@
 from galaxy.security.vault import UserVaultWrapper
 from galaxy.structured_app import (
     BasicSharedApp,
+    MinimalToolApp,
     StructuredApp,
 )
 from galaxy.tool_util.data import TabularToolDataTable
@@ -127,11 +129,11 @@ class ToolEvaluator:
     tool inputs in an isolated, testable manner.
     """
 
-    app: StructuredApp
+    app: MinimalToolApp
     job: model.Job
     materialize_datasets: bool = True
 
-    def __init__(self, app: StructuredApp, tool, job, local_working_directory):
+    def __init__(self, app: MinimalToolApp, tool, job, local_working_directory):
         self.app = app
         self.job = job
         self.tool = tool
@@ -190,7 +192,8 @@ def set_compute_environment(self, compute_environment: ComputeEnvironment, get_s
         self.execute_tool_hooks(inp_data=inp_data, out_data=out_data, incoming=incoming)
 
         if self.tool.secrets:
-            user_vault = UserVaultWrapper(self.app.vault, self._user)
+            app = cast(StructuredApp, self.app)
+            user_vault = UserVaultWrapper(app.vault, self._user)
             for secret in self.tool.secrets:
                 vault_key = secret.user_preferences_key
                 secret_value = user_vault.read_secret("preferences/" + vault_key)