opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18002 from mvdbeek/fix_invalid_param_reporting

Browse Source 
[24.0] Don't fail if reporting invalid parameter values
This commit is contained in:
Marius van den Beek
2024-04-17 16:15:31 +02:00
committed by GitHub
parent 88dcb255b0 48168faa35
commit 1c899abd60
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+8 -2
View File
@@ -892,6 +892,11 @@ class BaseURLToolParameter(HiddenToolParameter):
return d
def iter_to_string(iterable: typing.Iterable[typing.Any]) -> typing.Generator[str, None, None]:
for item in iterable:
yield str(item)
class SelectToolParameter(ToolParameter):
"""
Parameter that takes on one (or many) or a specific set of values.
@@ -1041,8 +1046,9 @@ class SelectToolParameter(ToolParameter):
elif set(value).issubset(set(fallback_values.keys())):
return [fallback_values[v] for v in value]
else:
invalid_options = iter_to_string(set(value) - set(legal_values))
raise ParameterValueError(
f"invalid options ({','.join(set(value) - set(legal_values))!r}) were selected (valid options: {','.join(legal_values)})",
f"invalid options ({','.join(invalid_options)!r}) were selected (valid options: {','.join(iter_to_string(legal_values))})",
self.name,
is_dynamic=self.is_dynamic,
)
@@ -1066,7 +1072,7 @@ class SelectToolParameter(ToolParameter):
return value
else:
raise ParameterValueError(
f"an invalid option ({value!r}) was selected (valid options: {','.join(legal_values)})",
f"an invalid option ({value!r}) was selected (valid options: {','.join(iter_to_string(legal_values))})",
self.name,
value,
is_dynamic=self.is_dynamic,