Download test and fixed old desc

Author: C-Achard

napari_cellseg3d/_tests/test_weight_download.py

@@ -0,0 +1,19 @@
+from napari_cellseg3d.code_models.model_workers import WeightsDownloader, WEIGHTS_DIR
+from napari_cellseg3d.config import ModelInfo
+
+
+def test_weight_download():
+
+    info = ModelInfo()
+
+    downloader = WeightsDownloader()
+
+    downloader.download_weights(
+        info.name,
+        info.get_model().get_weights_file()
+    )
+    result_path = WEIGHTS_DIR / str(info.get_model().get_weights_file())
+
+    assert result_path.is_file()
+
+

napari_cellseg3d/code_models/model_workers.py

@@ -119,7 +119,7 @@ def show_progress(count, block_size, total_size):
             url = neturls[model_name]
             response = urllib.request.urlopen(url)
 
-            start_message = f"Downloading the model from the M.W. Mathis Lab server {url}...."
+            start_message = f"Downloading the model from HuggingFace {url}...."
             total_size = int(response.getheader("Content-Length"))
             if self.log_widget is None:
                 logger.info(start_message)
@@ -142,7 +142,11 @@ def is_within_directory(directory, target):
                     abs_directory = Path(directory).resolve()
                     abs_target = Path(target).resolve()
                     # prefix = os.path.commonprefix([abs_directory, abs_target])
-                    return abs_target in abs_directory.parents
+                    logger.debug(abs_directory)
+                    logger.debug(abs_target)
+                    logger.debug(abs_directory.parents)
+
+                    return abs_directory in abs_target.parents
 
                 def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
 

napari_cellseg3d/config.py

@@ -23,8 +23,8 @@
 # TODO(cyril) add JSON load/save
 
 MODEL_LIST = {
-    "VNet": VNet,
     "SegResNet": SegResNet,
+    "VNet": VNet,
     # "TRAILMAP": TRAILMAP,
     "TRAILMAP_MS": TRAILMAP_MS,
     "SwinUNetR": SwinUNetR,