Fix time loop and multiprocessing when app is frozen

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

main.py

@@ -1,4 +1,10 @@
-from pywr_editor import app
+import multiprocessing
 
 if __name__ == "__main__":
+    # fix infinite loop - https://github.com/pyinstaller/pyinstaller/wiki/Recipe-Multiprocessing # noqa:E501
+    multiprocessing.freeze_support()
+    multiprocessing.set_start_method("spawn", force=True)
+
+    from pywr_editor import app
+
     app()

main.spec

@@ -40,6 +40,9 @@ a = Analysis(
         "PySide6.QtSvg",
         "PySide6.QtAxContainer",
         "PySide6.QtSvgWidgets",
+        "inspector_dialog",
+        "matplotlib",
+        "numpy",
     ],
     hookspath=[],
     hooksconfig={},
@@ -85,6 +88,6 @@ coll = COLLECT(
 
 # PyInstaller does not want to copy the following files/folder in the data attr
 shutil.copytree(pywr_dist.as_posix(), f"./dist/main/{pywr_dist.name}")
-shutil.copyfile(
-    Path(tables.__file__).parent / "libblosc2.dll", "./dist/main/tables/libblosc2.dll"
-)
+#shutil.copyfile(
+#    Path(tables.__file__).parent / "libblosc2.dll", "./dist/main/tables/libblosc2.dll"
+#)

pywr_editor/model/model_config.py

@@ -279,6 +279,7 @@ def check_missing_keys(self) -> None:
         ]:
             if key not in self.json:
                 self.json[key] = {}
+                self.has_changed()
 
         if (
             Constants.SHAPES_KEY.value
@@ -287,6 +288,7 @@ def check_missing_keys(self) -> None:
             self.json[Constants.EDITOR_CONFIG_KEY.value][
                 Constants.SHAPES_KEY.value
             ] = []
+            self.has_changed()
 
         # check that the metadata dictionary and its key/value pairs are defined
         default_metadata = {

tests/dialogs/test_dialog_tables.py

@@ -345,7 +345,7 @@ def test_valid_table_file(self, qtbot, table_name):
         # 5. Save form to test filter
         save_button: QPushButton = selected_page.findChild(QPushButton, "save_button")
         # enable button (disabled due to no changes)
-        assert model_config.has_changes is False
+        assert model_config.has_changes is True
         assert save_button.isEnabled() is False
         save_button.setEnabled(True)
         qtbot.mouseClick(save_button, Qt.MouseButton.LeftButton)

tests/json_models/model_dialog_parameter_threshold_values_widget.json

@@ -98,10 +98,12 @@
       "values": 56.7
     }
   },
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/json_models/model_dialog_parameters_column_widget_w_table_selector.json

@@ -158,10 +158,12 @@
       "index": 10
     }
   },
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/json_models/model_dialog_parameters_column_widget_w_url.json

@@ -162,10 +162,12 @@
       "index": 10
     }
   },
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/json_models/model_dialog_parameters_index_col_widget.json

@@ -59,6 +59,9 @@
       "Link"
     ]
   ],
+  "includes": [],
+  "scenarios": [],
+  "tables": {},
   "parameters": {
     "param_with_index_col_str": {
       "type": "constant",
@@ -245,10 +248,12 @@
       "parse_dates": true
     }
   },
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/json_models/model_dialog_parameters_index_widget_w_table_selector.json

@@ -303,10 +303,14 @@
       "column": " Date"
     }
   },
+  "includes": [],
+  "scenarios": [],
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/json_models/model_dialog_parameters_index_widget_w_url.json

@@ -284,10 +284,15 @@
       "column": " Date"
     }
   },
+  "includes": [],
+  "scenarios": [],
+  "tables": {},
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/json_models/model_dialog_parameters_table_selector_widget.json

@@ -150,10 +150,14 @@
       "table": "h5_no_keys"
     }
   },
+  "includes": [],
+  "scenarios": [],
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/json_models/model_dialog_parameters_url_widget.json

@@ -102,10 +102,15 @@
       "url": "files/table_no_keys.h5"
     }
   },
+  "includes": [],
+  "scenarios": [],
+  "tables": {},
+  "recorders": {},
   "pywr_editor": {
     "schematic_size": [
       1900,
       1450
-    ]
+    ],
+    "shapes": []
   }
 }

tests/model/test_nodes.py

@@ -109,7 +109,6 @@ def test_delete_node(self):
 
         model.nodes.delete("Non-existing node")
         assert all_nodes == model.nodes.get_all()
-        assert model.has_changes is False
 
     def test_model_with_orphans(self):
         """

tests/widgets/test_line_edit_widget.py

@@ -94,7 +94,7 @@ def model_config(self) -> ModelConfig:
             (
                 "valid_custom_parameter",
                 "custom",
-                "customParameter",
+                "customparameter",
                 {"type": "customParameter", "value": 2},
                 ParameterConfig(props={"type": "customParameter", "value": 2}),
             ),