Skip to content

Commit

Permalink
remove all FileInputModel Imports that are no longer needed
Browse files Browse the repository at this point in the history
  • Loading branch information
yrkim98 committed Feb 6, 2025
1 parent 158d7f4 commit 3dfcca9
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 23 deletions.
Original file line number Diff line number Diff line change
@@ -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,
)
Expand Down Expand Up @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -61,7 +50,6 @@ def viewer() -> FakeViewer:
def thresholding_view(
main_model,
thresholding_model,
file_input_model,
experiments_model,
viewer,
qtbot,
Expand Down
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
ThresholdingFileInputWidget,
)
from allencell_ml_segmenter.core.file_input_model import (
FileInputModel,
InputMode,
)

Expand Down

0 comments on commit 3dfcca9

Please sign in to comment.