Automatically set the suggested settings

backend/src/manager.py

@@ -152,9 +152,6 @@ class Manager:
         self,
         loss_type: str,
         regularizer_type: str,
-        reg_levels_input: str,
-        w1_range_input: str,
-        w2_range_input: str,
         resolution: int,
     ) -> None:
         if self.dataset is None:
@@ -165,19 +162,7 @@ class Manager:
         if regularizer_type not in ("l1", "l2"):
             raise ValueError(f"Invalid regularizer_type: {regularizer_type}")
 
-        try:
-            reg_levels = self._parse_levels(reg_levels_input)
-        except Exception as e:
-            raise ValueError(f"Invalid regularization levels: {e}")
-
-        try:
-            w1_range = self._parse_range(w1_range_input)
-        except Exception as e:
-            raise ValueError(f"Invalid w1 range: {e}")
-        try:
-            w2_range = self._parse_range(w2_range_input)
-        except Exception as e:
-            raise ValueError(f"Invalid w2 range: {e}")
+        w1_range, w2_range, reg_levels = compute_suggested_settings(self.dataset)
 
         self.plots_data = compute_plot_values(
             self.dataset,
@@ -205,9 +190,6 @@ class Manager:
         y_col: int,
         loss_type: str,
         regularizer_type: str,
-        reg_levels_input: str,
-        w1_range_input: str,
-        w2_range_input: str,
         resolution: int,
     ) -> tuple[Manager, Figure, Figure, Figure]:
         self.update_dataset(
@@ -224,12 +206,10 @@ class Manager:
             x2_col,
             y_col,
         )
+
         self.compute_plots_data(
             loss_type,
             regularizer_type,
-            reg_levels_input,
-            w1_range_input,
-            w2_range_input,
             resolution,
         )
 
@@ -241,44 +221,6 @@ class Manager:
         strength_plot = self._generate_strength_plot(self.plots_data.path)
         return self, contour_plot, data_plot, strength_plot
 
-    def handle_use_suggested_settings(
-        self,
-        dataset_type: str,
-        function: str,
-        x1_range_input: str,
-        x2_range_input: str,
-        x_selection_method: str,
-        sigma: float,
-        nsample: int,
-        csv_file: str,
-        has_header: bool,
-        x1_col: int,
-        x2_col: int,
-        y_col: int,
-    ) -> tuple[Manager, str, str, str]:
-        dataset = self._compute_dataset(
-            dataset_type,
-            function,
-            x1_range_input,
-            x2_range_input,
-            x_selection_method,
-            sigma,
-            nsample,
-            csv_file,
-            has_header,
-            x1_col,
-            x2_col,
-            y_col,
-        )
-
-        w1_range, w2_range, reg_levels = compute_suggested_settings(dataset)
-
-        w1_range_input = f"{w1_range[0]:.2f}, {w1_range[1]:.2f}"
-        w2_range_input = f"{w2_range[0]:.2f}, {w2_range[1]:.2f}"
-        reg_levels_input = ", ".join(f"{level:.2f}" for level in reg_levels)
-
-        return self, w1_range_input, w2_range_input, reg_levels_input
-
     @staticmethod
     def _generate_contour_plot(plots_data: PlotsData) -> Figure:
         fig, ax = plt.subplots(figsize=(8, 8))

frontends/gradio/main.py

@@ -66,9 +66,6 @@ def handle_generate_plots(
     y_col: int,
     loss_type: str,
     regularizer_type: str,
-    reg_levels_input: str,
-    w1_range_input: str,
-    w2_range_input: str,
     resolution: int,
 ) -> tuple[Manager, Figure, Figure, Figure]:
     try:
@@ -87,49 +84,12 @@ def handle_generate_plots(
             y_col,
             loss_type,
             regularizer_type,
-            reg_levels_input,
-            w1_range_input,
-            w2_range_input,
             resolution,
         )
     except Exception as e:
         raise gr.Error("Error generating plots: " + str(e))
 
 
-def handle_use_suggested_settings(
-    manager: Manager,
-    dataset_type: str,
-    function: str,
-    x1_range_input: str,
-    x2_range_input: str,
-    x_selection_method: str,
-    sigma: float,
-    nsample: int,
-    csv_file: str,
-    has_header: bool,
-    x1_col: int,
-    x2_col: int,
-    y_col: int,
-) -> tuple[Manager, str, str, str]:
-    try:
-        return manager.handle_use_suggested_settings(
-            dataset_type,
-            function,
-            x1_range_input,
-            x2_range_input,
-            x_selection_method,
-            sigma,
-            nsample,
-            csv_file,
-            has_header,
-            x1_col,
-            x2_col,
-            y_col,
-        )
-    except Exception as e:
-        raise gr.Error("Error computing suggested settings: " + str(e))
-
-
 def launch():
     default_dataset_type = "Generate"
 
@@ -148,9 +108,6 @@ def launch():
 
     default_loss_type = "l2"
     default_regularizer_type = "l2"
-    default_reg_levels = "10, 20, 30"
-    default_w1_range = "-100, 100"
-    default_w2_range = "-100, 100"
     default_resolution = 100
 
     manager = Manager()
@@ -169,9 +126,6 @@ def launch():
         default_y_col,
         default_loss_type,
         default_regularizer_type,
-        default_reg_levels,
-        default_w1_range,
-        default_w2_range,
         default_resolution,
     )
 
@@ -309,25 +263,6 @@ def launch():
                             interactive=True,
                         )
 
-                    with gr.Row():
-                        regularizer_levels_textbox = gr.Textbox(
-                            label="Regularization levels (comma-separated)",
-                            value=default_reg_levels,
-                            interactive=True,
-                        )
-
-                    with gr.Row():
-                        w1_range_textbox = gr.Textbox(
-                            label="w1 range (min,max)",
-                            value=default_w1_range,
-                            interactive=True,
-                        )
-                        w2_range_textbox = gr.Textbox(
-                            label="w2 range (min,max)",
-                            value=default_w2_range,
-                            interactive=True,
-                        )
-
                     resolution_slider = gr.Slider(
                         label="Grid resolution",
                         value=default_resolution,
@@ -337,32 +272,6 @@ def launch():
                         interactive=True,
                     )
                     
-                    gr.Button("Use suggested settings").click(
-                        fn=handle_use_suggested_settings,
-                        inputs=[
-                            manager_state,
-                            dataset_type,
-                            function,
-                            x1_textbox,
-                            x2_textbox,
-                            x_selection_method,
-                            sigma,
-                            nsample,
-                            csv_file,
-                            has_header,
-                            x1_col,
-                            x2_col,
-                            y_col,
-                        ],
-                        outputs=[
-                            manager_state,
-                            w1_range_textbox,
-                            w2_range_textbox,
-                            regularizer_levels_textbox,
-                        ],
-                    )
-
-
                 gr.Button("Regenerate Plots").click(
                     fn=handle_generate_plots,
                     inputs=[
@@ -381,9 +290,6 @@ def launch():
                         y_col,
                         loss_type_dropdown,
                         regularizer_type_dropdown,
-                        regularizer_levels_textbox,
-                        w1_range_textbox,
-                        w2_range_textbox,
                         resolution_slider,
                     ],
                     outputs=[manager_state, main_plot, data_plot, strength_plot],