Clean up status text

Author: WarmCyan

icat/anchorlist.py

@@ -1104,11 +1104,11 @@ def featurize(
         self.table.processing = True
         features = []
         for anchor in self.anchors:
-            self.fire_on_status_event(f"Computing features for {anchor.anchor_name}...")
+            # self.fire_on_status_event(f"Computing features for {anchor.anchor_name}...")
             self.table._set_anchor_processing(anchor.name, True)
             data[f"_{anchor.anchor_name}"] = anchor.featurize(data) * anchor.weight
             features.append(f"_{anchor.anchor_name}")
-            self.fire_on_status_event(None)
+            # self.fire_on_status_event(None)
             self.table._set_anchor_processing(anchor.name, False)
         if normalize:
             if reference_data is not None:

icat/model.py

@@ -205,7 +205,7 @@ def _on_selected_points_change(self, selected_ids: list[str]):
     def _train_model(self):
         """Fits the data to the current training dataset, note that this function
         assumes the data has already been featurized."""
-        self.fire_on_status_event(None)  # clear/refresh status label
+        self.fire_on_status_event(None)  # reset/clear status
 
         if not self.is_seeded():
             # we short circuit training the model here, but we do still want to show
@@ -352,6 +352,7 @@ def fit(self):
         # self.norm_reference = self.featurize(self.data.active_data, normalize=False)[
         #     features
         # ].copy()
+        self.fire_on_status_event("Computing features...")
         self.data.active_data = self.featurize(self.data.active_data, normalize=False)
         if self.training_data is not None:
             self.training_data = self.featurize(
@@ -364,6 +365,7 @@ def fit(self):
         # self.data.active_data.loc[:, features] = self.data.active_data[features].apply(
         #     AnchorList._l1_col_normalize, axis=0
         # )
+        self.fire_on_status_event(None)
 
         self._train_model()
 

icat/view.py

@@ -94,7 +94,7 @@ def _handle_status_event(self, status_text: str, source: str):
             self.status_label.children = f"Status: {status_text}"
         else:
             if self.model.is_seeded():
-                self.status_label.children = "Status: Ready!"
+                self.status_label.children = "Status: Model ready"
             else:
                 # TODO: replicating logic from model.is_seeded, better way to handle?
                 labeled_df = None
@@ -114,9 +114,9 @@ def _handle_status_event(self, status_text: str, source: str):
 
                 if labeled_df is not None:
                     if len(labeled_df[labeled_df[self.model.data.label_col] == 0]) == 0:
-                        label_str += " Label at least one more point uninteresting."
+                        label_str += " Need at least one point labeled 'uninteresting'."
                     if len(labeled_df[labeled_df[self.model.data.label_col] == 1]) == 0:
-                        label_str += " Label at least one more point interesting."
+                        label_str += " Need at least one point labeled 'interesting'."
                 self.status_label.children = label_str
 
     def _handle_data_sample_changed(self, new_sample_indices: list[int]):