Testing the generation of a list with nested models. Minor adjustment…

…s to generation.

confhub/__init__.py

@@ -2,4 +2,5 @@
 from confhub.core.block import BlockCore
 from confhub.reader import Confhub
 
+
 __all__ = ["field", "exclude", "BlockCore", "Confhub"]

confhub/builder.py

@@ -20,7 +20,15 @@ def __init__(self, *blocks: BlockCore):
     def generate_filenames(self) -> Dict[str, Any]:
         _datafiles = {'settings': {}, '.secrets': {}}
 
-        def add_field_to_datafiles(field_name: str, field: ConfigurationField, parent_path: List[str]) -> None:
+        def data_typing(field: ConfigurationField) -> Any:
+            if field.is_list:
+                return [field.get_default_value()]
+
+            return field.get_default_value()
+
+        def add_field_to_datafiles(
+                field_name: str, field: ConfigurationField, parent_path: List[str]
+        ) -> None:
             if field.secret:
                 target = _datafiles['.secrets']
             elif field.filename:
@@ -36,7 +44,7 @@ def add_field_to_datafiles(field_name: str, field: ConfigurationField, parent_pa
                     current[part] = {}
                 current = current[part]
 
-            current[field_name] = field.get_default_value() if not field.is_list else [field.get_default_value()]
+            current[field_name] = data_typing(field)
 
         def has_configuration_fields(select_class: BlockCore) -> bool:
             if any(isinstance(item, ConfigurationField) for item in [
@@ -51,17 +59,23 @@ def has_configuration_fields(select_class: BlockCore) -> bool:
                 else:
                     raise ConfhubError("Cannot find field in model object", select_class=select_class)
 
-        def process_block(_block: BlockCore, parent_path: List[str], parent: bool = False) -> None:
+        def process_block(_block: BlockCore, parent_path: List[str], parent: str = None) -> None:
             if hasattr(_block, '__exclude__') and _block.__exclude__ and not parent:
                 return
 
-            current_path = parent_path + [_block.__block__]
+            current_path = parent_path + [_block.__block__ if not parent else parent]
+            if parent:
+                current_path += [_block.__block__]
 
+            # field.is_list
             for field_name, field in (_block.__dict__.items() if has_configuration_fields(_block) else _block.__class__.__dict__.items()):
                 if isinstance(field, ConfigurationField):
-                    add_field_to_datafiles(field_name, field, current_path)
+                    if isinstance(field.data_type, BlockCore):
+                        process_block(field.data_type, current_path, parent=field_name)
+                    else:
+                        add_field_to_datafiles(field_name, field, current_path)
                 elif isinstance(field, BlockCore):
-                    process_block(field, current_path, parent=True)
+                    process_block(field, current_path, parent=field_name)
 
         for block in self.blocks:
             if block != BlockCore:
@@ -77,11 +91,14 @@ def create_files(self, config_path: Path) -> None:
                 with open(file_path, 'r', encoding='utf-8') as file:
                     yaml_data = yaml.safe_load(file)
 
-                    for key in data:
-                        if key in yaml_data:
-                            for inner_key in data[key]:
-                                if inner_key in yaml_data[key]:
-                                    data[key][inner_key] = yaml_data[key][inner_key]
+                    if yaml_data:
+                        for key in data:
+                            if key in yaml_data:
+                                if not isinstance(yaml_data[key], Dict):
+                                    for inner_key in data[key]:
+                                        if inner_key in yaml_data[key]:
+                                            if isinstance(data[key][inner_key], type(yaml_data[key][inner_key])):
+                                                data[key][inner_key] = yaml_data[key][inner_key]
 
             with open(file_path, 'w', encoding='utf-8') as file:
                 yaml.dump(data, file, default_flow_style=False)

confhub/core/fields.py

@@ -1,12 +1,12 @@
-from typing import Type
+from typing import Any
 
 from confhub.core.types import DataTypeMapping
 
 
 class ConfigurationField:
     def __init__(
             self,
-            data_type: Type,
+            data_type: Any,
             secret: bool,
             filename: str,
             is_list: bool,
@@ -16,12 +16,18 @@ def __init__(
         self.filename = filename
         self.is_list = is_list
 
+    def __str__(self) -> str:
+        return f"ConfigurationField: [{self.data_type}]"
+
+    def __repr__(self) -> str:
+        return f"ConfigurationField: [{self.data_type}; secret={self.secret}; filename={self.filename}; is_list={self.is_list}]"
+
     def get_default_value(self) -> str:
         return f"{self.data_type.__name__}; {DataTypeMapping.get_default_value(self.data_type.__name__)}"
 
 
 def field(
-        data_type: Type,
+        data_type: Any,
         secret: bool = False,
         filename: str = None,
         is_list: bool = False

confhub/core/parsing.py

@@ -1,3 +1,4 @@
+import sys
 from typing import Union, Any, Dict, List
 
 import yaml

confhub/reader.py

@@ -61,4 +61,9 @@ def __load(self, *models: BlockCore, files: List[str | Path]) -> Type[dataclasse
 
             __fields_from_dataclass.append((block.__block__, type(block), dataclasses.field(default=value)))
 
-        return dataclasses.make_dataclass('Data', __fields_from_dataclass)
+        return dataclasses.make_dataclass('Data', __fields_from_dataclass)
+
+
+if __name__ == '__main__':
+    data = Confhub().models
+    print()