Fix model download function

napari_cellseg3d/models/TRAILMAP_MS.py

@@ -3,12 +3,11 @@
 from napari_cellseg3d import utils
 import os
 
-modelname = "TRAILMAP_MS"
-target_dir = os.path.join("models","pretrained")
 
 def get_weights_file():
-    utils.download_model(modelname, target_dir)
-    return "TRAILMAP_MS_best_metric_epoch_26.pth" #model additionally trained on Mathis/Wyss mesoSPIM data
+    # model additionally trained on Mathis/Wyss mesoSPIM data
+    target_dir = utils.download_model("TRAILMAP_MS")
+    return os.path.join(target_dir, "TRAILMAP_MS_best_metric_epoch_26.pth")
 
 
 def get_net():

napari_cellseg3d/models/model_SegResNet.py

@@ -2,16 +2,14 @@
 from napari_cellseg3d import utils
 import os
 
-modelname = "SegResNet"
-target_dir = os.path.join("models","pretrained")
 
 def get_net():
     return SegResNetVAE
 
 
 def get_weights_file():
-    utils.download_model(modelname, target_dir)
-    return "SegResNet.pth"
+    target_dir = utils.download_model("SegResNet")
+    return os.path.join(target_dir, "SegResNet.pth")
 
 
 def get_output(model, input):

napari_cellseg3d/models/model_TRAILMAP.py

@@ -2,12 +2,11 @@
 from napari_cellseg3d import utils
 import os
 
-modelname = "TRAILMAP"
-target_dir = os.path.join("models","pretrained")
 
 def get_weights_file():
-    utils.download_model(modelname, target_dir)
-    return "TRAILMAP_PyTorch.pth" #original model from Liqun Luo lab, transfered to pytorch
+    # original model from Liqun Luo lab, transfered to pytorch
+    target_dir = utils.download_model("TRAILMAP")
+    return os.path.join(target_dir, "TRAILMAP_PyTorch.pth")
 
 
 def get_net():

napari_cellseg3d/models/model_VNet.py

@@ -3,16 +3,14 @@
 from napari_cellseg3d import utils
 import os
 
-modelname = "VNet"
-target_dir = os.path.join("models","pretrained")
 
 def get_net():
     return VNet()
 
 
 def get_weights_file():
-    utils.download_model(modelname, target_dir)
-    return "VNet_40e.pth"
+    target_dir = utils.download_model("VNet")
+    return os.path.join(target_dir, "VNet_40e.pth")
 
 
 def get_output(model, input):

napari_cellseg3d/utils.py

@@ -983,7 +983,7 @@ def merge_imgs(imgs, original_image_shape):
     return merged_imgs
 
 
-def download_model(modelname, target_dir):
+def download_model(modelname):
     """
     Downloads a specific pretained model.
     This code is adapted from DeepLabCut with permission from MWMathis
@@ -995,24 +995,11 @@ def download_model(modelname, target_dir):
     def show_progress(count, block_size, total_size):
         pbar.update(block_size)
 
-    def tarfilenamecutting(tarf):
-        """' auxfun to extract folder path
-        ie. /xyz-trainsetxyshufflez/
-        """
-        for memberid, member in enumerate(tarf.getmembers()):
-            if memberid == 0:
-                parent = str(member.path)
-                l = len(parent) + 1
-            if member.path.startswith(parent):
-                member.path = member.path[l:]
-                yield member
-
-    #TODO: fix error in line 1021;
-    cellseg3d_path = os.path.split(importlib.util.find_spec("napari-cellseg3d").origin)[0]
-    json_path = os.path.join(cellseg3d_path, "models", "pretrained", "pretrained_model_urls.json")
+    cellseg3d_path = os.path.split(importlib.util.find_spec("napari_cellseg3d").origin)[0]
+    pretrained_folder_path = os.path.join(cellseg3d_path, "models", "pretrained")
+    json_path = os.path.join(pretrained_folder_path, "pretrained_model_urls.json")
     with open(json_path) as f:
         neturls = json.load(f)
-
     if modelname in neturls.keys():
         url = neturls[modelname]
         response = urllib.request.urlopen(url)
@@ -1021,12 +1008,9 @@ def tarfilenamecutting(tarf):
         pbar = tqdm(unit="B", total=total_size, position=0)
         filename, _ = urllib.request.urlretrieve(url, reporthook=show_progress)
         with tarfile.open(filename, mode="r:gz") as tar:
-            tar.extractall(target_dir, members=tarfilenamecutting(tar))
+            tar.extractall(pretrained_folder_path)
+        return pretrained_folder_path
     else:
-        models = [
-            fn
-            for fn in neturls.keys()
-            if "VNet_" not in fn and "SegResNet" not in fn and "TRAILMAP_" not in fn
-        ]
-        print("Model does not exist: ", modelname)
-        #print("Pick one of the following: ", models)
+        raise ValueError(
+            f"Unknown model. `modelname` should be one of {', '.join(neturls)}"
+        )