refactored file structure. updated TPTBox requirements

Hendrik-code · Sep 9, 2024 · 815e3ae · 815e3ae
1 parent 43f9baf
commit 815e3ae
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ torchmetrics = "^1.1.2"
 tqdm = "^4.66.1"
 einops= "^0.6.1"
 nnunetv2 = "2.4.2"
-tptbox = "^0.1.4"
+tptbox = "^0.1.6"
 antspyx = "0.4.2"
 rich = "^13.6.0"
 

diff --git a/spineps/models.py b/spineps/models.py
@@ -3,11 +3,11 @@
 
 from TPTBox import Log_Type, No_Logger
 
-from spineps.auto_download import download_if_missing, instances, semantic
 from spineps.seg_enums import Modality
 from spineps.seg_model import Segmentation_Model, modeltype2class
-from spineps.seg_modelconfig import load_inference_config
+from spineps.utils.auto_download import download_if_missing, instances, semantic
 from spineps.utils.filepaths import get_mri_segmentor_models_dir, search_path
+from spineps.utils.seg_modelconfig import load_inference_config
 
 logger = No_Logger()
 logger.prefix = "Models"

diff --git a/spineps/seg_model.py b/spineps/seg_model.py
@@ -10,11 +10,11 @@
 from typing_extensions import Self
 
 from spineps.seg_enums import Acquisition, InputType, Modality, ModelType, OutputType
-from spineps.seg_modelconfig import Segmentation_Inference_Config, load_inference_config
 from spineps.Unet3D.pl_unet import PLNet
 from spineps.utils.citation_reminder import citation_reminder
 from spineps.utils.filepaths import search_path
 from spineps.utils.inference_api import load_inf_model, run_inference
+from spineps.utils.seg_modelconfig import Segmentation_Inference_Config, load_inference_config
 
 threads_started = False
 

diff --git a/spineps/auto_download.py → spineps/utils/auto_download.py b/spineps/auto_download.py → spineps/utils/auto_download.py
diff --git a/spineps/seg_modelconfig.py → spineps/utils/seg_modelconfig.py b/spineps/seg_modelconfig.py → spineps/utils/seg_modelconfig.py
diff --git a/unit_tests/test_filepaths.py b/unit_tests/test_filepaths.py
@@ -41,7 +41,7 @@ def test_search_path_multi(self):
         print(package_path)
         predictor_search = search_path(package_path, query="seg_*.py")
         print(predictor_search)
-        self.assertTrue(len(predictor_search) == 6)
+        self.assertTrue(len(predictor_search) == 5, predictor_search)
         # self.assertEqual(predictor_search[0], package_path.joinpath("utils", "predictor.py"))
 
     def test_env_path(self):