Skip to content

Commit ddc07c9

Browse files
authored
Merge pull request #20412 from mvdbeek/fix_validators_from_expression_json
[24.2] Skip validation of expression.json input in workflow parameter validator
2 parents 323d47e + a50f890 commit ddc07c9

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
@@ -1630,7 +1630,19 @@ def execute(
16301630
input_param = self.get_runtime_inputs(self)["input"]
16311631
# TODO: raise DelayedWorkflowEvaluation if replacement not ready ? Need test
16321632
try:
1633-
input_param.validate(input_value, trans)
1633+
if not isinstance(
1634+
input_value,
1635+
(
1636+
model.DatasetInstance,
1637+
model.HistoryDatasetCollectionAssociation,
1638+
model.DatasetCollection,
1639+
model.DatasetCollectionElement,
1640+
),
1641+
):
1642+
# We could attempt to turn expression.json datasets back into validatable values,
1643+
# but then we'd have to delay scheduling until they are ready. workflow parmater value validators are
1644+
# likely most important for parent workflows, where they run on primitive values.
1645+
input_param.validate(input_value, trans)
16341646
except ValueError as e:
16351647
raise FailWorkflowEvaluation(
16361648
why=InvocationFailureWorkflowParameterInvalid(

0 commit comments

Comments
 (0)