Merge pull request #15440 from bernt-matthias/name-validation

Add parameter name to validation errors
galaxyproject · Oct 23, 2023 · 223a8aa · 223a8aa
2 parents f9cecae + 98b71a5
commit 223a8aa
Show file tree

Hide file tree

Showing 3 changed files with 389 additions and 370 deletions.
diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
@@ -290,7 +290,10 @@ def validate(self, value, trans=None):
         if value in ["", None] and self.optional:
             return
         for validator in self.validators:
-            validator.validate(value, trans)
+            try:
+                validator.validate(value, trans)
+            except ValueError as e:
+                raise ValueError(f"Parameter {self.name}: {e}") from None
 
     def to_dict(self, trans, other_values=None):
         """to_dict tool parameter. This can be overridden by subclasses."""
@@ -1988,7 +1991,10 @@ def do_validate(v):
                 ):
                     return
                 else:
-                    validator.validate(v, trans)
+                    try:
+                        validator.validate(v, trans)
+                    except ValueError as e:
+                        raise ValueError(f"Parameter {self.name}: {e}") from None
 
         dataset_count = 0
         if value: