GridCal 5.3.21__tar.gz → 5.3.22__tar.gz

{gridcal-5.3.21 → gridcal-5.3.22}/GridCal/Gui/Main/MainWindow.py

@@ -4603,6 +4603,11 @@ class Ui_mainWindow(object):
 
         self.horizontalLayout_8.addWidget(self.server_pwd_lineEdit)
 
+        self.secureServerConnectionCheckBox = QCheckBox(self.frame_2)
+        self.secureServerConnectionCheckBox.setObjectName(u"secureServerConnectionCheckBox")
+
+        self.horizontalLayout_8.addWidget(self.secureServerConnectionCheckBox)
+
         self.horizontalSpacer_7 = QSpacerItem(304, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_8.addItem(self.horizontalSpacer_7)
@@ -6030,6 +6035,7 @@ class Ui_mainWindow(object):
 #if QT_CONFIG(tooltip)
         self.server_pwd_lineEdit.setToolTip(QCoreApplication.translate("mainWindow", u"Type here the GridCal server password (ask your IT team)", None))
 #endif // QT_CONFIG(tooltip)
+        self.secureServerConnectionCheckBox.setText(QCoreApplication.translate("mainWindow", u"Secure", None))
         self.server_status_label.setText(QCoreApplication.translate("mainWindow", u"...", None))
         self.settings_tabWidget.setTabText(self.settings_tabWidget.indexOf(self.tab_5), QCoreApplication.translate("mainWindow", u"Server", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.SettingsTab), QCoreApplication.translate("mainWindow", u"Settings", None))

{gridcal-5.3.21 → gridcal-5.3.22}/GridCal/Gui/Main/SubClasses/Server/server.py

@@ -26,7 +26,7 @@ class ServerMain(BaseMainGui):
         BaseMainGui.__init__(self, parent=parent)
 
         # Server driver
-        self.server_driver: ServerDriver = ServerDriver(url="", port=0, pwd="")
+        self.server_driver: ServerDriver = ServerDriver(url="", port=0, pwd="", secure=False)
         self.server_driver.connected_signal.connect(self.server_connected)
         self.server_driver.done_signal.connect(self.post_start_stop_server)  # connect the post function
 
@@ -61,7 +61,8 @@ class ServerMain(BaseMainGui):
         return {"url": self.ui.server_url_lineEdit.text(),
                 "port": self.ui.server_port_spinBox.value(),
                 "user": "",
-                "pwd": self.ui.server_pwd_lineEdit.text()}
+                "pwd": self.ui.server_pwd_lineEdit.text(),
+                "secure": self.ui.secureServerConnectionCheckBox.isChecked(),}
 
     def save_server_config(self):
         """
@@ -81,6 +82,7 @@ class ServerMain(BaseMainGui):
         self.ui.server_port_spinBox.setValue(data.get("port", 8080))
         # "user": "",
         self.ui.server_pwd_lineEdit.setText(data.get("pwd", "1234"))
+        self.ui.secureServerConnectionCheckBox.setChecked(data.get("secure", True))
 
     def load_server_config(self) -> None:
         """
@@ -107,6 +109,7 @@ class ServerMain(BaseMainGui):
             self.server_driver.set_values(url=self.ui.server_url_lineEdit.text().strip(),
                                           port=self.ui.server_port_spinBox.value(),
                                           pwd=self.ui.server_pwd_lineEdit.text().strip(),
+                                          secure=self.ui.secureServerConnectionCheckBox.isChecked(),
                                           status_func=self.ui.server_status_label.setText)
 
             # save the last server config

{gridcal-5.3.21 → gridcal-5.3.22}/GridCal/Gui/Main/SubClasses/Settings/configuration.py

@@ -179,7 +179,6 @@ class ConfigurationMain(ResultsMain):
                 }
             },
             "linear": {
-
                 "ptdf_threshold": self.ui.ptdf_threshold_doubleSpinBox,
                 "lodf_threshold": self.ui.lodf_threshold_doubleSpinBox
             },

{gridcal-5.3.21 → gridcal-5.3.22}/GridCal/Session/server_driver.py

@@ -147,7 +147,8 @@ class ServerDriver(QThread):
     sync_event = Signal()
     items_processed_event = Signal()
 
-    def __init__(self, url: str, port: int, pwd: str, sleep_time: int = 2, status_func: Callable[[str], None] = None):
+    def __init__(self, url: str, port: int, pwd: str, sleep_time: int = 2, status_func: Callable[[str], None] = None,
+                 secure: bool = False):
         """
         Constructor
         :param url: Server URL
@@ -163,6 +164,7 @@ class ServerDriver(QThread):
         self.pwd = pwd
         self.sleep_time = sleep_time
         self.status_func: Callable[[str], None] = status_func
+        self.secure = secure
         self.__running__ = False
 
         self.logger = Logger()
@@ -175,19 +177,23 @@ class ServerDriver(QThread):
         self.__cancel__ = False
         self.__pause__ = False
 
-    def set_values(self, url: str, port: int, pwd: str, sleep_time: int = 2, status_func: Callable[[str], None] = None):
+    def set_values(self, url: str, port: int, pwd: str, sleep_time: int = 2,
+                   secure: bool = False,
+                   status_func: Callable[[str], None] = None):
         """
         Set the values
         :param url: Server URL
         :param port: Server port
         :param pwd: Server password
         :param sleep_time: Sleep time (s)
+        :param secure: Use https?
         :param status_func: a text function pointer
         """
         self.url = url
         self.port = port
         self.pwd = pwd
         self.sleep_time = sleep_time
+        self.secure = secure
         self.status_func: Callable[[str], None] = status_func
         self.__running__ = False
         self.logger = Logger()
@@ -206,7 +212,10 @@ class ServerDriver(QThread):
         Base URL of the service
         :return:
         """
-        return f"https://{self.url}:{self.port}"
+        if self.secure:
+            return f"https://{self.url}:{self.port}"
+        else:
+            return f"http://{self.url}:{self.port}"
 
     def get_certificate_path(self):
 
@@ -504,9 +513,15 @@ class RemoteJobDriver(QThread):
         model_data = gather_model_as_jsons_for_communication(circuit=self.grid, instruction=self.instruction)
 
         try:
-            response = send_json_data(json_data=model_data,
-                                      endpoint_url=websocket_url,
-                                      certificate=self.certificate_path)
+            response, ok = send_json_data(json_data=model_data,
+                                          endpoint_url=websocket_url,
+                                          certificate=self.certificate_path)
+
+            if not ok:
+                response_text = response
+                self.logger.add_error("Response error", value=response_text)
+                response = None
+
         except requests.exceptions.ConnectionError as e:
             warn(str(e))
             response = None
@@ -516,7 +531,6 @@ class RemoteJobDriver(QThread):
 
             success = response.get("success", False)
 
-
             if success:
                 results_data = response["results"]
 

{gridcal-5.3.21 → gridcal-5.3.22}/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.21"
+__GridCal_VERSION__ = "5.3.22"
 
 url = 'https://github.com/SanPen/GridCal'
 

{gridcal-5.3.21 → gridcal-5.3.22}/PKG-INFO

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