diff --git a/tests/test_accessors.py b/tests/test_accessors.py index 1f730c47b057ae546adee419019edffeec9762a6..014eda2c283ce9297f3084513abad66497303cbd 100644 --- a/tests/test_accessors.py +++ b/tests/test_accessors.py @@ -2,10 +2,10 @@ import unittest import numpy as np -from base.accessors import PatchStack, make_patch_stack_from_file, FileNotFoundError +from model_server.base.accessors import PatchStack, make_patch_stack_from_file, FileNotFoundError -from conf.testing import czifile, output_path, monopngfile, rgbpngfile, tifffile, monozstackmask -from base.accessors import CziImageFileAccessor, DataShapeError, generate_file_accessor, InMemoryDataAccessor, PngFileAccessor, write_accessor_data_to_file, TifSingleSeriesFileAccessor +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 def _random_int(*args): return np.random.randint(0, 2 ** 8, size=args, dtype='uint8') diff --git a/tests/test_api.py b/tests/test_api.py index c113111f6f11d2298d4d3660eaaa0a61dde513c5..a8260b7df818c34ce65446342af20d050b35cbb6 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -6,7 +6,7 @@ import requests import unittest from urllib3 import Retry -from conf.testing import czifile +from model_server.conf.testing import czifile class TestServerBaseClass(unittest.TestCase): diff --git a/tests/test_model.py b/tests/test_model.py index 7c0c0ec7030aea515fa444adc6e4c8fb294312a8..57e07c8e16ad079d19f106517d9d06a9ef6daa51 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1,7 +1,7 @@ import unittest from conf.testing import czifile -from base.accessors import CziImageFileAccessor -from base.models import DummySemanticSegmentationModel, DummyInstanceSegmentationModel, CouldNotLoadModelError +from model_server.base.accessors import CziImageFileAccessor +from model_server.base.models import DummySemanticSegmentationModel, DummyInstanceSegmentationModel, CouldNotLoadModelError class TestCziImageFileAccess(unittest.TestCase): def setUp(self) -> None: diff --git a/tests/test_process.py b/tests/test_process.py index 63d8bf41d070629be2ae7b8f222eb4d47a167333..9a5b83804b9609c4f79e9a1f1bc36bd423fb260c 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -2,8 +2,8 @@ import unittest import numpy as np -from base.annotators import draw_contours_on_patch -from base.process import get_safe_contours, mask_largest_object, pad +from model_server.base.annotators import draw_contours_on_patch +from model_server.base.process import get_safe_contours, mask_largest_object, pad class TestProcessingUtilityMethods(unittest.TestCase): def setUp(self) -> None: diff --git a/tests/test_roiset.py b/tests/test_roiset.py index c798fa8bacdc1bd26591f33aa1ba7a74e7a8ea99..98e07ef2de36564ff278d2643860393a0ba620c1 100644 --- a/tests/test_roiset.py +++ b/tests/test_roiset.py @@ -9,10 +9,10 @@ import pandas as pd from model_server.conf.testing import output_path, roiset_test_data -from base.roiset import RoiSetExportParams, RoiSetMetaParams -from base.roiset import RoiSet -from base.accessors import generate_file_accessor, InMemoryDataAccessor, write_accessor_data_to_file, PatchStack -from base.models import DummyInstanceSegmentationModel +from model_server.base.roiset import RoiSetExportParams, RoiSetMetaParams +from model_server.base.roiset import RoiSet +from model_server.base.accessors import generate_file_accessor, InMemoryDataAccessor, write_accessor_data_to_file, PatchStack +from model_server.base.models import DummyInstanceSegmentationModel class BaseTestRoiSetMonoProducts(object): diff --git a/tests/test_session.py b/tests/test_session.py index 541dfb75b4e48ce4e78c980beac77f05f300019c..a7c13c07218ef15f1469dd54f24380cab0b519a5 100644 --- a/tests/test_session.py +++ b/tests/test_session.py @@ -3,8 +3,8 @@ import pathlib from pydantic import BaseModel import unittest -from base.models import DummySemanticSegmentationModel -from base.session import session +from model_server.base.models import DummySemanticSegmentationModel +from model_server.base.session import session class TestGetSessionObject(unittest.TestCase): def setUp(self) -> None: @@ -43,7 +43,7 @@ class TestGetSessionObject(unittest.TestCase): logfile1 = session1.logfile self.assertTrue(logfile1.exists()) - from base.session import session as session2 + from model_server.base.session import session as session2 self.assertEqual(session1, session2) logfile2 = session2.logfile self.assertTrue(logfile2.exists()) diff --git a/tests/test_workflow.py b/tests/test_workflow.py index cc66cf2109433f4a2b544e7930de8c29fbae8969..19bba960caf3b35bbf4bad74123b1ee36c9f651d 100644 --- a/tests/test_workflow.py +++ b/tests/test_workflow.py @@ -1,8 +1,8 @@ import unittest from conf.testing import czifile, output_path -from base.models import DummySemanticSegmentationModel -from base.workflows import classify_pixels +from model_server.base.models import DummySemanticSegmentationModel +from model_server.base.workflows import classify_pixels class TestGetSessionObject(unittest.TestCase):