[FIX] Fix circular import with DTIBasedMeasure enumeration (#1373)

* move DTIBasedMeasure to new clinica.utils.dwi module

* update tests

clinica/pipelines/dwi/dti/utils.py

@@ -1,11 +1,11 @@
 """This module contains utilities used by the DWIDTI pipeline."""
 
-from enum import Enum
 from pathlib import Path
 from typing import Dict, List, Tuple
 
+from clinica.utils.dwi import DTIBasedMeasure
+
 __all__ = [
-    "DTIBasedMeasure",
     "compute_statistics_on_atlases",
     "get_caps_filenames",
     "rename_into_caps",
@@ -15,15 +15,6 @@
 ]
 
 
-class DTIBasedMeasure(str, Enum):
-    """Possible DTI measures."""
-
-    FRACTIONAL_ANISOTROPY = "FA"
-    MEAN_DIFFUSIVITY = "MD"
-    AXIAL_DIFFUSIVITY = "AD"
-    RADIAL_DIFFUSIVITY = "RD"
-
-
 def compute_statistics_on_atlases(
     registered_map: Path, name_map: str, dwi_preprocessed_file: Path
 ) -> List[Path]:

clinica/utils/dwi.py

@@ -0,0 +1,12 @@
+from enum import Enum
+
+__all__ = ["DTIBasedMeasure"]
+
+
+class DTIBasedMeasure(str, Enum):
+    """Possible DTI measures."""
+
+    FRACTIONAL_ANISOTROPY = "FA"
+    MEAN_DIFFUSIVITY = "MD"
+    AXIAL_DIFFUSIVITY = "AD"
+    RADIAL_DIFFUSIVITY = "RD"

clinica/utils/input_files.py

@@ -7,7 +7,7 @@
 from collections.abc import Iterable
 from typing import Optional, Union
 
-from clinica.pipelines.dwi.dti.utils import DTIBasedMeasure
+from clinica.utils.dwi import DTIBasedMeasure
 from clinica.utils.pet import ReconstructionMethod, SUVRReferenceRegion, Tracer
 
 # BIDS

test/nonregression/pipelines/dwi/test_pipelines.py

@@ -31,8 +31,8 @@ def run_dwi_dti(
     input_dir: Path, output_dir: Path, ref_dir: Path, working_dir: Path
 ) -> None:
     from clinica.pipelines.dwi.dti.pipeline import DwiDti
-    from clinica.pipelines.dwi.dti.utils import DTIBasedMeasure
     from clinica.utils.bids import BIDSFileName
+    from clinica.utils.dwi import DTIBasedMeasure
 
     caps_dir = output_dir / "caps"
 

test/unittests/utils/test_input_files.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from clinica.pipelines.dwi.dti.utils import DTIBasedMeasure
+from clinica.utils.dwi import DTIBasedMeasure
 from clinica.utils.pet import ReconstructionMethod, Tracer
 
 

test/unittests/utils/test_utils_inputs.py

@@ -703,7 +703,7 @@ def test_clinica_file_reader_dwi_dti_error(tmp_path):
 
 
 def test_clinica_file_reader_dwi_dti(tmp_path):
-    from clinica.pipelines.dwi.dti.utils import DTIBasedMeasure
+    from clinica.utils.dwi import DTIBasedMeasure
     from clinica.utils.input_files import dwi_dti
     from clinica.utils.inputs import clinica_file_reader, clinica_list_of_files_reader