From a97ca626c7abb02450ba0002de553ed7e46e090a Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 5 Aug 2024 09:31:36 +0200 Subject: [PATCH 1/2] add when and when_not attribute in properties calculation (#29) --- src/rougail/convert.py | 9 +- src/rougail/object_model.py | 99 +++++++++++++------ src/rougail/tiramisu.py | 12 ++- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/no_namespace.py | 2 +- .../04_5disabled_calculation/tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/no_namespace.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/no_namespace.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/no_namespace.py | 2 +- .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 9 ++ .../makedict/after.json | 6 ++ .../makedict/base.json | 3 + .../makedict/before.json | 6 ++ .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 11 +++ .../tiramisu/multi.py | 16 +++ .../tiramisu/no_namespace.py | 10 ++ .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 9 ++ .../makedict/after.json | 10 ++ .../makedict/base.json | 4 + .../makedict/before.json | 10 ++ .../makedict/mandatory.json | 1 + .../tiramisu/base.py | 11 +++ .../tiramisu/multi.py | 16 +++ .../tiramisu/no_namespace.py | 10 ++ .../04_5hidden_calculation/tiramisu/base.py | 4 +- .../04_5hidden_calculation/tiramisu/multi.py | 8 +- .../04_5hidden_calculation2/tiramisu/base.py | 4 +- .../04_5hidden_calculation2/tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/no_namespace.py | 2 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/no_namespace.py | 4 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/no_namespace.py | 4 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/no_namespace.py | 4 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/no_namespace.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/no_namespace.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/base.py | 6 +- .../tiramisu/multi.py | 12 +-- .../tiramisu/no_namespace.py | 6 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../tiramisu/no_namespace.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- .../60_5family_dynamic_calc2/tiramisu/base.py | 4 +- .../tiramisu/multi.py | 8 +- .../tiramisu/base.py | 6 +- .../tiramisu/multi.py | 12 +-- .../tiramisu/no_namespace.py | 6 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 4 +- tests/test_1_flattener.py | 2 +- 85 files changed, 366 insertions(+), 183 deletions(-) create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/__init__.py create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/makedict/after.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/makedict/base.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/makedict/before.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/makedict/mandatory.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py create mode 100644 tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/__init__.py create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/makedict/after.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/makedict/base.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/makedict/before.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/makedict/mandatory.json create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py create mode 100644 tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py diff --git a/src/rougail/convert.py b/src/rougail/convert.py index 5414996a1..d267b20f9 100644 --- a/src/rougail/convert.py +++ b/src/rougail/convert.py @@ -58,7 +58,9 @@ from .error import DictConsistencyError from .i18n import _ from .object_model import CONVERT_OPTION # Choice, from .object_model import ( + PROPERTY_ATTRIBUTE, CALCULATION_TYPES, + CALCULATION_PROPERTY_TYPES, PARAM_TYPES, AnyParam, Calculation, @@ -1064,7 +1066,10 @@ class ParserVariable: if typ == "suffix" and not family_is_dynamic: msg = f'suffix calculation for "{attribute}" in "{path}" cannot be set none dynamic family' raise DictConsistencyError(msg, 53, xmlfiles) - calc = CALCULATION_TYPES[typ](**calculation_object) + if attribute in PROPERTY_ATTRIBUTE: + calc = CALCULATION_PROPERTY_TYPES[typ](**calculation_object) + else: + calc = CALCULATION_TYPES[typ](**calculation_object) if index is None: obj[attribute] = calc else: @@ -1315,5 +1320,5 @@ class RougailConvert(ParserVariable): if filename: with open(filename, "w", encoding="utf-8") as tiramisu: tiramisu.write(output) - # print(output) + #print(output) return output diff --git a/src/rougail/object_model.py b/src/rougail/object_model.py index bc66ad893..94fb36873 100644 --- a/src/rougail/object_model.py +++ b/src/rougail/object_model.py @@ -29,6 +29,7 @@ from pydantic import ( StrictStr, ConfigDict, ) +from tiramisu import undefined from .utils import get_jinja_variable_to_param, get_realpath from .error import DictConsistencyError @@ -339,7 +340,7 @@ class JinjaCalculation(Calculation): False, objectspace, add_help=True, - params={None: [self.attribute_name]}, + params={None: [self.attribute_name], 'when': True, 'inverse': False}, ) elif self.attribute_name == "choices": return_type = self.return_type @@ -363,16 +364,16 @@ class JinjaCalculation(Calculation): class VariableCalculation(Calculation): attribute_name: Literal[ - "frozen", "hidden", "mandatory", "disabled", "default", "choices", "dynamic" + "default", "choices", "dynamic" ] variable: StrictStr propertyerror: bool = True allow_none: bool = False - def to_function( - self, - objectspace, - ) -> dict: + def get_params(self, + objectspace, + needs_multi: Optional[bool] = None, + ): if self.ori_path is None: path = self.path else: @@ -391,29 +392,18 @@ class VariableCalculation(Calculation): "variable": variable, "propertyerror": self.propertyerror, } + if suffix: + param["suffix"] = suffix params = {None: [param]} if self.default_values: params['__default_value'] = self.default_values - if self.attribute_name in PROPERTY_ATTRIBUTE: - function = "variable_to_property" - help_function = "variable_to_property" - if variable.type != "boolean": - raise Exception("only boolean!") - params[None].insert(0, self.attribute_name) - else: - function = "calc_value" - help_function = None - if suffix: - param["suffix"] = suffix if self.allow_none: params["allow_none"] = True - # current variable is a multi - if self.attribute_name in PROPERTY_ATTRIBUTE: - needs_multi = False - elif self.attribute_name != "default": - needs_multi = True - else: - needs_multi = self.path in objectspace.multis + if needs_multi is None: + if self.attribute_name != "default": + needs_multi = True + else: + needs_multi = self.path in objectspace.multis calc_variable_is_multi = variable.path in objectspace.multis if not calc_variable_is_multi: if variable.path in objectspace.paths._dynamics and (suffix is None or suffix[-1] is None): @@ -438,13 +428,57 @@ class VariableCalculation(Calculation): elif calc_variable_is_multi: msg = f'the variable "{self.path}" has an invalid attribute "{self.attribute_name}", the variable "{variable.path}" is a multi' raise DictConsistencyError(msg, 21, self.xmlfiles) - ret = { - "function": function, + return params + + def to_function( + self, + objectspace, + ) -> dict: + params = self.get_params(objectspace) + return { + "function": "calc_value", "params": params, } - if help_function: - ret["help"] = help_function - return ret + + +class VariablePropertyCalculation(VariableCalculation): + attribute_name: Literal[*PROPERTY_ATTRIBUTE] + when: Any = undefined + when_not: Any = undefined + + def to_function( + self, + objectspace, + ) -> dict: + params = self.get_params(objectspace, False) + variable = params[None][0]["variable"] + if self.when is not undefined: + if self.version == '1.0': + msg = f'when is not allowed in format version 1.0 for attribute "{self.attribute_name}" for variable "{self.path}"' + raise DictConsistencyError(msg, 103, variable.xmlfiles) + if self.when_not is not undefined: + msg = f'the variable "{self.path}" has an invalid attribute "{self.attribute_name}", when and when_not cannot set together' + raise DictConsistencyError(msg, 31, variable.xmlfiles) + when = self.when + inverse = False + elif self.when_not is not undefined: + if self.version == '1.0': + msg = f'when_not is not allowed in format version 1.0 for attribute "{self.attribute_name}" for variable "{self.path}"' + raise DictConsistencyError(msg, 104, variable.xmlfiles) + when = self.when_not + inverse = True + else: + if variable.type != "boolean": + raise Exception("only boolean!") + when = True + inverse = False + params[None].insert(0, self.attribute_name) + params['when'] = when + params['inverse'] = inverse + return {"function": "variable_to_property", + "params": params, + "help": "variable_to_property", + } class InformationCalculation(Calculation): @@ -520,6 +554,13 @@ CALCULATION_TYPES = { "suffix": SuffixCalculation, "index": IndexCalculation, } +CALCULATION_PROPERTY_TYPES = { + "jinja": JinjaCalculation, + "variable": VariablePropertyCalculation, + "information": InformationCalculation, + "suffix": SuffixCalculation, + "index": IndexCalculation, +} BASETYPE_CALC = Union[StrictBool, StrictInt, StrictFloat, StrictStr, Calculation, None] diff --git a/src/rougail/tiramisu.py b/src/rougail/tiramisu.py index 333012aa6..cfcd3e175 100644 --- a/src/rougail/tiramisu.py +++ b/src/rougail/tiramisu.py @@ -93,13 +93,17 @@ def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, __def return values -def variable_to_property(prop, value): - return prop if value else None +def variable_to_property(prop, value, when, inverse): + if inverse: + is_match = value != when + else: + is_match = value == when + return prop if is_match else None -def jinja_to_property(prop, **kwargs): +def jinja_to_property(prop, when, inverse, **kwargs): value = func['jinja_to_function'](**kwargs) - return func['variable_to_property'](prop, value is not None) + return func['variable_to_property'](prop, value is not None, when, inverse) def jinja_to_property_help(prop, **kwargs): diff --git a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py index 65fcaab27..056fecb9e 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py +++ b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/base.py @@ -9,6 +9,6 @@ dict_env['default_rougail.var2'] = "yes" dict_env['hidden_rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" option_2 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py index 2c3fe5caa..385cf0108 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py +++ b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/multi.py @@ -12,11 +12,11 @@ dict_env['default_2.rougail.var2'] = "yes" dict_env['hidden_2.rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_7 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamOption(option_7)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.var1': ParamOption(option_7)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_7)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.var1': ParamOption(option_7)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py index 75ac7f90a..ffae50a5b 100644 --- a/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_1auto_save_and_calculated_hidden/tiramisu/no_namespace.py @@ -9,5 +9,5 @@ dict_env['default_var2'] = "yes" dict_env['hidden_var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" dict_env['frozen_var2'] = "{% if _.var1 == \"yes\" %}\n_.var1 is yes\n{% endif %}\n" option_1 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_': ParamValue({}), '_.var1': ParamOption(option_1)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_': ParamValue({}), '_.var1': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)})), properties=frozenset({"basic", "force_store_value", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_': ParamValue({}), '_.var1': ParamOption(option_1)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_': ParamValue({}), '_.var1': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py index 95d686bbb..c6c53e23a 100644 --- a/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation/tiramisu/base.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.variable1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['disabled_rougail.variable2'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a conditional variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py index 7cb6e50c1..30e7cce82 100644 --- a/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation/tiramisu/multi.py @@ -10,13 +10,13 @@ dict_env['disabled_1.rougail.variable2'] = "{% if _.condition == \"yes\" %}\ncon dict_env['disabled_2.rougail.variable1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['disabled_2.rougail.variable2'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a conditional variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="condition", doc="a conditional variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="variable1", doc="a first variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="variable2", doc="a second variable", properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.variable2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"basic"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py index 269b0e4fb..4e5bc3982 100644 --- a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/base.py @@ -10,7 +10,7 @@ dict_env['disabled_rougail.var1'] = "{% if _.condition == \"yes\" %}\ncondition dict_env['default_rougail.var2'] = "{{ rougail.condition }}\n" dict_env['disabled_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py index a39cb7144..8eff634f0 100644 --- a/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_default/tiramisu/multi.py @@ -14,13 +14,13 @@ dict_env['disabled_2.rougail.var1'] = "{% if _.condition == \"yes\" %}\nconditio dict_env['default_2.rougail.var2'] = "{{ rougail.condition }}\n" dict_env['disabled_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)})), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py index fd3bc24f6..ab7a38914 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/base.py @@ -10,7 +10,7 @@ dict_env['frozen_rougail.var1'] = "{% if unknown is not defined %}\nunknown is u dict_env['hidden_rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" dict_env['frozen_rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py index e19123c52..835f4f4e6 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/multi.py @@ -14,13 +14,13 @@ dict_env['frozen_2.rougail.var1'] = "{% if unknown is not defined %}\nunknown is dict_env['hidden_2.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" dict_env['frozen_2.rougail.var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"basic"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py index 60e44fac3..3da01d3f8 100644 --- a/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_optional/tiramisu/no_namespace.py @@ -10,6 +10,6 @@ dict_env['frozen_var1'] = "{% if unknown is not defined %}\nunknown is undefined dict_env['hidden_var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" dict_env['frozen_var2'] = "{% if condition is not defined %}\ncondition is undefined\n{% elif condition == \"no\" %}\ncondition is no\n{% endif %}\nparams:\n condition:\n type: variable\n variable: _.condition\n optional: true\n" option_1 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'unknown': ParamValue({})}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'unknown': ParamValue({})}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var1", doc="a first variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'unknown': ParamValue({})}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'unknown': ParamValue({})}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2, option_3]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py index fd8ba311a..776b9f139 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/base.py @@ -6,6 +6,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py index 79f2d8d6a..7dc06c876 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/multi.py @@ -6,11 +6,11 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_7 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_8 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_7))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_8 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_7)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py index 8e1535dc6..d41f68ac6 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable/tiramisu/no_namespace.py @@ -6,5 +6,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py index 7d815b58a..65be5ecbb 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/base.py @@ -6,6 +6,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py index 5d18de25c..f30d17a47 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/multi.py @@ -6,11 +6,11 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_7 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_8 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_7))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_8 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_7)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py index 3207f7575..e0f329b6d 100644 --- a/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py +++ b/tests/dictionaries/04_5disabled_calculation_variable2/tiramisu/no_namespace.py @@ -6,5 +6,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/__init__.py b/tests/dictionaries/04_5disabled_calculation_variable3/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..72bee6630 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/dictionaries/rougail/00-base.yml @@ -0,0 +1,9 @@ +--- +version: '1.1' +condition: "yes" # a condition +variable: + description: a variable + disabled: + type: variable + variable: _.condition + when: "yes" diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/after.json new file mode 100644 index 000000000..bfd746176 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.condition": { + "owner": "default", + "value": "yes" + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/base.json new file mode 100644 index 000000000..ab5be230f --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.condition": "yes" +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/before.json new file mode 100644 index 000000000..bfd746176 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.condition": { + "owner": "default", + "value": "yes" + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/mandatory.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/makedict/mandatory.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py new file mode 100644 index 000000000..fb73afb08 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py new file mode 100644 index 000000000..364417320 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) +option_7 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_7)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"})) +optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py new file mode 100644 index 000000000..1b3976193 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable3/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/__init__.py b/tests/dictionaries/04_5disabled_calculation_variable4/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml b/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..0884c8ee6 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/dictionaries/rougail/00-base.yml @@ -0,0 +1,9 @@ +--- +version: '1.1' +condition: "yes" # a condition +variable: + description: a variable + disabled: + type: variable + variable: _.condition + when_not: "yes" diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/makedict/after.json b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/after.json new file mode 100644 index 000000000..1d8049085 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/after.json @@ -0,0 +1,10 @@ +{ + "rougail.condition": { + "owner": "default", + "value": "yes" + }, + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/makedict/base.json b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/base.json new file mode 100644 index 000000000..2365df0f3 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/base.json @@ -0,0 +1,4 @@ +{ + "rougail.condition": "yes", + "rougail.variable": null +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/makedict/before.json b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/before.json new file mode 100644 index 000000000..1d8049085 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/before.json @@ -0,0 +1,10 @@ +{ + "rougail.condition": { + "owner": "default", + "value": "yes" + }, + "rougail.variable": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/makedict/mandatory.json b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/mandatory.json new file mode 100644 index 000000000..bdc34fddd --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/makedict/mandatory.json @@ -0,0 +1 @@ +["rougail.variable"] \ No newline at end of file diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py new file mode 100644 index 000000000..fb77f3012 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/base.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_2)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py new file mode 100644 index 000000000..627f246d3 --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/multi.py @@ -0,0 +1,16 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_3)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) +option_7 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_8 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_7)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"})) +optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py new file mode 100644 index 000000000..9ed1b721e --- /dev/null +++ b/tests/dictionaries/04_5disabled_calculation_variable4/tiramisu/no_namespace.py @@ -0,0 +1,10 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +option_2 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("disabled"), ParamOption(option_1)), kwargs={'when': ParamValue("yes"), 'inverse': ParamValue(True)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py index 9754dfbd1..06b2c9c5e 100644 --- a/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation/tiramisu/base.py @@ -10,7 +10,7 @@ dict_env['frozen_rougail.var1'] = "{% if _.condition == \"yes\" %}\ncondition is dict_env['hidden_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py index a71ff2e0a..370503caf 100644 --- a/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation/tiramisu/multi.py @@ -14,13 +14,13 @@ dict_env['frozen_2.rougail.var1'] = "{% if _.condition == \"yes\" %}\ncondition dict_env['hidden_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="condition", doc="the condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default="no", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py index 622b84915..9ccc51c39 100644 --- a/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation2/tiramisu/base.py @@ -12,7 +12,7 @@ dict_env['default_rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py index 0c2dc93d0..8367cc2ba 100644 --- a/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation2/tiramisu/multi.py @@ -18,13 +18,13 @@ dict_env['default_2.rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_2.rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if rougail.condition != \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py index e1594e509..b1e7fc473 100644 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py +++ b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/base.py @@ -12,7 +12,7 @@ dict_env['default_rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py index 12aaeb9d9..fa28549ee 100644 --- a/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py +++ b/tests/dictionaries/04_5hidden_calculation_default_calculation/tiramisu/multi.py @@ -18,13 +18,13 @@ dict_env['default_2.rougail.var2'] = "{{ rougail.condition }}\n" dict_env['hidden_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['frozen_2.rougail.var2'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_8 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_9 = StrOption(name="var1", doc="a first variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var2", doc="a second variable", default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)})), properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py index ebb885d85..f8c68f834 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/base.py @@ -7,6 +7,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.family'] = "true\n" option_3 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_2 = OptionDescription(name="family", doc="family", children=[option_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = OptionDescription(name="family", doc="family", children=[option_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py index 8ed9252b8..dcd35c7e3 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/multi.py @@ -8,11 +8,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_1.rougail.family'] = "true\n" dict_env['disabled_2.rougail.family'] = "true\n" option_4 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_3 = OptionDescription(name="family", doc="family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = OptionDescription(name="family", doc="family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_7 = OptionDescription(name="family", doc="family", children=[option_8], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_7 = OptionDescription(name="family", doc="family", children=[option_8], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_7], properties=frozenset({"basic"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py index b9234542f..ad28d0d60 100644 --- a/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/16_2family_redefine_calculation/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_family'] = "true\n" option_2 = StrOption(name="var1", doc="var1", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -optiondescription_1 = OptionDescription(name="family", doc="family", children=[option_2], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) +optiondescription_1 = OptionDescription(name="family", doc="family", children=[option_2], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py index 0ea9c4ee3..798477863 100644 --- a/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition/tiramisu/base.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.var1'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py index d9d76f35f..f7ceddb9f 100644 --- a/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition/tiramisu/multi.py @@ -10,13 +10,13 @@ dict_env['hidden_1.rougail.family'] = "{% if rougail.condition == \"yes\" %}\nco dict_env['frozen_2.rougail.family.var1'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_10 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_9 = OptionDescription(name="family", doc="possibly hidden family", children=[option_10], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])})) +option_10 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_9 = OptionDescription(name="family", doc="possibly hidden family", children=[option_10], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, optiondescription_9], properties=frozenset({"basic"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py index c302f76d8..c533144c7 100644 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/base.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.variable'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" option_2 = BoolOption(name="condition", doc="a conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) +option_4 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py index ac2426166..62e93f3cc 100644 --- a/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_boolean/tiramisu/multi.py @@ -10,13 +10,13 @@ dict_env['hidden_1.rougail.family'] = "{% if not rougail.condition %}\ncondition dict_env['frozen_2.rougail.family.variable'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if not rougail.condition %}\ncondition is false\n{% endif %}\n" option_3 = BoolOption(name="condition", doc="a conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_8 = BoolOption(name="condition", doc="a conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_10 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_9 = OptionDescription(name="family", doc="a family", children=[option_10], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])})) +option_10 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_9 = OptionDescription(name="family", doc="a family", children=[option_10], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_8)}), help_function=func['jinja_to_property_help'])})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, optiondescription_9], properties=frozenset({"basic"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py index af7a58f21..37f2bab84 100644 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/base.py @@ -8,8 +8,8 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.subfamily.var1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="subfamily", doc="subfamily", children=[option_5], properties=frozenset({"basic"})) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py index 1ab4646d4..909c7e25a 100644 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/multi.py @@ -10,15 +10,15 @@ dict_env['hidden_1.rougail.family'] = "{% if _.condition == \"yes\" %}\nconditio dict_env['frozen_2.rougail.family.subfamily.var1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="subfamily", doc="subfamily", children=[option_6], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) +optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="subfamily", doc="subfamily", children=[option_12], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])})) +optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py index dfec9c139..6d911a1f4 100644 --- a/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_hidden_condition_sub_family/tiramisu/no_namespace.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_family.subfamily.var1'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_family'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_1 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_': ParamValue({}), '_.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.subfamily.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_': ParamValue({}), '_.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="subfamily", doc="subfamily", children=[option_4], properties=frozenset({"basic"})) -optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_': ParamValue({}), '_.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_': ParamValue({}), '_.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py index 49cf2d327..5833f8ebd 100644 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/base.py @@ -6,8 +6,8 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="the variable use has condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_2))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="subfamily", doc="a subfamily", children=[option_5], properties=frozenset({"basic"})) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_2))), help_function=func['variable_to_property'])})) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py index af1f5d52f..3c736b606 100644 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/multi.py @@ -6,15 +6,15 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = BoolOption(name="condition", doc="the variable use has condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_3))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_3)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="subfamily", doc="a subfamily", children=[option_6], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_3))), help_function=func['variable_to_property'])})) +optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_3)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = BoolOption(name="condition", doc="the variable use has condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_9))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_9)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="subfamily", doc="a subfamily", children=[option_12], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_9))), help_function=func['variable_to_property'])})) +optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_9)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py index bdf6b7091..a726a87a5 100644 --- a/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_hidden_condition_variable_sub_family/tiramisu/no_namespace.py @@ -6,7 +6,7 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="the variable use has condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_1))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['variable_to_property'], Params((ParamValue("frozen"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="subfamily", doc="a subfamily", children=[option_4], properties=frozenset({"basic"})) -optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_1))), help_function=func['variable_to_property'])})) +optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['variable_to_property'], Params((ParamValue("hidden"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py index 98187a10a..1cfc4e437 100644 --- a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/base.py @@ -11,7 +11,7 @@ dict_env['frozen_rougail.family.variable_0'] = "{% if rougail.condition2 %}\ncon dict_env['hidden_rougail.family'] = "{% if not rougail.condition1 %}\ncondition1 is false\n{% endif %}\n" option_2 = BoolOption(name="condition1", doc="a first conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_3 = BoolOption(name="condition2", doc="a second conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition2': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition1': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition2': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition1': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_2)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, optiondescription_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py index 7e536e9b6..e4ae54a24 100644 --- a/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_condition_with_variable/tiramisu/multi.py @@ -15,14 +15,14 @@ dict_env['frozen_2.rougail.family.variable_0'] = "{% if rougail.condition2 %}\nc dict_env['hidden_2.rougail.family'] = "{% if not rougail.condition1 %}\ncondition1 is false\n{% endif %}\n" option_3 = BoolOption(name="condition1", doc="a first conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_4 = BoolOption(name="condition2", doc="a second conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_6 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition2': ParamOption(option_4)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition1': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition2': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition1': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) +option_6 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_4)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_3)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, optiondescription_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = BoolOption(name="condition1", doc="a first conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_10 = BoolOption(name="condition2", doc="a second conditional variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_12 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition2': ParamOption(option_10)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition1': ParamOption(option_9)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition2': ParamOption(option_10)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_11 = OptionDescription(name="family", doc="a family", children=[option_12], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition1': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])})) +option_12 = StrOption(name="variable", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_10)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_9)}), help_function=func['jinja_to_property_help']), Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.variable_0"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition2': ParamOption(option_10)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_11 = OptionDescription(name="family", doc="a family", children=[option_12], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition1': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, option_10, optiondescription_11], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py index 4c892cd48..2963c2ef4 100644 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py +++ b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/base.py @@ -8,8 +8,8 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.family.sub_family.var1'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_rougail.family'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_5], properties=frozenset({"basic"})) -optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_2), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py index e9169bba7..28c6a6d00 100644 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/multi.py @@ -10,15 +10,15 @@ dict_env['hidden_1.rougail.family'] = "{% if condition == \"yes\" %}\ncondition dict_env['frozen_2.rougail.family.sub_family.var1'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_2.rougail.family'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_6], properties=frozenset({"basic"})) -optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) +optiondescription_4 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_3), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_9), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_12], properties=frozenset({"basic"})) -optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])})) +optiondescription_10 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_9), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py index 4e7b0eac0..3245c78d3 100644 --- a/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_hidden_param_condition_sub_family/tiramisu/no_namespace.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_family.sub_family.var1'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['hidden_family'] = "{% if condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_1 = StrOption(name="condition", doc="the variable use has condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_family.sub_family.var1"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="sub_family", doc="a subfamily", children=[option_4], properties=frozenset({"basic"})) -optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = OptionDescription(name="family", doc="possibly hidden family", children=[optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_family"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'condition': ParamOption(option_1), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py index d48460867..e40133fbb 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/base.py @@ -7,6 +7,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['mandatory_rougail.var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py index 5d579fa68..17b84c4eb 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/multi.py @@ -8,11 +8,11 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['mandatory_1.rougail.var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" dict_env['mandatory_2.rougail.var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_1.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_1.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_7 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_2.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.condition': ParamOption(option_7)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_2.rougail.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.condition': ParamOption(option_7)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py index 36b54f972..4aedb872d 100644 --- a/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_mandatory_condition/tiramisu/no_namespace.py @@ -7,5 +7,5 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['mandatory_var'] = "{% if _.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_1 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_': ParamValue({}), '_.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("mandatory")), kwargs={'__internal_jinja': ParamValue("mandatory_var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_': ParamValue({}), '_.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py index ef39142a1..19e0d10de 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/base.py @@ -6,6 +6,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_2))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_2)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py index 8f285b0e2..4256d2a5a 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/multi.py @@ -6,11 +6,11 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_3 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_3))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_3)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_7 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_8 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_7))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_7)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"})) optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5]) diff --git a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py index 5b3918d74..c5b2e0d4d 100644 --- a/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py +++ b/tests/dictionaries/24_0family_mandatory_condition_variable/tiramisu/no_namespace.py @@ -6,5 +6,5 @@ ALLOWED_LEADER_PROPERTIES.add("basic") ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") option_1 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) -option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_1))), help_function=func['variable_to_property'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"standard", Calculation(func['variable_to_property'], Params((ParamValue("mandatory"), ParamOption(option_1)), kwargs={'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['variable_to_property'])}), informations={'type': 'string'}) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2]) diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py index 4d4f4adf3..d0ef07f83 100644 --- a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py +++ b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/base.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.leader.follower'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_2 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_4 = StrOption(name="leader", doc="aleader", multi=True, default=["a"], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py index e8b010f68..8cd00f91b 100644 --- a/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py +++ b/tests/dictionaries/44_4disabled_calcultion_follower/tiramisu/multi.py @@ -9,13 +9,13 @@ dict_env['disabled_1.rougail.leader.follower'] = "{% if rougail.condition == \"y dict_env['disabled_2.rougail.leader.follower'] = "{% if rougail.condition == \"yes\" %}\ncondition is yes\n{% endif %}\n" option_3 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_5 = StrOption(name="leader", doc="aleader", multi=True, default=["a"], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) -option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = BoolOption(name="condition", doc="a condition", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'}) option_11 = StrOption(name="leader", doc="aleader", multi=True, default=["a"], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) -option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic"})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) diff --git a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py index 604f0bee5..9b4cf6acb 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/base.py @@ -9,8 +9,8 @@ dict_env['frozen_rougail.leader.leader'] = "{% if __.condition == \"no\" %}\ncon dict_env['frozen_rougail.leader.follower'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" dict_env['hidden_rougail.leader.leader'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) +option_4 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py index 3270345cf..c47edf3c1 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/multi.py @@ -12,15 +12,15 @@ dict_env['frozen_2.rougail.leader.leader'] = "{% if __.condition == \"no\" %}\nc dict_env['frozen_2.rougail.leader.follower'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" dict_env['hidden_2.rougail.leader.leader'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_11 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])})) +option_11 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py index fbafb98f9..6ac0d3438 100644 --- a/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_5leadership_leader_hidden_calculation/tiramisu/no_namespace.py @@ -9,7 +9,7 @@ dict_env['frozen_leader.leader'] = "{% if __.condition == \"no\" %}\ncondition i dict_env['frozen_leader.follower'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" dict_env['hidden_leader.leader'] = "{% if __.condition == \"no\" %}\ncondition is no\n{% endif %}\n" option_1 = StrOption(name="condition", doc="a condition", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_3 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])})) +option_3 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", "notempty", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_leader.leader"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py index 4147d9443..840654731 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/base.py @@ -8,7 +8,7 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.leader.follower'] = "{% if __.condition == \"yes\" %}true{% else %}false{% endif %}\n" option_2 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="a leadership", children=[option_4, option_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py index d7708ff3a..572f943e6 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/multi.py @@ -9,13 +9,13 @@ dict_env['disabled_1.rougail.leader.follower'] = "{% if __.condition == \"yes\" dict_env['disabled_2.rougail.leader.follower'] = "{% if __.condition == \"yes\" %}true{% else %}false{% endif %}\n" option_3 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'string'}) -option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = Leadership(name="leader", doc="a leadership", children=[option_5, option_6], properties=frozenset({"basic"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_11 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'string'}) -option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.condition': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_10 = Leadership(name="leader", doc="a leadership", children=[option_11, option_12], properties=frozenset({"basic"})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, optiondescription_10], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) diff --git a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py index 50c03b64d..9b8bf78a8 100644 --- a/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py +++ b/tests/dictionaries/44_6leadership_follower_disabled_calculation/tiramisu/no_namespace.py @@ -8,6 +8,6 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_leader.follower'] = "{% if __.condition == \"yes\" %}true{% else %}false{% endif %}\n" option_1 = StrOption(name="condition", doc="a condition", default="yes", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="leader", doc="a leader", multi=True, properties=frozenset({"basic", "mandatory", "notempty"}), informations={'type': 'string'}) -option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="follower", doc="a follower", multi=True, properties=frozenset({"basic", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__': ParamValue({}), '__.condition': ParamOption(option_1)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = Leadership(name="leader", doc="a leadership", children=[option_3, option_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) diff --git a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py index 0b55b7db6..659fe00f0 100644 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py +++ b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/base.py @@ -7,7 +7,7 @@ ALLOWED_LEADER_PROPERTIES.add("standard") ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_rougail.leader.follower'] = "{% if _.leader == \"a\" %}\nthe value of \"leader\" is \"a\"\n{% endif %}\n" option_3 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b"], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) -option_4 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.leader': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_2 = Leadership(name="leader", doc="leader", children=[option_3, option_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_2], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py index 8855568a7..149e87fad 100644 --- a/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py +++ b/tests/dictionaries/44_9calculated_default_leadership_leader/tiramisu/multi.py @@ -8,12 +8,12 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['disabled_1.rougail.leader.follower'] = "{% if _.leader == \"a\" %}\nthe value of \"leader\" is \"a\"\n{% endif %}\n" dict_env['disabled_2.rougail.leader.follower'] = "{% if _.leader == \"a\" %}\nthe value of \"leader\" is \"a\"\n{% endif %}\n" option_4 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b"], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) -option_5 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.leader': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = Leadership(name="leader", doc="leader", children=[option_4, option_5], properties=frozenset({"standard"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) option_9 = StrOption(name="leader", doc="a leader", multi=True, default=["a", "b"], properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) -option_10 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_9)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '_.leader': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="follower", doc="a follower", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_9)))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.leader.follower"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '_.leader': ParamOption(option_9)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_8 = Leadership(name="leader", doc="leader", children=[option_9, option_10], properties=frozenset({"standard"})) optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_8], properties=frozenset({"standard"})) optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) diff --git a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py index 8c8d8b4b8..ab29a018d 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/base.py @@ -9,7 +9,7 @@ dict_env['frozen_rougail.dyn{{ suffix }}.vardyn'] = "{% if rougail.var2 == \"no\ dict_env['hidden_rougail.dyn{{ suffix }}'] = "{% if rougail.var2 == \"no\" %}\nvar2 is no\n{% endif %}\n" option_2 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) option_3 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_5 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ suffix }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.var2': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.var2': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) +option_5 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ suffix }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.var2': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_2, notraisepropertyerror=True)))), children=[option_5], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.var2': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, optiondescription_4], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py index 661994510..7f2d2e5a7 100644 --- a/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_calc2/tiramisu/multi.py @@ -11,14 +11,14 @@ dict_env['frozen_2.rougail.dyn{{ suffix }}.vardyn'] = "{% if rougail.var2 == \"n dict_env['hidden_2.rougail.dyn{{ suffix }}'] = "{% if rougail.var2 == \"no\" %}\nvar2 is no\n{% endif %}\n" option_3 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) option_4 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_6 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ suffix }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.var2': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_5 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.var2': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])})) +option_6 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ suffix }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.var2': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_5 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_3, notraisepropertyerror=True)))), children=[option_6], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.var2': ParamOption(option_4)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, optiondescription_5], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) option_9 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) option_10 = StrOption(name="var2", doc="a second variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'}) -option_12 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ suffix }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.var2': ParamOption(option_10)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_9, notraisepropertyerror=True)))), children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'rougail.var2': ParamOption(option_10)}), help_function=func['jinja_to_property_help'])})) +option_12 = StrOption(name="vardyn", doc="a dynamic variable", default="val", properties=frozenset({"force_default_on_freeze", "mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ suffix }}.vardyn"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.var2': ParamOption(option_10)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +optiondescription_11 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_9, notraisepropertyerror=True)))), children=[option_12], properties=frozenset({"standard", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), 'rougail.var2': ParamOption(option_10)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[option_9, option_10, optiondescription_11], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py index e87bea9f0..e7088407e 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/base.py @@ -8,9 +8,9 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_rougail.dyn{{ suffix }}.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['frozen_rougail.dyn{{ suffix }}.family.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['hidden_rougail.dyn{{ suffix }}'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" -option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_5 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_rougail.dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = OptionDescription(name="family", doc="a family", children=[option_5], properties=frozenset({"basic"})) -optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_3, optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])})) +optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_3, optiondescription_4], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_2], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py index a0e29c919..0477f1dd8 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/multi.py @@ -11,16 +11,16 @@ dict_env['hidden_1.rougail.dyn{{ suffix }}'] = "{% if suffix == 'val2' %}\ndisab dict_env['frozen_2.rougail.dyn{{ suffix }}.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['frozen_2.rougail.dyn{{ suffix }}.family.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['hidden_2.rougail.dyn{{ suffix }}'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" -option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_6 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_6 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_1.rougail.dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_5 = OptionDescription(name="family", doc="a family", children=[option_6], properties=frozenset({"basic"})) -optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_4, optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])})) +optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_4, optiondescription_5], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_1.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_3], properties=frozenset({"basic"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) -option_10 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_12 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_10 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_12 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_2.rougail.dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_11 = OptionDescription(name="family", doc="a family", children=[option_12], properties=frozenset({"basic"})) -optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_10, optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])})) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_10, optiondescription_11], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_2.rougail.dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) optiondescription_8 = OptionDescription(name="rougail", doc="Rougail", children=[optiondescription_9], properties=frozenset({"basic"})) optiondescription_7 = OptionDescription(name="2", doc="2", children=[optiondescription_8], properties=frozenset({"basic"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_7]) diff --git a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py index 72ace9621..0a66fab6e 100644 --- a/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py +++ b/tests/dictionaries/60_5family_dynamic_hidden_suffix/tiramisu/no_namespace.py @@ -8,8 +8,8 @@ ALLOWED_LEADER_PROPERTIES.add("advanced") dict_env['frozen_dyn{{ suffix }}.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['frozen_dyn{{ suffix }}.family.var'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" dict_env['hidden_dyn{{ suffix }}'] = "{% if suffix == 'val2' %}\ndisabled\n{% endif %}\n" -option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) -option_4 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_2 = StrOption(name="var", doc="a variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ suffix }}.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="a new variable", properties=frozenset({"basic", "force_default_on_freeze", "mandatory", Calculation(func['jinja_to_property'], Params((ParamValue("frozen")), kwargs={'__internal_jinja': ParamValue("frozen_dyn{{ suffix }}.family.var"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = OptionDescription(name="family", doc="a family", children=[option_4], properties=frozenset({"basic"})) -optiondescription_1 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_2, optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix()}), help_function=func['jinja_to_property_help'])})) +optiondescription_1 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="a dynamic family", suffixes=["val1", "val2"], children=[option_2, optiondescription_3], properties=frozenset({"basic", Calculation(func['jinja_to_property'], Params((ParamValue("hidden")), kwargs={'__internal_jinja': ParamValue("hidden_dyn{{ suffix }}"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'suffix': ParamSuffix(), 'when': ParamValue(True), 'inverse': ParamValue(False)}), help_function=func['jinja_to_property_help'])})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py index f5233a9ff..087fa9e5b 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/base.py @@ -10,7 +10,7 @@ option_2 = StrOption(name="var", doc="a suffix variable", multi=True, default=[" option_4 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamSuffix()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_5 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_4)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_7 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_4, ['val4'])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.{{ suffix }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.var': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_7 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_4, ['val4'])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_rougail.{{ suffix }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_2)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_3 = ConvertDynOptionDescription(name="{{ suffix }}_dyn", doc="a dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4, option_5, option_6, option_7], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"standard"})) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py index a46023740..7e9e55497 100644 --- a/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py +++ b/tests/dictionaries/60_5family_dynamic_unknown_suffix/tiramisu/multi.py @@ -11,7 +11,7 @@ option_3 = StrOption(name="var", doc="a suffix variable", multi=True, default=[" option_5 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamSuffix()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_6 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_5)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_7 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_5)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_8 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_5, ['val4'])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.{{ suffix }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.var': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_8 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_5, ['val4'])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_1.rougail.{{ suffix }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_3)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_4 = ConvertDynOptionDescription(name="{{ suffix }}_dyn", doc="a dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5, option_6, option_7, option_8], properties=frozenset({"standard"})) optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"standard"})) optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) @@ -19,7 +19,7 @@ option_11 = StrOption(name="var", doc="a suffix variable", multi=True, default=[ option_13 = StrOption(name="var1", doc="a variable 1", default=Calculation(func['calc_value'], Params((ParamSuffix()))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_14 = StrOption(name="var2", doc="a variable 2", default=Calculation(func['calc_value'], Params((ParamOption(option_13)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) option_15 = StrOption(name="var3", doc="a variable 3", default=Calculation(func['calc_value'], Params((ParamOption(option_13)))), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) -option_16 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ['val4'])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.{{ suffix }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), '__.var': ParamOption(option_11)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) +option_16 = StrOption(name="var4", doc="a variable 4", default=Calculation(func['calc_value'], Params((ParamDynOption(option_13, ['val4'])))), properties=frozenset({"mandatory", "standard", Calculation(func['jinja_to_property'], Params((ParamValue("disabled")), kwargs={'__internal_jinja': ParamValue("disabled_2.rougail.{{ suffix }}_dyn.var4"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(False), 'when': ParamValue(True), 'inverse': ParamValue(False), '__.var': ParamOption(option_11)}), help_function=func['jinja_to_property_help'])}), informations={'type': 'string'}) optiondescription_12 = ConvertDynOptionDescription(name="{{ suffix }}_dyn", doc="a dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_11)))), children=[option_13, option_14, option_15, option_16], properties=frozenset({"standard"})) optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_11, optiondescription_12], properties=frozenset({"standard"})) optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"})) diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index dfab78416..97cca2382 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -38,7 +38,7 @@ excludes = set([ ]) test_ok -= excludes test_raise -= excludes -#test_ok = ['00_8calculation_information'] +#test_ok = ['04_5disabled_calculation_variable3'] #test_ok = [] #test_raise = ['88valid_enum_invalid_default'] #test_raise = [] -- 2.45.0 From 3a7b3f7b07ab9942776cc9340707fa21be3bd735 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 5 Aug 2024 16:01:32 +0200 Subject: [PATCH 2/2] add structural_commandline plugin --- src/rougail/config.py | 2 +- src/rougail/object_model.py | 8 +-- .../structural_commandline/annotator.py | 53 +++++++++++++++++++ .../structural_commandline/object_model.py | 31 +++++++++++ .../__init__.py | 0 .../dictionaries/rougail/00-base.yml | 12 +++++ .../tiramisu/base.py | 12 +++++ .../tiramisu/multi.py | 18 +++++++ .../tiramisu/no_namespace.py | 11 ++++ 9 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 src/rougail/structural_commandline/annotator.py create mode 100644 src/rougail/structural_commandline/object_model.py create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/__init__.py create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py create mode 100644 tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py diff --git a/src/rougail/config.py b/src/rougail/config.py index 9efb6872d..b68629e3e 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -347,7 +347,7 @@ suffix: YAML().load(obj['options']), ) - tiram_obj = convert.save('a') + tiram_obj = convert.save(None) optiondescription = {} exec(tiram_obj, {}, optiondescription) # pylint: disable=W0122 return _RougailConfig(backward_compatibility, optiondescription["option_0"]) diff --git a/src/rougail/object_model.py b/src/rougail/object_model.py index 94fb36873..03f429cbd 100644 --- a/src/rougail/object_model.py +++ b/src/rougail/object_model.py @@ -52,15 +52,15 @@ def convert_boolean(value: str) -> bool: CONVERT_OPTION = { - "string": dict(opttype="StrOption", example="xxx"), + "string": dict(opttype="StrOption", example="example"), "number": dict(opttype="IntOption", func=int, example=42), "float": dict(opttype="FloatOption", func=float, example=1.42), "boolean": dict(opttype="BoolOption", func=convert_boolean), - "secret": dict(opttype="PasswordOption", example="xxx"), + "secret": dict(opttype="PasswordOption", example="secrets"), "mail": dict(opttype="EmailOption", example="user@example.net"), "unix_filename": dict(opttype="FilenameOption", example="/tmp/myfile.txt"), "date": dict(opttype="DateOption", example="2000-01-01"), - "unix_user": dict(opttype="UsernameOption", example="xxx"), + "unix_user": dict(opttype="UsernameOption", example="username"), "ip": dict(opttype="IPOption", initkwargs={"allow_reserved": True}, example="1.1.1.1"), "cidr": dict(opttype="IPOption", initkwargs={"cidr": True}, example="1.1.1.0/24"), "netmask": dict(opttype="NetmaskOption", example="255.255.255.0"), @@ -90,7 +90,7 @@ CONVERT_OPTION = { opttype="PermissionsOption", initkwargs={"warnings_only": True}, func=int, example="644" ), - "choice": dict(opttype="ChoiceOption", example="xxx"), + "choice": dict(opttype="ChoiceOption", example="a_choice"), # "symlink": dict(opttype="SymLinkOption"), } diff --git a/src/rougail/structural_commandline/annotator.py b/src/rougail/structural_commandline/annotator.py new file mode 100644 index 000000000..2e5ad8f46 --- /dev/null +++ b/src/rougail/structural_commandline/annotator.py @@ -0,0 +1,53 @@ +"""Annotate to add specify attribute for tiramisu-cmdline + +Silique (https://www.silique.fr) +Copyright (C) 2024 + +distribued with GPL-2 or later license + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +""" +from rougail.annotator.variable import Walk + +class Annotator(Walk): + """Annotate value""" + level = 5 + + def __init__(self, objectspace, *args) -> None: + if not objectspace.paths: + return + self.objectspace = objectspace + self.manage_alternative_name() + self.not_for_commandline() + + def manage_alternative_name(self) -> None: + for variable in self.get_variables(): + if variable.type == 'symlink': + continue + if not variable.alternative_name: + continue + alternative_name = variable.alternative_name + variable_path = variable.path + if '.' not in variable_path: + path = alternative_name + else: + path = variable_path.rsplit('.', 1)[0] + '.' + alternative_name + self.objectspace.add_variable(alternative_name, {'type': 'symlink', 'path': path, 'opt': variable}, variable.xmlfiles, False, False, variable.version) + + def not_for_commandline(self) -> None: + for variable in self.get_variables(): + if not hasattr(variable, 'commandline') or variable.commandline: + continue + self.objectspace.properties.add(variable.path, 'not_for_commandline', True) diff --git a/src/rougail/structural_commandline/object_model.py b/src/rougail/structural_commandline/object_model.py new file mode 100644 index 000000000..21318e6f6 --- /dev/null +++ b/src/rougail/structural_commandline/object_model.py @@ -0,0 +1,31 @@ +"""Annotate to add specify attribute for tiramisu-cmdline + +Silique (https://www.silique.fr) +Copyright (C) 2024 + +distribued with GPL-2 or later license + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +""" +from typing import Optional +from pydantic import BaseModel + + +class Variable(BaseModel): + alternative_name: Optional[str]=None + commandline: bool=True + + +__all__ = ('Variable',) diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/__init__.py b/tests/dictionaries/60_0family_dynamic_variable_suffix/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml b/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..5ab26aa38 --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/dictionaries/rougail/00-base.yml @@ -0,0 +1,12 @@ +--- +version: '1.1' +var: # A suffix variable + - val1 + - val2 +"dyn{{ suffix }}": + description: A dynamic family + type: dynamic + dynamic: + type: variable + variable: _.var + var: a value # A dynamic variable with suffix {{ suffix }} diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py new file mode 100644 index 000000000..5caff85bb --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/base.py @@ -0,0 +1,12 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_2 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_4 = StrOption(name="var", doc="A dynamic variable with suffix {{ suffix }}", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_3 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_2)))), children=[option_4], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, optiondescription_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py new file mode 100644 index 000000000..65fc02b60 --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/multi.py @@ -0,0 +1,18 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_3 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_5 = StrOption(name="var", doc="A dynamic variable with suffix {{ suffix }}", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_4 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"standard"})) +optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, optiondescription_4], properties=frozenset({"standard"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"})) +option_8 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_10 = StrOption(name="var", doc="A dynamic variable with suffix {{ suffix }}", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_9 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_8)))), children=[option_10], properties=frozenset({"standard"})) +optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, optiondescription_9], properties=frozenset({"standard"})) +optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6]) diff --git a/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py new file mode 100644 index 000000000..783cf60a4 --- /dev/null +++ b/tests/dictionaries/60_0family_dynamic_variable_suffix/tiramisu/no_namespace.py @@ -0,0 +1,11 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription +load_functions('tests/dictionaries/../eosfunc/test.py') +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +option_1 = StrOption(name="var", doc="A suffix variable", multi=True, default=["val1", "val2"], default_multi="val1", properties=frozenset({"mandatory", "notempty", "standard"}), informations={'type': 'string'}) +option_3 = StrOption(name="var", doc="A dynamic variable with suffix {{ suffix }}", default="a value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'}) +optiondescription_2 = ConvertDynOptionDescription(name="dyn{{ suffix }}", doc="A dynamic family", suffixes=Calculation(func['calc_value'], Params((ParamOption(option_1)))), children=[option_3], properties=frozenset({"standard"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, optiondescription_2]) -- 2.45.0