stove/rougail
3
0
Fork 0
Code Issues 10 Pull requests 1 Projects Releases Wiki Activity

feat: add default inference behavior for basic types #13

Closed
gremond wants to merge 10 commits from basic_types_inference into develop
pull from: basic_types_inference
merge into: stove:develop
Conversation 0 Commits 10 Files changed 112 +23 -22
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c7a9772d0e - Show all commits

43
src/rougail/annotator/variable.py
View file

@ -76,6 +76,9 @@ class Annotator(Walk): # pylint: disable=R0903
def convert_variable(self): def convert_variable(self):
"""convert variable""" """convert variable"""
# default type inference from a default value with :term:`basic types`
basic_types = {str: "string", int: "number", bool: "boolean", float: "float"}
for variable in self.get_variables(): for variable in self.get_variables():
if variable.type == "symlink": if variable.type == "symlink":
continue continue
@ -86,28 +89,26 @@ class Annotator(Walk): # pylint: disable=R0903
variable.type = "choice" variable.type = "choice"
self._convert_variable(variable) self._convert_variable(variable)
multi = self.objectspace.multis.get(variable.path, False) multi = self.objectspace.multis.get(variable.path, False)
# default type inference from a default value with :term:`basic types` if variable.version == "1.0":
basic_types = {str: "string", int: "number", bool: "boolean", float: "float"} # - version: 1.0, the default value is of type "string" by default
if variable.version == "1.0":
# - version: 1.0, the default value is of type "string" by default
if variable.type is None:
variable.type = "string"
else: #if variable.version != "1.0":
# - version: 1.1, the default value has no type by default
if multi is False and variable.type is None:
if type(variable.default) in basic_types:
variable.type = basic_types[type(variable.default)]
elif isinstance(variable.default, list):
if variable.multi is None or variable.multi is False:
variable.multi = True
if variable.type is None: if variable.type is None:
variable.type = basic_types[type(variable.default[0])] variable.type = "string"
#else: else: #if variable.version != "1.0":
# variable.type = "string" # - version: 1.1, the default value has no type by default
# let's update the "multi" attribute in the tiramisu cache then if multi is False and variable.type is None:
if variable.multi == True: if type(variable.default) in basic_types:
self.objectspace.multis[variable.path] = True variable.type = basic_types[type(variable.default)]
elif isinstance(variable.default, list):
if variable.multi is None or variable.multi is False:
variable.multi = True
if variable.type is None:
variable.type = basic_types[type(variable.default[0])]
#else:
# variable.type = "string"
# let's update the "multi" attribute in the tiramisu cache then
if variable.multi == True:
self.objectspace.multis[variable.path] = True
def _convert_variable( def _convert_variable(
self, self,

2
src/rougail/object_model.py
View file

@ -442,7 +442,7 @@ class Variable(BaseModel):
version: str version: str
# type will be set dynamically in `annotator/value.py`, default is None # type will be set dynamically in `annotator/value.py`, default is None
type: str = None type: str = None
choices: Union[None, List[BASETYPE_CALC], Calculation] choices: Union[None, List[BASETYPE_CALC], Calculation] = None
model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True) model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)