CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.2.0a62 (2026-02-11)
+
+### Feat
+
+- structural data in a string
+
+### Fix
+
+- structurals data in extra could be a simple file
+- allow define an addition variable in a type
+
 ## 1.2.0a61 (2026-02-06)
 
 ### Feat

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rougail"
-version = "1.2.0a61"
+version = "1.2.0a62"
 
 [tool.commitizen]
 name = "cz_conventional_commits"

rougail-base-pyproject.toml

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

rougail-pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail"
-version = "1.2.0a61"
+version = "1.2.0a62"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 description = "A consistency handling system that was initially designed in the configuration management"
 classifiers = [
@@ -18,7 +18,7 @@ classifiers = [
 dependencies = [
     "ruamel.yaml ~= 0.18.6",
     "pydantic ~= 2.9.2",
-    "rougail-base == 1.2.0a61",
+    "rougail-base == 1.2.0a62",
 ]
 
 [tool.flit.sdist]

src/rougail/__version__.py

@@ -1 +1 @@
-__version__ = "1.2.0a61"
+__version__ = "1.2.0a62"

src/rougail/convert/object_model.py

@@ -111,7 +111,7 @@ class VariableParam(Param):
     variable: str
     propertyerror: bool = True
     whole: bool = False
-    dynamic: bool = True
+#    dynamic: bool = True
     optional: bool = False
 
     def to_param(
@@ -254,6 +254,7 @@ class Calculation(BaseModel):
     default_values: Any = None
     namespace: Optional[str]
     warnings: Optional[bool] = None
+    description: Optional[StrictStr] = None
     xmlfiles: List[str]
 
     model_config = ConfigDict(extra="forbid")
@@ -298,7 +299,6 @@ class JinjaCalculation(Calculation):
     jinja: StrictStr
     params: Optional[List[Param]] = None
     return_type: BASETYPE = None
-    description: Optional[StrictStr] = None
 
     def _jinja_to_function(
         self,
@@ -719,7 +719,6 @@ class _VariableCalculation(Calculation):
 
 class VariableCalculation(_VariableCalculation):
     attribute_name: Literal["default", "choices", "dynamic"]
-    description: Optional[StrictStr] = None
     default: Any = undefined
 
     def to_function(
@@ -778,7 +777,6 @@ class VariablePropertyCalculation(_VariableCalculation):
     propertyerror: Union[Literal["transitive"], bool] = True
     when: Any = undefined
     when_not: Any = undefined
-    description: Optional[StrictStr] = None
     default: bool = False
 
     def to_function(
@@ -870,7 +868,6 @@ class InformationCalculation(Calculation):
     attribute_name: Literal["default", "choice", "dynamic"]
     information: StrictStr
     variable: Optional[StrictStr]
-    description: Optional[StrictStr] = None
 
     def to_function(
         self,
@@ -928,7 +925,6 @@ class _IdentifierCalculation(Calculation):
 
 class IdentifierCalculation(_IdentifierCalculation):
     attribute_name: Literal["default", "choice", "dynamic"]
-    description: Optional[StrictStr] = None
 
     def to_function(
         self,
@@ -948,7 +944,6 @@ class IdentifierPropertyCalculation(_IdentifierCalculation):
     attribute_name: Literal[*PROPERTY_ATTRIBUTE]
     when: Any = undefined
     when_not: Any = undefined
-    description: Optional[StrictStr] = None
 
     def to_function(
         self,
@@ -991,7 +986,6 @@ class IdentifierPropertyCalculation(_IdentifierCalculation):
 
 class IndexCalculation(Calculation):
     attribute_name: Literal["default", "choice", "dynamic"]
-    description: Optional[StrictStr] = None
 
     def to_function(
         self,
@@ -1011,7 +1005,6 @@ class IndexCalculation(Calculation):
 
 class NamespaceCalculation(Calculation):
     attribute_name: Literal["default", "secret_manager"]
-    description: Optional[StrictStr] = None
 
     def to_function(
         self,
@@ -1048,19 +1041,19 @@ SECRET_BASETYPE_CALC = Union[StrictStr, JinjaCalculation]
 class Family(BaseModel):
     name: str
     # informations
-    description: Optional[str] = None
+    description: Optional[StrictStr] = None
-    help: Optional[str] = None
+    help: Optional[StrictStr] = None
-    mode: Optional[str] = None
+    mode: Optional[StrictStr] = None
     # validation
     type: Literal["family", "leadership", "dynamic"] = "family"
     # properties
     hidden: Union[bool, Calculation] = False
     disabled: Union[bool, Calculation] = False
     # others
-    namespace: Optional[str]
+    namespace: Optional[StrictStr]
-    path: str
+    path: StrictStr
-    version: str
+    version: StrictStr
-    xmlfiles: List[str] = []
+    xmlfiles: List[StrictStr] = []
 
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
@@ -1074,9 +1067,9 @@ class Dynamic(Family):
 class Variable(BaseModel):
     name: str
     # user informations
-    description: Optional[str] = None
+    description: Optional[StrictStr] = None
-    help: Optional[str] = None
+    help: Optional[StrictStr] = None
-    mode: Optional[str] = None
+    mode: Optional[StrictStr] = None
     tags: Optional[list] = None
     examples: Optional[list] = None
     test: Optional[list] = None
@@ -1084,7 +1077,7 @@ class Variable(BaseModel):
     ## type will be set dynamically in `annotator/value.py`, default is None
     type: str = None
     params: Optional[List[Param]] = None
-    regexp: Optional[str] = None
+    regexp: Optional[StrictStr] = None
     choices: Optional[Union[List[BASETYPE_CALC], Calculation]] = None
     multi: Optional[bool] = None
     validators: Optional[List[Calculation]] = None