GridCal 5.3.38__tar.gz → 5.3.40__tar.gz

{gridcal-5.3.38 → gridcal-5.3.40}/GridCal/ExecuteGridCal.py

@@ -10,10 +10,13 @@ PACKAGE_PARENT = '..'
 SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
 sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
 from GridCal.__version__ import about_msg
+
+# NOTE: For some reason I cannot begin to comprehend, the activation fails on windows if called before the GUI...
+import GridCalEngine.Utils.ThirdParty.gslv.gslv_activation
+
 from GridCal.Gui.Main.GridCalMain import runGridCal
-import platform
 
-os.environ['JUPYTER_PLATFORM_DIRS'] = "1"
+import platform
 
 if platform.system() == 'Windows':
     # this makes the icon display properly under windows
@@ -29,4 +32,3 @@ if __name__ == "__main__":
     # os.environ["QT_QPA_PLATFORMTHEME"] = "qt5ct"  # this forces QT-only menus and look and feel
 
     runGridCal()
-

{gridcal-5.3.38 → gridcal-5.3.40}/GridCal/Gui/Diagrams/MapWidget/Branches/map_line_segment.py

@@ -317,7 +317,7 @@ class MapLineSegment(QGraphicsLineItem):
         x, y = scene_pos.x(), scene_pos.y()
         lat, lon = self.editor.to_lat_lon(x=x, y=y)
         add_menu_entry(menu=menu,
-                       text="Open in google earth",
+                       text="Open in Street view",
                        function_ptr=lambda: open_street_view(lat, lon),
                        icon_path=":/Icons/icons/map.svg")
 

{gridcal-5.3.38 → gridcal-5.3.40}/GridCal/Gui/Main/SubClasses/Model/objects.py

@@ -833,7 +833,7 @@ class ObjectsTableMain(DiagramsMain):
             elif elm_type == DeviceType.WireDevice.value:
 
                 name = f'Wire {len(self.circuit.wire_types) + 1}'
-                obj = dev.Wire(name=name, r_ext=0.01, r=0.01, x=0)
+                obj = dev.Wire(name=name)
                 self.circuit.add_wire(obj)
 
             elif elm_type == DeviceType.TransformerTypeDevice.value:

{gridcal-5.3.38 → gridcal-5.3.40}/GridCal/Gui/Main/SubClasses/io.py

@@ -26,6 +26,7 @@ from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.Compilers.circuit_to_newton_pa import NEWTON_PA_AVAILABLE
 from GridCalEngine.Compilers.circuit_to_pgm import PGM_AVAILABLE
 from GridCalEngine.Compilers.circuit_to_data import compile_numerical_circuit_at
+from GridCalEngine.IO.cim.cgmes.cgmes_export import get_available_cgmes_profiles
 from GridCalEngine.enumerations import CGMESVersions, SimulationTypes
 from GridCalEngine.IO.gridcal.contingency_parser import import_contingencies_from_json, export_contingencies_json_file
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile
@@ -61,15 +62,9 @@ class IoMain(ConfigurationMain):
                                                         CGMESVersions.v3_0_0]}
         self.ui.cgmes_version_comboBox.setModel(gf.get_list_model(list(self.cgmes_version_dict.keys())))
 
-        self.cgmes_profiles_dict = {x.value: x for x in [cgmesProfile.EQ,
-                                                         cgmesProfile.OP,
-                                                         cgmesProfile.SC,
-                                                         cgmesProfile.TP,
-                                                         cgmesProfile.SV,
-                                                         cgmesProfile.SSH,
-                                                         cgmesProfile.DY,
-                                                         cgmesProfile.DL,
-                                                         cgmesProfile.GL]}
+        self.cgmes_profiles_dict = {key: cgmesProfile(key) for key, val in
+                                    get_available_cgmes_profiles(cgmes_version=CGMESVersions.v2_4_15).items()}
+
         self.ui.cgmes_profiles_listView.setModel(gf.get_list_model(list(self.cgmes_profiles_dict.keys()),
                                                                    checks=True, check_value=True))
 
@@ -95,6 +90,9 @@ class IoMain(ConfigurationMain):
         self.ui.exportSimulationDataButton.clicked.connect(self.export_simulation_data)
         self.ui.loadResultFromDiskButton.clicked.connect(self.load_results_driver)
 
+        # change
+        self.ui.cgmes_version_comboBox.currentTextChanged.connect(self.cgmes_version_change)
+
     def dragEnterEvent(self, event):
         """
 
@@ -410,6 +408,11 @@ class IoMain(ConfigurationMain):
                         self.rosetta_gui.set_logger(self.open_file_thread_object.cgmes_logger)
                         self.rosetta_gui.update_combo_boxes()
                         self.rosetta_gui.show()
+                    else:
+                        # else, show the logger if it is necessary
+                        if len(self.open_file_thread_object.logger) > 0:
+                            dlg = LogsDialogue('Open CGMES file logger', self.open_file_thread_object.logger)
+                            dlg.exec()
 
                 else:
                     # else, show the logger if it is necessary
@@ -573,8 +576,6 @@ class IoMain(ConfigurationMain):
                 else:
                     return
 
-
-
     def export_circuit_differential(self):
         """
         Prompt to export a diff of this circuit and a base one
@@ -594,7 +595,6 @@ class IoMain(ConfigurationMain):
         dlg = GridDiffDialogue(grid=self.circuit)
         dlg.exec()
 
-
     # def post_create_circuit_differential(self):
     #     """
     #
@@ -1152,3 +1152,15 @@ class IoMain(ConfigurationMain):
         self.setup_time_sliders()
         self.get_circuit_snapshot_datetime()
         self.change_theme_mode()
+
+    def cgmes_version_change(self):
+        """
+        On GUI cgmes version change, display only the supported profiles
+        """
+        cgmes_version = self.cgmes_version_dict[self.ui.cgmes_version_comboBox.currentText()]
+
+        self.cgmes_profiles_dict = {key: cgmesProfile(key) for key, val in
+                                    get_available_cgmes_profiles(cgmes_version=cgmes_version).items()}
+
+        self.ui.cgmes_profiles_listView.setModel(gf.get_list_model(list(self.cgmes_profiles_dict.keys()),
+                                                                   checks=True, check_value=True))

{gridcal-5.3.38 → gridcal-5.3.40}/GridCal/__version__.py

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

{gridcal-5.3.38 → gridcal-5.3.40}/GridCal/update.py

@@ -5,30 +5,42 @@
 from __future__ import annotations
 from typing import Tuple
 import subprocess
+import requests
 import sys
 import packaging.version as pkg
 from GridCal.__version__ import __GridCal_VERSION__
 
 
-def find_latest_version(name: str = 'GridCal') -> str | None:
-    """
-    Find the latest version of a package
-    :param name: name of the Package
-    :return: version string
-    """
-    latest_version = str(subprocess.run([sys.executable, '-m', 'pip',
-                                         'install', f'{name}==random',
-                                         '--break-system-packages'],
-                                        capture_output=True, text=True))
-    latest_version = latest_version[latest_version.find('(from versions:') + 15:]
-    latest_version = latest_version[:latest_version.find(')')]
-    latest_version = latest_version.replace(' ', '').split(',')[-1]
-
-    if latest_version == 'none':
+# def find_latest_version(name: str = 'GridCal') -> str | None:
+#     """
+#     Find the latest version of a package
+#     :param name: name of the Package
+#     :return: version string
+#     """
+#     latest_version = str(subprocess.run([sys.executable, '-m', 'pip',
+#                                          'install', f'{name}==random',
+#                                          '--break-system-packages'],
+#                                         capture_output=True, text=True))
+#     latest_version = latest_version[latest_version.find('(from versions:') + 15:]
+#     latest_version = latest_version[:latest_version.find(')')]
+#     latest_version = latest_version.replace(' ', '').split(',')[-1]
+#
+#     if latest_version == 'none':
+#         return None
+#
+#     return latest_version
+
+
+def find_latest_version(package_name: str = 'GridCal'):
+    try:
+        url = f"https://pypi.org/pypi/{package_name}/json"
+        response = requests.get(url, timeout=5)
+        response.raise_for_status()
+        data = response.json()
+        return data["info"]["version"]
+    except Exception:
         return None
 
-    return latest_version
-
 
 def check_version(name: str = 'GridCal') -> Tuple[int, str]:
     """
@@ -43,7 +55,7 @@ def check_version(name: str = 'GridCal') -> Tuple[int, str]:
     +1: we are behind pipy, we can update
     """
 
-    latest_version = find_latest_version(name=name)
+    latest_version = find_latest_version(package_name=name)
 
     # pipy_version = pkg_resources.parse_version(latest_version)
     # gc_version = pkg_resources.parse_version(__GridCal_VERSION__)

{gridcal-5.3.38 → gridcal-5.3.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 5.3.38
+Version: 5.3.40
 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.