power-grid-model-io 1.2.18__py3-none-any.whl → 1.2.20__py3-none-any.whl

power_grid_model_io/converters/pandapower_converter.py

@@ -144,12 +144,13 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
                     extra_info[pgm_id] = {"id_reference": {"table": pp_table, "index": pp_idx}}
         for component_data in self.pgm_input_data.values():
             for attr_name in component_data.dtype.names:
-                if NODE_REF_RE.fullmatch(attr_name):
-                    for pgm_id, node_id in component_data[["id", attr_name]]:
-                        if pgm_id not in extra_info:
-                            extra_info[pgm_id] = {attr_name: node_id}
-                        else:
-                            extra_info[pgm_id][attr_name] = node_id
+                if not NODE_REF_RE.fullmatch(attr_name):
+                    continue
+                for pgm_id, node_id in component_data[["id", attr_name]]:
+                    if pgm_id in extra_info:
+                        extra_info[pgm_id][attr_name] = node_id
+                    else:
+                        extra_info[pgm_id] = {attr_name: node_id}
 
     def _extra_info_to_idx_lookup(self, extra_info: ExtraInfo):
         """

power_grid_model_io/converters/tabular_converter.py

@@ -478,7 +478,7 @@ class TabularConverter(BaseConverter[TabularData]):
                     value_column=sub_def["value_column"],
                 )
             elif isinstance(sub_def, list):
-                col_data = self._parse_pandas_function(data=data, table=table, function=name, col_def=sub_def)
+                col_data = self._parse_pandas_function(data=data, table=table, fn_name=name, col_def=sub_def)
             elif isinstance(sub_def, dict):
                 col_data = self._parse_function(data=data, table=table, function=name, col_def=sub_def)
             else:
@@ -549,13 +549,13 @@ class TabularConverter(BaseConverter[TabularData]):
 
         return col_data.apply(auto_id, axis=1, raw=True)
 
-    def _parse_pandas_function(self, data: TabularData, table: str, function: str, col_def: List[Any]) -> pd.DataFrame:
+    def _parse_pandas_function(self, data: TabularData, table: str, fn_name: str, col_def: List[Any]) -> pd.DataFrame:
         """Special vectorized functions.
 
         Args:
           data: The data
           table: The name of the current table
-          function: The name of the function.
+          fn_name: The name of the function.
           col_def: The definition of the function arguments
 
         Returns:
@@ -564,15 +564,15 @@ class TabularConverter(BaseConverter[TabularData]):
         assert isinstance(col_def, list)
 
         # "multiply" is an alias for "prod"
-        if function == "multiply":
-            function = "prod"
+        if fn_name == "multiply":
+            fn_name = "prod"
 
         col_data = self._parse_col_def(data=data, table=table, col_def=col_def, extra_info=None)
 
         try:
-            fn_ptr = getattr(col_data, function)
+            fn_ptr = getattr(col_data, fn_name)
         except AttributeError as ex:
-            raise ValueError(f"Pandas DataFrame has no function '{function}'") from ex
+            raise ValueError(f"Pandas DataFrame has no function '{fn_name}'") from ex
 
         # If the function expects an 'other' argument, apply the function per column (e.g. divide)
         empty = inspect.Parameter.empty
@@ -581,12 +581,12 @@ class TabularConverter(BaseConverter[TabularData]):
             n_columns = col_data.shape[1] if col_data.ndim > 1 else 1
             result = col_data.iloc[:, 0]
             for i in range(1, n_columns):
-                result = getattr(result, function)(other=col_data.iloc[:, i])
+                result = getattr(result, fn_name)(other=col_data.iloc[:, i])
             return pd.DataFrame(result)
 
         # If the function expects any argument
         if any(param.default == empty for name, param in fn_sig.parameters.items() if name != "kwargs"):
-            raise ValueError(f"Invalid pandas function DataFrame.{function}")
+            raise ValueError(f"Invalid pandas function DataFrame.{fn_name}")
 
         return pd.DataFrame(fn_ptr(axis=1))
 

power_grid_model_io/data_types/tabular_data.py

@@ -203,7 +203,7 @@ class TabularData:
         """
         Mimic the dictionary .items() function
 
-        Returns: An generator of the table names and the raw table data
+        Returns: A generator of the table names and the raw table data
         """
 
         # Note: PyCharm complains about the type, but it is correct, as an ItemsView extends from

power_grid_model_io/functions/_functions.py

@@ -100,8 +100,7 @@ def both_zeros_to_nan(value: float, other_value: float) -> float:
     value   0      value     nan
     nan     nan    value     nan
     """
-    if value == 0:
-        if other_value == 0 or not has_value(other_value):
-            _LOG.warning("0 replaced to nan")
-            return float("nan")
+    if value == 0 and (other_value == 0 or not has_value(other_value)):
+        _LOG.warning("0 replaced to nan")
+        return float("nan")
     return value

power_grid_model_io/utils/regex.py

@@ -42,7 +42,7 @@ node            The word 'node'
 $               End of the string
 """
 
-PVS_EFFICIENCY_TYPE_RE = re.compile(r"[ ,..]1 pu: (95|97) %")
+PVS_EFFICIENCY_TYPE_RE = re.compile(r"[ ,.]1 pu: (95|97) %")
 r"""
 Regular expressions to match the efficiency type percentage at 1 pu, eg:
     - 0,1 pu: 93 %; 1 pu: 97 %

{power_grid_model_io-1.2.18.dist-info → power_grid_model_io-1.2.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: power-grid-model-io
-Version: 1.2.18
+Version: 1.2.20
 Summary: Power Grid Model Input/Output
 Author-email: Alliander Dynamic Grid Calculation <dynamic.grid.calculation@alliander.com>
 License: MPL-2.0
@@ -67,15 +67,15 @@ SPDX-License-Identifier: MPL-2.0
 For detailed documentation, see [Read the Docs](https://power-grid-model-io.readthedocs.io/en/stable/index.html).
 
 # Examples
-* [PGM JSON Example](https://github.com/alliander-opensource/power-grid-model-io/blob/470e4abecf3a0f78f86d125c10fc9d8af73f01b3/docs/examples/pgm_json_example.ipynb)
+* [PGM JSON Example](https://github.com/alliander-opensource/power-grid-model-io/blob/1db236cf48271a43ee754212193e936b024fd18f/docs/examples/pgm_json_example.ipynb)
 
 
 # License
-This project is licensed under the Mozilla Public License, version 2.0 - see [LICENSE](https://github.com/alliander-opensource/power-grid-model-io/blob/470e4abecf3a0f78f86d125c10fc9d8af73f01b3/LICENSE) for details.
+This project is licensed under the Mozilla Public License, version 2.0 - see [LICENSE](https://github.com/alliander-opensource/power-grid-model-io/blob/1db236cf48271a43ee754212193e936b024fd18f/LICENSE) for details.
 
 # Contributing
-Please read [CODE_OF_CONDUCT](https://github.com/alliander-opensource/power-grid-model-io/blob/470e4abecf3a0f78f86d125c10fc9d8af73f01b3/CODE_OF_CONDUCT.md) and [CONTRIBUTING](https://github.com/alliander-opensource/power-grid-model-io/blob/470e4abecf3a0f78f86d125c10fc9d8af73f01b3/CONTRIBUTING.md) for details on the process 
+Please read [CODE_OF_CONDUCT](https://github.com/alliander-opensource/power-grid-model-io/blob/1db236cf48271a43ee754212193e936b024fd18f/CODE_OF_CONDUCT.md) and [CONTRIBUTING](https://github.com/alliander-opensource/power-grid-model-io/blob/1db236cf48271a43ee754212193e936b024fd18f/CONTRIBUTING.md) for details on the process 
 for submitting pull requests to us.
 
 # Contact
-Please read [SUPPORT](https://github.com/alliander-opensource/power-grid-model-io/blob/470e4abecf3a0f78f86d125c10fc9d8af73f01b3/SUPPORT.md) for how to connect and get into contact with the Power Gird Model IO project.
+Please read [SUPPORT](https://github.com/alliander-opensource/power-grid-model-io/blob/1db236cf48271a43ee754212193e936b024fd18f/SUPPORT.md) for how to connect and get into contact with the Power Gird Model IO project.

{power_grid_model_io-1.2.18.dist-info → power_grid_model_io-1.2.20.dist-info}/RECORD

@@ -6,9 +6,9 @@ power_grid_model_io/config/excel/vision_en.yaml,sha256=SqzFUrzd-QQpQtselfWTZOuNO
 power_grid_model_io/config/excel/vision_nl.yaml,sha256=x_m8nHokSlLT35-xwZrSpZEvUXVjMWsrZ0acV8DLizY,19128
 power_grid_model_io/converters/__init__.py,sha256=WKvQi375_pb1I4x36aTUvRjAqXHNNlbg2yX8P0fvvsA,424
 power_grid_model_io/converters/base_converter.py,sha256=1eljmenQSZx4hik4xwVJKFPwEVTx2lW1d965VykZnIQ,4927
-power_grid_model_io/converters/pandapower_converter.py,sha256=mG8p-VQYXbKuBr11EdbE0WHCG97ezrOOzyu6gRjmTd8,76435
+power_grid_model_io/converters/pandapower_converter.py,sha256=nY_6czzsz9QHa-O_cGBzTMd_uyCGOBOEJ9NY3-F62eE,76444
 power_grid_model_io/converters/pgm_json_converter.py,sha256=lwlnGNdODL_J1eD946kv8VzZYUhGudHSdt-92D7djrs,11780
-power_grid_model_io/converters/tabular_converter.py,sha256=mOgq5hWBShNoW77km_ClPpZJ9Lbkol0gMDgHYYFtYcI,28834
+power_grid_model_io/converters/tabular_converter.py,sha256=iKz0K0SNI7GozXirqQVxBuHVzmGlzq1qq3VPcFBwB8Q,28825
 power_grid_model_io/converters/vision_excel_converter.py,sha256=EXxFebNiKPLYMU4m1aIf4bccSYCU6EiVUvvlvXc7Gm8,2322
 power_grid_model_io/data_stores/__init__.py,sha256=4RCCaYmi3VSdnAYw3RGxH73K3Jez5VUymiWg-zXqj_c,154
 power_grid_model_io/data_stores/base_data_store.py,sha256=NQsw-g8HerFb7t3O4yuvFGirb8z_Zcq9J0ViKcJK1U0,1383
@@ -18,9 +18,9 @@ power_grid_model_io/data_stores/json_file_store.py,sha256=vmo25AiCIy16HDF8S5ZZKu
 power_grid_model_io/data_stores/vision_excel_file_store.py,sha256=d5J6ClvIpef_JwKcqCilzYU411IR8Zju6R9Dc4j0KXQ,821
 power_grid_model_io/data_types/__init__.py,sha256=s5GL9Q3P1Y2tU2S5ekQ2KbS3TetIvW1414xbZ1Zia3s,399
 power_grid_model_io/data_types/_data_types.py,sha256=BnqY6vbiivmvh_fLYY6enj3xRluL674xLScF0ATEGPs,1680
-power_grid_model_io/data_types/tabular_data.py,sha256=BC20WzbV1V03KD_BmfxwDKH4X_X_sbQ97PuUXz2Y7wA,8356
+power_grid_model_io/data_types/tabular_data.py,sha256=6CIPouIL0t-gG3VaqUv1G7pbLPTOgZ3H04Xn-QlPciY,8355
 power_grid_model_io/functions/__init__.py,sha256=LQKpnYqnZhMHb9QwWTTGiMadwl3e6jMSEzJf6TlIZk0,511
-power_grid_model_io/functions/_functions.py,sha256=J0KiqU_V3lniwNvYbFhF2_iOz5ug9_KahtlnM1xyeHs,2873
+power_grid_model_io/functions/_functions.py,sha256=BNFvNaVuXRBWyHgkTuoxm_UPqx55ZufMtq54SAz04K0,2859
 power_grid_model_io/functions/phase_to_phase.py,sha256=oaDRoPg6okII0rq8klPM085DF5pSmIDqlSiY9l-L5E8,6296
 power_grid_model_io/mappings/__init__.py,sha256=4RCCaYmi3VSdnAYw3RGxH73K3Jez5VUymiWg-zXqj_c,154
 power_grid_model_io/mappings/field_mapping.py,sha256=Ho70tft8nXdUPiRpLusQIle-D_XZan7s-Sa27FQo3Uo,1581
@@ -33,9 +33,9 @@ power_grid_model_io/utils/auto_id.py,sha256=fk-w1rnuvFbg8_hnteZSNa0j8p5xIF-bFDlQ
 power_grid_model_io/utils/dict.py,sha256=Y5fCB22qIwFVHinUq-TO1eXeNWU177sVPyOVVaAzl7o,1030
 power_grid_model_io/utils/json.py,sha256=Fw9GhCiwk4sXw48ljPOkWAR0LaRkdA8ZkUQu-K0z0vU,3343
 power_grid_model_io/utils/modules.py,sha256=ZB8IIK96VuJk5FkoclrUCuXOSsGeVqT3B01bBAcodeU,944
-power_grid_model_io/utils/regex.py,sha256=0uJDRSfggmDFu_nip1Oge8NUXBQ_8e-3HTLdB8niAkQ,1728
-power_grid_model_io-1.2.18.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
-power_grid_model_io-1.2.18.dist-info/METADATA,sha256=ciDelu3ZOiR63OFFZ_hsYZEhSV8uP7e0eB2UUXWOJuw,5679
-power_grid_model_io-1.2.18.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-power_grid_model_io-1.2.18.dist-info/top_level.txt,sha256=7sq9VveemMm2R0RgTBa4tH8y_xF4_1hxbufmX9OjCTo,20
-power_grid_model_io-1.2.18.dist-info/RECORD,,
+power_grid_model_io/utils/regex.py,sha256=dbKTyQMaTWou9Cvk35R2_9SJlz6Rd5rfH6Xy3BCeFJg,1727
+power_grid_model_io-1.2.20.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+power_grid_model_io-1.2.20.dist-info/METADATA,sha256=1DW3KbRA1-YstQtQKN-KP17NBxhz04mAquV5ep-2Urk,5679
+power_grid_model_io-1.2.20.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+power_grid_model_io-1.2.20.dist-info/top_level.txt,sha256=7sq9VveemMm2R0RgTBa4tH8y_xF4_1hxbufmX9OjCTo,20
+power_grid_model_io-1.2.20.dist-info/RECORD,,