GridCalEngine 5.1.56__tar.gz → 5.1.58__tar.gz

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/DataStructures/__init__.py

@@ -27,3 +27,4 @@ from GridCalEngine.DataStructures.fluid_turbine_data import FluidTurbineData
 from GridCalEngine.DataStructures.fluid_pump_data import FluidPumpData
 from GridCalEngine.DataStructures.fluid_p2x_data import FluidP2XData
 from GridCalEngine.DataStructures.fluid_path_data import FluidPathData
+from GridCalEngine.DataStructures.numerical_circuit import compile_numerical_circuit_at, NumericalCircuit

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/DataStructures/branch_data.py

@@ -352,7 +352,7 @@ class BranchData:
 
         :return:
         """
-        return 1.0 / (self.R + 1.0j * self.X)
+        return 1.0 / (self.R + 1.0j * self.X + 1e-20)
 
     def get_linear_series_admittance(self) -> Vec:
         """

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/Devices/Branches/transformer.py

@@ -33,15 +33,15 @@ from GridCalEngine.Devices.Parents.editable_device import DeviceType
 class Transformer2W(ControllableBranchParent):
 
     def __init__(self,
-                 bus_from: Bus = None,
-                 bus_to: Bus = None,
+                 bus_from: Bus | None = None,
+                 bus_to: Bus | None = None,
                  name='Branch',
-                 idtag: Union[None, str] = None,
+                 idtag: str | None = None,
                  code: str = '',
-                 cn_from: ConnectivityNode = None,
-                 cn_to: ConnectivityNode = None,
-                 HV: Union[None, float] = None,
-                 LV: Union[None, float] = None,
+                 cn_from: ConnectivityNode | None = None,
+                 cn_to: ConnectivityNode | None = None,
+                 HV: float | None = None,
+                 LV: float | None = None,
                  nominal_power: float = 0.001,
                  copper_losses: float = 0.0,
                  iron_losses: float = 0.0,
@@ -71,7 +71,7 @@ class Transformer2W(ControllableBranchParent):
                  alpha: float = 0.00330,
                  tap_module_control_mode: TapModuleControl = TapModuleControl.fixed,
                  tap_phase_control_mode: TapPhaseControl = TapPhaseControl.fixed,
-                 template: TransformerType = None,
+                 template: TransformerType | None = None,
                  contingency_factor: float = 1.0,
                  protection_rating_factor: float = 1.4,
                  contingency_enabled: bool = True,

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/Devices/Branches/vsc.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
 
 import pandas as pd
 import numpy as np
@@ -30,12 +31,12 @@ from GridCalEngine.Devices.Parents.editable_device import DeviceType
 class VSC(ControllableBranchParent):
 
     def __init__(self,
-                 bus_from: Bus = None,
-                 bus_to: Bus = None,
-                 cn_from: ConnectivityNode = None,
-                 cn_to: ConnectivityNode = None,
+                 bus_from: Bus | None = None,
+                 bus_to: Bus | None = None,
+                 cn_from: ConnectivityNode | None = None,
+                 cn_to: ConnectivityNode | None = None,
                  name='VSC',
-                 idtag=None,
+                 idtag: str | None = None,
                  code='',
                  active=True,
                  r=0.0001,

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/Devices/Injections/controllable_shunt.py

@@ -140,7 +140,10 @@ class ControllableShunt(ShuntParent):
 
         :return:
         """
-        return self._b_steps[0]
+        if len(self._b_steps):
+            return self._b_steps[0]
+        else:
+            return -9999.0
 
     @property
     def Bmax(self):
@@ -148,7 +151,10 @@ class ControllableShunt(ShuntParent):
 
         :return:
         """
-        return self._b_steps[-1]
+        if len(self._b_steps):
+            return self._b_steps[-1]
+        else:
+            return 9999.0
 
     @property
     def g_steps(self):

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/Devices/Parents/controllable_branch_parent.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
 
 import numpy as np
 from typing import Union
@@ -29,13 +30,13 @@ from GridCalEngine.Devices.profile import Profile
 class ControllableBranchParent(BranchParent):
 
     def __init__(self,
-                 bus_from: Bus,
-                 bus_to: Bus,
+                 bus_from: Bus | None,
+                 bus_to: Bus | None,
                  name: str,
-                 idtag: Union[None, str],
+                 idtag: str | None,
                  code: str,
-                 cn_from: ConnectivityNode,
-                 cn_to: ConnectivityNode,
+                 cn_from: ConnectivityNode | None,
+                 cn_to: ConnectivityNode | None,
                  active: bool,
                  rate: float,
                  r: float,
@@ -52,13 +53,12 @@ class ControllableBranchParent(BranchParent):
                  vset: float,
                  Pset: float,
                  Qset: float,
-                 regulation_branch: Union[BranchParent, None],
-                 regulation_bus: Union[Bus, None],
-                 regulation_cn: Union[ConnectivityNode, None],
+                 regulation_branch: BranchParent | None,
+                 regulation_bus: Bus | None,
+                 regulation_cn: ConnectivityNode | None,
                  temp_base: float,
                  temp_oper: float,
                  alpha: float,
-                 # control_mode: TransformerControlType,
                  tap_module_control_mode: TapModuleControl,
                  tap_phase_control_mode: TapPhaseControl,
                  contingency_factor: float,
@@ -293,9 +293,6 @@ class ControllableBranchParent(BranchParent):
                       definition='Objective power at the selected side.',
                       profile_name='Pset_prof', old_names=['Pdc_set'])
 
-        # self.register(key='regulation_branch', units='', tpe=DeviceType.BranchDevice,
-        #               definition='Branch where the controls are applied.', editable=False)
-
         self.register(key='temp_base', units='ºC', tpe=float, definition='Base temperature at which R was measured.')
         self.register(key='temp_oper', units='ºC', tpe=float, definition='Operation temperature to modify R.',
                       profile_name='temp_oper_prof')

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/Devices/Substation/connectivity_node.py

@@ -56,7 +56,7 @@ class ConnectivityNode(PhysicalDevice):
 
         self._voltage_level: Union[VoltageLevel, None] = voltage_level
 
-        self.internal: bool = bool(internal)
+        self._internal: bool = bool(internal)
 
         self.Vnom = float(Vnom) if voltage_level is None else voltage_level.Vnom
 
@@ -86,3 +86,11 @@ class ConnectivityNode(PhysicalDevice):
 
         if val is not None:
             self.Vnom = val.Vnom
+
+    @property
+    def internal(self):
+        return self._internal
+
+    @internal.setter
+    def internal(self, val: bool):
+        self._internal = val

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/Devices/assets.py

@@ -4953,7 +4953,7 @@ class Assets:
     #
     # ------------------------------------------------------------------------------------------------------------------
 
-    def get_elements_by_type(self, device_type: DeviceType) -> Union[pd.DatetimeIndex, List[ALL_DEV_TYPES]]:
+    def get_elements_by_type(self, device_type: DeviceType) -> pd.DatetimeIndex | List[ALL_DEV_TYPES]:
         """
         Get set of elements and their parent nodes
         :param device_type: DeviceTYpe instance

GridCalEngine-5.1.58/GridCalEngine/IO/__init__.py

@@ -0,0 +1,32 @@
+# GridCal
+# Copyright (C) 2015 - 2024 Santiago Peñate Vera
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+from GridCalEngine.IO.file_handler import FileOpen, FileSave, FileSavingOptions
+
+from GridCalEngine.IO.cim import *
+from GridCalEngine.IO.gridcal import *
+from GridCalEngine.IO.matpower import *
+from GridCalEngine.IO.epc import *
+from GridCalEngine.IO.dgs import *
+from GridCalEngine.IO.others import *
+
+
+
+
+
+
+

GridCalEngine-5.1.58/GridCalEngine/IO/cim/__init__.py

@@ -0,0 +1,18 @@
+# GridCal
+# Copyright (C) 2015 - 2024 Santiago Peñate Vera
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from GridCalEngine.IO.cim.cgmes import *
+from GridCalEngine.IO.cim.cim16 import *

GridCalEngine-5.1.58/GridCalEngine/IO/cim/cgmes/__init__.py

@@ -0,0 +1,20 @@
+# GridCal
+# Copyright (C) 2015 - 2024 Santiago Peñate Vera
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+from GridCalEngine.IO.cim.cgmes.cgmes_data_parser import CgmesDataParser
+from GridCalEngine.IO.cim.cgmes.cgmes_circuit import CgmesCircuit
+from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_to_gridcal.py

@@ -42,6 +42,10 @@ class CnLookup:
     """
 
     def __init__(self, cgmes_model: CgmesCircuit):
+        """
+
+        :param cgmes_model:
+        """
         self.cn_dict: Dict[str, gcdev.ConnectivityNode] = dict()
         self.bus_dict: Dict[str, gcdev.Bus] = dict()
 
@@ -302,7 +306,7 @@ def get_gcdev_buses(cgmes_model: CgmesCircuit,
     if slack_id is None:
         logger.add_error(msg="Couldn't find referencePriority 1 in the SynchronousMachines.",
                          device_class="SynchronousMachine",
-                         device_property="referencePriority")  # TODO error check
+                         device_property="referencePriority")
 
     # dictionary relating the TopologicalNode uuid to the gcdev CalculationNode
     calc_node_dict: Dict[str, gcdev.Bus] = dict()
@@ -397,13 +401,16 @@ def get_gcdev_buses(cgmes_model: CgmesCircuit,
 def get_gcdev_dc_buses(cgmes_model: CgmesCircuit,
                        gc_model: MultiCircuit,
                        buses_to_skip: List,
-                       logger: DataLogger) -> Dict[str, gcdev.Bus]:
+                       logger: DataLogger,
+                       default_nominal_voltage=500.0) -> Dict[str, gcdev.Bus]:
     """
     Convert the DCTopologicalNodes to DC Buses (CalculationNodes)
 
     :param cgmes_model: CgmesCircuit
     :param gc_model: gcdevCircuit
+    :param buses_to_skip:
     :param logger: DataLogger
+    :param default_nominal_voltage: default nominal voltage for DC nodes since CGMES does not have any...
     :return:
     """
 
@@ -413,13 +420,11 @@ def get_gcdev_dc_buses(cgmes_model: CgmesCircuit,
     for cgmes_elm in cgmes_model.cgmes_assets.DCTopologicalNode_list:
 
         if cgmes_elm not in buses_to_skip:
-            nominal_voltage = 500.0  # TODO get DC nominal Voltage
-
             gcdev_elm = gcdev.Bus(
                 name=cgmes_elm.name,
                 idtag=cgmes_elm.uuid,
                 code=cgmes_elm.description,
-                Vnom=nominal_voltage,
+                Vnom=default_nominal_voltage,
                 active=True,
                 is_slack=False,
                 is_dc=True,
@@ -460,19 +465,20 @@ def get_gcdev_dc_connectivity_nodes(cgmes_model: CgmesCircuit,
     for cgmes_elm in cgmes_model.cgmes_assets.DCNode_list:
 
         bus = dc_bus_dict.get(cgmes_elm.DCTopologicalNode.uuid, None)
-        vnom = 10
+
         if bus is None:
             logger.add_warning(msg='No DC Bus found for DC Node.',
                                device=cgmes_elm.rdfid,
                                device_class=cgmes_elm.tpe,
                                comment="Maybe it belongs to a DCGround, that is not imported.")
-            default_bus = None
+
         else:
             if bus not in used_buses:
                 default_bus = bus
                 used_buses.add(bus)
             else:
                 default_bus = None
+
             vnom = bus.Vnom
 
             gcdev_elm = gcdev.ConnectivityNode(
@@ -482,7 +488,6 @@ def get_gcdev_dc_connectivity_nodes(cgmes_model: CgmesCircuit,
                 dc=True,
                 default_bus=default_bus,  # this is only set by the BusBar's
                 Vnom=vnom,
-                # voltage_level=vl
             )
 
             gc_model.add_connectivity_node(gcdev_elm)
@@ -899,7 +904,6 @@ def get_gcdev_generators(cgmes_model: CgmesCircuit,
 
                     if technology:
                         gcdev_elm.technologies.append(gcdev.Association(api_object=technology, value=1.0))
-                        # gcdev_model.add_generator_fuel()
                 else:
                     logger.add_error(msg='SynchronousMachine has no generating unit',
                                      device=cgmes_elm.rdfid,
@@ -1022,7 +1026,7 @@ def get_gcdev_ac_lines(cgmes_model: CgmesCircuit,
                                                                            Sbase=Sbase)
 
                 current_rate = rates_dict.get(cgmes_elm.uuid, None)  # A
-                if current_rate:
+                if current_rate and cgmes_elm.BaseVoltage is not None:
                     # rate in MVA = kA * kV * sqrt(3)
                     rate = np.round((current_rate / 1000.0) * cgmes_elm.BaseVoltage.nominalVoltage * 1.73205080756888,
                                     4)
@@ -1187,9 +1191,6 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                         windings[i - 1] = pte
             windings = [x for x in windings if x is not None]
 
-            # windings = get_windings(cgmes_elm)
-            # windings: List[PowerTransformerEnd] = list(cgmes_elm.references_to_me['PowerTransformerEnd'])
-
             rate_mva = rates_dict.get(cgmes_elm.uuid, 9999.0)  # min PATL rate in MW/MVA
 
             calc_nodes, cns = find_connections(cgmes_elm=cgmes_elm,
@@ -1206,12 +1207,9 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                     cn_f = cns[0]
                     cn_t = cns[1]
 
-                    # v1 = windings[0].BaseVoltage.nominalVoltage
-                    # v2 = windings[1].BaseVoltage.nominalVoltage
                     HV = windings[0].ratedU
                     LV = windings[1].ratedU
-                    # HV = max(v1, v2)
-                    # LV = min(v1, v2)
+
                     # get per unit values
                     r, x, g, b, r0, x0, g0, b0 = get_pu_values_power_transformer(cgmes_elm, Sbase)
                     rated_s = windings[0].ratedS
@@ -1284,8 +1282,9 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                         windings2[i] = windings[j_min]
 
                         if i != j_min:
-                            logger.add_error(msg='The winding is not in the right order with respect to the transformer TopologicalNodes',
-                                             device=windings[j_min].uuid, device_class=windings[j_min].tpe)
+                            logger.add_error(
+                                msg='The winding is not in the right order with respect to the transformer TopologicalNodes',
+                                device=windings[j_min].uuid, device_class=windings[j_min].tpe)
 
                     windings = windings2
 
@@ -1312,7 +1311,7 @@ def get_gcdev_ac_transformers(cgmes_model: CgmesCircuit,
                                                     x12=x12, x23=x23, x31=x31,
                                                     rate12=windings[0].ratedS,
                                                     rate23=windings[1].ratedS,
-                                                    rate31=windings[2].ratedS,)
+                                                    rate31=windings[2].ratedS, )
 
                     r1, x1, g1, b1, r01, x01, g01, b01 = get_pu_values_power_transformer_end(windings[0], Sbase)
                     gcdev_elm.winding1.R = r1
@@ -1559,8 +1558,6 @@ def get_gcdev_shunts(cgmes_model: CgmesCircuit,
                     B=B * cgmes_elm.sections,
                     G0=G0 * cgmes_elm.sections,
                     B0=B0 * cgmes_elm.sections,
-                    # Bmax=B * cgmes_elm.maximumSections,
-                    # Bmin=B,
                     active=True,
                 )
                 gcdev_model.add_shunt(bus=calc_node, api_obj=gcdev_elm, cn=cn)
@@ -1590,6 +1587,7 @@ def get_gcdev_controllable_shunts(
     :param calc_node_dict: Dict[str, gcdev.Bus]
     :param cn_dict: Dict[str, gcdev.ConnectivityNode]
     :param device_to_terminal_dict: Dict[str, Terminal]
+    :param Sbase: base power (100 MVA)
     :param logger:
     """
     # comes later
@@ -1631,8 +1629,7 @@ def get_gcdev_switches(cgmes_model: CgmesCircuit,
     for e in cgmes_model.cgmes_assets.CurrentLimit_list:
         if not isinstance(e.OperationalLimitSet, str):
             conducting_equipment = e.OperationalLimitSet.Terminal.ConductingEquipment
-            if isinstance(conducting_equipment,
-                          (sw_type, br_type, ds_type, lbs_type)):
+            if isinstance(conducting_equipment, (sw_type, br_type, ds_type, lbs_type)):
                 branch_id = conducting_equipment.uuid
                 rates_dict[branch_id] = e.value
 
@@ -1690,7 +1687,6 @@ def get_gcdev_switches(cgmes_model: CgmesCircuit,
                     bus_to=calc_node_t,
                     rate=op_rate,
                     rated_current=rated_current,
-                    # is_open=cgmes_elm.open,   # not used
                     retained=cgmes_elm.retained,
                     normal_open=cgmes_elm.normalOpen
                 )
@@ -1786,6 +1782,7 @@ def get_gcdev_voltage_levels(cgmes_model: CgmesCircuit,
                 object_list=gcdev_model.substations,
                 target_idtag=cgmes_elm.Substation.uuid  # gcdev_elm.idtag
             )
+
             if subs:
                 gcdev_elm.substation = subs
 
@@ -1830,21 +1827,14 @@ def get_gcdev_busbars(cgmes_model: CgmesCircuit,
                                                logger=logger)
 
             if len(calc_nodes) == 1 or len(cns) == 1:
-                # calc_node = calc_nodes[0]
-                cn = cns[0]
 
                 vl_type = cgmes_model.get_class_type("VoltageLevel")
-                bay_type = cgmes_model.get_class_type("Bay")
                 container = cgmes_elm.EquipmentContainer
+
                 if isinstance(container, vl_type):
                     vl = container
-                    substation = container.Substation
-                elif isinstance(container, bay_type):
-                    vl = None
-                    substation = container.VoltageLevel.Substation
                 else:
                     vl = None
-                    substation = None
 
                 cn = cn_look_up.get_busbar_cn(bb_id=cgmes_elm.uuid)
                 bus = cn_look_up.get_busbar_bus(bb_id=cgmes_elm.uuid)
@@ -1928,10 +1918,12 @@ def get_gcdev_community(cgmes_model: CgmesCircuit,
                     object_list=gcdev_model.areas,
                     target_idtag=cgmes_elm.Region.uuid
                 )
+
                 if a is not None:
                     gcdev_elm.area = a
 
                 gcdev_model.add_zone(gcdev_elm)
+
             else:
                 gcdev_elm = gcdev.Community(
                     name=cgmes_elm.name,
@@ -1945,6 +1937,7 @@ def get_gcdev_community(cgmes_model: CgmesCircuit,
                     object_list=gcdev_model.countries,
                     target_idtag=cgmes_elm.Region.uuid
                 )
+
                 if c is not None:
                     gcdev_elm.country = c
 
@@ -1964,13 +1957,6 @@ def cgmes_to_gridcal(cgmes_model: CgmesCircuit,
     Sbase = gc_model.Sbase
     cgmes_model.emit_progress(70)
     cgmes_model.emit_text("Converting CGMES to Gridcal")
-    # busbar_dict = parse_bus_bars(cgmes_model, circuit, logger)
-    # parse_ac_line_segment(cgmes_model, circuit, busbar_dict, logger)
-    # parse_power_transformer(cgmes_model, circuit, busbar_dict, logger)
-    # parse_switches(cgmes_model, circuit, busbar_dict, logger)
-    # parse_loads(cgmes_model, circuit, busbar_dict, logger)
-    # parse_shunts(cgmes_model, circuit, busbar_dict, logger)
-    # parse_generators(cgmes_model, circuit, busbar_dict, logger)
 
     get_gcdev_countries(cgmes_model, gc_model)
 
@@ -1978,8 +1964,6 @@ def cgmes_to_gridcal(cgmes_model: CgmesCircuit,
 
     get_gcdev_substations(cgmes_model, gc_model)
 
-    vl_dict = get_gcdev_voltage_levels(cgmes_model, gc_model, logger)
-
     cn_look_up = CnLookup(cgmes_model)
 
     sv_volt_dict = get_gcdev_voltage_dict(cgmes_model=cgmes_model,
@@ -2069,7 +2053,8 @@ def cgmes_to_gridcal(cgmes_model: CgmesCircuit,
                        Sbase=Sbase)
 
     cgmes_model.emit_progress(91)
-    cgmes_model.emit_text("Converting CGMES to Gridcal - HVDC!")
+    cgmes_model.emit_text("Converting CGMES to Gridcal - HVDC")
+
     # DC elements  ---------------------------------------------------------
     dc_device_to_terminal_dict, ground_buses, ground_nodes = get_gcdev_dc_device_to_terminal_dict(
         cgmes_model=cgmes_model,

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v2_4_15/devices/connectivity_node.py

@@ -14,13 +14,15 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.identified_object import IdentifiedObject
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile
 
 
 class ConnectivityNode(IdentifiedObject):
-	def __init__(self, rdfid='', tpe='ConnectivityNode'):
+	def __init__(self, rdfid='', tpe: str = 'ConnectivityNode') -> None:
 		IdentifiedObject.__init__(self, rdfid, tpe)
 
 		from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.terminal import Terminal

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/ac_line_segment.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.conductor import Conductor
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile, UnitSymbol

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/acdc_converter.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.conducting_equipment import ConductingEquipment
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile, UnitSymbol

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/base_voltage.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.identified_object import IdentifiedObject
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile, UnitSymbol

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/bay.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.equipment_container import EquipmentContainer
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/boundary_point.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.power_system_resource import PowerSystemResource
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/bus_name_marker.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.identified_object import IdentifiedObject
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/caes_plant.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.power_system_resource import PowerSystemResource
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/clamp.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.conducting_equipment import ConductingEquipment
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile, UnitSymbol

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/cogeneration_plant.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.power_system_resource import PowerSystemResource
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/conform_load.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.energy_consumer import EnergyConsumer
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile

{GridCalEngine-5.1.56 → GridCalEngine-5.1.58}/GridCalEngine/IO/cim/cgmes/cgmes_v3_0_0/devices/connectivity_node.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.IO.cim.cgmes.cgmes_v3_0_0.devices.identified_object import IdentifiedObject
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile