Remove Util

Author: Behemyth

cppython/core/utility.py

@@ -1,9 +1,9 @@
 """Plugin builder"""
 
+import json
 from copy import deepcopy
 from pathlib import Path
 
-from cppython.core.utility import read_json, write_json, write_model_json
 from cppython.plugins.cmake.schema import CMakePresets, CMakeSyncData, ConfigurePreset
 
 
@@ -23,7 +23,9 @@ def write_provider_preset(provider_directory: Path, data: CMakeSyncData) -> None
 
         json_path = provider_directory / f'{data.provider_name}.json'
 
-        write_model_json(json_path, presets)
+        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        with open(json_path, 'w', encoding='utf8') as file:
+            json.dump(serialized, file, ensure_ascii=False, indent=4)
 
     @staticmethod
     def write_cppython_preset(
@@ -42,7 +44,10 @@ def write_cppython_preset(
 
         cppython_json_path = cppython_preset_directory / 'cppython.json'
 
-        write_model_json(cppython_json_path, presets)
+        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        with open(cppython_json_path, 'w', encoding='utf8') as file:
+            json.dump(serialized, file, ensure_ascii=False, indent=4)
+
         return cppython_json_path
 
     @staticmethod
@@ -57,7 +62,9 @@ def write_root_presets(preset_file: Path, _: Path) -> None:
         Args:
             preset_file: Preset file to modify
         """
-        initial_root_preset = read_json(preset_file)
+        with open(preset_file, encoding='utf-8') as file:
+            initial_root_preset = json.load(file)
 
         if (root_preset := deepcopy(initial_root_preset)) != initial_root_preset:
-            write_json(preset_file, root_preset)
+            with open(preset_file, 'w', encoding='utf-8') as file:
+                json.dump(root_preset, file, ensure_ascii=False, indent=4)

cppython/plugins/cmake/builder.py

@@ -38,7 +38,7 @@ def test_model_construction_from_data(self) -> None:
         """
 
         data = loads(toml_str)
-        result = self.Model.model_validate(data)
+        result = self.Model.model_validate(data, by_name=True)
         assert result.aliased_variable is True
 
     @staticmethod

tests/unit/core/test_schema.py

@@ -1,11 +1,11 @@
 """Unit test the provider plugin"""
 
+import json
 from pathlib import Path
 from typing import Any
 
 import pytest
 
-from cppython.core.utility import write_model_json
 from cppython.plugins.cmake.builder import Builder
 from cppython.plugins.cmake.plugin import CMakeGenerator
 from cppython.plugins.cmake.schema import (
@@ -104,7 +104,10 @@ def test_root_write(tmp_path: Path) -> None:
 
         root_file = tmp_path / 'CMakePresets.json'
         presets = CMakePresets()
-        write_model_json(root_file, presets)
+
+        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        with open(root_file, 'w', encoding='utf8') as file:
+            json.dump(serialized, file, ensure_ascii=False, indent=4)
 
         data = CMakeSyncData(provider_name=TypeName('test-provider'), top_level_includes=includes_file)
         builder.write_provider_preset(provider_directory, data)
@@ -137,7 +140,9 @@ def test_relative_root_write(tmp_path: Path) -> None:
 
         root_file = relative_indirection / 'CMakePresets.json'
         presets = CMakePresets()
-        write_model_json(root_file, presets)
+        serialized = json.loads(presets.model_dump_json(exclude_none=True, by_alias=False))
+        with open(root_file, 'w', encoding='utf8') as file:
+            json.dump(serialized, file, ensure_ascii=False, indent=4)
 
         data = CMakeSyncData(provider_name=TypeName('test-provider'), top_level_includes=includes_file)
         builder.write_provider_preset(provider_directory, data)