Skip to content

Commit 2e66316

Browse files
committed
Merge branch 'release_24.2' into release_25.0
2 parents 1155081 + ddc07c9 commit 2e66316

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

lib/galaxy/workflow/modules.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,19 @@ def execute(
16361636
input_param = self.get_runtime_inputs(self)["input"]
16371637
# TODO: raise DelayedWorkflowEvaluation if replacement not ready ? Need test
16381638
try:
1639-
input_param.validate(input_value, trans)
1639+
if not isinstance(
1640+
input_value,
1641+
(
1642+
model.DatasetInstance,
1643+
model.HistoryDatasetCollectionAssociation,
1644+
model.DatasetCollection,
1645+
model.DatasetCollectionElement,
1646+
),
1647+
):
1648+
# We could attempt to turn expression.json datasets back into validatable values,
1649+
# but then we'd have to delay scheduling until they are ready. workflow parmater value validators are
1650+
# likely most important for parent workflows, where they run on primitive values.
1651+
input_param.validate(input_value, trans)
16401652
except ValueError as e:
16411653
raise FailWorkflowEvaluation(
16421654
why=InvocationFailureWorkflowParameterInvalid(

0 commit comments

Comments
 (0)