Merge pull request #349 from SebGue/SaveDumps

[WiP] save compressed json

Author: BonneelP

Tests/Functions/test_save_load.py

@@ -98,6 +98,19 @@ def test_save_load_machine():
     assert result.frame == None
 
 
+def test_save_load_json_compressed():
+    """Check that you can save/load a compressed json file"""
+    test_obj = load(join(DATA_DIR, "Machine", "Toyota_Prius.json"))
+    # Check save
+    file_path = join(save_path, "Toyota_Prius_compressed")
+    assert not isfile(file_path + ".json.gz")
+    test_obj.save(file_path, type_compression=1)
+    assert isfile(file_path + ".json.gz")
+    # Check load
+    test_obj2 = load(file_path + ".json.gz")
+    assert test_obj == test_obj2
+
+
 @pytest.mark.IPMSM
 @pytest.mark.MagFEMM
 @pytest.mark.periodicity
@@ -145,29 +158,57 @@ def test_save_load_folder_path():
     if isfile(file_path):
         remove(file_path)
 
+    # Check save
     assert isfile(file_path) == False
     test_obj.save(loc_save_path, is_folder=True)
     assert isfile(file_path)
     assert isfile(join(loc_save_path, "MagnetPrius.json"))
+    assert isfile(join(loc_save_path, "MagnetPrius_00001.json"))
     assert isfile(join(loc_save_path, "M400-50A.json"))
+    assert isfile(join(loc_save_path, "M400-50A_00001.json"))
+    assert isfile(join(loc_save_path, "M400-50A_00002.json"))
+    assert isfile(join(loc_save_path, "Insulator1.json"))
+    assert isfile(join(loc_save_path, "Air.json"))
+    assert isfile(join(loc_save_path, "Copper1.json"))
     assert isfile(join(loc_save_path, "Toyota_Prius.json"))
-    assert isfile(join(loc_save_path, "test_save_load_folder_path.json"))
-    assert len(listdir(loc_save_path)) == 8
+    assert isfile(join(loc_save_path, "test_save_load_folder_path.json"))  # Simu
+    assert isfile(join(loc_save_path, "FolderSaved.json"))  # Output
+    assert len(listdir(loc_save_path)) == 11
+    # Check load
     test_obj2 = load(loc_save_path)
     assert test_obj == test_obj2
     assert callable(test_obj.simu.postproc_list[0]._run_func)
     assert callable(test_obj.simu.postproc_list[1]._run_func)
+    # Check that material name are still the same
+    assert test_obj2.simu.machine.stator.mat_type.name == "M400-50A"
+    assert test_obj2.simu.machine.rotor.mat_type.name == "M400-50A"
+    assert test_obj2.simu.machine.shaft.mat_type.name == "M400-50A"
 
     # Check that the machine can be updated
     test_obj2.simu.machine.stator.L1 = 999
+    test_obj2.simu.machine.name = "Toyota2"
     # Check that empty materials are not save in separate file
     test_obj2.simu.machine.stator.winding.conductor.ins_mat._set_None()
 
-    test_obj2.save(loc_save_path, is_folder=True)
+    test_obj2.save(loc_save_path, is_folder=True, is_delete_old=True)
+    assert isfile(join(loc_save_path, "MagnetPrius.json"))
+    assert isfile(join(loc_save_path, "MagnetPrius_00001.json"))
+    assert isfile(join(loc_save_path, "M400-50A.json"))
+    assert isfile(join(loc_save_path, "M400-50A_00001.json"))
+    assert isfile(join(loc_save_path, "M400-50A_00002.json"))
+    assert not isfile(join(loc_save_path, "Insulator1.json"))  # Material removed
+    assert not isfile(join(loc_save_path, "Material_00001.json"))  # Material removed
+    assert isfile(join(loc_save_path, "Air.json"))
+    assert isfile(join(loc_save_path, "Copper1.json"))
+    assert isfile(join(loc_save_path, "Toyota2.json"))
+    assert not isfile(join(loc_save_path, "Toyota_Prius.json"))
+    assert isfile(join(loc_save_path, "test_save_load_folder_path.json"))  # Simu
+    assert isfile(join(loc_save_path, "FolderSaved.json"))  # Output
+    assert len(listdir(loc_save_path)) == 10
     test_obj3 = load(loc_save_path)
 
     assert test_obj2.simu.machine.stator.L1 == test_obj3.simu.machine.stator.L1
-    assert len(listdir(loc_save_path)) == 8
+    assert len(test_obj2.compare(test_obj3)) == 0
 
 
 def test_save_load_just_name():
@@ -349,6 +390,8 @@ def test_save_load_simu(type_file):
 
 if __name__ == "__main__":
     test_save_load_folder_path()
+    test_save_load_json_compressed()
+    print("Done")
     # test_save_load_simu("json")
     # test_save_load_simu("h5")
     # test_save_load_simu("pkl")

Tests/GUI/DMatLib/test_DMatSetup.py

@@ -489,13 +489,14 @@ def test_BH_setup(self, setup):
         # Check table
         assert w_imp.tab_window is None
         w_imp.b_tab.clicked.emit()
-        w_imp.tab_window.si_row.value() == 4
-        w_imp.tab_window.si_col.value() == 2
-        w_imp.tab_window.w_tab.cellWidget(0, 0).value() == 0
-        w_imp.tab_window.w_tab.cellWidget(0, 1).value() == 1
-        w_imp.tab_window.w_tab.cellWidget(1, 0).value() == 2
-        w_imp.tab_window.w_tab.cellWidget(1, 1).value() == 100
-        w_imp.tab_window.w_tab.cellWidget(2, 0).value() == 3
-        w_imp.tab_window.w_tab.cellWidget(2, 1).value() == 300
-        w_imp.tab_window.w_tab.cellWidget(3, 0).value() == 5
-        w_imp.tab_window.w_tab.cellWidget(3, 1).value() == 800
+        assert w_imp.tab_window.si_row.value() == 4
+        assert w_imp.tab_window.si_col.value() == 2
+        assert w_imp.tab_window.w_tab.cellWidget(0, 0).value() == 0
+        assert w_imp.tab_window.w_tab.cellWidget(0, 1).value() == 1
+        assert w_imp.tab_window.w_tab.cellWidget(1, 0).value() == 2
+        assert w_imp.tab_window.w_tab.cellWidget(1, 1).value() == 100
+        assert w_imp.tab_window.w_tab.cellWidget(2, 0).value() == 3
+        assert w_imp.tab_window.w_tab.cellWidget(2, 1).value() == 300
+        assert w_imp.tab_window.w_tab.cellWidget(3, 0).value() == 5
+        assert w_imp.tab_window.w_tab.cellWidget(3, 1).value() == 800
+        w_imp.tab_window.close()

pyleecan/Classes/__init__.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+from os.path import dirname, join
+from json import load
+
+
+def get_class_dict():
+    """Function to get the Class Dict."""
+    path = dirname(__file__)
+
+    with open(join(path, "Class_Dict.json")) as class_dict_file:
+        class_dict = load(class_dict_file)
+
+    return class_dict

pyleecan/Functions/Load/load_json.py

@@ -1,6 +1,6 @@
+import gzip
 from json import load as jload
-from os.path import isfile, isdir
-from re import match
+from os.path import isdir, isfile, splitext
 
 
 def load_json(file_path):
@@ -9,7 +9,7 @@ def load_json(file_path):
     Parameters
     ----------
     file_path: str
-        path to the file to load
+        path to the file or directory to load
 
     Returns
     -------
@@ -18,24 +18,37 @@ def load_json(file_path):
     json_data: json decoded data type
         data of the json file
     """
+    # remove tailing dir seperators
+    while file_path.endswith(("\\", "/")):
+        file_path = file_path[:-1]
+
+    # if a path is given, add default file name to file_path
     if isdir(file_path):
         i = max(file_path.rfind("\\"), file_path.rfind("/"))
         if i != -1:
-            file_path += file_path[i:] + ".json"
+            file_path += file_path[i:]
         else:
-            file_path += "/" + file_path + ".json"
+            file_path += "/" + file_path
 
-    # The file_name must end with .json
-    elif not match(".*\.json", file_path):
-        file_path += ".json"  # If it doesn't, we add .json at the end
+    # if there is no file extension, try some
+    if not splitext(file_path)[1]:
+        file_ext = ""
+        for ext in [".json", ".json.gz"]:
+            if isfile(file_path + ext):
+                file_ext = ext
+        file_path += file_ext
 
     # The file (and the folder) should exist
     if not isfile(file_path):
         raise LoadMissingFileError(str(file_path) + " doesn't exist")
 
     # Get the data dictionary
-    with open(file_path, "r") as load_file:
-        json_data = jload(load_file)
+    if file_path.endswith(".json.gz"):
+        fp = gzip.open(file_path, mode="rt", encoding="utf-8")
+    else:
+        fp = open(file_path, "r")
+    with fp:
+        json_data = jload(fp)
 
     return file_path, json_data