diff --git a/tests/test_annotation_stores.py b/tests/test_annotation_stores.py index 66c990161..c3879c39f 100644 --- a/tests/test_annotation_stores.py +++ b/tests/test_annotation_stores.py @@ -40,7 +40,7 @@ if TYPE_CHECKING: # pragma: no cover from numbers import Number - from tiatoolbox.typing import Geometry + from tiatoolbox.type_hints import Geometry sqlite3.enable_callback_tracebacks(True) # noqa: FBT003 diff --git a/tests/test_patch_extraction.py b/tests/test_patch_extraction.py index 2609b9a48..a8535f7b1 100644 --- a/tests/test_patch_extraction.py +++ b/tests/test_patch_extraction.py @@ -21,7 +21,7 @@ ) if TYPE_CHECKING: - from tiatoolbox.typing import IntPair, Resolution, Units + from tiatoolbox.type_hints import IntPair, Resolution, Units def read_points_patches( diff --git a/tests/test_utils.py b/tests/test_utils.py index 95e6ee520..a06d57d90 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -28,7 +28,7 @@ from tiatoolbox.utils.transforms import locsize2bounds if TYPE_CHECKING: - from tiatoolbox.typing import IntBounds + from tiatoolbox.type_hints import IntBounds RNG = np.random.default_rng() # Numpy Random Generator diff --git a/tests/test_wsireader.py b/tests/test_wsireader.py index f43368406..e156f8990 100644 --- a/tests/test_wsireader.py +++ b/tests/test_wsireader.py @@ -52,7 +52,7 @@ import requests from openslide import OpenSlide - from tiatoolbox.typing import IntBounds, IntPair + from tiatoolbox.type_hints import IntBounds, IntPair from tiatoolbox.wsicore.wsimeta import WSIMeta # ------------------------------------------------------------------------------------- diff --git a/tiatoolbox/annotation/storage.py b/tiatoolbox/annotation/storage.py index 058b65b71..5834e2640 100644 --- a/tiatoolbox/annotation/storage.py +++ b/tiatoolbox/annotation/storage.py @@ -83,10 +83,10 @@ py_regexp, ) from tiatoolbox.enums import GeometryType -from tiatoolbox.typing import CallablePredicate, CallableSelect, Geometry +from tiatoolbox.type_hints import CallablePredicate, CallableSelect, Geometry if TYPE_CHECKING: # pragma: no cover - from tiatoolbox.typing import ( + from tiatoolbox.type_hints import ( Predicate, Properties, QueryGeometry, diff --git a/tiatoolbox/models/architecture/nuclick.py b/tiatoolbox/models/architecture/nuclick.py index 77f4ad993..0be45a8e1 100644 --- a/tiatoolbox/models/architecture/nuclick.py +++ b/tiatoolbox/models/architecture/nuclick.py @@ -24,7 +24,7 @@ from tiatoolbox.models.models_abc import ModelABC if TYPE_CHECKING: # pragma: no cover - from tiatoolbox.typing import IntPair + from tiatoolbox.type_hints import IntPair bn_axis = 1 diff --git a/tiatoolbox/models/dataset/classification.py b/tiatoolbox/models/dataset/classification.py index cd17dab7e..edf4e28aa 100644 --- a/tiatoolbox/models/dataset/classification.py +++ b/tiatoolbox/models/dataset/classification.py @@ -20,7 +20,7 @@ import torch from PIL.Image import Image - from tiatoolbox.typing import IntPair, Resolution, Units + from tiatoolbox.type_hints import IntPair, Resolution, Units class _TorchPreprocCaller: diff --git a/tiatoolbox/models/engine/multi_task_segmentor.py b/tiatoolbox/models/engine/multi_task_segmentor.py index 3e5cf97e9..2d3df757f 100644 --- a/tiatoolbox/models/engine/multi_task_segmentor.py +++ b/tiatoolbox/models/engine/multi_task_segmentor.py @@ -43,7 +43,7 @@ if TYPE_CHECKING: # pragma: no cover import torch - from tiatoolbox.typing import IntBounds + from tiatoolbox.type_hints import IntBounds # Python is yet to be able to natively pickle Object method/static method. diff --git a/tiatoolbox/models/engine/patch_predictor.py b/tiatoolbox/models/engine/patch_predictor.py index 9989c313e..088f78687 100644 --- a/tiatoolbox/models/engine/patch_predictor.py +++ b/tiatoolbox/models/engine/patch_predictor.py @@ -21,7 +21,7 @@ from tiatoolbox.wsicore.wsireader import VirtualWSIReader, WSIReader if TYPE_CHECKING: # pragma: no cover - from tiatoolbox.typing import IntPair, Resolution, Units + from tiatoolbox.type_hints import IntPair, Resolution, Units class IOPatchPredictorConfig(IOSegmentorConfig): diff --git a/tiatoolbox/models/engine/semantic_segmentor.py b/tiatoolbox/models/engine/semantic_segmentor.py index 029deebf9..791f369f7 100644 --- a/tiatoolbox/models/engine/semantic_segmentor.py +++ b/tiatoolbox/models/engine/semantic_segmentor.py @@ -28,7 +28,7 @@ if TYPE_CHECKING: # pragma: no cover from multiprocessing.managers import Namespace - from tiatoolbox.typing import IntPair, Resolution, Units + from tiatoolbox.type_hints import IntPair, Resolution, Units def _estimate_canvas_parameters( diff --git a/tiatoolbox/tools/patchextraction.py b/tiatoolbox/tools/patchextraction.py index 21fcb4eb0..3de867a19 100644 --- a/tiatoolbox/tools/patchextraction.py +++ b/tiatoolbox/tools/patchextraction.py @@ -20,7 +20,7 @@ from pandas import DataFrame from tiatoolbox.annotation.storage import AnnotationStore - from tiatoolbox.typing import Resolution, Units + from tiatoolbox.type_hints import Resolution, Units def validate_shape(shape: np.ndarray) -> bool: diff --git a/tiatoolbox/tools/registration/wsi_registration.py b/tiatoolbox/tools/registration/wsi_registration.py index a333d77b5..d0a6fc38a 100644 --- a/tiatoolbox/tools/registration/wsi_registration.py +++ b/tiatoolbox/tools/registration/wsi_registration.py @@ -24,7 +24,7 @@ from tiatoolbox.wsicore.wsireader import VirtualWSIReader, WSIReader if TYPE_CHECKING: # pragma: no cover - from tiatoolbox.typing import IntBounds, Resolution, Units + from tiatoolbox.type_hints import IntBounds, Resolution, Units RGB_IMAGE_DIM = 3 BIN_MASK_DIM = 2 diff --git a/tiatoolbox/typing.py b/tiatoolbox/type_hints.py similarity index 100% rename from tiatoolbox/typing.py rename to tiatoolbox/type_hints.py diff --git a/tiatoolbox/utils/image.py b/tiatoolbox/utils/image.py index d697a6e3c..db22eef21 100644 --- a/tiatoolbox/utils/image.py +++ b/tiatoolbox/utils/image.py @@ -18,7 +18,7 @@ ) if TYPE_CHECKING: # pragma: no cover - from tiatoolbox.typing import IntBounds, NumpyPadLiteral + from tiatoolbox.type_hints import IntBounds, NumpyPadLiteral PADDING_TO_BOUNDS = np.array([-1, -1, 1, 1]) """ diff --git a/tiatoolbox/wsicore/wsimeta.py b/tiatoolbox/wsicore/wsimeta.py index 0870e4fe1..97145e5d6 100644 --- a/tiatoolbox/wsicore/wsimeta.py +++ b/tiatoolbox/wsicore/wsimeta.py @@ -20,7 +20,7 @@ if TYPE_CHECKING: # pragma: no cover from collections.abc import Mapping, Sequence - from tiatoolbox.typing import Resolution, Units + from tiatoolbox.type_hints import Resolution, Units class WSIMeta: diff --git a/tiatoolbox/wsicore/wsireader.py b/tiatoolbox/wsicore/wsireader.py index 482a503f4..efcaaa710 100644 --- a/tiatoolbox/wsicore/wsireader.py +++ b/tiatoolbox/wsicore/wsireader.py @@ -34,7 +34,14 @@ import glymur - from tiatoolbox.typing import Bounds, IntBounds, IntPair, NumPair, Resolution, Units + from tiatoolbox.type_hints import ( + Bounds, + IntBounds, + IntPair, + NumPair, + Resolution, + Units, + ) from tiatoolbox.wsicore.metadata.ngff import Multiscales pixman_warning()