power-grid-model-io 1.3.6__py3-none-any.whl → 1.3.7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of power-grid-model-io might be problematic. Click here for more details.
- power_grid_model_io/converters/base_converter.py +9 -6
- power_grid_model_io/converters/pandapower_converter.py +155 -117
- power_grid_model_io/converters/pgm_json_converter.py +21 -16
- power_grid_model_io/converters/tabular_converter.py +28 -22
- power_grid_model_io/converters/vision_excel_converter.py +3 -3
- power_grid_model_io/data_stores/excel_file_store.py +5 -5
- power_grid_model_io/data_stores/json_file_store.py +1 -1
- power_grid_model_io/data_types/_data_types.py +2 -2
- power_grid_model_io/data_types/tabular_data.py +7 -7
- power_grid_model_io/functions/filters.py +2 -2
- power_grid_model_io/mappings/tabular_mapping.py +3 -3
- power_grid_model_io/mappings/value_mapping.py +2 -2
- power_grid_model_io/utils/auto_id.py +2 -2
- power_grid_model_io/utils/download.py +4 -4
- power_grid_model_io/utils/uuid_excel_cvtr.py +3 -3
- {power_grid_model_io-1.3.6.dist-info → power_grid_model_io-1.3.7.dist-info}/METADATA +1 -1
- {power_grid_model_io-1.3.6.dist-info → power_grid_model_io-1.3.7.dist-info}/RECORD +20 -20
- {power_grid_model_io-1.3.6.dist-info → power_grid_model_io-1.3.7.dist-info}/WHEEL +0 -0
- {power_grid_model_io-1.3.6.dist-info → power_grid_model_io-1.3.7.dist-info}/licenses/LICENSE +0 -0
- {power_grid_model_io-1.3.6.dist-info → power_grid_model_io-1.3.7.dist-info}/top_level.txt +0 -0
|
@@ -10,6 +10,7 @@ from abc import ABC, abstractmethod
|
|
|
10
10
|
from typing import Generic, Optional, Tuple, TypeVar
|
|
11
11
|
|
|
12
12
|
import structlog
|
|
13
|
+
from power_grid_model import DatasetType
|
|
13
14
|
from power_grid_model.data_types import Dataset, SingleDataset
|
|
14
15
|
|
|
15
16
|
from power_grid_model_io.data_stores.base_data_store import BaseDataStore
|
|
@@ -54,7 +55,9 @@ class BaseConverter(Generic[T], ABC):
|
|
|
54
55
|
|
|
55
56
|
data = self._load_data(data)
|
|
56
57
|
extra_info: ExtraInfo = {}
|
|
57
|
-
parsed_data = self._parse_data(
|
|
58
|
+
parsed_data = self._parse_data(
|
|
59
|
+
data=data, data_type=DatasetType.input, extra_info=extra_info if make_extra_info else None
|
|
60
|
+
)
|
|
58
61
|
if isinstance(parsed_data, list):
|
|
59
62
|
raise TypeError("Input data can not be batch data")
|
|
60
63
|
return parsed_data, extra_info
|
|
@@ -71,7 +74,7 @@ class BaseConverter(Generic[T], ABC):
|
|
|
71
74
|
|
|
72
75
|
"""
|
|
73
76
|
data = self._load_data(data)
|
|
74
|
-
return self._parse_data(data=data, data_type=
|
|
77
|
+
return self._parse_data(data=data, data_type=DatasetType.update, extra_info=None)
|
|
75
78
|
|
|
76
79
|
def load_sym_output_data(self, data: Optional[T] = None) -> Dataset:
|
|
77
80
|
"""Load symmetric output data
|
|
@@ -85,7 +88,7 @@ class BaseConverter(Generic[T], ABC):
|
|
|
85
88
|
|
|
86
89
|
"""
|
|
87
90
|
data = self._load_data(data)
|
|
88
|
-
return self._parse_data(data=data, data_type=
|
|
91
|
+
return self._parse_data(data=data, data_type=DatasetType.sym_output, extra_info=None)
|
|
89
92
|
|
|
90
93
|
def load_asym_output_data(self, data: Optional[T] = None) -> Dataset:
|
|
91
94
|
"""Load asymmetric output data
|
|
@@ -99,7 +102,7 @@ class BaseConverter(Generic[T], ABC):
|
|
|
99
102
|
|
|
100
103
|
"""
|
|
101
104
|
data = self._load_data(data)
|
|
102
|
-
return self._parse_data(data=data, data_type=
|
|
105
|
+
return self._parse_data(data=data, data_type=DatasetType.asym_output, extra_info=None)
|
|
103
106
|
|
|
104
107
|
def load_sc_output_data(self, data: Optional[T] = None) -> Dataset:
|
|
105
108
|
"""Load sc output data
|
|
@@ -113,7 +116,7 @@ class BaseConverter(Generic[T], ABC):
|
|
|
113
116
|
|
|
114
117
|
"""
|
|
115
118
|
data = self._load_data(data)
|
|
116
|
-
return self._parse_data(data=data, data_type=
|
|
119
|
+
return self._parse_data(data=data, data_type=DatasetType.sc_output, extra_info=None)
|
|
117
120
|
|
|
118
121
|
def convert(self, data: Dataset, extra_info: Optional[ExtraInfo] = None) -> T:
|
|
119
122
|
"""Convert input/update/(a)sym_output data and optionally extra info.
|
|
@@ -182,7 +185,7 @@ class BaseConverter(Generic[T], ABC):
|
|
|
182
185
|
raise ValueError("No data supplied!")
|
|
183
186
|
|
|
184
187
|
@abstractmethod # pragma: nocover
|
|
185
|
-
def _parse_data(self, data: T, data_type:
|
|
188
|
+
def _parse_data(self, data: T, data_type: DatasetType, extra_info: Optional[ExtraInfo]) -> Dataset:
|
|
186
189
|
pass
|
|
187
190
|
|
|
188
191
|
@abstractmethod # pragma: nocover
|