migrate datasettype from str to DatasetType

Signed-off-by: zhen0427 <[email protected]>

Author: zhen0427

src/power_grid_model_io/converters/base_converter.py

@@ -10,6 +10,7 @@
 from typing import Generic, Optional, Tuple, TypeVar
 
 import structlog
+from power_grid_model import DatasetType
 from power_grid_model.data_types import Dataset, SingleDataset
 
 from power_grid_model_io.data_stores.base_data_store import BaseDataStore
@@ -182,7 +183,7 @@ def _load_data(self, data: Optional[T]) -> T:
         raise ValueError("No data supplied!")
 
     @abstractmethod  # pragma: nocover
-    def _parse_data(self, data: T, data_type: str, extra_info: Optional[ExtraInfo]) -> Dataset:
+    def _parse_data(self, data: T, data_type: DatasetType, extra_info: Optional[ExtraInfo]) -> Dataset:
         pass
 
     @abstractmethod  # pragma: nocover

src/power_grid_model_io/converters/pandapower_converter.py

@@ -77,7 +77,7 @@ def __init__(
     def _parse_data(
         self,
         data: PandaPowerData,
-        data_type: str,
+        data_type: DatasetType,
         extra_info: Optional[ExtraInfo] = None,
     ) -> Dataset:
         """

src/power_grid_model_io/converters/pgm_json_converter.py

@@ -13,7 +13,7 @@
 from typing import Any, Dict, List, Optional, Union
 
 import numpy as np
-from power_grid_model import initialize_array
+from power_grid_model import DatasetType, initialize_array
 from power_grid_model.data_types import ComponentList, Dataset, SingleDataset, SinglePythonDataset
 from power_grid_model.utils import json_deserialize, json_serialize
 
@@ -53,7 +53,7 @@ def __init__(
         destination = JsonFileStore(file_path=Path(destination_file)) if destination_file else None
         super().__init__(source=source, destination=destination, log_level=log_level)
 
-    def _parse_data(self, data: StructuredData, data_type: str, extra_info: Optional[ExtraInfo]) -> Dataset:
+    def _parse_data(self, data: StructuredData, data_type: DatasetType, extra_info: Optional[ExtraInfo]) -> Dataset:
         """This function expects Structured data, which can either be a dictionary (single dataset) or a list of
         dictionaries (batch dataset). The structured dataset consists of components + attributes that exist within
         power-grid-model, but can also contain other data. If this data should be saved for later usage an extra_info

src/power_grid_model_io/converters/tabular_converter.py

@@ -14,7 +14,7 @@
 import numpy as np
 import pandas as pd
 import yaml
-from power_grid_model import initialize_array
+from power_grid_model import DatasetType, initialize_array
 from power_grid_model.data_types import Dataset
 
 from power_grid_model_io.converters.base_converter import BaseConverter
@@ -90,7 +90,7 @@ def set_mapping(self, mapping: Mapping[str, Any]) -> None:
         if "multipliers" in mapping:
             self._multipliers = MultiplierMapping(cast(Multipliers, mapping["multipliers"]), logger=self._log)
 
-    def _parse_data(self, data: TabularData, data_type: str, extra_info: Optional[ExtraInfo]) -> Dataset:
+    def _parse_data(self, data: TabularData, data_type: DatasetType, extra_info: Optional[ExtraInfo]) -> Dataset:
         """This function parses tabular data and returns power-grid-model data
 
         Args: