GridCalEngine 5.1.25__tar.gz → 5.1.26__tar.gz

{GridCalEngine-5.1.25 → GridCalEngine-5.1.26}/GridCalEngine/Devices/Parents/editable_device.py

@@ -18,7 +18,7 @@ import random
 import uuid
 import numpy as np
 from GridCalEngine.Devices.profile import Profile
-from typing import List, Dict, AnyStr, Any, Optional, Union, Type, Tuple
+from typing import List, Dict, AnyStr, Any, Union, Type, Tuple
 from GridCalEngine.enumerations import (DeviceType, TimeFrame, BuildStatus, WindingsConnection,
                                         TapModuleControl, TapPhaseControl, SubObjectType,
                                         HvdcControlType, ActionType, AvailableTransferMode, ContingencyMethod,
@@ -59,6 +59,15 @@ GCPROP_TYPES = Union[
 ]
 
 
+def uuid2idtag(val: str):
+    """
+    Remove the useless characters and format as a proper 32-char UID
+    :param val: value that looks like a UUID
+    :return: proper UUID
+    """
+    return val.replace('_', '').replace('-', '')
+
+
 def parse_idtag(val: Union[str, None]) -> str:
     """
     idtag setter
@@ -72,7 +81,7 @@ def parse_idtag(val: Union[str, None]) -> str:
         elif len(val) == 0:
             return uuid.uuid4().hex  # generate a proper UUIDv4 string
         else:
-            candidate_val = val.replace('_', '').replace('-', '')
+            candidate_val = uuid2idtag(val)
             if len(candidate_val) == 32:
                 return candidate_val  # if the string passed can be a UUID, set it
             else:
@@ -236,6 +245,19 @@ class EditableDevice:
                       display=False)
         self.register(key='comment', units='', tpe=str, definition='User comment')
 
+    def get_uuid(self) -> str:
+        """
+        If the idtag property looks like a UUID, it adds the dashes
+        :return: UUID with dashes
+        """
+        if isinstance(self._idtag, str):
+            if len(self.idtag) == 32:
+                return str(uuid.UUID(self.idtag))
+            else:
+                raise Exception("The idtag is not a proper UUID")
+        else:
+            raise Exception("The idtag is not a proper UUID string")
+
     def __str__(self) -> str:
         """
         Name of the object

{GridCalEngine-5.1.25 → GridCalEngine-5.1.26}/GridCalEngine/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.1.25"
+__GridCalEngine_VERSION__ = "5.1.26"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.25 → GridCalEngine-5.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.1.25
+Version: 5.1.26
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.

{GridCalEngine-5.1.25 → GridCalEngine-5.1.26}/GridCalEngine/IO/cim/cgmes/cgmes_utils.py

@@ -117,7 +117,6 @@ def build_rates_dict(cgmes_model, device_type, logger):
                     elif cl.value < act_lim:
                         rates_dict[branch_id] = rate_mva
 
-
     # TODO ActivePowerLimit_list, ApparentPowerLimit_list
     # for al in [cgmes_model.cgmes_assets.ActivePowerLimit_list,
     #            cgmes_model.cgmes_assets.ApparentPowerLimit_list]:
@@ -681,6 +680,7 @@ def find_object_by_uuid(cgmes_model: CgmesCircuit, object_list, target_uuid):
             return obj
     return None
 
+
 def find_tn_by_name(cgmes_model: CgmesCircuit, target_name):
     """
     Finds the topological node with the specified name