Merge development and solve conflicts

Author: Sarah Krebs

.flake8

@@ -7,6 +7,6 @@ extend-exclude =
     build
 extend-ignore =
     # No whitespace before ':' in [x : y]
-    E203
+    E203,
     # No lambdas — too strict
-    E731
+    E731,

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Plugins
 - Add symbolic explanations plugin (#46).
+- It is now possible to view multiple unequal runs at once in Cost over Time and Pareto (#93).
+- Runs with unequal objectives cannot be displayed together.
+- Added an enum for displaying according warning messages.
 
 ## Enhancements
 - Fix lower bounds of dependency versions.
@@ -11,6 +14,7 @@
 - Add exit button which first deletes running jobs and then terminates DeepCave.
 - Nicer handling of Keyboard Interrupt.
 - Disable debug mode.
+- Save plotly plots in higher resolution upon download.
 
 ## Bug-Fixes
 - Fix missing objective specification in LPI evaluator (#71).
@@ -19,6 +23,12 @@
 - Reset inputs to fix error when subsequently selecting runs with different configspaces, objectives or budgets (#106).
 - Fix errors due to changing inputs before runselection (#64).
 - For fANOVA, remove constant hyperparameters from configspace (#9).
+- When getting budget, objectives etc from multiple runs in Cost over Time and Pareto Front:
+    - Instead of taking the first run as comparative value,
+    - take the one with the lowest budget, else the index for the budgets could be out of bounds.
+- For PCP, show hyperparameters with highest importance closest to the cost, i.e. right (#124).
+- Add init files to all test directories.
+- Correct LPI importance tests.
 
 ## Documentation
 - Add How to Contribute section.
@@ -39,6 +49,10 @@
 - Major overhaul of docstrings in various files
 - Removed unused imports and variables
 
+## Groups
+- Groups now get a default name, if no name was entered by the user.
+- Groups get sorted alphabetically to appear more ordered.
+
 ## Additional Changes
 - Added a "make install examples" in Makefile
 
@@ -68,7 +82,7 @@
 - SMAC 2.0
 
 ## Dependencies
-- Remove SMAC dependency by adding required function directly
+- Remove SMAC dependency by adding required function directly.
 
 # Version 1.0.1
 

deepcave/config.py

@@ -56,6 +56,7 @@ class Config:
     SAVE_IMAGES = False  # The figure will be saved to the cache directory.
     FIGURE_MARGIN = dict(t=30, b=0, l=0, r=0)
     FIGURE_HEIGHT = "40vh"
+    FIGURE_DOWNLOAD_SCALE = 4.0
 
     # Redis settings
     REDIS_PORT: int = 6379

deepcave/layouts/general.py

@@ -337,6 +337,7 @@ def get_layout(
 
             # Load from cache if page is loaded
             children = []
+
             for name, paths in groups.items():
                 if name is None:
                     continue
@@ -368,10 +369,29 @@ def callback(group_names: List[str], all_run_paths, i):
                 self._refresh_groups = False
                 raise PreventUpdate()
 
+            # For the default group names, if no name was entered
+            group_counter = 0
+
             groups = {}
             for group_name, run_paths in zip(group_names, all_run_paths):
                 if group_name is None or group_name == "":
-                    continue
+                    # Set the default group name with a counter,
+                    # so the groups dont overwrite themselves
+                    group_name_unavailable = True
+
+                    groups_cache = c.get("groups")
+                    if groups_cache is None:
+                        continue
+
+                    # Check to see that no group name that already exists
+                    # gets picked
+                    while group_name_unavailable:
+                        group_name = f"Group {group_counter}"
+                        assert groups_cache is not None
+                        if group_name not in groups_cache.keys():
+                            group_name_unavailable = False
+                        else:
+                            group_counter += 1
 
                 if run_paths is None or len(run_paths) == 0:
                     continue
@@ -386,16 +406,20 @@ def callback(group_names: List[str], all_run_paths, i):
 
                 groups[group_name] = valid_run_paths
 
+            # Sort the groups alphabetically, so when added
+            # they appear ordered
+            sorted_groups = dict(sorted(groups.items()))
+
             try:
                 # Now save it
-                run_handler.update_groups(groups)
+                run_handler.update_groups(sorted_groups)
             except NotMergeableError:
                 notification.update("The selected runs are not mergeable.")
 
                 # This will automatically trigger the group display s.t. the selection is redo.
                 return i + 1
 
-            self.logger.debug(f"Groups: {groups}")
+            self.logger.debug(f"Groups: {sorted_groups}")
 
             raise PreventUpdate()
 

deepcave/plugins/__init__.py

@@ -917,7 +917,6 @@ def __call__(self, render_button: bool = False) -> List[Component]:
             ]
         else:
             components += [html.H1(self.name)]
-
         try:
             self.check_runs_compatibility(self.all_runs)
         except NotMergeableError as message:

deepcave/plugins/budget/budget_correlation.py

@@ -219,7 +219,11 @@ def get_output_layout(register: Callable) -> List[Any]:
                 [
                     dbc.Tab(
                         dcc.Graph(
-                            id=register("graph", "figure"), style={"height": config.FIGURE_HEIGHT}
+                            id=register("graph", "figure"),
+                            style={"height": config.FIGURE_HEIGHT},
+                            config={
+                                "toImageButtonOptions": {"scale": config.FIGURE_DOWNLOAD_SCALE}
+                            },
                         ),
                         label="Graph",
                     ),

deepcave/plugins/dynamic.py

@@ -95,6 +95,7 @@ def plugin_output_update(_: Any, *inputs_list: str) -> Any:
             runs = self.get_selected_runs(inputs)
 
             raw_outputs = {}
+            rc.clear()
             for run in runs:
                 run_outputs = rc.get(run, self.id, inputs_key)
                 if run_outputs is None:

deepcave/plugins/hyperparameter/importances.py

@@ -357,7 +357,11 @@ def get_output_layout(register: Callable) -> dcc.Graph:
         dcc.Graph
             Layout for the output block.
         """
-        return dcc.Graph(register("graph", "figure"), style={"height": config.FIGURE_HEIGHT})
+        return dcc.Graph(
+            register("graph", "figure"),
+            style={"height": config.FIGURE_HEIGHT},
+            config={"toImageButtonOptions": {"scale": config.FIGURE_DOWNLOAD_SCALE}},
+        )
 
     @staticmethod
     def load_outputs(run, inputs, outputs) -> go.Figure:  # type: ignore

deepcave/plugins/hyperparameter/pdp.py

@@ -366,7 +366,11 @@ def get_output_layout(register: Callable) -> dcc.Graph:
         dcc.Graph
             Layout for the output block.
         """
-        return dcc.Graph(register("graph", "figure"), style={"height": config.FIGURE_HEIGHT})
+        return dcc.Graph(
+            register("graph", "figure"),
+            style={"height": config.FIGURE_HEIGHT},
+            config={"toImageButtonOptions": {"scale": config.FIGURE_DOWNLOAD_SCALE}},
+        )
 
     @staticmethod
     def get_pdp_figure(  # type: ignore

deepcave/plugins/hyperparameter/symbolic_explanations.py

@@ -491,8 +491,16 @@ def get_output_layout(register: Callable) -> List[dcc.Graph]:
             Layout for the output block.
         """
         return [
-            dcc.Graph(register("symb_graph", "figure"), style={"height": config.FIGURE_HEIGHT}),
-            dcc.Graph(register("pdp_graph", "figure"), style={"height": config.FIGURE_HEIGHT}),
+            dcc.Graph(
+                register("symb_graph", "figure"),
+                style={"height": config.FIGURE_HEIGHT},
+                config={"toImageButtonOptions": {"scale": config.FIGURE_DOWNLOAD_SCALE}},
+            ),
+            dcc.Graph(
+                register("pdp_graph", "figure"),
+                style={"height": config.FIGURE_HEIGHT},
+                config={"toImageButtonOptions": {"scale": config.FIGURE_DOWNLOAD_SCALE}},
+            ),
         ]
 
     @staticmethod