fix: correction for calculated variable with a variable in a dynamic family

src/rougail/convert.py

@@ -47,6 +47,7 @@ import logging
 from pathlib import Path
 from typing import Optional, Union, get_type_hints, Any, Literal, List, Dict, Iterator, Tuple
 from itertools import chain
+from re import findall
 
 from yaml import safe_load
 from pydantic import ValidationError
@@ -124,9 +125,28 @@ class Paths:
     ) -> Any:
         suffix = None
         dynamic_path = None
+        dynamic_variable_path = None
         if not path in self._data:
             for dynamic in self._dynamics:
-                if path.startswith(dynamic):
+                if "{{ suffix }}" in dynamic:
+                    regexp = "^" + dynamic.replace('{{ suffix }}', '(.*)') + '.'
+                    finded = findall(regexp, path)
+                    if len(finded) != 1:
+                        continue
+                    splitted_dynamic = dynamic.split('.')
+                    splitted_path = path.split('.')
+                    for idx, s in enumerate(splitted_dynamic):
+                        if '{{ suffix }}' in s:
+                            break
+
+                    suffix_path = '.'.join(splitted_path[idx + 1:])
+                    if suffix_path:
+                        suffix_path = "." + suffix_path
+                    suffix = splitted_path[idx] + suffix_path
+                    dynamic_path = dynamic
+                    dynamic_variable_path = dynamic + suffix_path
+                    break
+                elif path.startswith(dynamic):
                     subpaths = path[len(dynamic) :].split(".", 1)
                     if (
                         subpaths[0]
@@ -136,15 +156,16 @@ class Paths:
                         suffix = (
                             dynamic.rsplit(".", 1)[-1] + subpaths[0] + "." + subpaths[1]
                         )
-                        dynamic_path = dynamic + "." + subpaths[1]
-                        break
-                if suffix:
+                        dynamic_path = dynamic
+                        dynamic_variable_path = dynamic + "." + subpaths[1]
                         break
         if suffix is None and not path in self._data:
-            return None, None
-        if suffix and dynamic_path:
-            path = dynamic_path
-        return self._data[path], suffix
+            return None, None, None
+        dynamic = None
+        if suffix and dynamic_variable_path:
+            path = dynamic_variable_path
+            dynamic = self._data[dynamic_path]
+        return self._data[path], suffix, dynamic
 
     def __getitem__(
         self,

src/rougail/object_model.py

@@ -85,7 +85,7 @@ class Calculation(BaseModel):
             param = param_obj.model_dump()
             if param.get("type") == "variable":
                 variable_path = self.get_realpath(param["variable"])
-                variable, suffix = objectspace.paths.get_with_dynamic(variable_path)
+                variable, suffix, dynamic = objectspace.paths.get_with_dynamic(variable_path)
                 if not variable:
                     if not param.get("optional"):
                         raise Exception(f"cannot find {variable_path}")
@@ -95,6 +95,7 @@ class Calculation(BaseModel):
                 param["variable"] = variable
                 if suffix:
                     param["suffix"] = suffix
+                    param["dynamic"] = dynamic
             if param.get("type") == "information":
                 if param["variable"]:
                     variable_path = self.get_realpath(param["variable"])
@@ -147,7 +148,7 @@ class JinjaCalculation(Calculation):
             default["params"] |= self.get_params(objectspace)
         if params:
             default["params"] |= params
-        for sub_variable, suffix, true_path in get_jinja_variable_to_param(
+        for sub_variable, suffix, true_path, dynamic in get_jinja_variable_to_param(
             self.jinja,
             objectspace,
             variable.xmlfiles,
@@ -161,6 +162,7 @@ class JinjaCalculation(Calculation):
                 }
                 if suffix:
                     default["params"][true_path]["suffix"] = suffix
+                    default["params"][true_path]["dynamic"] = dynamic
         return default
 
     def to_function(
@@ -230,7 +232,7 @@ class VariableCalculation(Calculation):
         objectspace,
     ) -> dict:
         variable_path = self.get_realpath(self.variable)
-        variable, suffix = objectspace.paths.get_with_dynamic(variable_path)
+        variable, suffix, dynamic = objectspace.paths.get_with_dynamic(variable_path)
         if not variable:
             raise Exception(f"pffff {variable_path}")
         if not isinstance(variable, objectspace.variable):
@@ -242,6 +244,7 @@ class VariableCalculation(Calculation):
         }
         if suffix:
             param["suffix"] = suffix
+            param["dynamic"] = dynamic
         params = {None: [param]}
         function = "calc_value"
         help_function = None

src/rougail/tiramisureflector.py

@@ -393,6 +393,7 @@ class Common:
                 param["variable"],
                 param.get("propertyerror", True),
                 param.get("suffix"),
+                param.get("dynamic"),
             )
         if param["type"] == "any":
             if isinstance(param["value"], str):
@@ -407,6 +408,7 @@ class Common:
         param,
         propertyerror,
         suffix: Optional[str],
+        dynamic,
     ) -> str:
         """build variable parameters"""
         if param.path == self.elt.path:
@@ -417,7 +419,7 @@ class Common:
         params = [f"{option_name}"]
         if suffix is not None:
             param_type = "ParamDynOption"
-            family = self.tiramisu.reflector_objects[param.path.rsplit(".", 1)[0]].get(
+            family = self.tiramisu.reflector_objects[dynamic.path].get(
                 self.calls, self.elt.path
             )
             params.extend([f"'{suffix}'", f"{family}"])

src/rougail/utils.py

@@ -112,8 +112,8 @@ def get_jinja_variable_to_param(
     variables = list(variables)
     variables.sort()
     for variable_path in variables:
-        variable, suffix = objectspace.paths.get_with_dynamic(
+        variable, suffix, dynamic = objectspace.paths.get_with_dynamic(
             get_realpath(variable_path, path_prefix)
         )
         if variable and variable.path in objectspace.variables:
-            yield variable, suffix, variable_path
+            yield variable, suffix, variable_path, dynamic

tests/dictionaries/00empty/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/00empty_variable/makedict/mandatory.json

@@ -0,0 +1 @@
+["rougail.empty"]

tests/dictionaries/00load_notype/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/00load_save/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/00load_subfolder/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_domainname/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_domainname_params/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_float/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_help_quote/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_multi/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_multi_notuniq/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_multi_uniq/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_value_doublequote/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_value_doublequote2/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_value_doublequote3/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_value_multi_doublequote/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_value_multi_doublequote2/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_value_multi_quote/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_value_quote/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01base_var_name_same_family/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01boolean_no_mandatory/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01family_description/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01test/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01test_boolean/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01test_multi/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01test_multi_none/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01test_redefine/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01test_redefine_base/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/01test_redefine_remove/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10autosave_hidden/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10check_base/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10check_no_param/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10check_optional/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10check_valid_differ/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10check_valid_differ_add/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10check_valid_differ_removecheck/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10check_valid_in_network/makedict/mandatory.json

@@ -0,0 +1 @@
+["rougail.general.adresse_ip_eth0", "rougail.general.adresse_netmask_eth0", "rougail.general.adresse_ip"]

tests/dictionaries/10check_valid_in_network_cidr/makedict/mandatory.json

@@ -0,0 +1 @@
+["rougail.general.adresse_ip_eth0", "rougail.general.adresse_ip"]

tests/dictionaries/10check_valid_ipnetmask/makedict/mandatory.json

@@ -0,0 +1 @@
+["rougail.general.adresse_ip_eth0", "rougail.general.adresse_netmask_eth0"]

tests/dictionaries/10check_valid_jinja/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10disabled_with_variable/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10disabled_with_variable2/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10fill/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10fill_optional/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10fill_quote/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10fill_target_information/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10fill_target_optional/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10frozenifin_unknown_valid_enum_number/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_append/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_append_hidden/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_append_name/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_auto/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_auto_index/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_auto_index_param/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_autoleader/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_autoleader_expert/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_autosaveexpert/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_empty/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_hidden/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_leader_hidden/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_leader_hidden_if_in/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_leader_hidden_if_in_name/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_leadermandatory/makedict/mandatory.json

@@ -0,0 +1 @@
+["rougail.general.leader.leader"]

tests/dictionaries/10leadership_mandatoryfollower/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_mandatoryfollower_value/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10leadership_multi/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_fill/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_list_optional/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_multi_param/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_multi_param2/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_multi_param3/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_multi_param4/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_multi_param5/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_multi_param6/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_multi_param_disabled/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_none/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_twice/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_variable/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_in_variable2/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_not_in_fallback/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabled_if_not_in_fallback_force/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabledifin_fallback/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabledifin_fallback_force/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_disabledifin_whithouttype/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_frozenifin/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_frozenifin_auto/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_frozenifin_multiparam/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_frozenifin_variable/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_frozenifnotin/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_hidden_if_empty_family/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_hidden_if_family/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_hidden_if_family2/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_hidden_if_family3/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_leadership/makedict/mandatory.json

@@ -0,0 +1 @@
+[]

tests/dictionaries/10load_leadership_default_multi/makedict/mandatory.json

@@ -0,0 +1 @@
+[]