Skip to content

Commit

Permalink
rename method and remove abstract decorator for now
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasGensollen committed Nov 28, 2024
1 parent f9f3807 commit 04608dd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
9 changes: 4 additions & 5 deletions clinica/pipelines/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ def determine_subject_and_session_to_process(self):
"""
from clinica.utils.stream import log_and_warn

visits_already_processed = self.get_processed_images()
visits_already_processed = self.get_processed_visits()
if len(visits_already_processed) == 0:
return
message = (
Expand All @@ -636,10 +636,9 @@ def determine_subject_and_session_to_process(self):
visit for visit in self.visits if visit not in visits_already_processed
]

@abc.abstractmethod
def get_processed_images(self) -> list[Visit]:
"""Extract processed image IDs in `caps_directory` based on `subjects`_`sessions`."""
raise NotImplemented
def get_processed_visits(self) -> list[Visit]:
"""Examine the files present in the CAPS output folder and return the visits for which processing has already been done."""
return []

def _init_nodes(self) -> None:
"""Init the basic workflow and I/O nodes necessary before build."""
Expand Down
2 changes: 1 addition & 1 deletion clinica/pipelines/pet/linear/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def _check_custom_dependencies(self) -> None:
"""Check dependencies that can not be listed in the `info.json` file."""
pass

def get_processed_images(self) -> list[Visit]:
def get_processed_visits(self) -> list[Visit]:
from clinica.utils.filemanip import extract_visits
from clinica.utils.input_files import pet_linear_nii
from clinica.utils.inputs import clinica_file_reader
Expand Down
2 changes: 1 addition & 1 deletion clinica/pipelines/t1_linear/anat_linear_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __init__(
caps_name=caps_name,
)

def get_processed_images(self) -> list[Visit]:
def get_processed_visits(self) -> list[Visit]:
from clinica.utils.filemanip import extract_visits
from clinica.utils.input_files import T1W_LINEAR, T1W_LINEAR_CROPPED
from clinica.utils.inputs import clinica_file_reader
Expand Down
4 changes: 2 additions & 2 deletions test/unittests/pipelines/pet/test_pet_linear_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_pet_linear_get_processed_visits_empty(tmp_path, mocker):
"uncropped_image": False,
},
)
assert pipeline.get_processed_images() == []
assert pipeline.get_processed_visits() == []


def test_pet_linear_get_processed_visits(tmp_path, mocker):
Expand Down Expand Up @@ -151,7 +151,7 @@ def test_pet_linear_get_processed_visits(tmp_path, mocker):
},
)

assert pipeline.get_processed_images() == [
assert pipeline.get_processed_visits() == [
Visit("sub-01", "ses-M006"),
Visit("sub-02", "ses-M000"),
]
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ def test_anat_linear_get_processed_visits_uncropped_images(
parameters={"uncropped_image": True},
)

assert pipeline.get_processed_images() == expected
assert pipeline.get_processed_visits() == expected
# pipeline2 always find an empty list of processed images because we want un-cropped images
# and the CAPS folder only contains cropped images
assert pipeline2.get_processed_images() == []
assert pipeline2.get_processed_visits() == []


@pytest.mark.parametrize(
Expand Down Expand Up @@ -240,10 +240,10 @@ def test_anat_linear_get_processed_visits_cropped_images(
parameters={"uncropped_image": True},
)

assert pipeline2.get_processed_images() == expected
assert pipeline2.get_processed_visits() == expected
# pipeline always find an empty list of processed images because we want cropped images
# and the CAPS folder only contains un-cropped images
assert pipeline.get_processed_images() == []
assert pipeline.get_processed_visits() == []


@pytest.mark.parametrize(
Expand Down

0 comments on commit 04608dd

Please sign in to comment.