Fix Model Serialization

Author: Behemyth

cppython/plugins/cmake/builder.py

@@ -23,9 +23,9 @@ def write_provider_preset(provider_directory: Path, data: CMakeSyncData) -> None
 
         json_path = provider_directory / f'{data.provider_name}.json'
 
-        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        serialized = presets.model_dump_json(exclude_none=True, by_alias=False, indent=4)
         with open(json_path, 'w', encoding='utf8') as file:
-            json.dump(serialized, file, ensure_ascii=False, indent=4)
+            file.write(serialized)
 
     @staticmethod
     def write_cppython_preset(
@@ -44,9 +44,9 @@ def write_cppython_preset(
 
         cppython_json_path = cppython_preset_directory / 'cppython.json'
 
-        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        serialized = presets.model_dump_json(exclude_none=True, by_alias=False, indent=4)
         with open(cppython_json_path, 'w', encoding='utf8') as file:
-            json.dump(serialized, file, ensure_ascii=False, indent=4)
+            file.write(serialized)
 
         return cppython_json_path
 
@@ -63,8 +63,12 @@ def write_root_presets(preset_file: Path, _: Path) -> None:
             preset_file: Preset file to modify
         """
         with open(preset_file, encoding='utf-8') as file:
-            initial_root_preset = json.load(file)
+            initial_json = file.read()
 
+        initial_root_preset = CMakePresets.model_validate_json(initial_json)
+
+        # Only write the file if the contents have changed
         if (root_preset := deepcopy(initial_root_preset)) != initial_root_preset:
             with open(preset_file, 'w', encoding='utf-8') as file:
-                json.dump(root_preset, file, ensure_ascii=False, indent=4)
+                preset = root_preset.model_dump_json(exclude_none=True, indent=4)
+                file.write(preset)

cppython/plugins/cmake/resolution.py

@@ -28,8 +28,9 @@ def resolve_cmake_data(data: dict[str, Any], core_data: CorePluginData) -> CMake
     # If the user hasn't specified a preset file, we need to create one
     if not modified_preset_dir.exists():
         modified_preset_dir.parent.mkdir(parents=True, exist_ok=True)
+        presets_string = CMakePresets().model_dump_json(exclude_none=True, indent=4)
+
         with modified_preset_dir.open('w', encoding='utf-8') as file:
-            presets_dict = CMakePresets().model_dump_json(exclude_none=True)
-            json.dump(presets_dict, file, ensure_ascii=False, indent=4)
+            file.write(presets_string)
 
     return CMakeData(preset_file=modified_preset_dir, configuration_name=parsed_data.configuration_name)

cppython/plugins/cmake/schema.py

@@ -47,7 +47,7 @@ class ConfigurePreset(CPPythonModel, extra='allow'):
     """Partial Configure Preset specification to allow cache variable injection"""
 
     name: str
-    cacheVariables: dict[str, None | bool | str | CacheVariable] | None
+    cacheVariables: dict[str, None | bool | str | CacheVariable] | None = None
 
 
 class CMakePresets(CPPythonModel, extra='allow'):
@@ -56,7 +56,10 @@ class CMakePresets(CPPythonModel, extra='allow'):
     The only information needed is the configure preset list for cache variable injection
     """
 
-    configurePresets: Annotated[list[ConfigurePreset], Field(description='The list of configure presets')] = []
+    version: Annotated[int, Field(description='The version of the JSON schema.')] = 9
+    configurePresets: Annotated[list[ConfigurePreset], Field(description='The list of configure presets')] = [
+        ConfigurePreset(name='default')
+    ]
 
 
 class CMakeSyncData(SyncData):

cppython/plugins/conan/plugin.py

@@ -98,7 +98,7 @@ def sync_data(self, consumer: SyncConsumer) -> SyncData:
             if sync_type == CMakeSyncData:
                 return CMakeSyncData(
                     provider_name=TypeName('conan'),
-                    top_level_includes=self.core_data.cppython_data.tool_path / 'conan' / 'conan_provider.cmake',
+                    top_level_includes=self.core_data.cppython_data.install_path / 'conan_provider.cmake',
                 )
 
         raise NotSupportedError('OOF')

cppython/plugins/vcpkg/plugin.py

@@ -193,9 +193,9 @@ def install(self) -> None:
         manifest = generate_manifest(self.core_data, self.data)
 
         # Write out the manifest
-        serialized = json.loads(manifest.model_dump_json(exclude_none=True, by_alias=True))
+        serialized = manifest.model_dump_json(exclude_none=True, by_alias=True, indent=4)
         with open(manifest_directory / 'vcpkg.json', 'w', encoding='utf8') as file:
-            json.dump(serialized, file, ensure_ascii=False, indent=4)
+            file.write(serialized)
 
         executable = self.core_data.cppython_data.install_path / 'vcpkg'
         logger = getLogger('cppython.vcpkg')
@@ -224,9 +224,9 @@ def update(self) -> None:
         manifest = generate_manifest(self.core_data, self.data)
 
         # Write out the manifest
-        serialized = json.loads(manifest.model_dump_json(exclude_none=True, by_alias=True))
+        serialized = manifest.model_dump_json(exclude_none=True, by_alias=True, indent=4)
         with open(manifest_directory / 'vcpkg.json', 'w', encoding='utf8') as file:
-            json.dump(serialized, file, ensure_ascii=False, indent=4)
+            file.write(serialized)
 
         executable = self.core_data.cppython_data.install_path / 'vcpkg'
         logger = getLogger('cppython.vcpkg')

tests/integration/examples/test_conan_cmake.py

@@ -4,6 +4,7 @@
 The tests ensure that the projects build, configure, and execute correctly.
 """
 
+import os
 import subprocess
 
 from typer.testing import CliRunner

tests/unit/plugins/cmake/test_generator.py

@@ -105,9 +105,9 @@ def test_root_write(tmp_path: Path) -> None:
         root_file = tmp_path / 'CMakePresets.json'
         presets = CMakePresets()
 
-        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        serialized = presets.model_dump_json(exclude_none=True, by_alias=False, indent=4)
         with open(root_file, 'w', encoding='utf8') as file:
-            json.dump(serialized, file, ensure_ascii=False, indent=4)
+            file.write(serialized)
 
         data = CMakeSyncData(provider_name=TypeName('test-provider'), top_level_includes=includes_file)
         builder.write_provider_preset(provider_directory, data)
@@ -140,9 +140,9 @@ def test_relative_root_write(tmp_path: Path) -> None:
 
         root_file = relative_indirection / 'CMakePresets.json'
         presets = CMakePresets()
-        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        serialized = presets.model_dump_json(exclude_none=True, by_alias=False, indent=4)
         with open(root_file, 'w', encoding='utf8') as file:
-            json.dump(serialized, file, ensure_ascii=False, indent=4)
+            file.write(serialized)
 
         data = CMakeSyncData(provider_name=TypeName('test-provider'), top_level_includes=includes_file)
         builder.write_provider_preset(provider_directory, data)