fixes for merge of develop

added standard types dict type
fixed all mypy issues

Author: KS-HTK

pandapower/estimation/algorithm/base.py

@@ -4,6 +4,7 @@
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
 import numpy as np
+from numpy.linalg import LinAlgError
 from scipy.sparse import csr_matrix, vstack, hstack
 from scipy.sparse.linalg import spsolve, norm, inv
 
@@ -144,7 +145,7 @@ def estimate(self, eppci: ExtendedPPCI, debug_mode=False, **kwargs):
                 # prepare next iteration
                 cur_it += 1
 
-            except np.linalg.linalg.LinAlgError:
+            except LinAlgError:
                 self.logger.error("A problem appeared while using the linear algebra methods."
                                   "Check and change the measurement set.")
                 return False
@@ -227,7 +228,7 @@ def estimate(self, eppci: ExtendedPPCI, **kwargs):
                 cur_it += 1
                 current_error = np.max(np.abs(d_E_ext[:len(eppci.non_slack_buses) + num_bus]))
                 self.logger.debug("Current error: {:.7f}".format(current_error))
-            except np.linalg.linalg.LinAlgError:
+            except LinAlgError:
                 self.logger.error("A problem appeared while using the linear algebra methods."
                                   "Check and change the measurement set.")
                 return False
@@ -269,7 +270,7 @@ def estimate(self, eppci: ExtendedPPCI, estimator="wls", **kwargs):
                 cur_it += 1
                 current_error = np.max(np.abs(d_E))
                 self.logger.debug("Current error: {:.7f}".format(current_error))
-            except np.linalg.linalg.LinAlgError:
+            except LinAlgError:
                 self.logger.error("A problem appeared while using the linear algebra methods."
                                   "Check and change the measurement set.")
                 return False
@@ -350,12 +351,12 @@ def estimate(self, eppci: ExtendedPPCI, debug_mode=False, **kwargs):
                 # prepare next iteration
                 cur_it += 1
 
-            except np.linalg.linalg.LinAlgError:
+            except LinAlgError:
                 self.logger.error("A problem appeared while using the linear algebra methods."
                                   "Check and change the measurement set.")
                 return False
 
-        # check if the estimation is successfull
+        # check if the estimation is successful
         self.check_result(current_error, cur_it)
         self.iterations = cur_it
         if debug_mode:

pandapower/estimation/algorithm/matrix_base.py

@@ -11,6 +11,11 @@
 
 from pandapower.estimation.ppc_conversion import ExtendedPPCI
 
+try:
+    from numpy import isin
+except ImportError:
+    from numpy import in1d as isin
+
 __all__ = ['BaseAlgebra', 'BaseAlgebraZeroInjConstraints']
 
 
@@ -295,8 +300,8 @@ def _define_mask(self, idx, mask1, mask2):
     @staticmethod
     def _merge_mask(mask1, mask2):
         new_mask_tot = np.unique(np.concatenate((mask1,mask2),0))
-        new_mask1 = np.in1d(new_mask_tot, mask1)
-        new_mask2 = np.in1d(new_mask_tot, mask2)
+        new_mask1 = isin(new_mask_tot, mask1)
+        new_mask2 = isin(new_mask_tot, mask2)
         return new_mask_tot, new_mask1, new_mask2
 
 

pandapower/file_io.py

@@ -158,7 +158,7 @@ def from_pickle(filename, convert=True):
         >>> net2 = from_pickle("example2.p") #relative path
     """
 
-    net = pandapowerNet(get_raw_data_from_pickle(filename))
+    net = pandapowerNet(net=get_raw_data_from_pickle(filename))
     transform_net_with_df_and_geo(net, ["bus_geodata"], ["line_geodata"])
 
     if convert:

pandapower/network.py

@@ -35,6 +35,7 @@
 
 from pandapower.network_structure import get_structure_dict
 from pandapower.std_types import add_basic_std_types
+from pandapower.pp_types import StandardTypesDict
 
 logger = logging.getLogger(__name__)
 
@@ -233,22 +234,28 @@ class pandapowerNet(ADict):
     """
     @overload
     def __init__(
-            self, name: str, f_hz: float = 50., sn_mva: float = 1., add_stdtypes: bool = True, custom_data: dict = None
+            self,
+            name: str,
+            f_hz: float = 50.,
+            sn_mva: float = 1.,
+            add_stdtypes: bool = True,
+            custom_data: dict | None = None
     ) -> None: ...
 
     @overload
     @deprecated("Calling pandapowerNet to copy a network is no longer supported. Use copy.deepcopy(net) instead.")
-    def __init__(self, net: "pandapowerNet") -> None: ...
+    def __init__(self, *, net: "pandapowerNet | dict") -> None: ...
 
 
     def __init__(
             self,
-            net: "pandapowerNet" = None,
-            name: str = None,
+            name: str | None = None,
             f_hz: float = 50.,
             sn_mva: float = 1.,
             add_stdtypes: bool = True,
-            custom_data: dict = None,
+            custom_data: dict | None = None,
+            *,
+            net: "pandapowerNet | dict | None" = None,
             **kwargs
     ) -> None:
         # TODO: remove once deprecations are removed
@@ -297,7 +304,7 @@ def __init__(
             if add_stdtypes:
                 add_basic_std_types(self)  # TODO: Test this
             else:
-                self.std_types = {"line": {}, "line_dc": {}, "trafo": {}, "trafo3w": {}, "fuse": {}}  # TODO: this should not be set here. a function to return the empty std_types would be sensible
+                self.std_types: StandardTypesDict = {"line": {}, "line_dc": {}, "trafo": {}, "trafo3w": {}, "fuse": {}}
             # reset res_… objects:
             for suffix in [None, "est", "sc", "3ph"]:
                 elements = []
@@ -329,7 +336,7 @@ def __init__(
                         )
                 if "res_cost" in self.keys():
                     del self["res_cost"]
-            self.user_pf_options = {}
+            self.user_pf_options: dict = {}
 
 
     @staticmethod

pandapower/pp_types.py

@@ -1,4 +1,4 @@
-from typing import Literal, Union
+from typing import Literal, Union, TypedDict, Any
 
 import numpy as np
 
@@ -32,4 +32,18 @@
 TapChangerType = Literal["Ratio", "Symmetrical", "Ideal"]
 TapChangerWithTabularType = Literal["Ratio", "Symmetrical", "Ideal", "Tabular"]
 UnderOverExcitedType = Literal["underexcited", "overexcited"]
-WyeDeltaType = Literal["wye", "delta"]
+WyeDeltaType = Literal["wye", "delta"]
+
+
+class StandardTypesDict(TypedDict):
+    """
+    Typing for the Standard Types.
+    """
+    line: dict[str, Any]
+    line_dc: dict[str, Any]
+    trafo: dict[str, Any]
+    trafo3w: dict[str, Any]
+    fuse: dict[str, Any]
+
+
+StandardTypesDictKeys = Literal["line", "line_dc", "trafo", "trafo3w", "fuse"]

pandapower/results_bus.py

@@ -190,7 +190,7 @@ def write_voltage_dependend_load_results(net, p, q, b):
 # TODO: many tests fail if this function fails, yet i could not find tests for it
 def write_pq_results_to_element(
         net: pandapowerNet, ppc: pd.DataFrame, element, suffix=None
-) -> None:
+) -> pandapowerNet:
     """
     get p_mw and q_mvar for a specific pq element ("load", "sgen"...).
     This function basically writes values element table to res_element table

pandapower/std_types.py

@@ -10,6 +10,8 @@
 
 import pandas as pd
 
+from pandapower.pp_types import StandardTypesDictKeys
+
 if TYPE_CHECKING:
     from pandapower.network import pandapowerNet
 
@@ -42,7 +44,7 @@ def create_std_type(
         net: 'pandapowerNet',
         data: dict,
         name: str,
-        element: str = "line",
+        element: StandardTypesDictKeys = "line",
         overwrite=True,
         check_required=True):
     """
@@ -121,6 +123,7 @@ def create_std_types(net, data, element="line", overwrite=True, check_required=T
             - "line_dc"
             - "trafo"
             - "trafo3w"
+            - "fuse"
             
         overwrite: whether overwriteing existing standard type is allowed
         check_required: check if required standard type parameters are present

pandapower/test/loadflow/test_facts_b2b_vsc.py

@@ -3,10 +3,9 @@
 import numpy as np
 import pytest
 
-from pandapower import create_line_dc_from_parameters
 from pandapower.create import (
     create_buses, create_bus, create_line_from_parameters, create_load, create_ext_grid, create_bus_dc, create_b2b_vsc,
-    create_line_dc, create_source_dc, create_load_dc
+    create_line_dc, create_source_dc, create_load_dc, create_line_dc_from_parameters
 )
 from pandapower.network import pandapowerNet
 from pandapower.run import runpp

pandapower/test/loadflow/test_rundcpp.py

@@ -9,12 +9,10 @@
 import numpy as np
 import pytest
 
-from pandapower import create_bus_dc, create_vsc
-from pandapower.create.line_create import create_line_from_parameters, create_line_dc_from_parameters
-
 from pandapower.auxiliary import LoadflowNotConverged
 from pandapower.create import (
-    create_bus, create_transformer, create_transformer3w, create_load, create_xward, create_switch, create_ext_grid
+    create_bus, create_transformer, create_transformer3w, create_load, create_xward, create_switch, create_ext_grid,
+    create_line_from_parameters, create_line_dc_from_parameters, create_bus_dc, create_vsc
 )
 from pandapower.network import pandapowerNet
 from pandapower.networks.power_system_test_cases import case4gs, case118

pandapower/test/loadflow/test_runpp.py

@@ -44,14 +44,11 @@
 
 logger = logging.getLogger(__name__)
 
-try:
-    from pandapower.pf.makeYbus_numba import makeYbus as makeYbus_numba
+from pandapower.auxiliary import _check_if_numba_is_installed
 
-    numba_installed = True
-except ImportError:
-    def makeYbus_numba():
-        pass
-    numba_installed = False
+numba_installed = _check_if_numba_is_installed()
+if numba_installed:
+    from pandapower.pf.makeYbus_numba import makeYbus as makeYbus_numba
 
 
 def test_minimal_net(**kwargs):