Updated cpl structure model json handling

src/cli/cpl/cli/model/cpl_structure_model.py

@@ -11,16 +11,12 @@ T = TypeVar("T", bound="CPLStructureModel")
 
 
 class CPLStructureModel:
-    def __init__(self, path: Optional[str] = None, ignore_fields: Optional[List[str]] = None):
-        self._path = path
-
-        self._ignore = {"_ignore", "_path"}
-        if ignore_fields is not None:
-            self._ignore.update(ignore_fields)
+    def __init__(self, path: Optional[str] = None):
+        self.__path = path
 
     @property
     def path(self) -> Optional[str]:
-        return self._path
+        return self.__path
 
     @classmethod
     def from_file(cls: Type[T], path: Path | str) -> T:
@@ -72,7 +68,7 @@ class CPLStructureModel:
     def to_json(self) -> Dict[str, Any]:
         result: Dict[str, Any] = {}
         for key, value in self.__dict__.items():
-            if not key.startswith("_") or key in self._ignore:
+            if not key.startswith("_") or key.startswith("__") or key.endswith("_"):
                 continue
             out_key = _self_or_cls_snake_to_camel(key[1:])
 
@@ -83,13 +79,13 @@ class CPLStructureModel:
         return result
 
     def save(self):
-        if not self._path:
+        if not self.__path:
             raise ValueError("Cannot save model without a path.")
 
-        if not Path(self._path).exists():
-            os.makedirs(Path(self._path).parent, exist_ok=True)
+        if not Path(self.__path).exists():
+            os.makedirs(Path(self.__path).parent, exist_ok=True)
 
-        with open(self._path, "w", encoding="utf-8") as f:
+        with open(self.__path, "w", encoding="utf-8") as f:
             json.dump(self.to_json(), f, indent=2)
 
     @staticmethod

src/cli/cpl/cli/model/workspace.py

@@ -24,23 +24,23 @@ class Workspace(CPLStructureModel):
         default_project: Optional[str],
         scripts: Dict[str, str],
     ):
-        CPLStructureModel.__init__(self, path, ["_actual_projects", "_project_names"])
+        CPLStructureModel.__init__(self, path)
 
         self._name = name
         self._projects = projects
         self._default_project = default_project
 
-        self._actual_projects = []
-        self._project_names = []
+        self.__actual_projects = []
+        self.__project_names = []
         for project in projects:
             if Path(project).is_dir() or not Path(project).exists():
                 raise ValueError(f"Project path '{project}' does not exist or is a directory.")
 
             p = Project.from_file(project)
-            self._actual_projects.append(p)
-            self._project_names.append(p.name)
+            self.__actual_projects.append(p)
+            self.__project_names.append(p.name)
 
-        if default_project is not None and default_project not in self._project_names:
+        if default_project is not None and default_project not in self.__project_names:
             raise ValueError(f"Default project '{default_project}' not found in workspace projects.")
 
         self._scripts = scripts
@@ -63,11 +63,11 @@ class Workspace(CPLStructureModel):
 
     @property
     def actual_projects(self) -> List[Project]:
-        return self._actual_projects
+        return self.__actual_projects
 
     @property
     def project_names(self) -> List[str]:
-        return self._project_names
+        return self.__project_names
 
     @property
     def default_project(self) -> Optional[str]: