3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-04 01:08:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] desc.ChoiceParam: more strict type checking and conversion

Browse source
This commit is contained in:
Fabien Castan 2024-05-27 21:46:26 +02:00
parent 520c25349f
commit 5a60d92a09
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
meshroom/core/desc.py
View file

@ -317,18 +317,28 @@ class ChoiceParam(Param):
def __init__(self, name, label, description, value, values, exclusive, uid, group='allParams', joinChar=' ', advanced=False, semantic='',
enabled=True, validValue=True, errorMessage="", visible=True):
assert values
super(ChoiceParam, self).__init__(name=name, label=label, description=description, value=value, uid=uid, group=group, advanced=advanced,
semantic=semantic, enabled=enabled, validValue=validValue, errorMessage=errorMessage, visible=visible)
self._values = values
self._exclusive = exclusive
self._joinChar = joinChar
self._valueType = type(self._values[0]) # cast to value type
super(ChoiceParam, self).__init__(name=name, label=label, description=description, value=value, uid=uid, group=group, advanced=advanced,
semantic=semantic, enabled=enabled, validValue=validValue, errorMessage=errorMessage, visible=visible)
if self._values:
# Look at the type of the first element of the possible values
assert isinstance(self._values, list)
self._valueType = type(self._values[0])
elif not exclusive:
# Possible values may be defined later, so use the value to define the type.
# if non exclusive, it is a list
assert isinstance(self._value, list)
self._valueType = type(self._value[0])
else:
self._valueType = type(self._value)
def conformValue(self, value):
""" Conform 'value' to the correct type and check for its validity """
# Bypassing the validation allows to have values that are not initially in the list of choices
# We cannot return _valueType(value) because some casts are not possible (e.g. str -> int)
return value
# We do not check that the value is in the list of values.
# This allows to have a value that is not in the list of possible values.
return self._valueType(value)
def validateValue(self, value):
if self.exclusive:
@ -337,6 +347,9 @@ class ChoiceParam(Param):
if isinstance(value, str):
value = value.split(',')
if not isinstance(value, Iterable):
raise ValueError('Non exclusive ChoiceParam value should be iterable (param:{}, value:{}, type:{}).'.format(self.name, value, type(value)))
return [self.conformValue(v) for v in value]
def checkValueTypes(self):