diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 18924a618d84..e24904731aec 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -892,6 +892,11 @@ def to_dict(self, trans, other_values=None): 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 @@ def from_json(self, value, trans, other_values=None, require_legal_value=True): 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 @@ def from_json(self, value, trans, other_values=None, require_legal_value=True): 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,