GridCalEngine 5.1.39__tar.gz → 5.1.40__tar.gz

{GridCalEngine-5.1.39 → GridCalEngine-5.1.40}/GridCalEngine/Devices/profile.py

@@ -255,7 +255,7 @@ class Profile:
         else:
             return 0.0
 
-    def set(self, arr: NumericVec):
+    def set(self, arr: NumericVec) -> bool:
         """
         Set array value
         :param arr:
@@ -278,31 +278,38 @@ class Profile:
                 if isinstance(base, np.bool_):
                     base = bool(base)
 
-                self._is_sparse = True
-                self._sparse_array = SparseArray(data_type=self.dtype)
+                if check_type(dtype=self.dtype, value=base):
+                    self._is_sparse = True
+                    self._sparse_array = SparseArray(data_type=self.dtype)
 
-                if most_common_count > 1:
-                    if isinstance(arr, np.ndarray):
-                        data, indptr = compress_array_numba(arr, base)
-                        data_map = {i: x for i, x in zip(indptr, data)}  # this is to use a native python dict
+                    if most_common_count > 1:
+                        if isinstance(arr, np.ndarray):
+                            data, indptr = compress_array_numba(arr, base)
+                            data_map = {i: x for i, x in zip(indptr, data)}  # this is to use a native python dict
+                        else:
+                            raise Exception('Unknown profile type' + str(type(arr)))
                     else:
-                        raise Exception('Unknown profile type' + str(type(arr)))
-                else:
-                    data_map = dict()
+                        data_map = dict()
 
-                self._sparse_array.create(size=len(arr),
-                                          default_value=base,
-                                          data=data_map)
-                check_type(dtype=self.dtype, value=base)
+                    self._sparse_array.create(size=len(arr),
+                                              default_value=base,
+                                              data=data_map)
+                else:
+                    print("Cannot set sparse array because the type check failed")
+                    return False
             else:
-                check_type(dtype=self.dtype, value=arr[0])
-                self._is_sparse = False
-                self._dense_array = arr
+                if check_type(dtype=self.dtype, value=arr[0]):
+                    self._is_sparse = False
+                    self._dense_array = arr
+                else:
+                    print("Cannot set dense array because the type check failed")
+                    return False
         else:
             self._is_sparse = False
             self._dense_array = arr
 
         self._initialized = True
+        return True
 
     def __eq__(self, other: "Profile") -> bool:
         """

{GridCalEngine-5.1.39 → GridCalEngine-5.1.40}/GridCalEngine/IO/__init__.py

@@ -16,3 +16,6 @@ from GridCalEngine.IO.matpower.matpower_parser import parse_matpower_file, get_m
 from GridCalEngine.IO.raw.raw_parser_legacy import PSSeParser
 
 from GridCalEngine.IO.file_handler import FileOpen, FileSave, FileSavingOptions
+
+from GridCalEngine.IO.gridcal.remote import (gather_model_as_jsons_for_communication, RemoteInstruction,
+                                             SimulationTypes, send_json_data, get_certificate_path, get_certificate)

{GridCalEngine-5.1.39 → GridCalEngine-5.1.40}/GridCalEngine/IO/gridcal/remote.py

@@ -15,12 +15,15 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import os
+import requests
+import asyncio
 from typing import Dict, Union, Any
 from uuid import uuid4, getnode
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 from GridCalEngine.enumerations import (SimulationTypes, JobStatus)
+from GridCalEngine.basic_structures import Logger
 from GridCalEngine.IO.gridcal.pack_unpack import gather_model_as_jsons
-from GridCalEngine.IO.gridcal.zip_interface import save_results_in_zip
+from GridCalEngine.IO.file_system import get_create_gridcal_folder
 
 
 class RemoteInstruction:
@@ -137,6 +140,49 @@ class RemoteJob:
         self.instruction = RemoteInstruction(data=data['instruction'])
 
 
+def get_certificate_path() -> str:
+    """
+    Get a path to the certificates
+    :return:
+    """
+    return os.path.join(get_create_gridcal_folder(), "server_cert.pem")
+
+
+def get_certificate(base_url: str, certificate_path: str, pwd: str, logger: Logger = Logger()) -> bool:
+    """
+    Try connecting to the server
+    :return: ok?
+    """
+    # Make a GET request to the root endpoint
+    try:
+        response = requests.get(f"{base_url}/get_cert",
+                                headers={"API-Key": pwd},
+                                verify=False,
+                                timeout=2)
+
+        # Save the certificate to a file
+
+        with open(certificate_path, "wb") as cert_file:
+            cert_file.write(response.content)
+
+        # Check if the request was successful
+        if response.status_code == 200:
+            # Print the response body
+            # print("Response Body:", response.json())
+            # self.data_model.parse_data(data=response.json())
+            return True
+        else:
+            # Print error message
+            logger.add_error(msg=f"Response error", value=response.text)
+            return False
+    except ConnectionError as e:
+        logger.add_error(msg=f"Connection error", value=str(e))
+        return False
+    except Exception as e:
+        logger.add_error(msg=f"General exception error", value=str(e))
+        return False
+
+
 def gather_model_as_jsons_for_communication(circuit: MultiCircuit,
                                             instruction: RemoteInstruction) -> Dict[str, Dict[str, Dict[str, str]]]:
     """
@@ -160,3 +206,25 @@ def gather_model_as_jsons_for_communication(circuit: MultiCircuit,
     return data
 
 
+def send_json_data(json_data: Dict[str, Union[str, Dict[str, Dict[str, str]]]],
+                   endpoint_url: str,
+                   certificate: str) -> Any:
+    """
+    Send a file along with instructions about the file
+    :param json_data: Json with te model
+    :param endpoint_url: Web socket URL to connect to
+    :param certificate: SSL certificate path
+    :return service response
+    """
+
+    response = asyncio.get_event_loop().run_until_complete(
+        requests.post(
+            url=endpoint_url,
+            json=json_data,
+            stream=True,
+            verify=certificate
+        )
+    )
+
+    # return server response
+    return response.json()

{GridCalEngine-5.1.39 → GridCalEngine-5.1.40}/GridCalEngine/Utils/Sparse/sparse_array.py

@@ -35,19 +35,19 @@ def check_type(dtype: PROFILE_TYPES, value: Any) -> bool:
     """
     tpe = type(value)
     if tpe in [bool, np.bool_]:
-        assert dtype == bool
+        return dtype == bool
     elif tpe in [int, np.int32, np.int64]:
-        assert dtype == int or dtype == float
+        return dtype == int or dtype == float
     elif tpe in [float, np.float32, np.float64]:
-        assert dtype == float
+        return dtype == float
     elif issubclass(tpe, Enum):
-        assert tpe == dtype  # check that the enum type is the same
+        return tpe == dtype  # check that the enum type is the same
 
     elif isinstance(dtype, DeviceType):
         return True
 
     elif dtype == Vec:
-        assert isinstance(value, np.ndarray) or value is None
+        return isinstance(value, np.ndarray) or value is None
 
     else:
         raise Exception("Sparse array type value Not recognized")

{GridCalEngine-5.1.39 → GridCalEngine-5.1.40}/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.39"
+__GridCalEngine_VERSION__ = "5.1.40"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.39 → GridCalEngine-5.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.1.39
+Version: 5.1.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.