♻️ Refactor typing to type_hints.

TissueImageAnalytics · Feb 4, 2025 · 6b3b10c · 6b3b10c
1 parent c0b8c1c
commit 6b3b10c
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → tiatoolbox/type_hints.py b/tiatoolbox/typing.py → tiatoolbox/type_hints.py
diff --git 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
@@ -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
@@ -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()