bump: version 1.2.0a7 → 1.2.0a8

CHANGELOG.md

@@ -1,3 +1,73 @@
+## 1.2.0a8 (2025-01-04)
+
+### Fix
+
+- better support of not_for_commandline feature
+
+## 1.2.0a7 (2025-01-02)
+
+### Fix
+
+- add structural_directory
+
+## 1.2.0a6 (2025-01-02)
+
+### Fix
+
+- add path.py
+
+## 1.2.0a5 (2025-01-02)
+
+### Feat
+
+- upgrade is not in formatter
+- remove prefix
+
+## 1.2.0a4 (2024-12-11)
+
+### Feat
+
+- move test to a new project rougail-tests
+- output could have annotator
+
+### Fix
+
+- remove link
+- reorganise user_datas
+- only change prefix if path is relative
+
+## 1.2.0a3 (2024-11-28)
+
+### Fix
+
+- add user_datas file
+
+## 1.2.0a2 (2024-11-27)
+
+### Feat
+
+- add "exists" attribut for a family
+
+### Fix
+
+- separate UserDatas
+- options could be a list
+
+## 1.2.0a1 (2024-11-25)
+
+### Fix
+
+- dynamic variable could be optional
+- dynamic variable declare in verion 1.0 has {{ suffix }}
+- user_data plugins could have annotator function
+- do not modify a dynamic variable if has default value
+
+## 1.2.0a0 (2024-11-08)
+
+### Feat
+
+- add force_optional option to allow charging structure even if all variables are not available
+
 ## 1.1.1 (2024-11-06)
 
 ### Fix

locale/fr/LC_MESSAGES/rougail.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2024-10-30 13:21+0100\n"
-"PO-Revision-Date: 2024-10-30 13:39+0100\n"
+"POT-Creation-Date: 2024-12-15 16:50+0100\n"
+"PO-Revision-Date: 2024-12-15 16:55+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -16,31 +16,31 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 3.5\n"
 
-#: src/rougail/annotator/family.py:142
+#: src/rougail/annotator/family.py:143
 msgid "default variable mode \"{0}\" is not a valid mode, valid modes are {1}"
 msgstr ""
 "le mode d'une variable par défaut \"{0}\" n'est pas un mode valide, les "
 "modes valides sont {1}"
 
-#: src/rougail/annotator/family.py:148
+#: src/rougail/annotator/family.py:149
 msgid "default family mode \"{0}\" is not a valid mode, valid modes are {1}"
 msgstr ""
 "le mode d'une famille par défaut \"{0}\" n'est pas un mode valide, les modes "
 "valides sont {1}"
 
-#: src/rougail/annotator/family.py:180
+#: src/rougail/annotator/family.py:181
 msgid "mode \"{0}\" for \"{1}\" is not a valid mode, valid modes are {2}"
 msgstr ""
 "le mode \"{0}\" pour \"{1}\" n'est pas un mode valide, les modes valides "
 "sont {2}"
 
-#: src/rougail/annotator/family.py:184
+#: src/rougail/annotator/family.py:185
 msgid "mode \"{0}\" for \"{1}\" is not a valid mode, no modes are available"
 msgstr ""
 "le mode \"{0}\" pour \"{1}\" n'est pas un mode valide, aucun mode ne sont "
 "définis"
 
-#: src/rougail/annotator/family.py:248
+#: src/rougail/annotator/family.py:249
 msgid ""
 "the variable \"{0}\" is mandatory so in \"{1}\" mode but family has the "
 "higher family mode \"{2}\""
@@ -48,7 +48,7 @@ msgstr ""
 "la variable \"{0}\" est obligatoire donc dans le mode \"{1}\" mais la "
 "famille a un mode supérieur \"{2}\""
 
-#: src/rougail/annotator/family.py:286
+#: src/rougail/annotator/family.py:287
 msgid ""
 "the follower \"{0}\" is in \"{1}\" mode but leader have the higher mode "
 "\"{2}\""
@@ -56,7 +56,7 @@ msgstr ""
 "la variable suiveuse \"{0}\" a le mode \"{1}\" mais la variable leader a un "
 "mode supérieur \"{2}\""
 
-#: src/rougail/annotator/family.py:319
+#: src/rougail/annotator/family.py:320
 msgid ""
 "the family \"{0}\" is in \"{1}\" mode but variables and families inside have "
 "the higher modes \"{2}\""
@@ -64,7 +64,7 @@ msgstr ""
 "la famille \"{0}\" a le mode \"{1}\" mais les variables et les familles à "
 "l'intérieur ont des modes supérieurs \"{2}\""
 
-#: src/rougail/annotator/family.py:337
+#: src/rougail/annotator/family.py:338
 msgid ""
 "the variable \"{0}\" is in \"{1}\" mode but family has the higher family "
 "mode \"{2}\""
@@ -72,37 +72,95 @@ msgstr ""
 "la variable \"{0}\" est dans le mode \"{1}\" mais la famille a le mode "
 "supérieur \"{2}\""
 
-#: src/rougail/annotator/value.py:80
+#: src/rougail/annotator/value.py:77
 msgid "the follower \"{0}\" without multi attribute can only have one value"
 msgstr ""
 "la variable suiveuse \"{0}\" sans l'attribut multi peut avoir seulement une "
 "valeur"
 
-#: src/rougail/annotator/value.py:96
+#: src/rougail/annotator/value.py:93
 msgid "the variable \"{0}\" is multi but has a non list default value"
 msgstr ""
 "la variable \"{0}\" est multiple mais a une valeur par défaut sans être une "
 "liste"
 
-#: src/rougail/annotator/variable.py:192
+#: src/rougail/annotator/variable.py:189
 msgid ""
 "the variable \"{0}\" has regexp attribut but has not the \"regexp\" type"
 msgstr ""
 "la variable \"{0}\" a un attribut regexp mais n'a pas le type \"regexp\""
 
-#: src/rougail/annotator/variable.py:235
+#: src/rougail/annotator/variable.py:232
 msgid ""
 "the variable \"{0}\" has choices attribut but has not the \"choice\" type"
 msgstr ""
 "la variable \"{0}\" a un attribut choices mais n'a pas le type \"choice\""
 
-#: src/rougail/annotator/variable.py:263
+#: src/rougail/annotator/variable.py:260
 msgid ""
 "the variable \"{0}\" has an unvalid default value \"{1}\" should be in {2}"
 msgstr ""
 "la variable \"{0}\" a la valeur par défaut invalide \"{1}\" devrait être {2}"
 
-#: src/rougail/convert.py:268
+#: src/rougail/config.py:216
+msgid "Directories where dictionary files are placed"
+msgstr "Répertoires où sont placés les fichiers de structure"
+
+#: src/rougail/config.py:227
+msgid "Sort dictionaries from differents directories"
+msgstr "Trier les fichiers de structure à partir de différents répertoires"
+
+#: src/rougail/config.py:232
+msgid "Main namespace name"
+msgstr "Nom de l'espace de nom principal"
+
+#: src/rougail/config.py:238
+msgid "Extra namespaces"
+msgstr "Espaces de nom supplémentaires"
+
+#: src/rougail/config.py:245
+msgid "Extra namespace name"
+msgstr "Nom de l'espace de nom supplémentaire"
+
+#: src/rougail/config.py:251
+msgid "Directories where extra dictionary files are placed"
+msgstr ""
+"Répertoires où sont placés les fichiers de structure de l'espace de nom "
+"supplémentaire"
+
+#: src/rougail/config.py:262
+msgid "Update dictionaries to newest Rougail format version"
+msgstr ""
+"Mettre à jour le fichier de structure vers la dernière version du format de "
+"Rougail"
+
+#: src/rougail/config.py:263
+msgid "Do not update dictionaries to newest Rougail format version"
+msgstr ""
+"Ne pas mettre à jour le fichier de structure vers la dernière version du "
+"format de Rougail"
+
+#: src/rougail/config.py:267
+msgid "Update informations"
+msgstr "Mise à jour des informations"
+
+#: src/rougail/config.py:273
+msgid "Directories where dictionary files will be placed"
+msgstr "Répertoires où sont placés les fichiers de structure"
+
+#: src/rougail/config.py:278
+msgid "Directories where extra files will be placed"
+msgstr "Répertoires où sont placés les fichiers de structure supplémentaire"
+
+#: src/rougail/config.py:290
+msgid "File with functions"
+msgstr "Fichier avec les fonctions"
+
+#: src/rougail/config.py:302
+msgid "All modes level available"
+msgstr "Tous les niveaux de modes valides"
+
+#: src/rougail/convert.py:281
 msgid ""
 "A variable or a family located in the \"{0}\" namespace shall not be used in "
 "the \"{1}\" namespace"
@@ -110,38 +168,42 @@ msgstr ""
 "Une variable ou une famille localisé dans l'espace de nom \"{0}\" ne devrait "
 "pas être utilisé dans l'espace de nom \"{1}\""
 
-#: src/rougail/convert.py:462
+#: src/rougail/convert.py:480
 msgid "unknown type {0} for {1}"
 msgstr "type {0} inconnu pour {1}"
 
-#: src/rougail/convert.py:1323
+#: src/rougail/convert.py:613
+msgid "The family \"{0}\" already exists and it is not redefined"
+msgstr "La famille \"{0}\" existe déjà et n'est pas redéfinie"
+
+#: src/rougail/convert.py:1356
 msgid "duplicate dictionary file name {0}"
 msgstr "nom de fichier {0} de dictionnaire dupliqué"
 
-#: src/rougail/convert.py:1370
+#: src/rougail/convert.py:1403
 msgid "Cannot execute annotate multiple time"
 msgstr "Ne peut exécuter l'annotation plusieurs fois"
 
-#: src/rougail/error.py:70
+#: src/rougail/error.py:67
 msgid "{0} in {1}"
 msgstr "{0} dans {1}"
 
-#: src/rougail/structural_commandline/annotator.py:70
+#: src/rougail/structural_commandline/annotator.py:67
 msgid "alternative_name \"{0}\" conflict with \"--help\""
 msgstr "alternative_name \"{0}\" est en conflit avec \"--help\""
 
-#: src/rougail/structural_commandline/annotator.py:73
+#: src/rougail/structural_commandline/annotator.py:72
 msgid "conflict alternative_name \"{0}\": \"{1}\" and \"{2}\""
 msgstr "conflit dans les \"alternative_name\" \"{0}\": \"{1}\" et \"{2}\""
 
-#: src/rougail/structural_commandline/annotator.py:96
+#: src/rougail/structural_commandline/annotator.py:95
 msgid ""
 "negative_description is mandatory for boolean variable, but \"{0}\" hasn't"
 msgstr ""
 "l'attribut negative_description est obligatoire pour des variables "
 "\"boolean\", mais \"{0}\" n'en a pas"
 
-#: src/rougail/structural_commandline/annotator.py:105
+#: src/rougail/structural_commandline/annotator.py:104
 msgid ""
 "negative_description is only available for boolean variable, but \"{0}\" is "
 "\"{1}\""
@@ -149,11 +211,11 @@ msgstr ""
 "l'attribut negative_description est seulement valide pour des variables "
 "\"boolean\", mais \"{0}\" est \"{1}\""
 
-#: src/rougail/update/update.py:741
+#: src/rougail/update/update.py:738
 msgid "not a XML file: {0}"
 msgstr "fichier XML invalid : {0}"
 
-#: src/rougail/utils.py:58
+#: src/rougail/utils.py:55
 msgid ""
 "invalid variable or family name \"{0}\" must only contains lowercase ascii "
 "character, number or _"
@@ -161,6 +223,6 @@ msgstr ""
 "nom invalide pour la variable ou famille \"{0}\" doit seulement contenir des "
 "caractères ascii minuscule, nombre or _"
 
-#: src/rougail/utils.py:120
+#: src/rougail/utils.py:117
 msgid "error in jinja \"{0}\" for the variable \"{1}\": {2}"
 msgstr "erreur dans Jinja \"{0}\" pour la variable \"{1}\": {2}"

locale/rougail.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-11-04 12:04+0100\n"
+"POT-Creation-Date: 2024-12-15 16:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,35 +15,35 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: src/rougail/annotator/family.py:139
+#: src/rougail/annotator/family.py:143
 msgid "default variable mode \"{0}\" is not a valid mode, valid modes are {1}"
 msgstr ""
 
-#: src/rougail/annotator/family.py:145
+#: src/rougail/annotator/family.py:149
 msgid "default family mode \"{0}\" is not a valid mode, valid modes are {1}"
 msgstr ""
 
-#: src/rougail/annotator/family.py:177
+#: src/rougail/annotator/family.py:181
 msgid "mode \"{0}\" for \"{1}\" is not a valid mode, valid modes are {2}"
 msgstr ""
 
-#: src/rougail/annotator/family.py:181
+#: src/rougail/annotator/family.py:185
 msgid "mode \"{0}\" for \"{1}\" is not a valid mode, no modes are available"
 msgstr ""
 
-#: src/rougail/annotator/family.py:245
+#: src/rougail/annotator/family.py:249
 msgid "the variable \"{0}\" is mandatory so in \"{1}\" mode but family has the higher family mode \"{2}\""
 msgstr ""
 
-#: src/rougail/annotator/family.py:283
+#: src/rougail/annotator/family.py:287
 msgid "the follower \"{0}\" is in \"{1}\" mode but leader have the higher mode \"{2}\""
 msgstr ""
 
-#: src/rougail/annotator/family.py:316
+#: src/rougail/annotator/family.py:320
 msgid "the family \"{0}\" is in \"{1}\" mode but variables and families inside have the higher modes \"{2}\""
 msgstr ""
 
-#: src/rougail/annotator/family.py:334
+#: src/rougail/annotator/family.py:338
 msgid "the variable \"{0}\" is in \"{1}\" mode but family has the higher family mode \"{2}\""
 msgstr ""
 
@@ -67,19 +67,75 @@ msgstr ""
 msgid "the variable \"{0}\" has an unvalid default value \"{1}\" should be in {2}"
 msgstr ""
 
+#: src/rougail/config.py:216
+msgid "Directories where dictionary files are placed"
+msgstr ""
+
+#: src/rougail/config.py:227
+msgid "Sort dictionaries from differents directories"
+msgstr ""
+
+#: src/rougail/config.py:232
+msgid "Main namespace name"
+msgstr ""
+
+#: src/rougail/config.py:238
+msgid "Extra namespaces"
+msgstr ""
+
+#: src/rougail/config.py:245
+msgid "Extra namespace name"
+msgstr ""
+
+#: src/rougail/config.py:251
+msgid "Directories where extra dictionary files are placed"
+msgstr ""
+
+#: src/rougail/config.py:262
+msgid "Update dictionaries to newest Rougail format version"
+msgstr ""
+
+#: src/rougail/config.py:263
+msgid "Do not update dictionaries to newest Rougail format version"
+msgstr ""
+
+#: src/rougail/config.py:267
+msgid "Update informations"
+msgstr ""
+
+#: src/rougail/config.py:273
+msgid "Directories where dictionary files will be placed"
+msgstr ""
+
+#: src/rougail/config.py:278
+msgid "Directories where extra files will be placed"
+msgstr ""
+
+#: src/rougail/config.py:290
+msgid "File with functions"
+msgstr ""
+
+#: src/rougail/config.py:302
+msgid "All modes level available"
+msgstr ""
+
 #: src/rougail/convert.py:281
 msgid "A variable or a family located in the \"{0}\" namespace shall not be used in the \"{1}\" namespace"
 msgstr ""
 
-#: src/rougail/convert.py:475
+#: src/rougail/convert.py:480
 msgid "unknown type {0} for {1}"
 msgstr ""
 
-#: src/rougail/convert.py:1345
+#: src/rougail/convert.py:613
+msgid "The family \"{0}\" already exists and it is not redefined"
+msgstr ""
+
+#: src/rougail/convert.py:1356
 msgid "duplicate dictionary file name {0}"
 msgstr ""
 
-#: src/rougail/convert.py:1392
+#: src/rougail/convert.py:1403
 msgid "Cannot execute annotate multiple time"
 msgstr ""
 

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail"
-version = "1.1.1"
+version = "1.2.0a8"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "A consistency handling system that was initially designed in the configuration management"

src/rougail/__init__.py

@@ -25,17 +25,14 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from tiramisu import Config, undefined
-from tiramisu.error import PropertiesOptionError, LeadershipError, ConfigError
+from tiramisu import Config
 from warnings import warn
-from typing import List
-from re import compile, findall
 
 from .convert import RougailConvert
 from .config import RougailConfig
-from .update import RougailUpgrade
-from .object_model import CONVERT_OPTION
 from .utils import normalize_family
+from .object_model import CONVERT_OPTION
+from .user_datas import UserDatas
 
 
 def tiramisu_display_name(
@@ -58,7 +55,7 @@ def tiramisu_display_name(
     return f"{path}{comment}"
 
 
-class Rougail:
+class Rougail(UserDatas):
     """Main Rougail object"""
 
     def __init__(
@@ -71,18 +68,10 @@ class Rougail:
         self.converted = RougailConvert(self.rougailconfig)
         self.config = None
 
-    def add_path_prefix(
-        self,
-        path_prefix: str,
-    ) -> None:
-        """Add a prefix"""
-        self.converted.load_config()
-        self.converted.parse_directories(path_prefix)
-
     def run(self):
         """Get Tiramisu Config"""
         if not self.config:
-            tiram_obj = self.converted.save(self.rougailconfig["tiramisu_cache"])
+            tiram_obj = self.converted.save()
             optiondescription = {}
             custom_types = {
                 custom.__name__: custom
@@ -104,223 +93,5 @@ class Rougail:
         )
         return self.run()
 
-    def user_datas(self, user_datas: List[dict]):
-        values = {}
-        errors = []
-        warnings = []
-        for datas in user_datas:
-            options = datas.get("options", {})
-            for name, data in datas.get("values", {}).items():
-                values[name] = {
-                    "values": data,
-                    "options": options.copy(),
-                }
-            errors.extend(datas.get("errors", []))
-            warnings.extend(datas.get("warnings", []))
-        self._auto_configure_dynamics(values)
-        while values:
-            value_is_set = False
-            for option in self._get_variable(self.config):
-                path = option.path()
-                if path not in values:
-                    path = path.upper()
-                    options = values.get(path, {}).get("options", {})
-                    if path not in values or options.get("upper") is not True:
-                        continue
-                else:
-                    options = values[path].get("options", {})
-                value = values[path]["values"]
-                if option.ismulti():
-                    if options.get("multi_separator") and not isinstance(value, list):
-                        value = value.split(options["multi_separator"])
-                        values[path]["values"] = value
-                    if options.get("needs_convert"):
-                        value = [convert_value(option, val) for val in value]
-                        values[path]["values"] = value
-                        values[path]["options"]["needs_convert"] = False
-                elif options.get("needs_convert"):
-                    value = convert_value(option, value)
-                index = option.index()
-                if index is not None:
-                    if not isinstance(value, list) or index >= len(value):
-                        continue
-                    value = value[index]
-                try:
-                    option.value.set(value)
-                    value_is_set = True
-                    if index is not None:
-                        values[path]["values"][index] = undefined
-                        if set(values[path]["values"]) == {undefined}:
-                            values.pop(path)
-                    else:
-                        values.pop(path)
-                except Exception as err:
-                    if path != option.path():
-                        values[option.path()] = values.pop(path)
-            if not value_is_set:
-                break
-        for path, data in values.items():
-            try:
-                option = self.config.option(path)
-                value = data["values"]
-                if option.isfollower():
-                    for index, val in enumerate(value):
-                        if val is undefined:
-                            continue
-                        self.config.option(path, index).value.set(val)
-                else:
-                    option.value.set(value)
-            except AttributeError as err:
-                errors.append(str(err))
-            except (ValueError, LeadershipError) as err:
-                # errors.append(str(err).replace('"', "'"))
-                errors.append(str(err))
-            except PropertiesOptionError as err:
-                #                warnings.append(f'"{err}" but is defined in "{self.filename}"')
-                warnings.append(str(err))
-        return {
-            "errors": errors,
-            "warnings": warnings,
-        }
 
-    def _get_variable(self, config):
-        for subconfig in config:
-            if subconfig.isoptiondescription():
-                yield from self._get_variable(subconfig)
-            else:
-                yield subconfig
-
-    def _auto_configure_dynamics(
-        self,
-        values,
-    ):
-        cache = {}
-        added = []
-        for path, data in list(values.items()):
-            value = data["values"]
-            #            for value in data['values'].items():
-            try:
-                option = self.config.option(path)
-                option.name()
-            except (ConfigError, PropertiesOptionError):
-                pass
-            except AttributeError:
-                config = self.config
-                current_path = ""
-                identifiers = []
-                for name in path.split(".")[:-1]:
-                    if current_path:
-                        current_path += "."
-                    current_path += name
-                    if current_path in cache:
-                        config, identifier = cache[current_path]
-                        identifiers.append(identifier)
-                    else:
-                        tconfig = config.option(name)
-                        try:
-                            tconfig.group_type()
-                            config = tconfig
-                        except AttributeError:
-                            for tconfig in config.list(uncalculated=True):
-                                if tconfig.isdynamic(only_self=True):
-                                    identifier = self._get_identifier(
-                                        tconfig.name(), name
-                                    )
-                                    if identifier is None:
-                                        continue
-                                    dynamic_variable = tconfig.information.get(
-                                        "dynamic_variable",
-                                        None,
-                                    )
-                                    if not dynamic_variable:
-                                        continue
-                                    option_type = self.config.option(
-                                        dynamic_variable
-                                    ).information.get("type")
-                                    if identifiers:
-                                        for s in identifiers:
-                                            dynamic_variable = dynamic_variable.replace(
-                                                "{{ identifier }}", str(s), 1
-                                            )
-                                    if dynamic_variable not in values:
-                                        values[dynamic_variable] = {"values": []}
-                                        added.append(dynamic_variable)
-                                    elif dynamic_variable not in added:
-                                        continue
-                                    config = tconfig
-                                    #                                        option_type = option.information.get('type')
-                                    typ = CONVERT_OPTION.get(option_type, {}).get(
-                                        "func"
-                                    )
-                                    if typ:
-                                        identifier = typ(identifier)
-                                    if (
-                                        identifier
-                                        not in values[dynamic_variable]["values"]
-                                    ):
-                                        values[dynamic_variable]["values"].append(
-                                            identifier
-                                        )
-                                    identifiers.append(identifier)
-                                    cache[current_path] = config, identifier
-                                    break
-            else:
-                if option.isdynamic():
-                    parent_option = self.config.option(path.rsplit(".", 1)[0])
-                    identifiers = self._get_identifier(
-                        parent_option.name(uncalculated=True),
-                        parent_option.name(),
-                    )
-                    dynamic_variable = None
-                    while True:
-                        dynamic_variable = parent_option.information.get(
-                            "dynamic_variable",
-                            None,
-                        )
-                        if dynamic_variable:
-                            break
-                        parent_option = self.config.option(
-                            parent_option.path().rsplit(".", 1)[0]
-                        )
-                        if "." not in parent_option.path():
-                            parent_option = None
-                            break
-                    if not parent_option:
-                        continue
-                    identifiers = parent_option.identifiers()
-                    for identifier in identifiers:
-                        dynamic_variable = dynamic_variable.replace(
-                            "{{ identifier }}", str(identifier), 1
-                        )
-                    if dynamic_variable not in values:
-                        values[dynamic_variable] = {"values": []}
-                        added.append(dynamic_variable)
-                    elif dynamic_variable not in added:
-                        continue
-                    option_type = option.information.get("type")
-                    typ = CONVERT_OPTION.get(option_type, {}).get("func")
-                    if typ:
-                        identifier = typ(identifier)
-                    if identifier not in values[dynamic_variable]["values"]:
-                        values[dynamic_variable]["values"].append(identifier)
-                    cache[option.path()] = option, identifier
-
-    def _get_identifier(self, true_name, name) -> str:
-        regexp = true_name.replace("{{ identifier }}", "(.*)")
-        finded = findall(regexp, name)
-        if len(finded) != 1 or not finded[0]:
-            return
-        return finded[0]
-
-
-def convert_value(option, value):
-    if value == "":
-        return None
-    option_type = option.information.get("type")
-    func = CONVERT_OPTION.get(option_type, {}).get("func")
-    if func:
-        return func(value)
-    return value
-
-
-__all__ = ("Rougail", "RougailConfig", "RougailUpgrade")
+__all__ = ("Rougail", "RougailConfig")

src/rougail/annotator/__init__.py

@@ -71,16 +71,38 @@ class SpaceAnnotator:  # pylint: disable=R0903
             if extra_annotator in ANNOTATORS:
                 continue
             get_annotators(ANNOTATORS, extra_annotator)
-        for plugin in objectspace.plugins:
+        for structural in objectspace.structurals:
             try:
-                get_annotators(ANNOTATORS, f"rougail.{plugin}", "annotator")
+                get_annotators(
+                    ANNOTATORS, f"rougail.structural_{structural}", "annotator"
+                )
+            except ModuleNotFoundError:
+                pass
+        for user_data in objectspace.user_datas:
+            try:
+                get_annotators(
+                    ANNOTATORS, f"rougail.user_data_{user_data}", "annotator"
+                )
+            except ModuleNotFoundError:
+                pass
+        if objectspace.output:
+            try:
+                get_annotators(
+                    ANNOTATORS, f"rougail.output_{objectspace.output}", "annotator"
+                )
             except ModuleNotFoundError:
                 pass
         annotators = ANNOTATORS["rougail.annotator"].copy()
         for extra_annotator in objectspace.extra_annotators:
             annotators.extend(ANNOTATORS[extra_annotator])
-        for plugin in objectspace.plugins:
-            annotators.extend(ANNOTATORS[f"rougail.{plugin}.annotator"])
+        for structural in objectspace.structurals:
+            annotators.extend(ANNOTATORS[f"rougail.structural_{structural}.annotator"])
+        for user_data in objectspace.user_datas:
+            annotators.extend(ANNOTATORS[f"rougail.user_data_{user_data}.annotator"])
+        if objectspace.output:
+            annotators.extend(
+                ANNOTATORS[f"rougail.output_{objectspace.output}.annotator"]
+            )
         annotators = sorted(annotators, key=get_level)
         functions = {}
         functions_files = objectspace.functions_files

src/rougail/annotator/family.py

@@ -125,10 +125,17 @@ class Annotator(Walk):
             if family.type == "dynamic" and isinstance(
                 family.dynamic, VariableCalculation
             ):
-                path = self.objectspace.paths.get_full_path(
-                    family.dynamic.variable,
-                    family.path,
-                )
+                path = family.dynamic.variable
+                if (
+                    family.version != "1.0"
+                    and self.objectspace.paths.regexp_relative.search(path)
+                ):
+                    path = self.objectspace.paths.get_full_path(
+                        family.dynamic.variable,
+                        family.path,
+                    )
+                if family.version == "1.0" and "{{ suffix }}" in path:
+                    path = path.replace("{{ suffix }}", "{{ identifier }}")
                 self.objectspace.informations.add(family.path, "dynamic_variable", path)
 
     def change_modes(self):

src/rougail/annotator/property.py

@@ -120,7 +120,7 @@ class Annotator(Walk):
             else:
                 value = []
                 for calculation in frozen:
-                    calculation_copy = calculation.copy()
+                    calculation_copy = calculation.model_copy()
                     calculation_copy.attribute_name = "frozen"
                     calculation_copy.ori_path = calculation_copy.path
                     calculation_copy.path = path

src/rougail/annotator/value.py

@@ -92,7 +92,7 @@ class Annotator(Walk):  # pylint: disable=R0903
         elif variable.multi:
             msg = _(
                 'the variable "{0}" is multi but has a non list default value'
-            ).format(variable.name)
+            ).format(variable.path)
             raise DictConsistencyError(msg, 12, variable.xmlfiles)
         elif variable.path in self.objectspace.followers:
             self.objectspace.default_multi[variable.path] = variable.default

src/rougail/annotator/variable.py

@@ -62,12 +62,6 @@ class Annotator(Walk):  # pylint: disable=R0903
         if not objectspace.paths:
             return
         self.objectspace = objectspace
-        if self.objectspace.main_namespace:
-            self.forbidden_name = [self.objectspace.main_namespace]
-            for extra in self.objectspace.extra_dictionaries:
-                self.forbidden_name.append(extra)
-        else:
-            self.forbidden_name = []
         # default type inference from a default value with :term:`basic types`
         self.basic_types = {
             str: "string",
@@ -139,7 +133,6 @@ class Annotator(Walk):  # pylint: disable=R0903
         calculated_variable_path = variable.default.variable
         calculated_variable, identifier = self.objectspace.paths.get_with_dynamic(
             calculated_variable_path,
-            variable.default.path_prefix,
             variable.path,
             variable.version,
             variable.namespace,

src/rougail/config.py

@@ -26,12 +26,16 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
+from sys import version_info
+
 from pathlib import Path
 from tiramisu import Config
 from ruamel.yaml import YAML
 from .utils import _, load_modules, normalize_family
 from .convert import RougailConvert
 
+if version_info.major == 3 and version_info.minor:
+    import rougail.structural_commandline.object_model
 
 RENAMED = {
     "dictionaries_dir": "main_dictionaries",
@@ -60,7 +64,11 @@ def get_sub_modules():
 
 
 def get_level(module):
-    return module["level"]
+    return float(module["level"]) + {
+        "structural": 0.1,
+        "user data": 0.2,
+        "output": 0.3,
+    }.get(module["process"])
 
 
 class _RougailConfig:
@@ -182,8 +190,13 @@ class FakeRougailConvert(RougailConvert):
         self.base_option_name = "baseoption"
         self.export_with_import = True
         self.internal_functions = []
-        self.plugins = ["structural_commandline"]
+        self.force_optional = False
+        self.structurals = ["commandline"]
+        self.user_datas = []
+        self.output = None
         self.add_extra_options = self.add_extra_options
+        self.tiramisu_cache = False
+        self.load_unexist_redefine = False
 
 
 def get_rougail_config(
@@ -191,10 +204,6 @@ def get_rougail_config(
     backward_compatibility: bool = True,
     add_extra_options: bool = True,
 ) -> _RougailConfig:
-    if backward_compatibility:
-        main_namespace_default = "rougail"
-    else:
-        main_namespace_default = "null"
     rougail_options = f"""default_dictionary_format_version:
   description: Dictionary format version by default, if not specified in dictionary file
   alternative_name: v
@@ -203,82 +212,8 @@ def get_rougail_config(
     - '1.1'
   mandatory: false
 
-main_dictionaries:
-  description: 'Directories where dictionary files are placed'
-  type: unix_filename
-  alternative_name: m
-  params:
-     allow_relative: True
-     test_existence: True
-     types:
-       - directory
-  multi: true
-
-sort_dictionaries_all:
-  description: Sort dictionaries from differents directories
-  negative_description: Sort dictionaries directory by directory
-  default: false
-
-main_namespace:
-  description: Main namespace name
-  default: {main_namespace_default}
-  alternative_name: s
-  mandatory: false
-
-extra_dictionaries:
-  description: Extra namespaces
-  type: leadership
-  disabled:
-    variable: main_namespace
-    when: null
-
-  names:
-    description: 'Extra namespace name'
-    alternative_name: xn
-    multi: true
-    mandatory: false
-
-  directories:
-    description: Directories where extra dictionary files are placed
-    alternative_name: xd
-    type: unix_filename
-    params:
-      allow_relative: true
-      test_existence: true
-      types:
-        - directory
-    multi: true
-
-upgrade:
-  description: Update dictionaries to newest Rougail format version
-  negative_description: Do not update dictionaries to newest Rougail format version
-  default: false
-
-upgrade_options:
-  description: Update informations
-  disabled:
-    variable: upgrade
-    when: false
-
-  main_dictionaries:
-    description: 'Directories where dictionary files will be placed'
-    default:
-      variable: __.main_dictionaries
-
-  extra_dictionary:
-    description: 'Directories where extra files will be placed'
-    type: unix_filename
-    params:
-      allow_relative: true
-      test_existence: true
-      types:
-        - directory
-    disabled:
-      variable: __.main_namespace
-      when: null
-
 functions_files:
-  description: File with functions
+  description: {_("File with functions")}
   alternative_name: c
   type: unix_filename
   params:
@@ -290,74 +225,74 @@ functions_files:
   mandatory: false
 
 modes_level:
-  description: All modes level available
+  description: {_("All modes level available")}
   multi: true
   mandatory: false
 """
     if backward_compatibility:
-        rougail_options += """
-  default:
+        rougail_options += """  default:
     - basic
     - standard
     - advanced
 """
-    rougail_options += """
+    rougail_options += f"""
 default_family_mode:
-  description: Default mode for a family
+  description: {_("Default mode for a family")}
   default:
     jinja: |
-      {% if modes_level %}
-      {{ modes_level[0] }}
-      {% endif %}
+      {{% if modes_level %}}
+      {{{{ modes_level[0] }}}}
+      {{% endif %}}
   disabled:
     jinja: |
-      {% if not modes_level %}
+      {{% if not modes_level %}}
       No mode
-      {% endif %}
+      {{% endif %}}
   validators:
     - type: jinja
       jinja: |
-        {% if default_family_mode not in modes_level %}
-        not in modes_level ({modes_level})
-        {% endif %}
+        {{% if default_family_mode not in modes_level %}}
+        not in modes_level ({{modes_level}})
+        {{% endif %}}
   commandline: false
 
 default_variable_mode:
-  description: Default mode for a variable
+  description: {_("Default mode for a variable")}
   default:
     jinja: |
-      {% if modes_level %}
-        {% if modes_level | length == 1 %}
-      {{ modes_level[0] }}
-        {% else %}
-      {{ modes_level[1] }}
-        {% endif %}
-      {% endif %}
+      {{% if modes_level %}}
+        {{% if modes_level | length == 1 %}}
+      {{{{ modes_level[0] }}}}
+        {{% else %}}
+      {{{{ modes_level[1] }}}}
+        {{% endif %}}
+      {{% endif %}}
   disabled:
     jinja: |
-      {% if not modes_level %}
+      {{% if not modes_level %}}
       No mode
-      {% endif %}
+      {{% endif %}}
   validators:
     - type: jinja
       jinja: |
-        {% if default_variable_mode not in modes_level %}
-        not in modes_level ({modes_level})
-        {% endif %}
+        {{% if default_variable_mode not in modes_level %}}
+        not in modes_level ({{modes_level}})
+        {{% endif %}}
   commandline: false
 
 base_option_name:
-  description: Option name for the base option
+  description: {_("Option name for the base option")}
   default: baseoption
   commandline: false
 
 not_export_with_import:
-  description: In cache file, do not importation of Tiramisu and other dependencies
+  description: {_("In cache file, do not importation of Tiramisu and other dependencies")}
+  negative_description: {_("In cache file, do importation of Tiramisu and other dependencies")}
   default: false
   commandline: false
 
 tiramisu_cache:
-  description: Tiramisu cache filename
+  description: {_("Tiramisu cache filename")}
   alternative_name: t
   type: unix_filename
   mandatory: false
@@ -365,47 +300,52 @@ tiramisu_cache:
     allow_relative: true
 
 internal_functions:
-  description: Name of internal functions that we can use as a function
+  description: {_("Name of internal functions that we can use as a function")}
   multi: true
   mandatory: false
   commandline: false
 
 extra_annotators:
-  description: Name of extra annotators
-  multi: true
-  mandatory: false
-  commandline: false
-
-plugins:
-  description: Name of Rougail plugins
+  description: {_("Name of extra annotators")}
   multi: true
   mandatory: false
   commandline: false
 
 suffix:
-  description: Suffix add to generated option name
+  description: {_("Suffix add to generated option name")}
   default: ''
   mandatory: false
   commandline: false
+
+force_optional:
+  description: {_("Every variable in calculation are optional")}
+  negative_description: {_("Variable in calculation are not optional by default")}
+  default: False
+
+load_unexist_redefine:
+  description: {_("Load redefine variable even if there don't already exists")}
+  negative_description: {_("Load redefine variable even if there don't already exists")}
+  commandline: false
+  default: False
+
 """
     processes = {
         "structural": [],
-        "output": [],
         "user data": [],
+        "output": [],
     }
     for module in get_sub_modules().values():
-        data = module.get_rougail_config()
+        data = module.get_rougail_config(backward_compatibility=backward_compatibility)
         processes[data["process"]].append(data)
     # reorder
     for process in processes:
         processes[process] = list(sorted(processes[process], key=get_level))
-    rougail_process = """step:  # Load and exporter steps
-  disabled:
-    variable: upgrade"""
+    rougail_process = "step:  # Load and exporter steps"
     for process in processes:
         if processes[process]:
             objects = processes[process]
             rougail_process += """
+
   {NAME}:
     description: Select for {NAME}
     alternative_name: {NAME[0]}
@@ -416,26 +356,29 @@ suffix:
             for obj in objects:
                 rougail_process += f"      - {obj['name']}\n"
             if process == "structural":
-                rougail_process += "    commandline: false"
+                rougail_process += """    commandline: false
+    multi: true
+    default:
+    - directory
+"""
             elif process == "user data":
                 rougail_process += """    multi: true
-    mandatory: false
-"""
+    mandatory: false"""
                 hidden_outputs = [
                     process["name"]
                     for process in processes["output"]
                     if not process.get("allow_user_data", True)
                 ]
                 if hidden_outputs:
-                    rougail_process += """    hidden:
+                    rougail_process += """
+    hidden:
       type: jinja
       jinja: |
 """
                     for hidden_output in hidden_outputs:
                         rougail_process += """        {% if _.output == 'NAME' %}
         Cannot load user data for NAME output
-        {% endif %}
-""".replace(
+        {% endif %}""".replace(
                             "NAME", hidden_output
                         )
             elif objects:
@@ -443,10 +386,10 @@ suffix:
                     DEFAULT=objects[0]["name"]
                 )
         else:
-            if process == 'output':
-                prop = 'hidden'
+            if process == "output":
+                prop = "hidden"
             else:
-                prop = 'disabled'
+                prop = "disabled"
             rougail_process += """
   {NAME}:
     description: Select for {NAME}
@@ -461,8 +404,9 @@ suffix:
                 PROP=prop,
             )
     rougail_options += rougail_process
+    # print(rougail_options)
     convert = FakeRougailConvert(add_extra_options)
-    convert._init()
+    convert.init()
     convert.namespace = None
     convert.parse_root_file(
         "rougail.config",
@@ -471,20 +415,27 @@ suffix:
         YAML().load(rougail_options),
     )
     extra_vars = {}
-    for process in processes:
-        for obj in processes[process]:
-            if "extra_vars" in obj:
-                extra_vars |= obj["extra_vars"]
-            if not "options" in obj:
-                continue
+    objects = []
+    for obj in sorted(
+        [obj for objects in processes.values() for obj in objects], key=get_level
+    ):
+        if "extra_vars" in obj:
+            extra_vars |= obj["extra_vars"]
+        if not "options" in obj:
+            continue
+        if not isinstance(obj["options"], list):
+            options = [obj["options"]]
+        else:
+            options = obj["options"]
+        for option in options:
             convert.parse_root_file(
                 f'rougail.config.{obj["name"]}',
                 "",
                 "1.1",
-                YAML().load(obj["options"]),
+                YAML().load(option),
             )
 
-    tiram_obj = convert.save(None)
+    tiram_obj = convert.save()
     optiondescription = {}
     exec(tiram_obj, {}, optiondescription)  # pylint: disable=W0122
     return _RougailConfig(

src/rougail/convert.py

@@ -27,9 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 import logging
-from itertools import chain
 from pathlib import Path
-from re import compile, findall
 from typing import (
     Any,
     Dict,
@@ -42,8 +40,6 @@ from typing import (
     get_type_hints,
 )
 
-from pydantic import ValidationError
-from ruamel.yaml import YAML
 from ruamel.yaml.comments import CommentedMap
 from pydantic import ValidationError
 
@@ -68,7 +64,8 @@ from .object_model import (
     VariableCalculation,
 )
 from .tiramisureflector import TiramisuReflector
-from .utils import get_realpath, normalize_family, load_modules
+from .utils import load_modules
+from .path import Paths
 from .error import DictConsistencyError
 
 property_types = Union[Literal[True], Calculation]
@@ -100,218 +97,6 @@ class Property:
         return path in self._properties
 
 
-class Paths:
-    regexp_relative = compile(r"^_*\.(.*)$")
-
-    def __init__(
-        self,
-        default_namespace: str,
-    ) -> None:
-        self._data: Dict[str, Union[Variable, Family]] = {}
-        self._dynamics: Dict[str:str] = {}
-        if default_namespace is not None:
-            default_namespace = normalize_family(default_namespace)
-        self.default_namespace = default_namespace
-        self.path_prefix = None
-
-    def has_value(self) -> bool:
-        return self._data != {}
-
-    def add(
-        self,
-        path: str,
-        data: Any,
-        is_dynamic: bool,
-        dynamic: str,
-        *,
-        force: bool = False,
-    ) -> None:
-        self._data[path] = data
-        if not force and is_dynamic:
-            self._dynamics[path] = dynamic
-
-    def get_full_path(
-        self,
-        path: str,
-        current_path: str,
-    ):
-        relative, subpath = path.split(".", 1)
-        relative_len = len(relative)
-        path_len = current_path.count(".")
-        if path_len + 1 == relative_len:
-            return subpath
-        parent_path = current_path.rsplit(".", relative_len)[0]
-        return parent_path + "." + subpath
-
-    def get_with_dynamic(
-        self,
-        path: str,
-        identifier_path: str,
-        current_path: str,
-        version: str,
-        namespace: str,
-        xmlfiles: List[str],
-    ) -> Any:
-        identifier = None
-        if version != "1.0" and self.regexp_relative.search(path):
-            path = self.get_full_path(
-                path,
-                current_path,
-            )
-        else:
-            path = get_realpath(path, identifier_path)
-        dynamic = None
-        # version 1.0
-        if version == "1.0":
-            if not path in self._data and "{{ suffix }}" not in path:
-                new_path = None
-                current_path = None
-                identifiers = []
-                for name in path.split("."):
-                    parent_path = current_path
-                    if current_path:
-                        current_path += "." + name
-                    else:
-                        current_path = name
-                    if current_path in self._data:
-                        if new_path:
-                            new_path += "." + name
-                        else:
-                            new_path = name
-                        continue
-                    for dynamic_path in self._dynamics:
-                        if "." in dynamic_path:
-                            parent_dynamic, name_dynamic = dynamic_path.rsplit(".", 1)
-                        else:
-                            parent_dynamic = None
-                            name_dynamic = dynamic_path
-                        if (
-                            parent_dynamic == parent_path
-                            and name_dynamic.endswith("{{ identifier }}")
-                            and name == name_dynamic.replace("{{ identifier }}", "")
-                        ):
-                            new_path += "." + name_dynamic
-                            break
-                        regexp = "^" + name_dynamic.replace("{{ identifier }}", "(.*)")
-                        finded = findall(regexp, name)
-                        if len(finded) != 1 or not finded[0]:
-                            continue
-                        if finded[0] == "{{ identifier }}":
-                            identifiers.append(None)
-                        else:
-                            identifiers.append(finded[0])
-                        if new_path is None:
-                            new_path = name_dynamic
-                        else:
-                            new_path += "." + name_dynamic
-                        parent_path = dynamic_path
-                        break
-                    else:
-                        if new_path:
-                            new_path += "." + name
-                        else:
-                            new_path = name
-                path = new_path
-            else:
-                identifiers = None
-                if "{{ suffix }}" in path:
-                    path = path.replace("{{ suffix }}", "{{ identifier }}")
-        elif not path in self._data:
-            current_path = None
-            parent_path = None
-            new_path = current_path
-            identifiers = []
-            for name in path.split("."):
-                if current_path:
-                    current_path += "." + name
-                else:
-                    current_path = name
-                # parent_path, name_path = path.rsplit('.', 1)
-                if current_path in self._data:
-                    if new_path:
-                        new_path += "." + name
-                    else:
-                        new_path = name
-                    parent_path = current_path
-                    continue
-                for dynamic_path in self._dynamics:
-                    if "." in dynamic_path:
-                        parent_dynamic, name_dynamic = dynamic_path.rsplit(".", 1)
-                    else:
-                        parent_dynamic = None
-                        name_dynamic = dynamic_path
-                    if (
-                        "{{ identifier }}" not in name_dynamic
-                        or parent_path != parent_dynamic
-                    ):
-                        continue
-                    regexp = "^" + name_dynamic.replace("{{ identifier }}", "(.*)")
-                    finded = findall(regexp, name)
-                    if len(finded) != 1 or not finded[0]:
-                        continue
-                    if finded[0] == "{{ identifier }}":
-                        identifiers.append(None)
-                    else:
-                        identifiers.append(finded[0])
-                    if new_path is None:
-                        new_path = name_dynamic
-                    else:
-                        new_path += "." + name_dynamic
-                    parent_path = dynamic_path
-                    break
-                else:
-                    if new_path:
-                        new_path += "." + name
-                    else:
-                        new_path = name
-                    if "{{ identifier }}" in name:
-                        identifiers.append(None)
-                    parent_path = current_path
-            path = new_path
-        else:
-            identifiers = None
-        if path not in self._data:
-            return None, None
-        option = self._data[path]
-        option_namespace = option.namespace
-        if (
-            self.default_namespace not in [namespace, option_namespace]
-            and namespace != option_namespace
-        ):
-            msg = _(
-                'A variable or a family located in the "{0}" namespace shall not be used in the "{1}" namespace'
-            ).format(option_namespace, namespace)
-            raise DictConsistencyError(msg, 38, xmlfiles)
-        return option, identifiers
-
-    def __getitem__(
-        self,
-        path: str,
-    ) -> Union[Family, Variable]:
-        if not path in self._data:
-            raise AttributeError(f"cannot find variable or family {path}")
-        return self._data[path]
-
-    def __contains__(
-        self,
-        path: str,
-    ) -> bool:
-        return path in self._data
-
-    def __delitem__(
-        self,
-        path: str,
-    ) -> None:
-        logging.info("remove empty family %s", path)
-        del self._data[path]
-
-    def is_dynamic(self, path: str) -> bool:
-        return path in self._dynamics
-
-    def get(self):
-        return self._data.values()
-
-
 information_types = Dict[str, Union[str, int, float, bool]]
 
 
@@ -342,7 +127,7 @@ class ParserVariable:
     def __init__(self, rougailconfig):
         self.rougailconfig = rougailconfig
         self.load_config()
-        self.paths = Paths(self.main_namespace)
+        self.paths = Paths(None)
         self.families = []
         self.variables = []
         self.parents = {".": []}
@@ -350,6 +135,7 @@ class ParserVariable:
         self.reflector_names = {}
         self.leaders = []
         self.followers = []
+        self.dynamics = []
         self.multis = {}
         self.default_multi = {}
         self.jinja = {}
@@ -362,20 +148,11 @@ class ParserVariable:
         self.properties = Property()
         # self.choices = Appendable()
         self.has_dyn_option = False
-        self.path_prefix = None
         self.is_init = False
         super().__init__()
 
     def load_config(self) -> None:
         rougailconfig = self.rougailconfig
-        self.sort_dictionaries_all = rougailconfig["sort_dictionaries_all"]
-        try:
-            self.main_dictionaries = rougailconfig["main_dictionaries"]
-        except:
-            self.main_dictionaries = []
-        self.main_namespace = rougailconfig["main_namespace"]
-        if self.main_namespace:
-            self.extra_dictionaries = rougailconfig["extra_dictionaries"]
         self.suffix = rougailconfig["suffix"]
         self.default_dictionary_format_version = rougailconfig[
             "default_dictionary_format_version"
@@ -390,35 +167,43 @@ class ParserVariable:
         self.base_option_name = rougailconfig["base_option_name"]
         self.export_with_import = rougailconfig["export_with_import"]
         self.internal_functions = rougailconfig["internal_functions"]
+        self.force_optional = rougailconfig["force_optional"]
         self.add_extra_options = rougailconfig[
             "structural_commandline.add_extra_options"
         ]
-        self.plugins = rougailconfig["plugins"]
+        self.structurals = rougailconfig["step.structural"]
+        self.user_datas = rougailconfig["step.user_data"]
+        self.output = rougailconfig["step.output"]
+        self.tiramisu_cache = rougailconfig["tiramisu_cache"]
+        self.load_unexist_redefine = rougailconfig["load_unexist_redefine"]
 
-    def _init(self):
+    def init(self):
         if self.is_init:
             return
         variable = Variable
         family = Family
-        if self.plugins:
-            root = Path(__file__).parent
-            for plugin in self.plugins:
-                module_path = root / plugin / "object_model.py"
-                if not module_path.is_file():
-                    continue
-                module = load_modules(
-                    f"rougail.{plugin}.object_model", str(module_path)
+        root = Path(__file__).parent
+        self.walker = None
+        for structural_name in self.structurals:
+            structural = f"structural_{structural_name}"
+            module_path = root / structural / "__init__.py"
+            if not module_path.is_file():
+                continue
+            module = load_modules(f"rougail.{structural}", str(module_path))
+            if "Variable" in module.__all__:
+                variable = type(
+                    variable.__name__ + "_" + structural,
+                    (variable, module.Variable),
+                    {},
                 )
-                if "Variable" in module.__all__:
-                    variable = type(
-                        variable.__name__ + "_" + plugin,
-                        (variable, module.Variable),
-                        {},
-                    )
-                if "Family" in module.__all__:
-                    family = type(
-                        family.__name__ + "_" + plugin, (family, module.Family), {}
-                    )
+            if "Family" in module.__all__:
+                family = type(
+                    family.__name__ + "_" + structural, (family, module.Family), {}
+                )
+            if "Walker" in module.__all__:
+                if self.walker:
+                    raise Exception("multiple walker defined!")
+                self.walker = module.Walker
         self.variable = variable
         self.family = family
         self.dynamic = type(Dynamic.__name__, (Dynamic, family), {})
@@ -426,7 +211,7 @@ class ParserVariable:
         # FIXME: only for format 1.0
         self.family_types = hint["type"].__args__  # pylint: disable=W0201
         self.family_attrs = frozenset(  # pylint: disable=W0201
-            set(hint) - {"name", "path", "xmlfiles"} | {"redefine"}
+            set(hint) - {"name", "path", "xmlfiles"} | {"redefine", "exists"}
         )
         self.family_calculations = self.search_calculation(  # pylint: disable=W0201
             hint
@@ -588,6 +373,10 @@ class ParserVariable:
             return
         family_obj = {}
         subfamily_obj = {}
+        if version != "1.0":
+            exists = obj.pop("exists", None)
+        else:
+            exists = None
         force_to_attrs = list(self.list_attributes(obj))
         for key, value in obj.items():
             if key in force_to_attrs:
@@ -599,9 +388,11 @@ class ParserVariable:
         if path in self.paths:
             # it's just for modify subfamily or subvariable, do not redefine
             if family_obj:
-                if not obj.pop("redefine", False):
+                if exists in [None, True] and not obj.pop("redefine", False):
                     raise DictConsistencyError(
-                        f'The family "{path}" already exists and it is not redefined',
+                        _(
+                            'The family "{0}" already exists and it is not redefined'
+                        ).format(path),
                         32,
                         [filename],
                     )
@@ -615,23 +406,27 @@ class ParserVariable:
                     version,
                     typ="family",
                 )
-                self.paths.add(
-                    path,
-                    self.paths[path].model_copy(update=obj),
-                    family_is_dynamic,
-                    parent_dynamic,
-                    force=True,
-                )
+                if self.load_unexist_redefine or exists in [None, True]:
+                    self.paths.add(
+                        path,
+                        self.paths[path].model_copy(update=obj),
+                        family_is_dynamic,
+                        parent_dynamic,
+                        force=True,
+                    )
             self.paths[path].xmlfiles.append(filename)
             force_not_first = True
             if self.paths[path].type == "dynamic":
                 family_is_dynamic = True
                 parent_dynamic = path
         else:
-            if "redefine" in obj and obj["redefine"]:
+            redefine = family_obj.pop("redefine", None)
+            if not self.load_unexist_redefine and exists is None and redefine:
                 raise Exception(
                     f'cannot redefine the inexisting family "{path}" in {filename}'
                 )
+            if not self.load_unexist_redefine and exists is True:
+                return
             extra_attrs = set(family_obj) - self.family_attrs
             if extra_attrs:
                 raise Exception(f"extra attrs ... {extra_attrs}")
@@ -850,8 +645,9 @@ class ParserVariable:
             version,
         )
         self.parse_params(path, obj)
+        exists = obj.pop("exists", None)
         if path in self.paths:
-            if "exists" in obj and not obj.pop("exists"):
+            if not self.load_unexist_redefine and exists is False:
                 return
             if not obj.pop("redefine", False):
                 msg = f'Variable "{path}" already exists'
@@ -865,12 +661,13 @@ class ParserVariable:
             )
             self.paths[path].xmlfiles.append(filename)
         else:
-            if "exists" in obj and obj.pop("exists"):
+            if not self.load_unexist_redefine and exists is True:
                 # this variable must exist
                 # but it's not the case
                 # so do nothing
                 return
-            if "redefine" in obj and obj["redefine"]:
+            redefine = obj.pop("redefine", False)
+            if not self.load_unexist_redefine and redefine:
                 msg = f'cannot redefine the inexisting variable "{path}"'
                 raise DictConsistencyError(msg, 46, [filename])
             obj["path"] = path
@@ -993,7 +790,6 @@ class ParserVariable:
 
         variable["namespace"] = self.namespace
         variable["version"] = version
-        variable["path_prefix"] = self.path_prefix
         variable["xmlfiles"] = filename
         variable_type = self.get_family_or_variable_type(variable)
         obj = {
@@ -1070,6 +866,9 @@ class ParserVariable:
             return value["type"] in CALCULATION_TYPES
         # auto set type
         typ = set(CALCULATION_TYPES) & set(value)
+        # XXX variable is also set to information
+        if typ == {"variable", "information"}:
+            typ = {"information"}
         if len(typ) == 1:
             value["type"] = list(typ)[0]
             return True
@@ -1094,7 +893,6 @@ class ParserVariable:
         typ = calculation_object.pop("type")
 
         calculation_object["attribute_name"] = attribute
-        calculation_object["path_prefix"] = self.path_prefix
         calculation_object["path"] = path
         calculation_object["inside_list"] = inside_list
         calculation_object["version"] = version
@@ -1109,6 +907,9 @@ class ParserVariable:
                 if isinstance(val, dict) and "type" not in val:
                     # auto set type
                     param_typ = set(CALCULATION_TYPES) & set(val)
+                    # XXX variable is also set to information
+                    if param_typ == {"variable", "information"}:
+                        param_typ = {"information"}
                     if len(param_typ) == 1:
                         val["type"] = list(param_typ)[0]
                 if not isinstance(val, dict) or "type" not in val:
@@ -1164,7 +965,7 @@ class RougailConvert(ParserVariable):
 
     def __init__(self, rougailconfig) -> None:
         self.annotator = False
-        self.yaml = YAML()
+        self.has_namespace = False
         super().__init__(rougailconfig)
 
     def search_calculation(
@@ -1194,81 +995,20 @@ class RougailConvert(ParserVariable):
                 inside_list.append(key)
         return inside_list, outside_list
 
-    def parse_directories(
-        self,
-        path_prefix: Optional[str] = None,
+    def create_namespace(
+        self, namespace_description: str, namespace_path: Optional[str] = None
     ) -> None:
-        """Parse directories content"""
-        self._init()
-        if path_prefix:
-            n_path_prefix = normalize_family(path_prefix)
-            if n_path_prefix in self.parents:
-                raise Exception("pfffff")
-            root_parent = n_path_prefix
-            self.path_prefix = n_path_prefix
-            self.namespace = None
-            self.add_family(
-                n_path_prefix,
-                n_path_prefix,
-                {"description": path_prefix},
-                "",
-                False,
-                None,
-                "",
-            )
-        else:
-            root_parent = "."
-        if self.main_namespace:
-            directory_dict = chain(
-                (
-                    (
-                        self.main_namespace,
-                        self.main_dictionaries,
-                    ),
-                ),
-                self.extra_dictionaries.items(),
-            )
-            for namespace, extra_dirs in directory_dict:
-                if namespace is None:
-                    self.namespace = namespace
-                else:
-                    self.namespace = normalize_family(namespace)
-                if root_parent == ".":
-                    namespace_path = self.namespace
-                else:
-                    namespace_path = f"{root_parent}.{self.namespace}"
-                if namespace_path in self.parents:
-                    raise Exception("pfff")
-                for idx, filename in enumerate(self.get_sorted_filename(extra_dirs)):
-                    if not idx:
-                        self.parse_family(
-                            "",
-                            self.namespace,
-                            namespace_path,
-                            {
-                                "description": namespace,
-                            },
-                            "",
-                        )
-                    self.parse_variable_file(
-                        filename,
-                        namespace_path,
-                    )
-        else:
-            self.namespace = None
-            if root_parent == ".":
-                namespace_path = ""
-            else:
-                namespace_path = f"{root_parent}"
-            if namespace_path in self.parents:
-                raise Exception("pfff")
-            for filename in self.get_sorted_filename(self.main_dictionaries):
-                self.parse_variable_file(
-                    filename,
-                    namespace_path,
-                )
-        if path_prefix:
-            self.path_prefix = None
+        if namespace_path is None:
+            namespace_path = self.namespace
+        self.parse_family(
+            "",
+            self.namespace,
+            namespace_path,
+            {
+                "description": namespace_description,
+            },
+            "",
+        )
 
     def get_comment(
         self,
@@ -1283,27 +1023,6 @@ class RougailConvert(ParserVariable):
             comment = comment.value[1:].strip()
         return comment
 
-    def parse_variable_file(
-        self,
-        filename: str,
-        path: str,
-    ) -> None:
-        """Parse file"""
-        with open(filename, encoding="utf8") as file_fh:
-            objects = self.yaml.load(file_fh)
-        version = self.validate_file_version(
-            objects,
-            filename,
-        )
-        if objects is None:
-            return
-        self.parse_root_file(
-            filename,
-            path,
-            version,
-            objects,
-        )
-
     def parse_root_file(
         self,
         filename: str,
@@ -1322,38 +1041,6 @@ class RougailConvert(ParserVariable):
                 comment,
             )
 
-    def get_sorted_filename(
-        self,
-        directories: Union[str, List[str]],
-    ) -> Iterator[str]:
-        """Sort filename"""
-        if not isinstance(directories, list):
-            directories = [directories]
-        if self.sort_dictionaries_all:
-            filenames = {}
-        for directory_name in directories:
-            directory = Path(directory_name)
-            if not directory.is_dir():
-                continue
-            if not self.sort_dictionaries_all:
-                filenames = {}
-            for file_path in directory.iterdir():
-                if file_path.suffix not in [".yml", ".yaml"]:
-                    continue
-                if file_path.name in filenames:
-                    raise DictConsistencyError(
-                        _("duplicate dictionary file name {0}").format(file_path.name),
-                        78,
-                        [filenames[file_path.name][1]],
-                    )
-                filenames[file_path.name] = str(file_path)
-            if not self.sort_dictionaries_all:
-                for filename in sorted(filenames):
-                    yield filenames[filename]
-        if self.sort_dictionaries_all:
-            for filename in sorted(filenames):
-                yield filenames[filename]
-
     def validate_file_version(
         self,
         obj: dict,
@@ -1386,6 +1073,7 @@ class RougailConvert(ParserVariable):
     ):
         """Apply annotation"""
         if not self.paths.has_value():
+            self.init()
             self.parse_directories()
         if self.annotator:
             raise DictConsistencyError(
@@ -1394,6 +1082,13 @@ class RougailConvert(ParserVariable):
         SpaceAnnotator(self)
         self.annotator = True
 
+    def parse_directories(self) -> None:
+        if not self.walker:
+            msg = _("cannot find walker in structural {0}!").format(self.structurals)
+            raise DictConsistencyError(msg, 51, None)
+        self.init()
+        self.walker(self)
+
     def reflect(self) -> None:
         """Apply TiramisuReflector"""
         functions_files = [
@@ -1406,13 +1101,13 @@ class RougailConvert(ParserVariable):
 
     def save(
         self,
-        filename: str,
     ):
         """Return tiramisu object declaration as a string"""
-        self._init()
+        self.init()
         self.annotate()
         self.reflect()
         output = self.reflector.get_text() + "\n"
+        filename = self.tiramisu_cache
         if filename:
             with open(filename, "w", encoding="utf-8") as tiramisu:
                 tiramisu.write(output)

src/rougail/error.py

@@ -69,10 +69,6 @@ class DictConsistencyError(Exception):
         self.errno = errno
 
 
-class UpgradeError(Exception):
-    """Error during XML upgrade"""
-
-
 ## ---- generic exceptions ----
 
 
@@ -81,6 +77,10 @@ class NotFoundError(Exception):
     pass
 
 
+class ExtentionError(Exception):
+    pass
+
+
 ## ---- specific exceptions ----
 
 

src/rougail/object_model.py

@@ -27,7 +27,7 @@ from pydantic import (
     ConfigDict,
 )
 from tiramisu import undefined
-from .utils import get_jinja_variable_to_param, get_realpath
+from .utils import get_jinja_variable_to_param
 from .error import DictConsistencyError, VariableCalculationDependencyError
 
 BASETYPE = Union[StrictBool, StrictInt, StrictFloat, StrictStr, None]
@@ -178,7 +178,6 @@ PARAM_TYPES = {
 
 
 class Calculation(BaseModel):
-    path_prefix: Optional[str]
     path: str
     inside_list: bool
     version: str
@@ -189,12 +188,6 @@ class Calculation(BaseModel):
 
     model_config = ConfigDict(extra="forbid")
 
-    def get_realpath(
-        self,
-        path: str,
-    ) -> str:
-        return get_realpath(path, self.path_prefix)
-
     def get_params(self, objectspace):
         if not self.params:
             return {}
@@ -208,7 +201,6 @@ class Calculation(BaseModel):
                     path = self.ori_path
                 variable, identifier = objectspace.paths.get_with_dynamic(
                     param["variable"],
-                    self.path_prefix,
                     path,
                     self.version,
                     self.namespace,
@@ -220,7 +212,12 @@ class Calculation(BaseModel):
                         raise DictConsistencyError(msg, 22, self.xmlfiles)
                     continue
                 if not isinstance(variable, objectspace.variable):
-                    raise Exception("pfff it's a family")
+                    if isinstance(variable, objectspace.family):
+                        msg = f'the variable "{variable["name"]}" is in fact a family in attribute "{self.attribute_name}" for "{self.path}"'
+                        raise DictConsistencyError(msg, 42, self.xmlfiles)
+                    else:
+                        msg = f'unknown object "{variable}" in attribute "{self.attribute_name}" for "{self.path}"'
+                        raise DictConsistencyError(msg, 44, self.xmlfiles)
                 param["variable"] = variable
                 if identifier:
                     param["identifier"] = identifier
@@ -232,7 +229,6 @@ class Calculation(BaseModel):
                         path = self.ori_path
                     variable, identifier = objectspace.paths.get_with_dynamic(
                         param["variable"],
-                        self.path_prefix,
                         path,
                         self.version,
                         self.namespace,
@@ -314,7 +310,6 @@ class JinjaCalculation(Calculation):
             objectspace,
             variable.xmlfiles,
             objectspace.functions,
-            self.path_prefix,
             self.version,
             self.namespace,
         ):
@@ -332,6 +327,7 @@ class JinjaCalculation(Calculation):
                 }
                 if self.version != "1.0":
                     default["params"][true_path]["propertyerror"] = False
+                    default["params"][true_path]["optional"] = True
                 if identifier:
                     default["params"][true_path]["identifier"] = identifier
         return default
@@ -412,15 +408,18 @@ class _VariableCalculation(Calculation):
             path = self.ori_path
         variable, identifier = objectspace.paths.get_with_dynamic(
             self.variable,
-            self.path_prefix,
             path,
             self.version,
             self.namespace,
             self.xmlfiles,
         )
         if variable and not isinstance(variable, objectspace.variable):
-            # FIXME remove the pfff
-            raise Exception("pfff it's a family")
+            if isinstance(variable, objectspace.family):
+                msg = f'the variable "{variable.path}" is in fact a family in attribute "{self.attribute_name}" for "{self.path}"'
+                raise DictConsistencyError(msg, 47, self.xmlfiles)
+            else:
+                msg = f'unknown object "{variable}" in attribute "{self.attribute_name}" for "{self.path}"'
+                raise DictConsistencyError(msg, 48, self.xmlfiles)
         return variable, identifier
 
     def get_params(
@@ -432,13 +431,21 @@ class _VariableCalculation(Calculation):
         needs_multi: Optional[bool] = None,
     ):
         if not variable:
-            msg = f'Variable not found "{self.variable}" for attribut "{self.attribute_name}" for variable "{self.path}"'
-            raise DictConsistencyError(msg, 88, self.xmlfiles)
+            if not objectspace.force_optional:
+                if self.ori_path is None:
+                    path = self.path
+                else:
+                    path = self.ori_path
+                msg = f'Variable not found "{self.variable}" for attribut "{self.attribute_name}" in variable "{path}"'
+                raise DictConsistencyError(msg, 88, self.xmlfiles)
+            return {None: [["example"]]}
         param = {
             "type": "variable",
             "variable": variable,
             "propertyerror": self.propertyerror,
         }
+        if isinstance(self, VariableCalculation) and self.optional:
+            param["optional"] = self.optional
         if identifier:
             param["identifier"] = identifier
         params = {None: [param]}
@@ -488,6 +495,12 @@ class _VariableCalculation(Calculation):
                 raise DictConsistencyError(msg, 21, self.xmlfiles)
             else:
                 params[None][0]["index"] = {"index": {"type": "index"}}
+        if self.path in objectspace.followers:
+            multi = objectspace.multis[self.path] == "submulti"
+        else:
+            multi = self.path in objectspace.multis
+        if multi and not self.inside_list:
+            params["__internal_multi"] = True
         return params
 
 
@@ -503,7 +516,11 @@ class VariableCalculation(_VariableCalculation):
             msg = f'"{self.attribute_name}" variable shall not have an "optional" attribute for variable "{self.variable}"'
             raise DictConsistencyError(msg, 33, self.xmlfiles)
         variable, identifier = self.get_variable(objectspace)
-        if not variable and self.optional:
+        if (
+            not variable
+            and self.optional
+            or (objectspace.force_optional and self.attribute_name == "default")
+        ):
             raise VariableCalculationDependencyError()
         params = self.get_params(
             objectspace,
@@ -517,7 +534,8 @@ class VariableCalculation(_VariableCalculation):
 
 
 class VariablePropertyCalculation(_VariableCalculation):
-    attribute_name: Literal[*PROPERTY_ATTRIBUTE]
+    # For python 3.9 attribute_name: Literal[*PROPERTY_ATTRIBUTE]
+    attribute_name: Literal["frozen", "hidden", "disabled", "mandatory"]
     when: Any = undefined
     when_not: Any = undefined
 
@@ -532,30 +550,31 @@ class VariablePropertyCalculation(_VariableCalculation):
             identifier,
             needs_multi=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
+        if params[None] and "variable" in params[None][0]:
+            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["when"] = when
+            params["inverse"] = inverse
         params[None].insert(0, self.attribute_name)
-        params["when"] = when
-        params["inverse"] = inverse
         return {
             "function": "variable_to_property",
             "params": params,
@@ -587,15 +606,20 @@ class InformationCalculation(Calculation):
                 path = self.ori_path
             variable, identifier = objectspace.paths.get_with_dynamic(
                 self.variable,
-                self.path_prefix,
                 path,
                 self.version,
                 self.namespace,
                 self.xmlfiles,
             )
-            if variable is None or identifier is not None:
-                raise Exception("pfff")
-            params[None][0]["variable"] = variable
+            if variable is None:
+                if not objectspace.force_optional:
+                    msg = f'cannot find variable "{self.variable}" for the information "{self.information}" when calculating "{self.attribute_name}"'
+                    raise DictConsistencyError(msg, 40, variable.xmlfiles)
+            if identifier is not None:
+                msg = f'identifier not allowed for the information "{self.information}" when calculating "{self.attribute_name}"'
+                raise DictConsistencyError(msg, 41, variable.xmlfiles)
+            if variable:
+                params[None][0]["variable"] = variable
         if self.default_values:
             params["__default_value"] = self.default_values
         return {
@@ -631,7 +655,8 @@ class IdentifierCalculation(_IdentifierCalculation):
 
 
 class IdentifierPropertyCalculation(_IdentifierCalculation):
-    attribute_name: Literal[*PROPERTY_ATTRIBUTE]
+    # for python 3.9 attribute_name: Literal[*PROPERTY_ATTRIBUTE]
+    attribute_name: Literal["frozen", "hidden", "disabled", "mandatory"]
     when: Any = undefined
     when_not: Any = undefined
 
@@ -684,16 +709,16 @@ class IndexCalculation(Calculation):
 
 CALCULATION_TYPES = {
     "jinja": JinjaCalculation,
-    "variable": VariableCalculation,
     "information": InformationCalculation,
+    "variable": VariableCalculation,
     "identifier": IdentifierCalculation,
     "suffix": IdentifierCalculation,
     "index": IndexCalculation,
 }
 CALCULATION_PROPERTY_TYPES = {
     "jinja": JinjaCalculation,
-    "variable": VariablePropertyCalculation,
     "information": InformationCalculation,
+    "variable": VariablePropertyCalculation,
     "identifier": IdentifierPropertyCalculation,
     "index": IndexCalculation,
 }
@@ -702,14 +727,18 @@ BASETYPE_CALC = Union[StrictBool, StrictInt, StrictFloat, StrictStr, Calculation
 
 class Family(BaseModel):
     name: str
+    # informations
     description: Optional[str] = None
-    type: Literal["family", "leadership", "dynamic"] = "family"
-    path: str
     help: Optional[str] = None
     mode: Optional[str] = None
+    # validation
+    type: Literal["family", "leadership", "dynamic"] = "family"
+    # properties
     hidden: Union[bool, Calculation] = False
     disabled: Union[bool, Calculation] = False
+    # others
     namespace: Optional[str]
+    path: str
     version: str
     xmlfiles: List[str] = []
 
@@ -723,30 +752,34 @@ class Dynamic(Family):
 
 
 class Variable(BaseModel):
-    # type will be set dynamically in `annotator/value.py`, default is None
-    type: str = None
     name: str
+    # user informations
     description: Optional[str] = None
-    default: Union[List[BASETYPE_CALC], BASETYPE_CALC] = None
-    choices: Optional[Union[List[BASETYPE_CALC], Calculation]] = None
-    regexp: Optional[str] = None
-    params: Optional[List[Param]] = None
-    validators: Optional[List[Calculation]] = None
-    multi: Optional[bool] = None
-    unique: Optional[bool] = None
     help: Optional[str] = None
-    hidden: Union[bool, Calculation] = False
-    disabled: Union[bool, Calculation] = False
+    mode: Optional[str] = None
+    examples: Optional[list] = None
+    test: Optional[list] = None
+    # validations
+    ## type will be set dynamically in `annotator/value.py`, default is None
+    type: str = None
+    params: Optional[List[Param]] = None
+    regexp: Optional[str] = None
+    choices: Optional[Union[List[BASETYPE_CALC], Calculation]] = None
+    multi: Optional[bool] = None
+    validators: Optional[List[Calculation]] = None
+    # value
+    default: Union[List[BASETYPE_CALC], BASETYPE_CALC] = None
+    # properties
+    auto_save: bool = False
     mandatory: Union[None, bool, Calculation] = None
     empty: Union[None, bool, Calculation] = True
-    auto_save: bool = False
-    mode: Optional[str] = None
-    test: Optional[list] = None
-    examples: Optional[list] = None
+    unique: Optional[bool] = None
+    hidden: Union[bool, Calculation] = False
+    disabled: Union[bool, Calculation] = False
+    # others
     path: str
     namespace: Optional[str]
     version: str
-    path_prefix: Optional[str]
     xmlfiles: List[str] = []
 
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
@@ -759,7 +792,6 @@ class SymLink(BaseModel):
     opt: Variable
     namespace: Optional[str]
     version: str
-    path_prefix: Optional[str]
     xmlfiles: List[str] = []
 
     model_config = ConfigDict(extra="forbid")

src/rougail/path.py

@@ -0,0 +1,240 @@
+"""
+Copyright (C) 2024
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 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 Lesser General Public License for more
+details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from typing import (
+    Any,
+    Dict,
+    List,
+    Union,
+)
+import logging
+from re import compile, findall
+
+from .i18n import _
+from .object_model import Family, Variable
+from .utils import normalize_family
+
+
+class Paths:
+    regexp_relative = compile(r"^_*\.(.*)$")
+
+    def __init__(
+        self,
+        default_namespace: str,
+    ) -> None:
+        self._data: Dict[str, Union[Variable, Family]] = {}
+        self._dynamics: Dict[str:str] = {}
+        if default_namespace is not None:
+            default_namespace = normalize_family(default_namespace)
+        self.default_namespace = default_namespace
+
+    def has_value(self) -> bool:
+        return self._data != {}
+
+    def add(
+        self,
+        path: str,
+        data: Any,
+        is_dynamic: bool,
+        dynamic: str,
+        *,
+        force: bool = False,
+    ) -> None:
+        self._data[path] = data
+        if not force and is_dynamic:
+            self._dynamics[path] = dynamic
+
+    def get_full_path(
+        self,
+        path: str,
+        current_path: str,
+    ):
+        relative, subpath = path.split(".", 1)
+        relative_len = len(relative)
+        path_len = current_path.count(".")
+        if path_len + 1 == relative_len:
+            return subpath
+        parent_path = current_path.rsplit(".", relative_len)[0]
+        return parent_path + "." + subpath
+
+    def get_with_dynamic(
+        self,
+        path: str,
+        #        identifier_path: str,
+        current_path: str,
+        version: str,
+        namespace: str,
+        xmlfiles: List[str],
+    ) -> Any:
+        identifier = None
+        if version != "1.0" and self.regexp_relative.search(path):
+            path = self.get_full_path(
+                path,
+                current_path,
+            )
+        #        elif identifier_path:
+        #            path = f"{identifier_path}.{path}"
+        dynamic = None
+        # version 1.0
+        if version == "1.0":
+            if not path in self._data and "{{ suffix }}" not in path:
+                new_path = None
+                current_path = None
+                identifiers = []
+                for name in path.split("."):
+                    parent_path = current_path
+                    if current_path:
+                        current_path += "." + name
+                    else:
+                        current_path = name
+                    if current_path in self._data:
+                        if new_path:
+                            new_path += "." + name
+                        else:
+                            new_path = name
+                        continue
+                    for dynamic_path in self._dynamics:
+                        if "." in dynamic_path:
+                            parent_dynamic, name_dynamic = dynamic_path.rsplit(".", 1)
+                        else:
+                            parent_dynamic = None
+                            name_dynamic = dynamic_path
+                        if (
+                            parent_dynamic == parent_path
+                            and name_dynamic.endswith("{{ identifier }}")
+                            and name == name_dynamic.replace("{{ identifier }}", "")
+                        ):
+                            new_path += "." + name_dynamic
+                            break
+                        regexp = "^" + name_dynamic.replace("{{ identifier }}", "(.*)")
+                        finded = findall(regexp, name)
+                        if len(finded) != 1 or not finded[0]:
+                            continue
+                        if finded[0] == "{{ identifier }}":
+                            identifiers.append(None)
+                        else:
+                            identifiers.append(finded[0])
+                        if new_path is None:
+                            new_path = name_dynamic
+                        else:
+                            new_path += "." + name_dynamic
+                        parent_path = dynamic_path
+                        break
+                    else:
+                        if new_path:
+                            new_path += "." + name
+                        else:
+                            new_path = name
+                path = new_path
+            else:
+                identifiers = None
+                if "{{ suffix }}" in path:
+                    path = path.replace("{{ suffix }}", "{{ identifier }}")
+        elif not path in self._data:
+            current_path = None
+            parent_path = None
+            new_path = current_path
+            identifiers = []
+            for name in path.split("."):
+                if current_path:
+                    current_path += "." + name
+                else:
+                    current_path = name
+                # parent_path, name_path = path.rsplit('.', 1)
+                if current_path in self._data:
+                    if new_path:
+                        new_path += "." + name
+                    else:
+                        new_path = name
+                    parent_path = current_path
+                    continue
+                for dynamic_path in self._dynamics:
+                    if "." in dynamic_path:
+                        parent_dynamic, name_dynamic = dynamic_path.rsplit(".", 1)
+                    else:
+                        parent_dynamic = None
+                        name_dynamic = dynamic_path
+                    if (
+                        "{{ identifier }}" not in name_dynamic
+                        or parent_path != parent_dynamic
+                    ):
+                        continue
+                    regexp = "^" + name_dynamic.replace("{{ identifier }}", "(.*)")
+                    finded = findall(regexp, name)
+                    if len(finded) != 1 or not finded[0]:
+                        continue
+                    if finded[0] == "{{ identifier }}":
+                        identifiers.append(None)
+                    else:
+                        identifiers.append(finded[0])
+                    if new_path is None:
+                        new_path = name_dynamic
+                    else:
+                        new_path += "." + name_dynamic
+                    parent_path = dynamic_path
+                    break
+                else:
+                    if new_path:
+                        new_path += "." + name
+                    else:
+                        new_path = name
+                    if "{{ identifier }}" in name:
+                        identifiers.append(None)
+                    parent_path = current_path
+            path = new_path
+        else:
+            identifiers = None
+        if path not in self._data:
+            return None, None
+        option = self._data[path]
+        option_namespace = option.namespace
+        if (
+            self.default_namespace not in [namespace, option_namespace]
+            and namespace != option_namespace
+        ):
+            msg = _(
+                'A variable or a family located in the "{0}" namespace shall not be used in the "{1}" namespace'
+            ).format(option_namespace, namespace)
+            raise DictConsistencyError(msg, 38, xmlfiles)
+        return option, identifiers
+
+    def __getitem__(
+        self,
+        path: str,
+    ) -> Union[Family, Variable]:
+        if not path in self._data:
+            raise AttributeError(f"cannot find variable or family {path}")
+        return self._data[path]
+
+    def __contains__(
+        self,
+        path: str,
+    ) -> bool:
+        return path in self._data
+
+    def __delitem__(
+        self,
+        path: str,
+    ) -> None:
+        logging.info("remove empty family %s", path)
+        del self._data[path]
+
+    def is_dynamic(self, path: str) -> bool:
+        return path in self._dynamics
+
+    def get(self):
+        return self._data.values()

src/rougail/structural_commandline/__init__.py

@@ -16,4 +16,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from .update import RougailUpgrade
+from .object_model import Variable, Family
+
+
+__all__ = ("Variable", "Family")

src/rougail/structural_commandline/annotator.py

@@ -50,7 +50,7 @@ class Annotator(Walk):
                     self.not_for_commandline(variable)
                 else:
                     self.manage_alternative_name(variable)
-                    self.manage_negative_description(variable)
+            self.manage_negative_description(variable)
 
     def not_for_commandline(self, variable) -> None:
         self.objectspace.properties.add(variable.path, "not_for_commandline", True)

src/rougail/structural_commandline/config.py

@@ -27,12 +27,14 @@ def get_rougail_config(
 structural_commandline:
   description: Configuration rougail-structural_commandline
   commandline: false
+
   add_extra_options:
     description: Add extra options to tiramisu-cmdline-parser
+    negative_description: Remove extra options to tiramisu-cmdline-parser
     default: true
 """
     return {
-        "name": "exporter",
+        "name": "cmdline",
         "process": "structural",
         "options": options,
         "level": 20,

src/rougail/structural_commandline/object_model.py

@@ -29,6 +29,3 @@ class Variable(BaseModel):
 
 class Family(BaseModel):
     commandline: bool = True
-
-
-__all__ = ("Variable", "Family")

src/rougail/structural_directory/__init__.py

@@ -0,0 +1,153 @@
+"""
+Silique (https://www.silique.fr)
+Copyright (C) 2022-2024
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 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 Lesser General Public License for more
+details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from typing import Union, List, Iterator, Optional
+from itertools import chain
+from pathlib import Path
+
+from ruamel.yaml import YAML
+
+from ..utils import normalize_family
+from ..path import Paths
+
+
+class Walker:
+    def __init__(
+        self,
+        convert,
+    ) -> None:
+        """Parse directories content"""
+        self.convert = convert
+        self.yaml = YAML()
+        rougailconfig = self.convert.rougailconfig
+        self.sort_dictionaries_all = rougailconfig["sort_dictionaries_all"]
+        if rougailconfig["main_namespace"]:
+            self.convert.paths = Paths(rougailconfig["main_namespace"])
+            self.load_with_extra(
+                rougailconfig["extra_dictionaries"],
+                rougailconfig["main_namespace"],
+                rougailconfig["main_dictionaries"],
+            )
+        else:
+            self.convert.namespace = None
+            namespace_path = ""
+            if namespace_path in self.convert.parents:
+                raise Exception("pfff")
+            for filename in self.get_sorted_filename(
+                rougailconfig["main_dictionaries"]
+            ):
+                self.parse_variable_file(
+                    filename,
+                    namespace_path,
+                )
+
+    def load_with_extra(
+        self,
+        extra_structures: dict,
+        main_namespace: Optional[str] = None,
+        main_structures: Optional[List[str]] = None,
+    ) -> None:
+        self.convert.has_namespace = True
+        if main_namespace:
+            directory_dict = chain(
+                (
+                    (
+                        main_namespace,
+                        main_structures,
+                    ),
+                ),
+                extra_structures.items(),
+            )
+        else:
+            directory_dict = extra_structures.items()
+        for namespace, extra_dirs in directory_dict:
+            # if namespace is None:
+            #     self.convert.namespace = namespace
+            # else:
+            self.convert.namespace = normalize_family(namespace)
+            namespace_path = self.convert.namespace
+            if namespace_path in self.convert.parents:
+                raise Exception("pfff")
+            for idx, filename in enumerate(self.get_sorted_filename(extra_dirs)):
+                if not idx:
+                    # create only for the first file
+                    self.convert.create_namespace(namespace, namespace_path)
+                self.parse_variable_file(
+                    filename,
+                    namespace_path,
+                )
+
+    def get_sorted_filename(
+        self,
+        directories: Union[str, List[str]],
+    ) -> Iterator[str]:
+        """Sort filename"""
+        if not isinstance(directories, list):
+            directories = [directories]
+        if self.sort_dictionaries_all:
+            filenames = {}
+        for directory_name in directories:
+            directory = Path(directory_name)
+            if not self.sort_dictionaries_all:
+                filenames = {}
+            if directory.is_file():
+                self.get_filename(directory, filenames)
+            else:
+                for file_path in directory.iterdir():
+                    self.get_filename(file_path, filenames)
+            if not self.sort_dictionaries_all:
+                for filename in sorted(filenames):
+                    yield filenames[filename]
+        if self.sort_dictionaries_all:
+            for filename in sorted(filenames):
+                yield filenames[filename]
+
+    def get_filename(self, file_path, filenames: List[str]) -> None:
+        if file_path.suffix not in [".yml", ".yaml"]:
+            return
+        if file_path.name in filenames:
+            raise DictConsistencyError(
+                _("duplicate dictionary file name {0}").format(file_path.name),
+                78,
+                [filenames[file_path.name][1]],
+            )
+        filenames[file_path.name] = str(file_path)
+
+    def parse_variable_file(
+        self,
+        filename: str,
+        path: str,
+    ) -> None:
+        """Parse file"""
+        with open(filename, encoding="utf8") as file_fh:
+            objects = self.yaml.load(file_fh)
+        version = self.convert.validate_file_version(
+            objects,
+            filename,
+        )
+        if objects is None:
+            return
+        self.convert.parse_root_file(
+            filename,
+            path,
+            version,
+            objects,
+        )
+
+
+__all__ = ("Walker",)

src/rougail/structural_directory/config.py

@@ -0,0 +1,99 @@
+"""
+Silique (https://www.silique.fr)
+Copyright (C) 2024
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation, either version 3 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 Lesser General Public License for more
+details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from ..utils import _
+
+
+def get_rougail_config(
+    *,
+    backward_compatibility=True,
+) -> dict:
+    if backward_compatibility:
+        main_namespace_default = "rougail"
+    else:
+        main_namespace_default = "null"
+    options = f"""main_dictionaries:
+  description: {_("Directories where dictionary files are placed")}
+  type: unix_filename
+  alternative_name: m
+  params:
+     allow_relative: True
+     test_existence: True
+  multi: true
+  disabled:
+    jinja: >-
+      {{% if 'directory' not in step.structural %}}
+      directory is not in step.structural
+      {{% endif %}}
+
+sort_dictionaries_all:
+  description: {_("Sort dictionaries from differents directories")}
+  negative_description: Sort dictionaries directory by directory
+  default: false
+  disabled:
+    jinja: >-
+      {{% if 'directory' not in step.structural %}}
+      directory is not in step.structural
+      {{% endif %}}
+
+main_namespace:
+  description: {_("Main namespace name")}
+  default: {main_namespace_default}
+  alternative_name: s
+  mandatory: false
+  disabled:
+    jinja: >-
+      {{% if 'directory' not in step.structural %}}
+      directory is not in step.structural
+      {{% endif %}}
+
+extra_dictionaries:
+  description: {_("Extra namespaces")}
+  type: leadership
+  disabled:
+    jinja: >-
+      {{% if 'directory' not in step.structural %}}
+      directory is not in step.structural
+      {{% endif %}}
+
+  names:
+    description: {_("Extra namespace name")}
+    alternative_name: xn
+    multi: true
+    mandatory: false
+
+  directories:
+    description: {_("Directories where extra dictionary files are placed")}
+    alternative_name: xd
+    type: unix_filename
+    params:
+      allow_relative: true
+      test_existence: true
+      types:
+        - directory
+    multi: true
+"""
+    return {
+        "name": "directory",
+        "process": "structural",
+        "options": options,
+        "level": 5,
+    }
+
+
+__all__ = "get_rougail_config"

src/rougail/tiramisu.py

@@ -27,10 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from typing import Any
 
-try:
-    from tiramisu5 import DynOptionDescription, calc_value
-except ModuleNotFoundError:
-    from tiramisu import DynOptionDescription, calc_value
 from importlib.machinery import SourceFileLoader as _SourceFileLoader
 from importlib.util import (
     spec_from_loader as _spec_from_loader,
@@ -40,8 +36,8 @@ from jinja2 import StrictUndefined, DictLoader
 from jinja2.sandbox import SandboxedEnvironment
 from rougail.object_model import CONVERT_OPTION
 from rougail.error import display_xmlfiles
-from tiramisu import function_waiting_for_error
-from tiramisu.error import ValueWarning, ConfigError, PropertiesOptionError
+from tiramisu import DynOptionDescription, calc_value, function_waiting_for_error
+from tiramisu.error import ValueWarning, ConfigError, PropertiesOptionError, CancelParam
 from .utils import normalize_family
 
 
@@ -102,8 +98,10 @@ def load_functions(path):
         func[function] = getattr(func_, function)
 
 
-def rougail_calc_value(*args, __default_value=None, **kwargs):
+def rougail_calc_value(*args, __default_value=None, __internal_multi=False, **kwargs):
     values = calc_value(*args, **kwargs)
+    if values is None and __internal_multi:
+        values = []
     if __default_value is not None and values in [None, []]:
         return __default_value
     return values
@@ -128,9 +126,15 @@ def jinja_to_function(
         if "." in key:
             c_kw = kw
             path, var = key.rsplit(".", 1)
+            if isinstance(value, CancelParam):
+                count_o_path = value.origin_path.count(".") - value.current_path.count(
+                    "."
+                )
+                path = path.rsplit(".", count_o_path)[0]
             for subkey in path.split("."):
                 c_kw = c_kw.setdefault(subkey, {})
-            c_kw[var] = value
+            if not isinstance(value, CancelParam):
+                c_kw[var] = value
         else:
             if key in kw:
                 raise ConfigError(

src/rougail/tiramisureflector.py

@@ -87,7 +87,7 @@ class TiramisuReflector:
                     continue
                 self.text["header"].append(f"load_functions('{funcs_path}')")
         if self.objectspace.export_with_import:
-            if objectspace.main_namespace:
+            if self.objectspace.has_namespace:
                 self.text["header"].extend(
                     [
                         "try:",
@@ -339,6 +339,7 @@ class Common:
             return self.build_option_param(
                 param["variable"],
                 param.get("propertyerror", True),
+                param.get("optional", False),
                 param.get("identifier"),
                 param.get("dynamic"),
                 param.get("whole", False),
@@ -355,6 +356,7 @@ class Common:
         self,
         variable,
         propertyerror,
+        optional: bool,
         identifier: Optional[str],
         dynamic,
         whole: bool,
@@ -370,6 +372,11 @@ class Common:
         )
         params = [f"{option_name}"]
         if identifier is not None:
+            if not self.objectspace.paths.is_dynamic(variable.path):
+                msg = _("internal error, {0} is not a dynamic variable").format(
+                    variable.path
+                )
+                raise DictConsistencyError(msg, 49, self.elt.xmlfiles)
             param_type = "ParamDynOption"
             identifiers = []
             for ident in identifier:
@@ -377,6 +384,8 @@ class Common:
                     ident = self.convert_str(ident)
                 identifiers.append(str(ident))
             params.append("[" + ", ".join(identifiers) + "]")
+            if optional:
+                params.append("optional=True")
         else:
             param_type = "ParamOption"
         if not propertyerror:

src/rougail/user_datas.py

@@ -0,0 +1,241 @@
+"""
+Silique (https://www.silique.fr)
+Copyright (C) 2022-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 List
+from re import findall
+
+from tiramisu import undefined, Calculation
+from tiramisu.error import PropertiesOptionError, LeadershipError, ConfigError
+
+from .object_model import CONVERT_OPTION
+
+
+class UserDatas:
+    def __init__(self, config) -> None:
+        self.config = config
+
+    def user_datas(self, user_datas: List[dict]):
+        self.values = {}
+        self.errors = []
+        self.warnings = []
+        self._populate_values(user_datas)
+        self._auto_configure_dynamics()
+        self._populate_config()
+        self._populate_error_warnings()
+        return {
+            "errors": self.errors,
+            "warnings": self.warnings,
+        }
+
+    def _populate_values(self, user_datas):
+        for datas in user_datas:
+            options = datas.get("options", {})
+            for name, data in datas.get("values", {}).items():
+                self.values[name] = {
+                    "values": data,
+                    "options": options.copy(),
+                }
+            self.errors.extend(datas.get("errors", []))
+            self.warnings.extend(datas.get("warnings", []))
+
+    def _get_variable(self, config):
+        for subconfig in config:
+            if subconfig.isoptiondescription():
+                yield from self._get_variable(subconfig)
+            else:
+                yield subconfig
+
+    def _auto_configure_dynamics(self):
+        cache = {}
+        added = []
+        for path, data in list(self.values.items()):
+            value = data["values"]
+            try:
+                option = self.config.option(path)
+                option.name()
+            except (ConfigError, PropertiesOptionError):
+                pass
+            except AttributeError:
+                self._not_found_is_dynamic(self.config, path, cache, added)
+
+    def _not_found_is_dynamic(self, config, path, cache, added):
+        """if path is not found, check if parent is a dynamic family"""
+        current_path = ""
+        identifiers = []
+        # get parent
+        for name in path.split(".")[:-1]:
+            if current_path:
+                current_path += "."
+            current_path += name
+            if current_path in cache:
+                config, identifier = cache[current_path]
+                identifiers.append(identifier)
+                continue
+            tconfig = config.option(name)
+            try:
+                tconfig.group_type()
+                # object exists, so current config is the temporary config
+                config = tconfig
+                if config.isdynamic(only_self=True):
+                    identifiers.append(config.identifiers()[-1])
+            except AttributeError:
+                # try to found the good dynamic family
+                for tconfig in config.list(uncalculated=True):
+                    if not tconfig.isdynamic(only_self=True):
+                        # it's not a dynamic variable
+                        continue
+                    identifier = self._get_identifier(tconfig.name(), name)
+                    if identifier is None:
+                        # it's a dynamic variable but doesn't match the current name
+                        continue
+                    dynamic_variable = tconfig.information.get(
+                        "dynamic_variable",
+                        None,
+                    )
+                    if not dynamic_variable:
+                        # it's the good dynamic variable but it's not linked to a variable
+                        # so cannot change the variable
+                        continue
+                    option_type = self.config.option(dynamic_variable).information.get(
+                        "type"
+                    )
+                    dyn_options_values = (
+                        self.config.option(dynamic_variable).get().impl_getdefault()
+                    )
+                    if "{{ identifier }}" in dynamic_variable:
+                        for s in identifiers:
+                            dynamic_variable = dynamic_variable.replace(
+                                "{{ identifier }}", str(s), 1
+                            )
+                    if dynamic_variable not in self.values and not dyn_options_values:
+                        self.values[dynamic_variable] = {"values": []}
+                        added.append(dynamic_variable)
+                    elif dynamic_variable not in added:
+                        continue
+                    config = tconfig
+                    identifiers.append(identifier)
+                    typ = CONVERT_OPTION.get(option_type, {}).get("func")
+                    if typ:
+                        identifier = typ(identifier)
+                    if identifier not in self.values[dynamic_variable]["values"]:
+                        self.values[dynamic_variable]["values"].append(identifier)
+                    cache[current_path] = config, identifier
+                    break
+
+    def _populate_config(self):
+        while self.values:
+            value_is_set = False
+            for option in self._get_variable(self.config):
+                path = option.path()
+                if path not in self.values:
+                    continue
+                options = self.values[path].get("options", {})
+                value = self.values[path]["values"]
+                needs_convert = options.get("needs_convert", False)
+
+                # converted value
+                if option.ismulti():
+                    if options.get("multi_separator") and not isinstance(value, list):
+                        value = value.split(options["multi_separator"])
+                        self.values[path]["values"] = value
+                        if option.issubmulti():
+                            value = [[val] for val in value]
+                    if needs_convert:
+                        if option.issubmulti():
+                            for idx, val in enumerate(value):
+                                value[idx] = [convert_value(option, v) for v in val]
+                        else:
+                            value = [convert_value(option, val) for val in value]
+                        self.values[path]["values"] = value
+                        self.values[path]["options"]["needs_convert"] = False
+                elif needs_convert:
+                    value = convert_value(option, value)
+                index = option.index()
+                if index is not None:
+                    if not isinstance(value, list) or index >= len(value):
+                        continue
+                    value = value[index]
+                try:
+                    option.value.set(value)
+                    value_is_set = True
+                    # value is correctly set, remove variable to the set
+                    if index is not None:
+                        # if it's a follower waiting for all followers are sets
+                        self.values[path]["values"][index] = undefined
+                        if set(self.values[path]["values"]) == {undefined}:
+                            self.values.pop(path)
+                    else:
+                        self.values.pop(path)
+                except Exception:
+                    if path != option.path():
+                        self.values[option.path()] = self.values.pop(path)
+            if not value_is_set:
+                break
+
+    def _get_identifier(self, true_name, name) -> str:
+        if true_name == "{{ identifier }}":
+            return name
+        regexp = true_name.replace("{{ identifier }}", "(.*)")
+        finded = findall(regexp, name)
+        if len(finded) != 1 or not finded[0]:
+            return None
+        return finded[0]
+
+    def _populate_error_warnings(self):
+        # we don't find variable, apply value just to get error or warning messages
+        for path, data in self.values.items():
+            try:
+                option = self.config.option(path)
+                if option.isoptiondescription():
+                    self.errors.append(
+                        f'the option "{option.path()}" is an option description'
+                    )
+                    continue
+                value = data["values"]
+                if option.isfollower():
+                    for index, val in enumerate(value):
+                        if val is undefined:
+                            continue
+                        self.config.option(path, index).value.set(val)
+                else:
+                    option.value.set(value)
+            except AttributeError as err:
+                self.errors.append(str(err))
+            except (ValueError, LeadershipError) as err:
+                self.errors.append(str(err))
+            except PropertiesOptionError as err:
+                self.warnings.append(str(err))
+
+
+def convert_value(option, value):
+    if value == "":
+        return None
+    option_type = option.information.get("type")
+    if option_type == "choice":
+        choices = option.value.list()
+        if value not in choices and isinstance(value, str):
+            # FIXME add other tests (boolean, float, ...)
+            if value.isnumeric() and int(value) in choices:
+                value = int(value)
+    func = CONVERT_OPTION.get(option_type, {}).get("func")
+    if func:
+        return func(value)
+    return value

src/rougail/utils.py

@@ -78,13 +78,10 @@ def load_modules(name, module) -> List[str]:
     return eosfunc
 
 
-def get_realpath(
-    path: str,
-    path_prefix: str,
-) -> str:
-    if path_prefix:
-        return f"{path_prefix}.{path}"
-    return path
+# def get_realpath(
+#    path: str,
+# ) -> str:
+#    return path
 
 
 def get_jinja_variable_to_param(
@@ -93,7 +90,6 @@ def get_jinja_variable_to_param(
     objectspace,
     xmlfiles,
     functions,
-    path_prefix,
     version,
     namespace,
 ):
@@ -125,7 +121,6 @@ def get_jinja_variable_to_param(
     for variable_path in variables:
         variable, identifier = objectspace.paths.get_with_dynamic(
             variable_path,
-            path_prefix,
             current_path,
             version,
             namespace,
@@ -152,7 +147,6 @@ def get_jinja_variable_to_param(
                 vpath = vpath.rsplit(".", 1)[0]
                 variable, identifier = objectspace.paths.get_with_dynamic(
                     vpath,
-                    path_prefix,
                     current_path,
                     version,
                     namespace,

tests/dictionaries/00_0empty/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_0empty/tiramisu/multi.py

@@ -1,15 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[], properties=frozenset({"advanced"}))
-optiondescription_2 = OptionDescription(name="2", doc="2", children=[], properties=frozenset({"advanced"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_2])

tests/dictionaries/00_0empty/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_0version_underscore/dictionaries/rougail/00-base.yml

@@ -1,3 +0,0 @@
----
-_version: '1.1'
-version:  # a variable

tests/dictionaries/00_0version_underscore/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_0version_underscore/tiramisu/multi.py

@@ -1,19 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = StrOption(name="version", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"basic"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
-option_6 = StrOption(name="version", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"basic"}))
-optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"basic"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_0version_underscore/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_1empty_variable/dictionaries/rougail/00-base.yml

@@ -1,3 +0,0 @@
----
-version: '1.0'
-empty:

tests/dictionaries/00_1empty_variable/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_1empty_variable/tiramisu/multi.py

@@ -1,19 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = StrOption(name="empty", doc="empty", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"basic"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
-option_6 = StrOption(name="empty", doc="empty", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"basic"}))
-optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"basic"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_1empty_variable/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml

@@ -1,10 +0,0 @@
----
-version: 1.1
-var1: "no"  # a first variable
-var2:
-  description: a second variable
-  multi: true
-  default:
-    jinja: |
-      {{ _.var1 }}
-    description: the value of var1

tests/dictionaries/00_2default_calculated/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:
@@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_rougail.var2'] = "{{ _.var1 }}\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", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_2default_calculated/tiramisu/multi.py

@@ -1,23 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-dict_env['default_1.rougail.var2'] = "{{ _.var1 }}\n"
-dict_env['default_2.rougail.var2'] = "{{ _.var1 }}\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", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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])

tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py

@@ -2,11 +2,11 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_var2'] = "{{ _.var1 }}\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", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2])

tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml

@@ -1,15 +0,0 @@
----
-version: 1.1
-var1:  # a first variable
-  - 'no'
-  - 'yes'
-  - maybe
-var2:
-  description: a second variable
-  multi: true
-  default:
-    jinja: |
-      {% for val in _.var1 %}
-      {{ val }}
-      {% endfor %}
-    description: the value of _.var1

tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:
@@ -12,6 +12,6 @@ ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
 option_2 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py

@@ -1,23 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-dict_env['default_1.rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
-dict_env['default_2.rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
-option_3 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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])

tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py

@@ -2,11 +2,11 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
 option_1 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_2default_calculated_multi/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2])

tests/dictionaries/00_2default_calculated_variable_transitive/dictionaries/rougail/00-base.yml

@@ -1,15 +0,0 @@
----
-version: 1.1
-
-var1:
-  description: a first variable
-  multi: true
-  type: domainname
-  params:
-    allow_ip: true
-
-var2:
-  description: a second variable
-  default:
-    type: variable
-    variable: _.var1

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:
@@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'domainname'})
-option_3 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_2)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
+option_3 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_2)), kwargs={'__internal_multi': ParamValue(True)})), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
 optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py

@@ -1,21 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'domainname'})
-option_4 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
-option_7 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'domainname'})
-option_8 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_7)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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])

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/no_namespace.py

@@ -2,10 +2,10 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_1 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'domainname'})
-option_2 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_1)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
+option_2 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_1)), kwargs={'__internal_multi': ParamValue(True)})), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2])

tests/dictionaries/00_4load_subfolder/dictionaries/rougail/99-base.yml

@@ -1,4 +0,0 @@
----
-version: '1.0'
-var1:
-  description: a variable

tests/dictionaries/00_4load_subfolder/dictionaries/rougail2/00-base.yml

@@ -1,4 +0,0 @@
----
-version: "1.0"
-var2:
-  description: a variable

tests/dictionaries/00_4load_subfolder/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_4load_subfolder/tiramisu/multi.py

@@ -1,21 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-option_4 = StrOption(name="var2", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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 variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-option_8 = StrOption(name="var2", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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])

tests/dictionaries/00_4load_subfolder/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_5load_notype/dictionaries/rougail/00-base.yml

@@ -1,5 +0,0 @@
----
-version: '1.0'
-without_type:
-  description: a variable
-  default: non

tests/dictionaries/00_5load_notype/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_5load_notype/tiramisu/multi.py

@@ -1,19 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = StrOption(name="without_type", doc="a variable", default="non", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_6 = StrOption(name="without_type", doc="a variable", default="non", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
-optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_5load_notype/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6boolean/dictionaries/rougail/00-base.yml

@@ -1,18 +0,0 @@
----
-version: '1.1'
-var1: true  # the first variable
-var2:
-  description: the second variable
-  default: true
-var3:
-  description: the third variable
-  type: boolean
-  default: true
-var4: false  # the forth variable
-var5:
-  description: the fifth variable
-  default: false
-var6:
-  description: the sixth variable
-  type: boolean
-  default: false

tests/dictionaries/00_6boolean/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6boolean/tiramisu/multi.py

@@ -1,29 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = BoolOption(name="var1", doc="the first variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_4 = BoolOption(name="var2", doc="the second variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_5 = BoolOption(name="var3", doc="the third variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_6 = BoolOption(name="var4", doc="the forth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_7 = BoolOption(name="var5", doc="the fifth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_8 = BoolOption(name="var6", doc="the sixth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_11 = BoolOption(name="var1", doc="the first variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_12 = BoolOption(name="var2", doc="the second variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_13 = BoolOption(name="var3", doc="the third variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_14 = BoolOption(name="var4", doc="the forth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_15 = BoolOption(name="var5", doc="the fifth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-option_16 = BoolOption(name="var6", doc="the sixth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
-optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6boolean/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6boolean_no_mandatory/dictionaries/rougail/00-base.yml

@@ -1,6 +0,0 @@
----
-version: '1.1'
-variable:
-  description: a variable
-  type: boolean
-  mandatory: false

tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py

@@ -1,19 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = BoolOption(name="variable", doc="a variable", default=True, properties=frozenset({"standard"}), informations={'type': 'boolean'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_6 = BoolOption(name="variable", doc="a variable", default=True, properties=frozenset({"standard"}), informations={'type': 'boolean'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
-optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6boolean_no_mandatory/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6choice/dictionaries/rougail/00-base.yml

@@ -1,42 +0,0 @@
----
-version: '1.1'
-var1:
-  description: the first variable
-  choices:
-    - a
-    - b
-    - c
-var2:
-  description: the second variable
-  choices:
-    - a
-    - b
-    - c
-var3:
-  description: the third variable
-  choices:
-    - a
-    - b
-    - c
-  mandatory: false
-var4:
-  description: the forth variable
-  choices:
-    - null
-    - b
-    - c
-  mandatory: false
-var5:
-  description: the fifth variable
-  choices:
-    - a
-    - b
-    - c
-  default: a
-var6:
-  description: the sixth variable
-  choices:
-    - 1
-    - 2
-    - 3
-  default: 1

tests/dictionaries/00_6choice/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6choice/tiramisu/multi.py

@@ -1,29 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = ChoiceOption(name="var1", doc="the first variable", values=("a", "b", "c"), properties=frozenset({"basic", "mandatory"}), informations={'type': 'choice'})
-option_4 = ChoiceOption(name="var2", doc="the second variable", values=("a", "b", "c"), properties=frozenset({"basic", "mandatory"}), informations={'type': 'choice'})
-option_5 = ChoiceOption(name="var3", doc="the third variable", values=("a", "b", "c", None), properties=frozenset({"standard"}), informations={'type': 'choice'})
-option_6 = ChoiceOption(name="var4", doc="the forth variable", values=(None, "b", "c"), properties=frozenset({"standard"}), informations={'type': 'choice'})
-option_7 = ChoiceOption(name="var5", doc="the fifth variable", values=("a", "b", "c"), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-option_8 = ChoiceOption(name="var6", doc="the sixth variable", values=(1, 2, 3), default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"basic"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
-option_11 = ChoiceOption(name="var1", doc="the first variable", values=("a", "b", "c"), properties=frozenset({"basic", "mandatory"}), informations={'type': 'choice'})
-option_12 = ChoiceOption(name="var2", doc="the second variable", values=("a", "b", "c"), properties=frozenset({"basic", "mandatory"}), informations={'type': 'choice'})
-option_13 = ChoiceOption(name="var3", doc="the third variable", values=("a", "b", "c", None), properties=frozenset({"standard"}), informations={'type': 'choice'})
-option_14 = ChoiceOption(name="var4", doc="the forth variable", values=(None, "b", "c"), properties=frozenset({"standard"}), informations={'type': 'choice'})
-option_15 = ChoiceOption(name="var5", doc="the fifth variable", values=("a", "b", "c"), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-option_16 = ChoiceOption(name="var6", doc="the sixth variable", values=(1, 2, 3), default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"basic"}))
-optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"basic"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6choice/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml

@@ -1,12 +0,0 @@
----
-version: 1.1
-var:
-  description: a variable
-  default: 9
-  choices:
-    jinja: |
-      {% for n in trange(0, 10) %}
-      {{ n }}
-      {% endfor %}
-    return_type: 'number'
-    description: choices is 0 to 9

tests/dictionaries/00_6choice_calculation/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:
@@ -11,6 +11,6 @@ ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['choices_rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n"
-option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
+option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
 optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6choice_calculation/tiramisu/multi.py

@@ -1,21 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-dict_env['choices_1.rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n"
-dict_env['choices_2.rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n"
-option_3 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_1.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("1.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_6 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_2.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("2.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
-optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6choice_calculation/tiramisu/no_namespace.py

@@ -2,10 +2,10 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['choices_var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n"
-option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
+option_1 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['../rougail-tests/structures/00_6choice_calculation/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/00_6choice_variable/dictionaries/rougail/00-base.yml

@@ -1,11 +0,0 @@
----
-version: '1.1'
-var1:  # a second variable
-  - a
-  - b
-  - c
-var2:
-  description: a first variable
-  default: a
-  choices:
-    variable: _.var1

tests/dictionaries/00_6choice_variable/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6choice_variable/tiramisu/multi.py

@@ -1,21 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = StrOption(name="var1", doc="a second variable", multi=True, default=["a", "b", "c"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_4 = ChoiceOption(name="var2", doc="a first variable", values=Calculation(func['calc_value'], Params((ParamOption(option_3)))), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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="var1", doc="a second variable", multi=True, default=["a", "b", "c"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_8 = ChoiceOption(name="var2", doc="a first variable", values=Calculation(func['calc_value'], Params((ParamOption(option_7)))), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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])

tests/dictionaries/00_6choice_variable/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6custom/dictionaries/rougail/00-base.yml

@@ -1,9 +0,0 @@
----
-version: '1.1'
-custom1:
-  description: the first variable
-  type: custom
-custom2:
-  description: the seconf variable
-  type: custom
-  default: value

tests/dictionaries/00_6custom/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6custom/tiramisu/multi.py

@@ -1,21 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = CustomOption(name="custom1", doc="the first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'custom'})
-option_4 = CustomOption(name="custom2", doc="the seconf variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'custom'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
-option_7 = CustomOption(name="custom1", doc="the first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'custom'})
-option_8 = CustomOption(name="custom2", doc="the seconf variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'custom'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, 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])

tests/dictionaries/00_6custom/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6domainname/dictionaries/rougail/00-base.yml

@@ -1,6 +0,0 @@
----
-version: '1.1'
-variable:
-  description: a domain name variable
-  type: domainname
-  default: my.domain.name

tests/dictionaries/00_6domainname/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6domainname/tiramisu/multi.py

@@ -1,19 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_6 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
-optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6domainname/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6domainname_params/dictionaries/rougail/00-base.yml

@@ -1,8 +0,0 @@
----
-version: '1.1'
-variable:
-  description: a domain name variable
-  type: domainname
-  default: my.domain.name
-  params:
-    allow_ip: true

tests/dictionaries/00_6domainname_params/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6domainname_params/tiramisu/multi.py

@@ -1,19 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_6 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
-optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6domainname_params/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6float/dictionaries/rougail/00-base.yml

@@ -1,18 +0,0 @@
----
-version: '1.1'
-var1: 0.0  # the first variable
-var2:
-  description: the second variable
-  default: 0.0
-var3:
-  description: the third variable
-  type: float
-  default: 0.0
-var4: 10.1  # the forth variable
-var5:
-  description: the fifth variable
-  default: 10.1
-var6:
-  description: the sixth variable
-  type: float
-  default: 10.1

tests/dictionaries/00_6float/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6float/tiramisu/multi.py

@@ -1,29 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = FloatOption(name="var1", doc="the first variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_4 = FloatOption(name="var2", doc="the second variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_5 = FloatOption(name="var3", doc="the third variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_6 = FloatOption(name="var4", doc="the forth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_7 = FloatOption(name="var5", doc="the fifth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_8 = FloatOption(name="var6", doc="the sixth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_11 = FloatOption(name="var1", doc="the first variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_12 = FloatOption(name="var2", doc="the second variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_13 = FloatOption(name="var3", doc="the third variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_14 = FloatOption(name="var4", doc="the forth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_15 = FloatOption(name="var5", doc="the fifth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-option_16 = FloatOption(name="var6", doc="the sixth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
-optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6float/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6number/dictionaries/rougail/00-base.yml

@@ -1,18 +0,0 @@
----
-version: '1.1'
-var1: 0  # the first variable
-var2:
-  description: the second variable
-  default: 0
-var3:
-  description: the third variable
-  type: number
-  default: 0
-var4: 10  # this forth variable
-var5:
-  description: the fifth variable
-  default: 10
-var6:
-  description: the sixth variable
-  type: number
-  default: 10

tests/dictionaries/00_6number/tiramisu/base.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 try:
     groups.namespace
 except:

tests/dictionaries/00_6number/tiramisu/multi.py

@@ -1,29 +0,0 @@
-from tiramisu import *
-from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
-from re import compile as re_compile
-from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
-ALLOWED_LEADER_PROPERTIES.add("basic")
-ALLOWED_LEADER_PROPERTIES.add("standard")
-ALLOWED_LEADER_PROPERTIES.add("advanced")
-option_3 = IntOption(name="var1", doc="the first variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_4 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_5 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_6 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_7 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_8 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
-optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
-option_11 = IntOption(name="var1", doc="the first variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_12 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_13 = IntOption(name="var3", doc="the third variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_14 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_15 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-option_16 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
-optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"}))
-option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6number/tiramisu/no_namespace.py

@@ -2,7 +2,7 @@ from tiramisu import *
 from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
-load_functions('tests/dictionaries/../eosfunc/test.py')
+load_functions('../rougail-tests/funcs/test.py')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_6port/dictionaries/rougail/00-base.yml

@@ -1,13 +0,0 @@
----
-version: '1.1'
-variable1:
-  description: a port variable
-  type: port
-variable2:
-  description: a port variable with default value
-  type: port
-  default: '8080'
-variable3:
-  description: a port variable with integer default value
-  type: port
-  default: 8080