power-grid-model-io 1.3.5__tar.gz → 1.3.7__tar.gz

{power_grid_model_io-1.3.5 → power_grid_model_io-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-io
-Version: 1.3.5
+Version: 1.3.7
 Summary: Power Grid Model Input/Output
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -33,6 +33,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pydantic>2; extra == "dev"
 Requires-Dist: pandapower>2.11.1; extra == "dev"
 Provides-Extra: examples

power_grid_model_io-1.3.7/PYPI_VERSION

@@ -0,0 +1 @@
+1.3.7

{power_grid_model_io-1.3.5 → power_grid_model_io-1.3.7}/pyproject.toml

@@ -44,6 +44,7 @@ dev = [
     "pylint",
     "pytest",
     "pytest-cov",
+    "ruff",
     "pydantic>2", # Used in unit tests
     "pandapower>2.11.1",
 ]
@@ -89,33 +90,43 @@ addopts = [
 ]
 xfail_strict = true
 
-[tool.black]
+[tool.ruff]
+# Same as Black.
 line-length = 120
-target-version = ["py311", "py312", "py313"]
+indent-width = 4
+show-fixes = true
 
-[tool.isort]
-profile = "black"
-line_length = 120
+# Assume Python 3.11
+target-version = "py311"
 
-[tool.pylint]
-max-line-length = 120
-ignore-paths = [
-    "docs/",
-    "examples/",
-    "tests/",
-    "setup.py",
-]
-disable = [
-    "fixme", # allow todos
-]
-good-names=[
-    "ex",   # exception
-    "i",    # iterator or current
-    "p",    # active power
-    "q",    # reactive power
-    "s",    # power (p + q)
-    "v",    # voltage
+[tool.ruff.lint]
+select = [
+    # pycodestyle
+    "E",
+    # Pyflakes
+    "F",
+    # isort
+    "I",
+    "SIM",
+    "YTT",
+    "BLE",
+    "PERF",
+    "Q",
+    "ICN",
+    "ISC",
+    "G",
+    "LOG",
+    "EXE",
+    "FA",
+    "FURB",
+    "FLY",
+    "SLOT",
 ]
+ignore = ["SIM108", "SIM118", "SIM110", "SIM211"]
+
+[tool.ruff.lint.isort]
+# Imports that are imported using keyword "as" and are from the same source - are combined.
+combine-as-imports = true
 
 [tool.mypy]
 follow_imports = "silent"

{power_grid_model_io-1.3.5 → power_grid_model_io-1.3.7}/src/power_grid_model_io/converters/__init__.py

@@ -8,3 +8,5 @@ Converters
 from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter
 from power_grid_model_io.converters.pgm_json_converter import PgmJsonConverter
 from power_grid_model_io.converters.vision_excel_converter import VisionExcelConverter
+
+__all__ = ["PandaPowerConverter", "PgmJsonConverter", "VisionExcelConverter"]

{power_grid_model_io-1.3.5 → power_grid_model_io-1.3.7}/src/power_grid_model_io/converters/base_converter.py

@@ -4,11 +4,13 @@
 """
 Abstract converter class
 """
+
 import logging
 from abc import ABC, abstractmethod
 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
@@ -53,7 +55,9 @@ class BaseConverter(Generic[T], ABC):
 
         data = self._load_data(data)
         extra_info: ExtraInfo = {}
-        parsed_data = self._parse_data(data=data, data_type="input", extra_info=extra_info if make_extra_info else None)
+        parsed_data = self._parse_data(
+            data=data, data_type=DatasetType.input, extra_info=extra_info if make_extra_info else None
+        )
         if isinstance(parsed_data, list):
             raise TypeError("Input data can not be batch data")
         return parsed_data, extra_info
@@ -70,7 +74,7 @@ class BaseConverter(Generic[T], ABC):
 
         """
         data = self._load_data(data)
-        return self._parse_data(data=data, data_type="update", extra_info=None)
+        return self._parse_data(data=data, data_type=DatasetType.update, extra_info=None)
 
     def load_sym_output_data(self, data: Optional[T] = None) -> Dataset:
         """Load symmetric output data
@@ -84,7 +88,7 @@ class BaseConverter(Generic[T], ABC):
 
         """
         data = self._load_data(data)
-        return self._parse_data(data=data, data_type="sym_output", extra_info=None)
+        return self._parse_data(data=data, data_type=DatasetType.sym_output, extra_info=None)
 
     def load_asym_output_data(self, data: Optional[T] = None) -> Dataset:
         """Load asymmetric output data
@@ -98,7 +102,7 @@ class BaseConverter(Generic[T], ABC):
 
         """
         data = self._load_data(data)
-        return self._parse_data(data=data, data_type="asym_output", extra_info=None)
+        return self._parse_data(data=data, data_type=DatasetType.asym_output, extra_info=None)
 
     def load_sc_output_data(self, data: Optional[T] = None) -> Dataset:
         """Load sc output data
@@ -112,7 +116,7 @@ class BaseConverter(Generic[T], ABC):
 
         """
         data = self._load_data(data)
-        return self._parse_data(data=data, data_type="sc_output", extra_info=None)
+        return self._parse_data(data=data, data_type=DatasetType.sc_output, extra_info=None)
 
     def convert(self, data: Dataset, extra_info: Optional[ExtraInfo] = None) -> T:
         """Convert input/update/(a)sym_output data and optionally extra info.
@@ -181,7 +185,7 @@ class BaseConverter(Generic[T], ABC):
         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