LightSim2Grid 0.10.3.dev0__tar.gz → 0.11.0__tar.gz

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0/LightSim2Grid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LightSim2Grid
-Version: 0.10.3.dev0
+Version: 0.11.0
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
 Home-page: https://github.com/grid2op/lightsim2grid/
 Author: Benjamin Donnot
@@ -18,6 +18,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
@@ -154,17 +156,20 @@ see section [6.1 Customization of the compilation](#Customization-of-the-compila
 
 Pypi packages are available for linux (`x86_64` cpu architecture), windows (`x86_64` cpu architecture) and macos (`x86_64` cpu architecture) with python versions: 
 
-- 3.7
+- 3.7  (lightsim2grid < 0.10.4)
 - 3.8
 - 3.9
 - 3.10 (lightsim2grid >= 0.6.1)
 - 3.11 (lightsim2grid >= 0.7.1)
 - 3.12 (lightsim2grid >= 0.7.5)
 - 3.13 (lightsim2grid >= 0.9.2.post2)
+- 3.14 (lightsim2grid >= 0.10.4)
 
 
 As from version 0.8.2, we also distribute windows `arm64` and macos `arm64` binaries of lightsim2grid that can be installed
-directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
+directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). 
+
+We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
 
 
 **NB** on some version of MacOs (thanks Apple !), especially the one using M1 or M2 chip, lightsim2grid is only available

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/LightSim2Grid.egg-info/SOURCES.txt

@@ -501,6 +501,7 @@ lightsim2grid/gridmodel/from_pandapower/_my_const.py
 lightsim2grid/gridmodel/from_pandapower/_pp_bus_to_ls_bus.py
 lightsim2grid/gridmodel/from_pandapower/initGridModel.py
 lightsim2grid/gridmodel/from_pypowsybl/__init__.py
+lightsim2grid/gridmodel/from_pypowsybl/_aux_handle_slack.py
 lightsim2grid/gridmodel/from_pypowsybl/_from_pypowsybl.py
 lightsim2grid/newtonpf/__init__.py
 lightsim2grid/pandapower_compat/__init__.py
@@ -513,6 +514,8 @@ lightsim2grid/rewards/n1ContingencyReward.py
 lightsim2grid/solver/__init__.py
 src/BaseConstants.cpp
 src/BaseConstants.h
+src/BaseSubstation.cpp
+src/BaseSubstation.h
 src/ChooseSolver.cpp
 src/ChooseSolver.h
 src/CustTimer.h

{lightsim2grid-0.10.3.dev0/LightSim2Grid.egg-info → lightsim2grid-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LightSim2Grid
-Version: 0.10.3.dev0
+Version: 0.11.0
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
 Home-page: https://github.com/grid2op/lightsim2grid/
 Author: Benjamin Donnot
@@ -18,6 +18,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
@@ -154,17 +156,20 @@ see section [6.1 Customization of the compilation](#Customization-of-the-compila
 
 Pypi packages are available for linux (`x86_64` cpu architecture), windows (`x86_64` cpu architecture) and macos (`x86_64` cpu architecture) with python versions: 
 
-- 3.7
+- 3.7  (lightsim2grid < 0.10.4)
 - 3.8
 - 3.9
 - 3.10 (lightsim2grid >= 0.6.1)
 - 3.11 (lightsim2grid >= 0.7.1)
 - 3.12 (lightsim2grid >= 0.7.5)
 - 3.13 (lightsim2grid >= 0.9.2.post2)
+- 3.14 (lightsim2grid >= 0.10.4)
 
 
 As from version 0.8.2, we also distribute windows `arm64` and macos `arm64` binaries of lightsim2grid that can be installed
-directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
+directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). 
+
+We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
 
 
 **NB** on some version of MacOs (thanks Apple !), especially the one using M1 or M2 chip, lightsim2grid is only available

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/README.md

@@ -82,17 +82,20 @@ see section [6.1 Customization of the compilation](#Customization-of-the-compila
 
 Pypi packages are available for linux (`x86_64` cpu architecture), windows (`x86_64` cpu architecture) and macos (`x86_64` cpu architecture) with python versions: 
 
-- 3.7
+- 3.7  (lightsim2grid < 0.10.4)
 - 3.8
 - 3.9
 - 3.10 (lightsim2grid >= 0.6.1)
 - 3.11 (lightsim2grid >= 0.7.1)
 - 3.12 (lightsim2grid >= 0.7.5)
 - 3.13 (lightsim2grid >= 0.9.2.post2)
+- 3.14 (lightsim2grid >= 0.10.4)
 
 
 As from version 0.8.2, we also distribute windows `arm64` and macos `arm64` binaries of lightsim2grid that can be installed
-directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
+directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). 
+
+We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
 
 
 **NB** on some version of MacOs (thanks Apple !), especially the one using M1 or M2 chip, lightsim2grid is only available

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/lightsim2grid/__init__.py

@@ -6,38 +6,43 @@
 # SPDX-License-Identifier: MPL-2.0
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
 
-__version__ = "0.10.3.dev0"
+__version__ = "0.11.0"
 
-__all__ = ["newtonpf", "SolverType", "ErrorType", "solver", "compilation_options"]
+__all__ = [
+    "newtonpf",
+    "SolverType",
+    "ErrorType",
+    "solver",
+    "compilation_options"]
 
 # import directly from c++ module
 from lightsim2grid.solver import SolverType
 from lightsim2grid.solver import ErrorType
 
 try:
-    from lightsim2grid.lightSimBackend import LightSimBackend
+    from lightsim2grid.lightSimBackend import LightSimBackend  # noqa: F401
     __all__.append("LightSimBackend")
 except ImportError as exc_:
     # grid2op is not installed, the Backend will not be available
     pass
 
 try:
-    from lightsim2grid.physical_law_checker import PhysicalLawChecker
+    from lightsim2grid.physical_law_checker import PhysicalLawChecker  # noqa: F401
     __all__.append("PhysicalLawChecker")
 except ImportError as exc_:
     # grid2op is not installed, the PhysicalLawChecker will not be available
     pass
 
 try:
-    from lightsim2grid.timeSerie import TimeSerie
-    __all__.append("TimeSerie")
+    from lightsim2grid.timeSerie import TimeSerie  # noqa: F401
+    __all__.append("TimeSerie")  
     __all__.append("timeSerie")
 except ImportError as exc_:
     # grid2op is not installed, the TimeSeries module will not be available
     pass
 
 try:
-    from lightsim2grid.contingencyAnalysis import ContingencyAnalysis
+    from lightsim2grid.contingencyAnalysis import ContingencyAnalysis  # noqa: F401
     __all__.append("contingencyAnalysis")
     __all__.append("ContingencyAnalysis")
 except ImportError as exc_:
@@ -45,7 +50,7 @@ except ImportError as exc_:
     pass
     
 try:
-    from lightsim2grid.rewards import *
+    from lightsim2grid.rewards import N1ContingencyReward  # noqa: F401
     __all__.append("rewards")
 except ImportError as exc_:
     # grid2op is not installed, the SecurtiyAnalysis module will not be available

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/lightsim2grid/gridmodel/from_pandapower/_aux_add_dc_line.py

@@ -15,7 +15,7 @@ from ._pp_bus_to_ls_bus import pp_bus_to_ls
 
 def _aux_add_dc_line(model, pp_net, pp_to_ls):
     """
-    Add the transformers of the pp_net into the lightsim2grid "model"
+    Add the dc lines of the pp_net into the lightsim2grid "model"
 
     Parameters
     ----------

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/lightsim2grid/gridmodel/from_pandapower/_aux_add_slack.py

@@ -6,12 +6,19 @@
 # SPDX-License-Identifier: MPL-2.0
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
 
+from typing import Literal
 import warnings
 import numpy as np
+
 from ._pp_bus_to_ls_bus import pp_bus_to_ls
+from ._my_const import ALLOWED_PP_ORIG_FILE
 
 
-def _aux_add_slack(model, pp_net, pp_to_ls):
+def _aux_add_slack(
+    model,
+    pp_net,
+    pp_to_ls,
+    pp_orig_file : ALLOWED_PP_ORIG_FILE = "pandapower_v2"):
     """
     add the slack bus(es) to the lightsim2grid "model" based on the information in the pandapower network.
 
@@ -37,7 +44,12 @@ def _aux_add_slack(model, pp_net, pp_to_ls):
         #     # TODO SLACK remove this warning ! (will be done at the end when more tests will be done)
         #     warnings.warn("LightSim cannot handle multiple slack bus at the moment. Only the first "
         #                   "slack bus of pandapower will be used.")
-        slack_gen_ids = np.where(pp_net.gen["slack"].values)[0]
+        possible_slack = pp_net.gen["slack"]
+        if pp_orig_file == "pandapower_v3" and "slack_weight" in pp_net.gen:
+            # in pandapower 3 even if a generator is not marked as a slack, but has a 
+            # slack weight != 0. then it's a slack. It was not the case in pandapower 2...
+            possible_slack |= pp_net.gen["slack_weight"].abs() > 1e-6
+        slack_gen_ids = possible_slack.values.nonzero()[0]
         if "slack_weight" in pp_net.gen:
             slack_coeff = pp_net.gen["slack_weight"].values[slack_gen_ids]
         for slack_id in slack_gen_ids:

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/lightsim2grid/gridmodel/from_pandapower/_aux_add_trafo.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, RTE (https://www.rte-france.com)
+# Copyright (c) 2020-2025, RTE (https://www.rte-france.com)
 # See AUTHORS.txt
 # This Source Code Form is subject to the terms of the Mozilla Public License, version 2.0.
 # If a copy of the Mozilla Public License, version 2.0 was not distributed with this file,
@@ -12,9 +12,16 @@ import pandapower as pp
 from packaging import version
 
 from ._pp_bus_to_ls_bus import pp_bus_to_ls
-from ._my_const import _MIN_PP_VERSION_ADV_GRID_MODEL
+from ._my_const import _MIN_PP_VERSION_ADV_GRID_MODEL, ALLOWED_PP_ORIG_FILE
 
-def _aux_add_trafo(converter, model, pp_net, pp_to_ls):
+
+def _aux_add_trafo(
+    converter,
+    model,
+    pp_net,
+    pp_to_ls,
+    pp_orig_file : ALLOWED_PP_ORIG_FILE = "pandapower_v2"
+    ):
     """
     Add the transformers of the pp_net into the lightsim2grid "model"
 
@@ -80,58 +87,61 @@ def _aux_add_trafo(converter, model, pp_net, pp_to_ls):
     tap_angles_[~np.isfinite(tap_angles_)] = 0.
     tap_angles_ = np.deg2rad(tap_angles_)
 
+    if "leakage_resistance_ratio_hv" in pp_net.trafo and (np.abs(pp_net.trafo["leakage_resistance_ratio_hv"].values - 0.5) < 1e-7).any():
+        warnings.warn("leakage_resistance_ratio_hv != 0.5 is not supported by this converter at the moment. It will be replaced by 0.5")
+        
+    trafo_model_is_t = True
+    if "_options" in pp_net and "trafo_model" in pp_net._options:
+        trafo_model_is_t = pp_net._options["trafo_model"] == "t"
+        
     # compute physical parameters
-    if version.parse(pp.__version__) >= _MIN_PP_VERSION_ADV_GRID_MODEL:
-        # TODO
+    if version.parse(pp.__version__) >= _MIN_PP_VERSION_ADV_GRID_MODEL and pp_orig_file == "pandapower_v3":
+        # use pandapower version 3 converter in this case.
+        # We use it because:
+        # - the grid comes from pandapower3 (eg pn.case118() with pandapower 3 installed)
+        # - AND the pandapower version is >= 3
         trafo_r, trafo_x, trafo_b = \
-            converter.get_trafo_param(tap_step_pct,
-                                      tap_pos,
-                                      tap_angles_,  # in radian !
-                                      is_tap_hv_side,
-                                      pp_net.bus.loc[pp_net.trafo["hv_bus"]]["vn_kv"],
-                                      pp_net.bus.loc[pp_net.trafo["lv_bus"]]["vn_kv"],
-                                      pp_net.trafo["vk_percent"].values,
-                                      pp_net.trafo["vkr_percent"].values,
-                                      pp_net.trafo["sn_mva"].values,
-                                      pp_net.trafo["pfe_kw"].values,
-                                      pp_net.trafo["i0_percent"].values,
-                                      )
-
-        # initialize the grid
-        model.init_trafo(trafo_r,
-                        trafo_x,
-                        trafo_b,
-                        tap_step_pct,
-                        tap_pos,
-                        shift_,
-                        is_tap_hv_side,
-                        pp_bus_to_ls(pp_net.trafo["hv_bus"].values, pp_to_ls),
-                        pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls))
+            converter.get_trafo_param_pp3(tap_step_pct,
+                                          tap_pos,
+                                          tap_angles_,  # in radian !
+                                          is_tap_hv_side,
+                                          pp_net.bus.loc[pp_net.trafo["hv_bus"]]["vn_kv"],
+                                          pp_net.bus.loc[pp_net.trafo["lv_bus"]]["vn_kv"],
+                                          pp_net.trafo["vk_percent"].values,
+                                          pp_net.trafo["vkr_percent"].values,
+                                          pp_net.trafo["sn_mva"].values,
+                                          pp_net.trafo["pfe_kw"].values,
+                                          pp_net.trafo["i0_percent"].values,
+                                          trafo_model_is_t
+                                          )
     else:
+        # default legacy mode: use the pandapower 2 converter
+        if not trafo_model_is_t:
+            raise RuntimeError("Cannot convert a transformer with model 'pi' to LightSim2grid (using pandapower < 3)")
         trafo_r, trafo_x, trafo_b = \
-            converter.get_trafo_param_legacy(tap_step_pct,
-                                             tap_pos,
-                                             tap_angles_,  # in radian !
-                                             is_tap_hv_side,
-                                             pp_net.bus.loc[pp_net.trafo["hv_bus"]]["vn_kv"],
-                                             pp_net.bus.loc[pp_net.trafo["lv_bus"]]["vn_kv"],
-                                             pp_net.trafo["vk_percent"].values,
-                                             pp_net.trafo["vkr_percent"].values,
-                                             pp_net.trafo["sn_mva"].values,
-                                             pp_net.trafo["pfe_kw"].values,
-                                             pp_net.trafo["i0_percent"].values,
-                                             )
-
-        # initialize the grid
-        model.init_trafo(trafo_r,
-                        trafo_x,
-                        trafo_b,
-                        tap_step_pct,
-                        tap_pos,
-                        shift_,
-                        is_tap_hv_side,
-                        pp_bus_to_ls(pp_net.trafo["hv_bus"].values, pp_to_ls),
-                        pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls))
+            converter.get_trafo_param_pp2(tap_step_pct,
+                                          tap_pos,
+                                          tap_angles_,  # in radian !
+                                          is_tap_hv_side,
+                                          pp_net.bus.loc[pp_net.trafo["hv_bus"]]["vn_kv"],
+                                          pp_net.bus.loc[pp_net.trafo["lv_bus"]]["vn_kv"],
+                                          pp_net.trafo["vk_percent"].values,
+                                          pp_net.trafo["vkr_percent"].values,
+                                          pp_net.trafo["sn_mva"].values,
+                                          pp_net.trafo["pfe_kw"].values,
+                                          pp_net.trafo["i0_percent"].values,
+                                          )
+
+    # initialize the grid
+    model.init_trafo_pandapower(trafo_r,
+                                trafo_x,
+                                trafo_b,
+                                tap_step_pct,
+                                tap_pos,
+                                shift_,
+                                is_tap_hv_side,
+                                pp_bus_to_ls(pp_net.trafo["hv_bus"].values, pp_to_ls),
+                                pp_bus_to_ls(pp_net.trafo["lv_bus"].values, pp_to_ls))
 
     for tr_id, is_connected in enumerate(pp_net.trafo["in_service"].values):
         if not is_connected:

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/lightsim2grid/gridmodel/from_pandapower/_aux_check_legit.py

@@ -7,7 +7,6 @@
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
 
 import warnings
-import numpy as np
 
 
 def _aux_check_legit(pp_net):

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/lightsim2grid/gridmodel/from_pandapower/_my_const.py

@@ -6,6 +6,10 @@
 # SPDX-License-Identifier: MPL-2.0
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
 
+from typing import Literal
 from packaging import version
+
 # pandapower version with more advanced grid modelling
 _MIN_PP_VERSION_ADV_GRID_MODEL = version.parse("2.15")  
+
+ALLOWED_PP_ORIG_FILE = Literal["pandapower_v2", "pandapower_v3"]

{lightsim2grid-0.10.3.dev0 → lightsim2grid-0.11.0}/lightsim2grid/gridmodel/from_pandapower/initGridModel.py

@@ -10,6 +10,7 @@
 Use the pandapower converter to properly initialize a GridModel c++ object.
 """
 
+from typing import Optional
 import numpy as np
 from numbers import Number
 
@@ -25,9 +26,14 @@ from ._aux_check_legit import _aux_check_legit
 from ._aux_add_slack import _aux_add_slack
 from ._aux_add_storage import _aux_add_storage
 from ._aux_add_dc_line import _aux_add_dc_line
+from ._my_const import ALLOWED_PP_ORIG_FILE
 
 
-def init(pp_net: "pandapower.auxiliary.pandapowerNet") -> GridModel:
+def init(pp_net: "pandapower.auxiliary.pandapowerNet",
+         n_sub: Optional[int]=None,  # number of voltage levels
+         n_busbar_per_sub: Optional[int]=None,  # max number of buses allowed per substation / voltage level
+         pp_orig_file : ALLOWED_PP_ORIG_FILE = "pandapower_v2"
+         ) -> GridModel:
     """
     Convert a pandapower network as input into a GridModel.
 
@@ -54,6 +60,17 @@ def init(pp_net: "pandapower.auxiliary.pandapowerNet") -> GridModel:
     ----------
     pp_net: :class:`pandapower.auxiliary.pandapowerNet`
         The initial pandapower network you want to convert
+        
+    pp_orig_file: 
+        Pandapower change the formula they used internally to compute the "equations" parameters
+        of the transformers between pandapower 2.xx and 3.xx.
+        
+        If you are using a recent (=> 3.xx) version of pandapower, you can pass use the
+        ad-hoc trafo converter of lightsim2grid. 
+        
+        For grid2op environment, we recommed **NOT** to use it if the environment has been released
+        before 2026 as the case files came from pandapower 2 (so it's better to use the pandapower 2 
+        converter).
 
     Returns
     -------
@@ -61,6 +78,9 @@ def init(pp_net: "pandapower.auxiliary.pandapowerNet") -> GridModel:
         The initialize gridmodel
 
     """
+    if pp_orig_file not in ALLOWED_PP_ORIG_FILE.__args__:
+        raise RuntimeError(f"pp_orig_file argument should be one of {sorted(ALLOWED_PP_ORIG_FILE.__args__)}")
+    
     # check for things not supported and raise if needed
     _aux_check_legit(pp_net)
 
@@ -77,9 +97,37 @@ def init(pp_net: "pandapower.auxiliary.pandapowerNet") -> GridModel:
             if isinstance(tmp_, Number):
                 model.set_init_vm_pu(float(tmp_))
     model.set_sn_mva(pp_net.sn_mva)
-
+    if n_sub is None:
+        n_sub = pp_net.bus.shape[0]
+        if n_busbar_per_sub is not None and n_busbar_per_sub != 1:
+            raise RuntimeError(f"If n_sub is None, n_busbar_per_sub must be None (or 1), found {n_busbar_per_sub}.")
+        n_busbar_per_sub = 1
+    # input data check
+    try:
+        tmp = int(n_sub)
+    except ValueError as exc_:
+        raise RuntimeError("Impossible to convert n_sub to int") from exc_
+    if tmp != n_sub:
+        raise RuntimeError(f"n_sub should be a int, you provided {tmp} which cannot safely be converted to an int.")
+    n_sub = tmp
+    if n_sub <= 0:
+        raise RuntimeError(f"You need to provide a grid with at least 1 substation / voltage level, provided n_sub={n_sub}")
+    
+    try:
+        tmp = int(n_busbar_per_sub)
+    except ValueError as exc_:
+        raise RuntimeError("Impossible to convert n_busbar_per_sub to int") from exc_
+    if tmp != n_busbar_per_sub:
+        raise RuntimeError(f"n_busbar_per_sub should be a int, you provided {tmp} which cannot safely be converted to an int.")
+    n_busbar_per_sub = tmp
+    if n_busbar_per_sub <= 0:
+        raise RuntimeError(f"You need to provide a grid with at least 1 busbar per "
+                           f"substation / voltage level, provided n_busbar_per_sub={n_busbar_per_sub}")
+    
     tmp_bus_ind = np.argsort(pp_net.bus.index)
-    model.init_bus(pp_net.bus.iloc[tmp_bus_ind]["vn_kv"].values,
+    model.init_bus(n_sub,
+                   n_busbar_per_sub,
+                   pp_net.bus.iloc[tmp_bus_ind]["vn_kv"].values,
                    pp_net.line.shape[0],
                    pp_net.trafo.shape[0])
     if np.any(np.sort(pp_net.bus.index) != np.arange(pp_net.bus.shape[0])):
@@ -103,7 +151,7 @@ def init(pp_net: "pandapower.auxiliary.pandapowerNet") -> GridModel:
     _aux_add_shunt(model, pp_net, pp_to_ls)
 
     # handle the trafos
-    _aux_add_trafo(converter, model, pp_net, pp_to_ls)
+    _aux_add_trafo(converter, model, pp_net, pp_to_ls, pp_orig_file)
 
     # handle loads
     _aux_add_load(model, pp_net, pp_to_ls)
@@ -121,6 +169,6 @@ def init(pp_net: "pandapower.auxiliary.pandapowerNet") -> GridModel:
     _aux_add_dc_line(model, pp_net, pp_to_ls)
 
     # deal with slack bus
-    _aux_add_slack(model, pp_net, pp_to_ls)
+    _aux_add_slack(model, pp_net, pp_to_ls, pp_orig_file)
 
     return model

lightsim2grid-0.11.0/lightsim2grid/gridmodel/from_pypowsybl/_aux_handle_slack.py

@@ -0,0 +1,68 @@
+# Copyright (c) 2025, RTE (https://www.rte-france.com)
+# See AUTHORS.txt
+# This Source Code Form is subject to the terms of the Mozilla Public License, version 2.0.
+# If a copy of the Mozilla Public License, version 2.0 was not distributed with this file,
+# you can obtain one at http://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+# This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
+
+
+import numpy as np
+
+
+def handle_slack_one_el(df_gen, gen_slack_id):
+    if isinstance(gen_slack_id, (str, np.str_)):
+        gen_slack_id_int = int((df_gen.index == gen_slack_id).nonzero()[0][0])
+        gen_slack_weight = -float(df_gen.iloc[gen_slack_id_int]["p"])
+    elif isinstance(gen_slack_id, tuple):
+        if len(gen_slack_id) != 2:
+            raise RuntimeError("When initializing gen_slack_id with a tuple, it should be "
+                               "(gen_id_or_name, slack_weights). You provided a tuple of size "
+                               f"{len(gen_slack_id)} != 2.")
+        gen_slack_id_maybe_int, gen_slack_weight = gen_slack_id
+        if not isinstance(gen_slack_id_maybe_int, int):
+            gen_slack_id_int = handle_slack_one_el(df_gen, gen_slack_id_maybe_int)[0]
+        else:
+            gen_slack_id_int = gen_slack_id_maybe_int
+        if float(gen_slack_weight) != gen_slack_weight:
+            raise RuntimeError("When initializing the slack with a tuple, the second element of "
+                               "each is the slack weight and should be convertible to a float.")
+        gen_slack_weight = float(gen_slack_weight)
+    else:
+        try:
+            gen_slack_id_int = int(gen_slack_id)
+        except Exception as exc_:
+            raise RuntimeError("'gen_slack_id' should be either an int or "
+                                "a generator names") from exc_
+        if gen_slack_id_int != gen_slack_id:
+            raise RuntimeError("'gen_slack_id' should be either an int or a "
+                                "generator names")
+        gen_slack_weight = 1.
+    if not df_gen.iloc[gen_slack_id_int]["connected"] or abs(gen_slack_weight) < 1e-5:
+        return None, None
+    return gen_slack_id_int, gen_slack_weight
+
+
+def handle_slack_iterable(df_gen, gen_slack_id):
+    res_ids = []
+    res_ws = []
+    if isinstance(gen_slack_id, (list, tuple, set)):
+        for el in gen_slack_id:
+            tmp_id, tmp_w = handle_slack_one_el(df_gen, el)
+            if tmp_id is None or tmp_w is None:
+                # gen is disconnected
+                continue
+            res_ids.append(tmp_id)
+            res_ws.append(tmp_w)
+    elif isinstance(gen_slack_id, (dict)):
+        for k, v in gen_slack_id.items():
+            tmp_id, tmp_w = handle_slack_one_el(df_gen, (k, v))
+            if tmp_id is None or tmp_w is None:
+                # gen is disconnected
+                continue
+            res_ids.append(tmp_id)
+            res_ws.append(tmp_w)
+    else:
+        raise RuntimeError("when intializing the slack with an iterable, make sure to "
+                           "provide either a python list or a python dict.")
+    return res_ids, res_ws