From 3dfcca9715a56b67159a8d90a182470078fd0397 Mon Sep 17 00:00:00 2001 From: "brian.kim" Date: Thu, 6 Feb 2025 14:05:01 -0800 Subject: [PATCH] remove all FileInputModel Imports that are no longer needed --- .../_tests/thresholding/test_thresholding_service.py | 2 -- .../_tests/thresholding/test_thresholding_view.py | 12 ------------ .../core/thresholding_file_input_widget.py | 7 +------ .../thresholding/thresholding_service.py | 2 -- .../thresholding/thresholding_view.py | 1 - 5 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_service.py b/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_service.py index 8647b882..8a1bae86 100644 --- a/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_service.py +++ b/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_service.py @@ -1,7 +1,6 @@ import pytest import numpy as np -from allencell_ml_segmenter.core.file_input_model import FileInputModel from allencell_ml_segmenter._tests.fakes.fake_experiments_model import ( FakeExperimentsModel, ) @@ -29,7 +28,6 @@ def test_on_threshold_changed_non_prediction(test_image): thresholding_service: ThresholdingService = ThresholdingService( thresholding_model, FakeExperimentsModel(), - FileInputModel(), MainModel(), viewer, task_executor=SynchroTaskExecutor.global_instance(), diff --git a/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_view.py b/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_view.py index d005050d..6c092bc3 100644 --- a/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_view.py +++ b/src/allencell_ml_segmenter/_tests/thresholding/test_thresholding_view.py @@ -13,7 +13,6 @@ ThresholdingModel, ) from allencell_ml_segmenter.core.file_input_model import ( - FileInputModel, InputMode, ) from allencell_ml_segmenter._tests.fakes.fake_viewer import FakeViewer @@ -37,16 +36,6 @@ def thresholding_model(tmp_path: Path) -> ThresholdingModel: return model -@pytest.fixture -# tmp_path is a builtin pytest fixture for a faked path -def file_input_model(tmp_path: Path) -> FileInputModel: - model = FileInputModel() - model.set_output_directory(tmp_path / "output") - model.set_input_image_path(tmp_path / "input") - model.set_input_mode(InputMode.FROM_PATH) - return model - - @pytest.fixture def experiments_model() -> FakeExperimentsModel: return FakeExperimentsModel() @@ -61,7 +50,6 @@ def viewer() -> FakeViewer: def thresholding_view( main_model, thresholding_model, - file_input_model, experiments_model, viewer, qtbot, diff --git a/src/allencell_ml_segmenter/core/thresholding_file_input_widget.py b/src/allencell_ml_segmenter/core/thresholding_file_input_widget.py index b4aac652..9f8fda70 100644 --- a/src/allencell_ml_segmenter/core/thresholding_file_input_widget.py +++ b/src/allencell_ml_segmenter/core/thresholding_file_input_widget.py @@ -1,18 +1,13 @@ -from typing import Any, Optional +from typing import Optional -from napari.layers import Layer from allencell_ml_segmenter.core.file_input_model import ( InputMode, - FileInputModel, ) from allencell_ml_segmenter.core.file_input_widget import FileInputWidget from allencell_ml_segmenter.main.i_viewer import IViewer -from allencell_ml_segmenter.main.segmenter_layer import LabelsLayer from qtpy.QtCore import Qt -from allencell_ml_segmenter.prediction.service import ModelFileService - from napari.utils.events import Event as NapariEvent # type: ignore from allencell_ml_segmenter.thresholding.thresholding_model import ( diff --git a/src/allencell_ml_segmenter/thresholding/thresholding_service.py b/src/allencell_ml_segmenter/thresholding/thresholding_service.py index cfbb74a0..815f75a9 100644 --- a/src/allencell_ml_segmenter/thresholding/thresholding_service.py +++ b/src/allencell_ml_segmenter/thresholding/thresholding_service.py @@ -8,11 +8,9 @@ from napari.utils.notifications import show_info # type: ignore from allencell_ml_segmenter.core.event import Event -from allencell_ml_segmenter.core.file_input_model import FileInputModel from allencell_ml_segmenter.core.subscriber import Subscriber from allencell_ml_segmenter.main.experiments_model import ExperimentsModel from allencell_ml_segmenter.main.main_model import MainModel -from allencell_ml_segmenter.main.segmenter_layer import LabelsLayer from allencell_ml_segmenter.thresholding.thresholding_model import ( ThresholdingModel, ) diff --git a/src/allencell_ml_segmenter/thresholding/thresholding_view.py b/src/allencell_ml_segmenter/thresholding/thresholding_view.py index 772240cd..453b2ca5 100644 --- a/src/allencell_ml_segmenter/thresholding/thresholding_view.py +++ b/src/allencell_ml_segmenter/thresholding/thresholding_view.py @@ -25,7 +25,6 @@ ThresholdingFileInputWidget, ) from allencell_ml_segmenter.core.file_input_model import ( - FileInputModel, InputMode, )