Merge branch 'main' into feature/clean-up-remaining-enums-2

Author: figueroa1395

src/power_grid_model/validation/_rules.py

@@ -40,12 +40,10 @@
 
 import numpy as np
 
-from power_grid_model import ComponentType
-from power_grid_model._core.dataset_definitions import DatasetType
-from power_grid_model._core.enum import AngleMeasurementType
+from power_grid_model._core.dataset_definitions import ComponentType, DatasetType
+from power_grid_model._core.enum import AngleMeasurementType, FaultPhase, FaultType, WindingType
 from power_grid_model._core.utils import get_comp_size, is_nan_or_default
 from power_grid_model.data_types import SingleDataset
-from power_grid_model.enum import FaultPhase, FaultType, WindingType
 from power_grid_model.validation.errors import (
     ComparisonError,
     FaultPhaseError,

src/power_grid_model/validation/_validation.py

@@ -16,8 +16,8 @@
 
 import numpy as np
 
-from power_grid_model import ComponentType, DatasetType, power_grid_meta_data
-from power_grid_model._core.dataset_definitions import _map_to_component_types
+from power_grid_model._core.dataset_definitions import ComponentType, DatasetType, _map_to_component_types
+from power_grid_model._core.power_grid_meta import power_grid_meta_data
 from power_grid_model._core.utils import (
     compatibility_convert_row_columnar_dataset as _compatibility_convert_row_columnar_dataset,
     convert_batch_dataset_to_batch_list as _convert_batch_dataset_to_batch_list,

src/power_grid_model/validation/assertions.py

@@ -7,8 +7,8 @@
 ValidationException if the validation results in one or more errors.
 """
 
+from power_grid_model._core.enum import CalculationType
 from power_grid_model.data_types import BatchDataset, SingleDataset
-from power_grid_model.enum import CalculationType
 from power_grid_model.validation._validation import validate_batch_data, validate_input_data
 from power_grid_model.validation.errors import ValidationError
 from power_grid_model.validation.utils import errors_to_string

src/power_grid_model/validation/utils.py

@@ -11,8 +11,8 @@
 
 import numpy as np
 
-from power_grid_model import power_grid_meta_data
 from power_grid_model._core.dataset_definitions import ComponentType, DatasetType
+from power_grid_model._core.power_grid_meta import power_grid_meta_data
 from power_grid_model.data_types import SingleArray, SingleComponentData, SingleDataset
 from power_grid_model.validation.errors import ValidationError