[typing] Redefine Sample type in each lib

src/mednet/libs/classification/config/data/montgomery/datamodule.py

@@ -13,10 +13,10 @@ import PIL.Image
 from mednet.libs.classification.data.typing import (
     ClassificationRawDataLoader as _ClassificationRawDataLoader,
 )
+from mednet.libs.classification.data.typing import Sample
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.image_utils import remove_black_borders
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
 from torchvision.transforms.functional import to_tensor
 

src/mednet/libs/classification/config/data/nih_cxr14/datamodule.py

@@ -13,9 +13,9 @@ import PIL.Image
 from mednet.libs.classification.data.typing import (
     ClassificationRawDataLoader as _ClassificationRawDataLoader,
 )
+from mednet.libs.classification.data.typing import Sample
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
 from torchvision.transforms.functional import to_tensor
 

src/mednet/libs/classification/config/data/padchest/datamodule.py

@@ -14,10 +14,10 @@ import PIL.Image
 from mednet.libs.classification.data.typing import (
     ClassificationRawDataLoader as _ClassificationRawDataLoader,
 )
+from mednet.libs.classification.data.typing import Sample
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.image_utils import remove_black_borders
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
 from torchvision.transforms.functional import to_tensor
 

src/mednet/libs/classification/config/data/shenzhen/datamodule.py

@@ -13,10 +13,10 @@ import PIL.Image
 from mednet.libs.classification.data.typing import (
     ClassificationRawDataLoader as _ClassificationRawDataLoader,
 )
+from mednet.libs.classification.data.typing import Sample
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.image_utils import remove_black_borders
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
 from torchvision.transforms.functional import to_tensor
 

src/mednet/libs/classification/config/data/tbpoc/datamodule.py

@@ -9,10 +9,10 @@ import PIL.Image
 from mednet.libs.classification.data.typing import (
     ClassificationRawDataLoader as _ClassificationRawDataLoader,
 )
+from mednet.libs.classification.data.typing import Sample
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.image_utils import remove_black_borders
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
 from torchvision.transforms.functional import to_tensor
 

src/mednet/libs/classification/config/data/tbx11k/datamodule.py

@@ -13,9 +13,9 @@ import typing_extensions
 from mednet.libs.classification.data.typing import (
     ClassificationRawDataLoader as _ClassificationRawDataLoader,
 )
+from mednet.libs.classification.data.typing import Sample
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
 from torch.utils.data._utils.collate import default_collate_fn_map
 from torchvision.transforms.functional import to_tensor

src/mednet/libs/classification/data/typing.py

 import typing
 
-from mednet.libs.common.data.typing import RawDataLoader, Sample
+import torch
+from mednet.libs.common.data.typing import RawDataLoader
+
+Sample: typing.TypeAlias = tuple[torch.Tensor, typing.Mapping[str, typing.Any]]
 
 
 class ClassificationRawDataLoader(RawDataLoader):

src/mednet/libs/classification/engine/saliency/completeness.py

@@ -11,7 +11,7 @@ import lightning.pytorch
 import numpy as np
 import torch
 import tqdm
-from mednet.libs.common.data.typing import Sample
+from mednet.libs.classification.data.typing import Sample
 from mednet.libs.common.engine.device import DeviceManager
 from pytorch_grad_cam.metrics.road import (
     ROADLeastRelevantFirstAverage,

src/mednet/libs/common/data/typing.py

@@ -9,7 +9,9 @@ import typing
 import torch
 import torch.utils.data
 
-Sample: typing.TypeAlias = tuple[torch.Tensor, typing.Mapping[str, typing.Any]]
+Sample: typing.TypeAlias = tuple[
+    torch.Tensor | typing.Mapping[str, torch.Tensor], typing.Mapping[str, typing.Any]
+]
 """Definition of a sample.
 
 First parameter

src/mednet/libs/segmentation/config/data/avdrive/datamodule.py

@@ -9,9 +9,9 @@ import pathlib
 import PIL.Image
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/chasedb1/datamodule.py

@@ -10,9 +10,9 @@ import PIL.Image
 import pkg_resources
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/cxr8/datamodule.py

@@ -11,8 +11,8 @@ import PIL.Image
 import torch
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/drhagis/datamodule.py

@@ -9,9 +9,9 @@ import pathlib
 import PIL.Image
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/drionsdb/datamodule.py

@@ -11,9 +11,9 @@ import PIL.Image
 import pkg_resources
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/drishtigs1/datamodule.py

@@ -10,9 +10,9 @@ import PIL.Image
 import pkg_resources
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/drive/datamodule.py

@@ -9,9 +9,9 @@ import pathlib
 import PIL.Image
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/hrf/datamodule.py

@@ -9,9 +9,9 @@ import pathlib
 import PIL.Image
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/iostar/datamodule.py

@@ -9,9 +9,9 @@ import pathlib
 import PIL.Image
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.models.transforms import crop_image_to_mask
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/jsrt/datamodule.py

@@ -12,8 +12,8 @@ import skimage.exposure
 import torch
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )

src/mednet/libs/segmentation/config/data/montgomery/datamodule.py

@@ -12,8 +12,8 @@ import pkg_resources
 import torch
 from mednet.libs.common.data.datamodule import CachingDataModule
 from mednet.libs.common.data.split import make_split
-from mednet.libs.common.data.typing import Sample
 from mednet.libs.common.utils.rc import load_rc
+from mednet.libs.segmentation.data.typing import Sample
 from mednet.libs.segmentation.data.typing import (
     SegmentationRawDataLoader as _SegmentationRawDataLoader,
 )