Improve filepath messages

Author: C-Achard

napari_cellseg3d/code_models/model_framework.py

@@ -245,16 +245,22 @@ def _toggle_weights_path(self):
             self.custom_weights_choice, self.weights_filewidget
         )
 
-    def create_dataset_dict_no_labs(self):
-        """Creates unsupervised data dictionary for MONAI transforms and training."""
+    def get_unsupervised_image_filepaths(self):
         volume_directory = Path(
             self.unsupervised_images_filewidget.text_field.text()
         )
+
         if not volume_directory.exists():
             raise ValueError(f"Data folder {volume_directory} does not exist")
-        images_filepaths = sorted(Path.glob(volume_directory, "*.tif"))
+        return sorted(Path.glob(volume_directory, "*.tif"))
+
+    def create_dataset_dict_no_labs(self):
+        """Creates unsupervised data dictionary for MONAI transforms and training."""
+        images_filepaths = self.get_unsupervised_image_filepaths()
         if len(images_filepaths) == 0:
-            raise ValueError(f"Data folder {volume_directory} is empty")
+            raise ValueError(
+                f"Data folder {self.unsupervised_images_filewidget.text_field.text()} is empty"
+            )
 
         logger.info("Images :")
         for file in images_filepaths:

napari_cellseg3d/code_plugins/plugin_base.py

@@ -389,7 +389,7 @@ def __init__(
         # Validation images widget
         self.unsupervised_images_filewidget = ui.FilePathWidget(
             description="Training directory",
-            file_function=self.load_validation_images_dataset,
+            file_function=self.load_unsup_images_dataset,
             parent=self,
         )
         self.unsupervised_images_filewidget.setVisible(False)
@@ -421,19 +421,23 @@ def load_dataset_paths(self):
     def load_image_dataset(self):
         """Show file dialog to set :py:attr:`~images_filepaths`"""
         filenames = self.load_dataset_paths()
-        logger.debug(f"image filenames : {filenames}")
         if filenames:
+            logger.info("Images loaded :")
+            for f in filenames:
+                logger.info(f"{str(Path(f).name)}")
             self.images_filepaths = [str(path) for path in sorted(filenames)]
             path = str(Path(filenames[0]).parent)
             self.image_filewidget.text_field.setText(path)
             self.image_filewidget.check_ready()
             self._update_default_paths(path)
 
-    def load_validation_images_dataset(self):
+    def load_unsup_images_dataset(self):
         """Show file dialog to set :py:attr:`~val_images_filepaths`"""
         filenames = self.load_dataset_paths()
-        logger.debug(f"val filenames : {filenames}")
         if filenames:
+            logger.info("Images loaded (unsupervised training) :")
+            for f in filenames:
+                logger.info(f"{str(Path(f).name)}")
             self.validation_filepaths = [
                 str(path) for path in sorted(filenames)
             ]
@@ -445,8 +449,10 @@ def load_validation_images_dataset(self):
     def load_label_dataset(self):
         """Show file dialog to set :py:attr:`~labels_filepaths`"""
         filenames = self.load_dataset_paths()
-        logger.debug(f"labels filenames : {filenames}")
         if filenames:
+            logger.info("Labels loaded :")
+            for f in filenames:
+                logger.info(f"{str(Path(f).name)}")
             self.labels_filepaths = [str(path) for path in sorted(filenames)]
             path = str(Path(filenames[0]).parent)
             self.labels_filewidget.text_field.setText(path)
@@ -477,13 +483,13 @@ def extract_dataset_paths(paths):
             return None
         return str(Path(paths[0]).parent)
 
-
     def _check_all_filepaths(self):
         self.image_filewidget.check_ready()
         self.labels_filewidget.check_ready()
         self.results_filewidget.check_ready()
         self.unsupervised_images_filewidget.check_ready()
 
+
 class BasePluginUtils(BasePluginFolder):
     """Small subclass used to have centralized widgets layer and result path selection in utilities"""
 
@@ -516,4 +522,3 @@ def _update_default_paths(self, path=None):
         logger.debug(f"Trying to update default with {default_path}")
         if default_path is not None:
             self.utils_default_paths.append(default_path)
-

napari_cellseg3d/interface.py

@@ -1258,7 +1258,7 @@ def open_folder_dialog(
 ):
     default_path = utils.parse_default_path(possible_paths)
 
-    logger.info(f"Default : {default_path}")
+    logger.debug(f"Default : {default_path}")
     return QFileDialog.getExistingDirectory(
         widget, "Open directory", default_path  # + "/.."
     )