CHANGELOG.md

@@ -1,9 +1,3 @@
-## 0.2.0a14 (2025-04-07)
-
-### Fix
-
-- calculation for dynamic ans leadership variables
-
 ## 0.2.0a13 (2025-04-02)
 
 ### Fix

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail.output_doc"
-version = "0.2.0a14"
+version = "0.2.0a13"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "Rougail output doc"

src/rougail/output_doc/annotator.py

@@ -88,7 +88,7 @@ class Annotator(Walk):
         """For dynamic we must have values to document it"""
         if not isinstance(value, Calculation):
             return
-        value_added = False
+        default_values = ["example"]
         if isinstance(value, (VariableCalculation, VariablePropertyCalculation)):
             variable = self.objectspace.paths.get_with_dynamic(
                 value.variable,
@@ -97,29 +97,21 @@ class Annotator(Walk):
                 value.namespace,
                 value.xmlfiles,
             )[0]
-            if variable and not variable.default:
+            if variable:
-                values = self.add_examples_values(variable)
+                values = self.get_examples_values(variable)
-                value_added = True
+                if values:
-        if not value_added:
+                    default_values = values
-            default_values = ["example"]
+        if not return_a_list:
-            if not return_a_list:
+            default_values = default_values[0]
-                default_values = default_values[0]
+        value.default_values = default_values
-            value.default_values = default_values
 
-    def add_examples_values(self, variable) -> list:
+    def get_examples_values(self, variable) -> list:
-        """Check examples or test information to define examples values in a variable"""
+        """Check examples or test information to define examples values"""
         values = self.objectspace.informations.get(variable.path).get("examples", None)
         if not values:
             values = self.objectspace.informations.get(variable.path).get("test", None)
         if isinstance(values, tuple):
             values = list(values)
-        if values:
-            variable.default = list(values)
-        else:
-            variable.default = [CONVERT_OPTION[variable.type]["example"]]
-        self.objectspace.informations.add(
-            variable.path, "default_value_makes_sense", False
-        )
         return values
 
     def populate_variable(self) -> None:
@@ -147,7 +139,14 @@ class Annotator(Walk):
                 variable.version,
             )
             if variable.path in self.objectspace.leaders and not variable.default:
-                self.add_examples_values(variable)
+                values = self.get_examples_values(variable)
+                if values:
+                    variable.default = list(values)
+                else:
+                    variable.default = [CONVERT_OPTION[variable.type]["example"]]
+                self.objectspace.informations.add(
+                    variable.path, "default_value_makes_sense", False
+                )
             self.objectspace.informations.add(
                 variable.path, "dictionaries", variable.xmlfiles
             )

src/rougail/output_doc/doc.py

@@ -375,7 +375,7 @@ class RougailOutputDoc(Examples):
         informations["example"] = [example]
         informations["mandatory_without_value"] = "mandatory" in variable.property.get(
             uncalculated=True
-        ) and (not variable.information.get("default_value_makes_sense", True) or variable.value.get(uncalculated=True) in [None, []])
+        ) and variable.value.get(uncalculated=True) in [None, []]
 
     def _get_example(self, variable, informations: dict, leader):
         example = informations.get("examples")
@@ -510,13 +510,14 @@ class RougailOutputDoc(Examples):
         self,
         variable,
     ):
+        if not variable.information.get("default_value_makes_sense", True):
+            return None
         default = self._to_string(variable, "default", do_not_raise=True)
         if default is not None:
             if default == []:
                 default = None
             return default
-        if variable.information.get("default_value_makes_sense", True):
+        default = variable.value.get(uncalculated=True)
-            default = variable.value.get(uncalculated=True)
         if default == []:
             default = None
         return default
@@ -525,8 +526,11 @@ class RougailOutputDoc(Examples):
         self,
         variable,
         prop,
+        identifier="",
         do_not_raise=False,
     ):
+        if identifier:
+            raise Exception("pfff")
         calculation = variable.information.get(f"{prop}_calculation", None)
         if not calculation:
             if do_not_raise:

tests/results/test_examples/40_0leadership.md

@@ -1,12 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-leader:
-  - leader: example
-    follower1: example
-    follower2: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/40_0leadership_diff_name.md

@@ -1,12 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-leadership:
-  - leader: example
-    follower1: example
-    follower2: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/40_0leadership_follower_default_calculation.md

@@ -1,10 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-leader:
-  - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/40_0leadership_leader_not_multi.md

@@ -1,13 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-general1:
-  leader:
-    - leader: example
-      follower1: example
-      follower2: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/40_1leadership_append_follower.md

@@ -1,13 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-leader:
-  - leader: example
-    follower1: example
-    follower2: example
-    follower3: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/40_6leadership_follower_multi.md

@@ -1,12 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-leadership:
-  - leader: example
-    follower1:
-      - example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/44_4leadership_mandatory.md

@@ -1,10 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-leader:
-  - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/44_6leadership_follower_disabled_calculation.md

@@ -1,11 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-leader:
-  - leader: example
-    follower: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/60_6family_dynamic_leadership.md

@@ -1,14 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-dynval1:
-  leadership:
-    - leader: example
-dynval2:
-  leadership:
-    - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_examples/60_6family_dynamic_leadership_empty.md

@@ -1,14 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-dynval1:
-  leadership:
-    - leader: example
-dynval2:
-  leadership:
-    - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.adoc

@@ -47,28 +47,22 @@ This family builds families dynamically.
 | Variable   | Description   
 | 
 
-**rougail.dyn__val1__.dyn___tval1__.var** +
+**rougail.dyn__val1__.dyn___example__.var** +
-**rougail.dyn__val1__.dyn___tval2__.var** +
+**rougail.dyn__val2__.dyn___example__.var** +
-**rougail.dyn__val2__.dyn___tval1__.var** +
-**rougail.dyn__val2__.dyn___tval2__.var** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | 
 A variable dynamic. +
 **Default**: the value of the identifier.               
 | 
 
-**rougail.dyn__val1__.dyn___tval1__.var_identifier** +
+**rougail.dyn__val1__.dyn___example__.var_identifier** +
-**rougail.dyn__val1__.dyn___tval2__.var_identifier** +
+**rougail.dyn__val2__.dyn___example__.var_identifier** +
-**rougail.dyn__val2__.dyn___tval1__.var_identifier** +
-**rougail.dyn__val2__.dyn___tval2__.var_identifier** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | 
 Identifier from first family. +
 **Default**: the value of the identifier.               
 | 
 
-**rougail.dyn__val1__.dyn___tval1__.var_identifiers** +
+**rougail.dyn__val1__.dyn___example__.var_identifiers** +
-**rougail.dyn__val1__.dyn___tval2__.var_identifiers** +
+**rougail.dyn__val2__.dyn___example__.var_identifiers** +
-**rougail.dyn__val2__.dyn___tval1__.var_identifiers** +
-**rougail.dyn__val2__.dyn___tval2__.var_identifiers** +
 `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `standard` `mandatory`            | 
 Merge identifiers. +
 **Default**: join identifier 1 et identifier 2.               

tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json

@@ -116,16 +116,12 @@
             "type": "dynamic",
             "informations": {
               "paths": [
-                "rougail.dynval1.dyn_tval1",
+                "rougail.dynval1.dyn_example",
-                "rougail.dynval1.dyn_tval2",
+                "rougail.dynval2.dyn_example"
-                "rougail.dynval2.dyn_tval1",
-                "rougail.dynval2.dyn_tval2"
               ],
               "names": [
-                "dyn_tval1",
+                "dyn_example",
-                "dyn_tval2",
+                "dyn_example"
-                "dyn_tval1",
-                "dyn_tval2"
               ],
               "description": "a Second dynamic variable",
               "properties": [
@@ -142,14 +138,10 @@
             "children": {
               "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var": {
                 "paths": [
-                  "rougail.dynval1.dyn_tval1.var",
+                  "rougail.dynval1.dyn_example.var",
-                  "rougail.dynval1.dyn_tval2.var",
+                  "rougail.dynval2.dyn_example.var"
-                  "rougail.dynval2.dyn_tval1.var",
-                  "rougail.dynval2.dyn_tval2.var"
                 ],
                 "names": [
-                  "var",
-                  "var",
                   "var",
                   "var"
                 ],
@@ -175,14 +167,10 @@
               },
               "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifier": {
                 "paths": [
-                  "rougail.dynval1.dyn_tval1.var_identifier",
+                  "rougail.dynval1.dyn_example.var_identifier",
-                  "rougail.dynval1.dyn_tval2.var_identifier",
+                  "rougail.dynval2.dyn_example.var_identifier"
-                  "rougail.dynval2.dyn_tval1.var_identifier",
-                  "rougail.dynval2.dyn_tval2.var_identifier"
                 ],
                 "names": [
-                  "var_identifier",
-                  "var_identifier",
                   "var_identifier",
                   "var_identifier"
                 ],
@@ -208,14 +196,10 @@
               },
               "rougail.dyn{{ identifier }}.dyn_{{ identifier }}.var_identifiers": {
                 "paths": [
-                  "rougail.dynval1.dyn_tval1.var_identifiers",
+                  "rougail.dynval1.dyn_example.var_identifiers",
-                  "rougail.dynval1.dyn_tval2.var_identifiers",
+                  "rougail.dynval2.dyn_example.var_identifiers"
-                  "rougail.dynval2.dyn_tval1.var_identifiers",
-                  "rougail.dynval2.dyn_tval2.var_identifiers"
                 ],
                 "names": [
-                  "var_identifiers",
-                  "var_identifiers",
                   "var_identifiers",
                   "var_identifiers"
                 ],

tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.md

@@ -26,7 +26,7 @@ This family builds families dynamically.
 
 | Variable                                                                                                                         | Description                                                                                                                      |
 |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **rougail.dyn*val1*.dyn_*tval1*.var**<br/>**rougail.dyn*val1*.dyn_*tval2*.var**<br/>**rougail.dyn*val2*.dyn_*tval1*.var**<br/>**rougail.dyn*val2*.dyn_*tval2*.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                                                                                                                                                                                                                                                                                                                                                                                                                              | A variable dynamic.<br/>**Default**: the value of the identifier.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| **rougail.dyn*val1*.dyn_*example*.var**<br/>**rougail.dyn*val2*.dyn_*example*.var**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | A variable dynamic.<br/>**Default**: the value of the identifier.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| **rougail.dyn*val1*.dyn_*tval1*.var_identifier**<br/>**rougail.dyn*val1*.dyn_*tval2*.var_identifier**<br/>**rougail.dyn*val2*.dyn_*tval1*.var_identifier**<br/>**rougail.dyn*val2*.dyn_*tval2*.var_identifier**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                                                                                                                                                                                                                                                                                                                                                                                  | Identifier from first family.<br/>**Default**: the value of the identifier.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| **rougail.dyn*val1*.dyn_*example*.var_identifier**<br/>**rougail.dyn*val2*.dyn_*example*.var_identifier**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Identifier from first family.<br/>**Default**: the value of the identifier.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| **rougail.dyn*val1*.dyn_*tval1*.var_identifiers**<br/>**rougail.dyn*val1*.dyn_*tval2*.var_identifiers**<br/>**rougail.dyn*val2*.dyn_*tval1*.var_identifiers**<br/>**rougail.dyn*val2*.dyn_*tval2*.var_identifiers**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                                                                                                                                                                                                                                                                                                                                                                              | Merge identifiers.<br/>**Default**: join identifier 1 et identifier 2.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| **rougail.dyn*val1*.dyn_*example*.var_identifiers**<br/>**rougail.dyn*val2*.dyn_*example*.var_identifiers**<br/>[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `standard` `mandatory`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Merge identifiers.<br/>**Default**: join identifier 1 et identifier 2.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 

tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.sh

@@ -50,21 +50,15 @@ This family builds families dynamically.
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 ┃ Variable                              ┃ Description                          ┃
 ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
-│ rougail.dynval1.dyn_tval1.var         │ A variable dynamic.                  │
+│ rougail.dynval1.dyn_example.var       │ A variable dynamic.                  │
-│ rougail.dynval1.dyn_tval2.var         │ Default: the value of the            │
+│ rougail.dynval2.dyn_example.var       │ Default: the value of the            │
-│ rougail.dynval2.dyn_tval1.var         │ identifier.                          │
+│  string   standard   mandatory        │ identifier.                          │
-│ rougail.dynval2.dyn_tval2.var         │                                      │
-│  string   standard   mandatory        │                                      │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
-│ rougail.dynval1.dyn_tval1.var_identi… │ Identifier from first family.        │
+│ rougail.dynval1.dyn_example.var_iden… │ Identifier from first family.        │
-│ rougail.dynval1.dyn_tval2.var_identi… │ Default: the value of the            │
+│ rougail.dynval2.dyn_example.var_iden… │ Default: the value of the            │
-│ rougail.dynval2.dyn_tval1.var_identi… │ identifier.                          │
+│  string   standard   mandatory        │ identifier.                          │
-│ rougail.dynval2.dyn_tval2.var_identi… │                                      │
-│  string   standard   mandatory        │                                      │
 ├───────────────────────────────────────┼──────────────────────────────────────┤
-│ rougail.dynval1.dyn_tval1.var_identi… │ Merge identifiers.                   │
+│ rougail.dynval1.dyn_example.var_iden… │ Merge identifiers.                   │
-│ rougail.dynval1.dyn_tval2.var_identi… │ Default: join identifier 1 et        │
+│ rougail.dynval2.dyn_example.var_iden… │ Default: join identifier 1 et        │
-│ rougail.dynval2.dyn_tval1.var_identi… │ identifier 2.                        │
+│  string   standard   mandatory        │ identifier 2.                        │
-│ rougail.dynval2.dyn_tval2.var_identi… │                                      │
-│  string   standard   mandatory        │                                      │
 └───────────────────────────────────────┴──────────────────────────────────────┘

tests/results/test_namespace_examples/40_0leadership.md

@@ -1,13 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  leader:
-    - leader: example
-      follower1: example
-      follower2: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/40_0leadership_diff_name.md

@@ -1,13 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  leadership:
-    - leader: example
-      follower1: example
-      follower2: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/40_0leadership_follower_default_calculation.md

@@ -1,11 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  leader:
-    - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/40_0leadership_leader_not_multi.md

@@ -1,14 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  general1:
-    leader:
-      - leader: example
-        follower1: example
-        follower2: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/40_1leadership_append_follower.md

@@ -1,14 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  leader:
-    - leader: example
-      follower1: example
-      follower2: example
-      follower3: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/40_6leadership_follower_multi.md

@@ -1,13 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  leadership:
-    - leader: example
-      follower1:
-        - example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/44_4leadership_mandatory.md

@@ -1,11 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  leader:
-    - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/44_6leadership_follower_disabled_calculation.md

@@ -1,12 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  leader:
-    - leader: example
-      follower: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/60_6family_dynamic_leadership.md

@@ -1,15 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  dynval1:
-    leadership:
-      - leader: example
-  dynval2:
-    leadership:
-      - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/60_6family_dynamic_leadership_empty.md

@@ -1,15 +1,3 @@
-# Example with mandatory variables not filled in
-
-```yaml
----
-rougail:
-  dynval1:
-    leadership:
-      - leader: example
-  dynval2:
-    leadership:
-      - leader: example
-```
 # Example with all variables modifiable
 
 ```yaml

tests/results/test_namespace_examples/60_6family_dynamic_sub_dynamic_empty.md

@@ -8,26 +8,16 @@ rougail:
     - val2
   dynval1:
     var:
-      - tval1
+      - example
-      - tval2
+    dyn_example:
-    dyn_tval1:
+      var: example
-      var: tval1
       var_identifier: val1
-      var_identifiers: val1-tval1
+      var_identifiers: val1-example
-    dyn_tval2:
-      var: tval2
-      var_identifier: val1
-      var_identifiers: val1-tval2
   dynval2:
     var:
-      - tval1
+      - example
-      - tval2
+    dyn_example:
-    dyn_tval1:
+      var: example
-      var: tval1
       var_identifier: val2
-      var_identifiers: val2-tval1
+      var_identifiers: val2-example
-    dyn_tval2:
-      var: tval2
-      var_identifier: val2
-      var_identifiers: val2-tval2
 ```

tests/test_load.py

@@ -14,7 +14,7 @@ excludes = [
 ]
 
 test_ok = get_structures_list(excludes)
-# test_ok = [Path('../rougail-tests/structures/60_0family_dynamic_test')]
+# test_ok = [Path('../rougail-tests/structures/60_5family_dynamic_calc_suffix_disabled2')]
 
 
 os.environ['COLUMNS'] = '80'