diff --git a/model_server/base/roiset.py b/model_server/base/roiset.py index 936b53682821f015f46e2dcb07c9ffcb6f2455db..2f20ba9ac68af7cc86d3d513a863fe93f52a9393 100644 --- a/model_server/base/roiset.py +++ b/model_server/base/roiset.py @@ -16,9 +16,9 @@ from sklearn.linear_model import LinearRegression from model_server.base.accessors import GenericImageDataAccessor, InMemoryDataAccessor, write_accessor_data_to_file from model_server.base.models import InstanceSegmentationModel from model_server.base.process import pad, rescale, resample_to_8bit, make_rgb -from base.annotators import draw_box_on_patch, draw_contours_on_patch, draw_boxes_on_3d_image -from base.accessors import PatchStack -from base.process import mask_largest_object +from model_server.base.annotators import draw_box_on_patch, draw_contours_on_patch, draw_boxes_on_3d_image +from model_server.base.accessors import PatchStack +from model_server.base.process import mask_largest_object class PatchParams(BaseModel): diff --git a/model_server/extensions/ilastik/models.py b/model_server/extensions/ilastik/models.py index 91493a2bed5fc0f676206a3cf1b75a3ff4f7c00b..de25566a6571b6a07f8f6e1d453e49a1b13f9c72 100644 --- a/model_server/extensions/ilastik/models.py +++ b/model_server/extensions/ilastik/models.py @@ -5,7 +5,7 @@ import numpy as np import vigra import model_server.extensions.ilastik.conf -from base.accessors import PatchStack +from model_server.base.accessors import PatchStack from model_server.base.accessors import GenericImageDataAccessor, InMemoryDataAccessor from model_server.base.models import Model, ImageToImageModel, InstanceSegmentationModel, InvalidInputImageError, ParameterExpectedError, SemanticSegmentationModel diff --git a/model_server/extensions/ilastik/workflows.py b/model_server/extensions/ilastik/workflows.py index aed4b8f24e47e995c8dc9ed4377a305cc355dbc7..bbe21e4171bf1c0c8145694b7fac2839611a73af 100644 --- a/model_server/extensions/ilastik/workflows.py +++ b/model_server/extensions/ilastik/workflows.py @@ -4,11 +4,12 @@ Implementation of image analysis work behind API endpoints, without knowledge of from pathlib import Path from typing import Dict +from pydantic import BaseModel + from model_server.extensions.ilastik.models import IlastikPixelClassifierModel, IlastikObjectClassifierFromPixelPredictionsModel from model_server.base.accessors import generate_file_accessor, write_accessor_data_to_file from model_server.base.workflows import Timer -from pydantic import BaseModel class WorkflowRunRecord(BaseModel): pixel_model_id: str diff --git a/tests/test_accessors.py b/tests/test_accessors.py index d622a368dae6e89a24dabf1044391092f48b88b5..f85920bacae5711e05c291e22d428f1c54e4fca3 100644 --- a/tests/test_accessors.py +++ b/tests/test_accessors.py @@ -2,8 +2,7 @@ import unittest import numpy as np -from base.accessors import PatchStack, make_patch_stack_from_file, FileNotFoundError -from conf.testing import monozstackmask +from model_server.base.accessors import PatchStack, make_patch_stack_from_file, FileNotFoundError from model_server.conf.testing import czifile, output_path, monopngfile, rgbpngfile, tifffile, monozstackmask from model_server.base.accessors import CziImageFileAccessor, DataShapeError, generate_file_accessor, InMemoryDataAccessor, PngFileAccessor, write_accessor_data_to_file, TifSingleSeriesFileAccessor diff --git a/tests/test_process.py b/tests/test_process.py index 454151bc4f84156348624318a43837b5e9a370c8..569ac1b797437381df4d80e3da749447ea52e91f 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -2,7 +2,7 @@ import unittest import numpy as np -from base.process import mask_largest_object +from model_server.base.process import mask_largest_object from model_server.base.process import pad class TestProcessingUtilityMethods(unittest.TestCase):