power-grid-model-io 1.2.95__py3-none-any.whl → 1.2.97__py3-none-any.whl

power_grid_model_io/converters/pandapower_converter.py

@@ -12,7 +12,15 @@ from typing import Dict, List, MutableMapping, Optional, Tuple, Type, Union
 import numpy as np
 import pandas as pd
 import structlog
-from power_grid_model import Branch3Side, BranchSide, LoadGenType, WindingType, initialize_array, power_grid_meta_data
+from power_grid_model import (
+    Branch3Side,
+    BranchSide,
+    DatasetType,
+    LoadGenType,
+    WindingType,
+    initialize_array,
+    power_grid_meta_data,
+)
 from power_grid_model.data_types import Dataset, SingleDataset
 
 from power_grid_model_io.converters.base_converter import BaseConverter
@@ -113,10 +121,10 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
             self._extra_info_to_pgm_input_data(extra_info)
 
         # Convert
-        def pgm_output_dtype_checker(check_type: str) -> bool:
+        def pgm_output_dtype_checker(check_type: DatasetType | str) -> bool:
             return all(
                 (
-                    comp_array.dtype == power_grid_meta_data[check_type][component]
+                    comp_array.dtype == power_grid_meta_data[DatasetType[check_type]][component]
                     for component, comp_array in self.pgm_output_data.items()
                 )
             )
@@ -248,7 +256,10 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         nan = np.iinfo(dtype).min
         all_other_cols = ["i_n"]
         for component, data in self.pgm_output_data.items():
-            input_cols = power_grid_meta_data["input"][component].dtype.names
+            input_cols = power_grid_meta_data[DatasetType.input][component].dtype.names
+            if input_cols is None:
+                input_cols = tuple()
+
             node_cols = [col for col in input_cols if is_node_ref(col)]
             other_cols = [col for col in input_cols if col in all_other_cols]
             if not node_cols + other_cols:
@@ -747,8 +758,12 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         pgm_transformers["sn"] = sn_mva * parallel * 1e6
         pgm_transformers["uk"] = vk_percent * 1e-2
         pgm_transformers["pk"] = vkr_percent * sn_mva * parallel * (1e6 * 1e-2)
-        pgm_transformers["i0"] = i_no_load * 1e-2
         pgm_transformers["p0"] = pfe * parallel * 1e3
+        pgm_transformers["i0"] = i_no_load * 1e-2
+        i0_min_threshold = pgm_transformers["p0"] / pgm_transformers["sn"]
+        if any(np.less(pgm_transformers["i0"], i0_min_threshold)):
+            logger.warning("Minimum value of i0_percent is clipped to p0/sn")
+            pgm_transformers["i0"] = np.clip(pgm_transformers["i0"], a_min=i0_min_threshold, a_max=None)
         pgm_transformers["clock"] = clocks
         pgm_transformers["winding_from"] = winding_types["winding_from"]
         pgm_transformers["winding_to"] = winding_types["winding_to"]
@@ -875,8 +890,12 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         pgm_3wtransformers["pk_13"] = vkr_lv_percent * np.minimum(sn_hv_mva, sn_lv_mva) * (1e-2 * 1e6)
         pgm_3wtransformers["pk_23"] = vkr_mv_percent * np.minimum(sn_mv_mva, sn_lv_mva) * (1e-2 * 1e6)
 
-        pgm_3wtransformers["i0"] = self._get_pp_attr("trafo3w", "i0_percent", expected_type="f8") * 1e-2
         pgm_3wtransformers["p0"] = self._get_pp_attr("trafo3w", "pfe_kw", expected_type="f8") * 1e3
+        pgm_3wtransformers["i0"] = self._get_pp_attr("trafo3w", "i0_percent", expected_type="f8") * 1e-2
+        i0_min_threshold = pgm_3wtransformers["p0"] / pgm_3wtransformers["sn_1"]
+        if any(np.less(pgm_3wtransformers["i0"], i0_min_threshold)):
+            logger.warning("Minimum value of i0_percent is clipped to p0/sn_1")
+            pgm_3wtransformers["i0"] = np.clip(pgm_3wtransformers["i0"], a_min=i0_min_threshold, a_max=None)
         pgm_3wtransformers["clock_12"] = clocks_12
         pgm_3wtransformers["clock_13"] = clocks_13
         pgm_3wtransformers["winding_1"] = winding_types["winding_1"]
@@ -1594,9 +1613,11 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         # Combine all branch bus, current and et in one dataframe
         all_i_df = pd.concat(
             [
-                join_currents(table, bus_name, i_name)
-                if not rest_switches_absent[table]
-                else pd.DataFrame(columns=["bus", "element", "et", "i_ka"])
+                (
+                    join_currents(table, bus_name, i_name)
+                    if not rest_switches_absent[table]
+                    else pd.DataFrame(columns=["bus", "element", "et", "i_ka"])
+                )
                 for table, attr_names in switch_attrs.items()
                 for bus_name, i_name in attr_names.items()
             ]

power_grid_model_io/converters/pgm_json_converter.py

@@ -151,9 +151,12 @@ class PgmJsonConverter(BaseConverter[StructuredData]):
 
                 # If an attribute doesn't exist, it is added to the extra_info lookup table
                 elif extra_info is not None:
-                    if obj["id"] not in extra_info:
-                        extra_info[obj["id"]] = {}
-                    extra_info[obj["id"]][attribute] = value
+                    obj_id = obj["id"]
+                    if not isinstance(obj_id, int):
+                        raise ValueError(f"Invalid 'id' value for {component} {data_type} data")
+                    if obj_id not in extra_info:
+                        extra_info[obj_id] = {}
+                    extra_info[obj_id][attribute] = value
         return array
 
     def _serialize_data(self, data: Dataset, extra_info: Optional[ExtraInfo]) -> StructuredData:
@@ -271,7 +274,7 @@ class PgmJsonConverter(BaseConverter[StructuredData]):
                 self._extract_extra_component_info(component, entry, reserialized_data, extra_info)
 
     def _extract_extra_component_info(
-        self, component: str, attributes: Dict[str, Any], reserialized_data: SingleDataset, extra_info: ExtraInfo
+        self, component: str, attributes: Dict[str, Any], reserialized_data: SinglePythonDataset, extra_info: ExtraInfo
     ):
         entry_id = attributes["id"]
         reserialized_entry = self._get_first_by(reserialized_data[component], "id", entry_id)

power_grid_model_io/converters/tabular_converter.py

@@ -180,6 +180,8 @@ class TabularConverter(BaseConverter[TabularData]):
 
         if "filters" in attributes:
             table_mask = self._parse_table_filters(data=data, table=table, filtering_functions=attributes["filters"])
+            if table_mask is not None and not table_mask.any():
+                return None
         else:
             table_mask = None
 
@@ -219,7 +221,7 @@ class TabularConverter(BaseConverter[TabularData]):
         for filtering_fn in filtering_functions:
             for fn_name, kwargs in filtering_fn.items():
                 fn_ptr = get_function(fn_name)
-                table_mask &= data[table].apply(fn_ptr, axis=1, **kwargs).values
+                table_mask &= cast(pd.DataFrame, data[table]).apply(fn_ptr, axis=1, **kwargs).values
         return table_mask
 
     # pylint: disable = too-many-arguments

{power_grid_model_io-1.2.95.dist-info → power_grid_model_io-1.2.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: power-grid-model-io
-Version: 1.2.95
+Version: 1.2.97
 Summary: Power Grid Model Input/Output
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -21,31 +21,31 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy >=1.20
+Requires-Dist: numpy>=1.20
 Requires-Dist: openpyxl
 Requires-Dist: pandas
-Requires-Dist: power-grid-model >=1.8
+Requires-Dist: power-grid-model>=1.8
 Requires-Dist: pyyaml
 Requires-Dist: structlog
 Requires-Dist: tqdm
 Provides-Extra: dev
-Requires-Dist: pandapower >2.11.1 ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Requires-Dist: pylint ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: pytest-cov ; extra == 'dev'
-Requires-Dist: pydantic >2 ; extra == 'dev'
-Requires-Dist: numba ; extra == 'dev'
+Requires-Dist: pandapower>2.11.1; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pydantic>2; extra == "dev"
+Requires-Dist: numba; extra == "dev"
 Provides-Extra: doc
-Requires-Dist: sphinx ; extra == 'doc'
-Requires-Dist: myst-nb ; extra == 'doc'
-Requires-Dist: sphinx-rtd-theme ; extra == 'doc'
-Requires-Dist: readthedocs-sphinx-search ; extra == 'doc'
-Requires-Dist: sphinx-hoverxref ; extra == 'doc'
-Requires-Dist: numpydoc ; extra == 'doc'
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: myst-nb; extra == "doc"
+Requires-Dist: sphinx-rtd-theme; extra == "doc"
+Requires-Dist: readthedocs-sphinx-search; extra == "doc"
+Requires-Dist: sphinx-hoverxref; extra == "doc"
+Requires-Dist: numpydoc; extra == "doc"
 Provides-Extra: examples
-Requires-Dist: pandapower >2.11.1 ; extra == 'examples'
-Requires-Dist: pyarrow ; extra == 'examples'
+Requires-Dist: pandapower>2.11.1; extra == "examples"
+Requires-Dist: pyarrow; extra == "examples"
 
 <!--
 SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>

{power_grid_model_io-1.2.95.dist-info → power_grid_model_io-1.2.97.dist-info}/RECORD

@@ -8,9 +8,9 @@ power_grid_model_io/config/excel/vision_en_9_7.yaml,sha256=yXClnsAxy2cIey6fW6pcm
 power_grid_model_io/config/excel/vision_nl.yaml,sha256=hALPcS4RjPYxNodnC5-FTCE7djnLVSAtnsayeOhUuRY,21333
 power_grid_model_io/converters/__init__.py,sha256=kmbjFW6kVr30fmHb6mAoD7DQAqmbrsOuF1ewd8b0Q3M,408
 power_grid_model_io/converters/base_converter.py,sha256=TICEXyG7PtimAUvhAmpSoZUqwa0shiDdwbWpiM2Ur7o,6048
-power_grid_model_io/converters/pandapower_converter.py,sha256=6gY-mvbVLlKKBxGOM1024pekCtmMeGUxQunN19nYHio,113935
-power_grid_model_io/converters/pgm_json_converter.py,sha256=uqsDGhf4hilzUQdQXZEfOYXWJnUpMQqTNHXnWQUY-So,13158
-power_grid_model_io/converters/tabular_converter.py,sha256=ZokMM8W1Y3gfIZAdhWsaIT9eAfcFvVxao5XTwYy7cU8,33453
+power_grid_model_io/converters/pandapower_converter.py,sha256=ycjnKAJcn8E6Eor9uCmzbvdKleLZlzvgR2syQY9X9NQ,114803
+power_grid_model_io/converters/pgm_json_converter.py,sha256=GdesepDPVl1oX_F35Dtjz6kzrkiGfvQA55rBzWJYhA4,13343
+power_grid_model_io/converters/tabular_converter.py,sha256=piBO5lgB_qDhkrYSDMy7PvZ6Fo1dhcdUp0tl0taayHY,33565
 power_grid_model_io/converters/vision_excel_converter.py,sha256=aGEoOh8Y-ZK1O5oSZQCrW_-0MHlBg1RjiJyQjLs91pY,4155
 power_grid_model_io/data_stores/__init__.py,sha256=qwbj1j-Aa_yRB-E3j35pEVtF3mgH8CVIXAnog5mOry0,138
 power_grid_model_io/data_stores/base_data_store.py,sha256=DJfLtRwvx_tXKnpjtBdfbMqPjWc324Eo5WeKTXjWXqc,1706
@@ -41,8 +41,8 @@ power_grid_model_io/utils/modules.py,sha256=a4IdozSL-sOZcmIQON_aQS7-cpnCyt-3p7zs
 power_grid_model_io/utils/parsing.py,sha256=XB1QSHnslIieFJBKFXZCtiydqpOqQBiX_CXDbItXgAQ,4522
 power_grid_model_io/utils/uuid_excel_cvtr.py,sha256=H1iWhW_nluJBUJ3hK-Gc0xJjGnH5e35WrBz_fA3YXZs,7626
 power_grid_model_io/utils/zip.py,sha256=VXHX4xWPPZbhOlZUAbMDy3MgQFzK6_l7sRvGXihNUY4,3875
-power_grid_model_io-1.2.95.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
-power_grid_model_io-1.2.95.dist-info/METADATA,sha256=8Nr0s9pMZMWM8HG5rcJqyhs0Y4gXlEW5u8RG5FtXpRE,8039
-power_grid_model_io-1.2.95.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-power_grid_model_io-1.2.95.dist-info/top_level.txt,sha256=7sq9VveemMm2R0RgTBa4tH8y_xF4_1hxbufmX9OjCTo,20
-power_grid_model_io-1.2.95.dist-info/RECORD,,
+power_grid_model_io-1.2.97.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+power_grid_model_io-1.2.97.dist-info/METADATA,sha256=tGMO4lJ0t1-D_LreiuBHmwp9aLcctS3NZx-V8zbmucA,8019
+power_grid_model_io-1.2.97.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+power_grid_model_io-1.2.97.dist-info/top_level.txt,sha256=7sq9VveemMm2R0RgTBa4tH8y_xF4_1hxbufmX9OjCTo,20
+power_grid_model_io-1.2.97.dist-info/RECORD,,

{power_grid_model_io-1.2.95.dist-info → power_grid_model_io-1.2.97.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any