GridCal 5.3.15__tar.gz → 5.3.17__tar.gz

{gridcal-5.3.15 → gridcal-5.3.17}/GridCal/Gui/Main/SubClasses/Server/server.py

@@ -130,7 +130,7 @@ class ServerMain(BaseMainGui):
         :return:
         """
         if not self.server_driver.is_running():
-            if len(self.server_driver.logger):
+            if self.server_driver.logger.has_logs():
                 warning_msg(text="Could not connect to the server", title="Server connection")
                 self.ui.actionEnable_server_mode.setChecked(False)
 

{gridcal-5.3.15 → gridcal-5.3.17}/GridCal/Session/server_driver.py

@@ -218,9 +218,9 @@ class ServerDriver(QThread):
         """
         return self.__running__
 
-    def get_certificate(self) -> bool:
+    def get_server_certificate(self) -> bool:
         """
-        Try connecting to the server
+        Try get the server certificate
         :return: ok?
         """
 
@@ -236,8 +236,8 @@ class ServerDriver(QThread):
         """
 
         # get the SSL certificate (only once per class instance)
-        if not self._loaded_certificate:
-            self._loaded_certificate = self.get_certificate()
+        self._loaded_certificate = self.get_server_certificate()
+        self.__running__ = False
 
         # Make a GET request to the root endpoint
         try:
@@ -250,16 +250,20 @@ class ServerDriver(QThread):
             if response.status_code == 200:
                 # Print the response body
                 # print("Response Body:", response.json())
+                self.__running__ = True
                 return True
             else:
                 # Print error message
                 self.logger.add_error(msg=f"Response error", value=response.text)
+                print(response.text)
                 return False
         except ConnectionError as e:
             self.logger.add_error(msg=f"Connection error", value=str(e))
+            print(str(e))
             return False
         except Exception as e:
             self.logger.add_error(msg=f"General exception error", value=str(e))
+            print(str(e))
             return False
 
     def get_jobs(self) -> bool:
@@ -410,28 +414,30 @@ class ServerDriver(QThread):
             # get the running jobs
             self.get_jobs()
 
-            while not self.__cancel__:
-
-                if not self.__pause__:
-                    self.report_status("Sync" if ok else "Server not responding")
-                    self.__running__ = True
-
-                    # sleep
-                    time.sleep(self.sleep_time)
-
-                else:
-                    self.report_status("Sync paused" if ok else "Server not responding")
-                    self.__running__ = False
-
-                    # sleep 1 second to catch other events
-                    time.sleep(self.sleep_time)
-
-                # check if alive
-                ok = self.server_connect()
-
-                if not ok:
-                    # set to false, so that we force re-download on reconnection
-                    self._loaded_certificate = False
+            self.report_status("Sync" if ok else "Server not responding")
+
+            # while not self.__cancel__:
+            #
+            #     if not self.__pause__:
+            #         self.report_status("Sync" if ok else "Server not responding")
+            #         self.__running__ = True
+            #
+            #         # sleep
+            #         time.sleep(self.sleep_time)
+            #
+            #     else:
+            #         self.report_status("Sync paused" if ok else "Server not responding")
+            #         self.__running__ = False
+            #
+            #         # sleep 1 second to catch other events
+            #         time.sleep(self.sleep_time)
+            #
+            #     # check if alive
+            #     ok = self.server_connect()
+            #
+            #     if not ok:
+            #         # set to false, so that we force re-download on reconnection
+            #         self._loaded_certificate = False
 
         else:
             # bad connection
@@ -440,10 +446,10 @@ class ServerDriver(QThread):
             self.done_signal.emit()
             return None
 
-        self.data_model.clear()
-        self.report_status("Sync stop")
-        self.__running__ = False
-        self.done_signal.emit()
+        # self.data_model.clear()
+        # self.report_status("Sync stop")
+        # self.__running__ = False
+        # self.done_signal.emit()
 
     def cancel(self) -> None:
         """

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

{gridcal-5.3.15 → gridcal-5.3.17}/PKG-INFO

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

{gridcal-5.3.15 → gridcal-5.3.17}/setup.py

@@ -78,7 +78,6 @@ dependencies = ['setuptools>=41.0.1',
                 "darkdetect",
                 "pyqtdarktheme",
                 "websockets",
-                "aiohttp",
                 "opencv-python>=4.10.0.84",
                 "packaging",
                 "GridCalEngine==" + __GridCal_VERSION__,  # the GridCalEngine version must be exactly the same