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

power_grid_model_io/converters/pandapower_converter.py

@@ -79,7 +79,8 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
 
         # Construct extra_info
         if extra_info is not None:
-            self._fill_extra_info(extra_info=extra_info)
+            self._fill_pgm_extra_info(extra_info=extra_info)
+            self._fill_pp_extra_info(extra_info=extra_info)
 
         return self.pgm_input_data
 
@@ -135,22 +136,56 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         self._create_pgm_input_generators()
         self._create_pgm_input_dclines()
 
-    def _fill_extra_info(self, extra_info: ExtraInfo):
+    def _fill_pgm_extra_info(self, extra_info: ExtraInfo):
+        """
+        Fills in extra information of power-grid-model input after conversion from pandapower to the extra_info dict
+
+        Args:
+            extra_info: The extra info dict
+        """
         for (pp_table, name), indices in self.idx_lookup.items():
             for pgm_id, pp_idx in zip(indices.index, indices):
                 if name:
                     extra_info[pgm_id] = {"id_reference": {"table": pp_table, "name": name, "index": pp_idx}}
                 else:
                     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 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}
+                    if pgm_id not in extra_info:
+                        extra_info[pgm_id] = {}
+                    if "pgm_input" not in extra_info[pgm_id]:
+                        extra_info[pgm_id]["pgm_input"] = {}
+                    extra_info[pgm_id]["pgm_input"][attr_name] = node_id
+
+    def _fill_pp_extra_info(self, extra_info: ExtraInfo):
+        """
+        Fills extra information from pandapower input dataframes not available in power-grid-model input
+        to the extra_info dict.
+        Currently, it is possible to only store the derating factor (df) of trafo.
+
+        Args:
+            extra_info: The extra info dict
+        """
+        pp_input = {"trafo": {"df"}}
+        for pp_table, pp_attr in pp_input.items():
+            if pp_table in self.pp_input_data:
+                pp_attr = pp_attr & set(self.pp_input_data[pp_table].columns)
+                if not pp_attr:
+                    continue
+                pgm_ids = self._get_pgm_ids(pp_table=pp_table)
+                pp_extra_data = self.pp_input_data[pp_table][pp_attr]
+                pp_extra_data.index = pgm_ids
+                for pgm_id, pp_element in pp_extra_data.iterrows():
+                    if pgm_id not in extra_info:
+                        extra_info[pgm_id] = {}
+                    if "pp_input" not in extra_info[pgm_id]:
+                        extra_info[pgm_id]["pp_input"] = {}
+                    for attr in pp_attr:
+                        extra_info[pgm_id]["pp_input"][attr] = pp_element[attr]
 
     def _extra_info_to_idx_lookup(self, extra_info: ExtraInfo):
         """
@@ -202,10 +237,29 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
                 dtype={"names": ["id"] + node_cols, "formats": [dtype] * num_cols},
             )
             for i, pgm_id in enumerate(data["id"]):
-                extra = extra_info[pgm_id]
+                extra = extra_info[pgm_id].get("pgm_input", {})
                 ref[i] = (pgm_id,) + tuple(extra[col] for col in node_cols)
             self.pgm_input_data[component] = ref
 
+    def _extra_info_to_pp_input_data(self, extra_info: ExtraInfo):
+        """
+        Converts extra component info into node_lookup
+        Currently, it is possible to only retrieve the derating factor (df) of trafo.
+
+        Args:
+            extra_info: a dictionary where the node reference ids are stored
+        """
+        assert not self.pp_input_data
+        assert self.pgm_output_data
+
+        if "transformer" not in self.pgm_output_data:
+            return
+
+        pgm_ids = self.pgm_output_data["transformer"]["id"]
+        pp_ids = self._get_pp_ids(pp_table="trafo", pgm_idx=pgm_ids)
+        derating_factor = (extra_info.get(pgm_id, {}).get("pp_input", {}).get("df", np.nan) for pgm_id in pgm_ids)
+        self.pp_input_data = {"trafo": pd.DataFrame(derating_factor, columns=["df"], index=pp_ids)}
+
     def _create_output_data(self):
         """
         Performs the conversion from power-grid-model to PandaPower by calling individual conversion functions.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: power-grid-model-io
-Version: 1.2.20
+Version: 1.2.21
 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/1db236cf48271a43ee754212193e936b024fd18f/docs/examples/pgm_json_example.ipynb)
+* [PGM JSON Example](https://github.com/alliander-opensource/power-grid-model-io/blob/d8dd031d970de476dcde7b42d76438ed4a09fd05/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/1db236cf48271a43ee754212193e936b024fd18f/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/d8dd031d970de476dcde7b42d76438ed4a09fd05/LICENSE) for details.
 
 # Contributing
-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 
+Please read [CODE_OF_CONDUCT](https://github.com/alliander-opensource/power-grid-model-io/blob/d8dd031d970de476dcde7b42d76438ed4a09fd05/CODE_OF_CONDUCT.md) and [CONTRIBUTING](https://github.com/alliander-opensource/power-grid-model-io/blob/d8dd031d970de476dcde7b42d76438ed4a09fd05/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/1db236cf48271a43ee754212193e936b024fd18f/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/d8dd031d970de476dcde7b42d76438ed4a09fd05/SUPPORT.md) for how to connect and get into contact with the Power Gird Model IO project.

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

@@ -6,7 +6,7 @@ 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=nY_6czzsz9QHa-O_cGBzTMd_uyCGOBOEJ9NY3-F62eE,76444
+power_grid_model_io/converters/pandapower_converter.py,sha256=hpoMEbIDyN4JVeubPYtQt6vgZwl-CL2uO6Di0qurrOo,78866
 power_grid_model_io/converters/pgm_json_converter.py,sha256=lwlnGNdODL_J1eD946kv8VzZYUhGudHSdt-92D7djrs,11780
 power_grid_model_io/converters/tabular_converter.py,sha256=iKz0K0SNI7GozXirqQVxBuHVzmGlzq1qq3VPcFBwB8Q,28825
 power_grid_model_io/converters/vision_excel_converter.py,sha256=EXxFebNiKPLYMU4m1aIf4bccSYCU6EiVUvvlvXc7Gm8,2322
@@ -34,8 +34,8 @@ power_grid_model_io/utils/dict.py,sha256=Y5fCB22qIwFVHinUq-TO1eXeNWU177sVPyOVVaA
 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=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,,
+power_grid_model_io-1.2.21.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+power_grid_model_io-1.2.21.dist-info/METADATA,sha256=ypD_fWN9H7CftOXjZImDIsfhR3SgpS7wtWsvOezh3IE,5679
+power_grid_model_io-1.2.21.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+power_grid_model_io-1.2.21.dist-info/top_level.txt,sha256=7sq9VveemMm2R0RgTBa4tH8y_xF4_1hxbufmX9OjCTo,20
+power_grid_model_io-1.2.21.dist-info/RECORD,,