datamint 1.6.3.post1__py3-none-any.whl → 1.7.0__py3-none-any.whl

datamint/dataset/dataset.py

@@ -7,6 +7,7 @@ import numpy as np
 import logging
 from PIL import Image
 import albumentations
+from datamint.dataset.annotation import Annotation
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -116,12 +117,12 @@ class DatamintDataset(DatamintBaseDataset):
         if semantic_seg_merge_strategy is not None and not return_as_semantic_segmentation:
             raise ValueError("semantic_seg_merge_strategy can only be used if return_as_semantic_segmentation is True")
 
-    def _load_segmentations(self, annotations: list[dict], img_shape) -> tuple[dict[str, list], dict[str, list]]:
+    def _load_segmentations(self, annotations: list[Annotation], img_shape) -> tuple[dict[str, list], dict[str, list]]:
         """
         Load segmentations from annotations.
 
         Args:
-            annotations: list of annotations. Each annotation is a dictionary with keys 'type', 'file', 'added_by', 'name', 'index'.
+            annotations: list of Annotation objects
             img_shape: shape of the image (#frames, C, H, W)
 
         Returns:
@@ -142,14 +143,14 @@ class DatamintDataset(DatamintBaseDataset):
 
         # Load segmentation annotations
         for ann in annotations:
-            if ann['type'] != 'segmentation':
+            if ann.type != 'segmentation':
                 continue
-            if 'file' not in ann:
+            if ann.file is None:
                 _LOGGER.warning(f"Segmentation annotation without file in annotations {ann}")
                 continue
-            author = ann['added_by']
+            author = ann.created_by
 
-            segfilepath = ann['file']  # png file
+            segfilepath = ann.file  # png file
             segfilepath = os.path.join(self.dataset_dir, segfilepath)
             # FIXME: avoid enforcing resizing the mask
             seg = (Image.open(segfilepath)
@@ -161,11 +162,11 @@ class DatamintDataset(DatamintBaseDataset):
             seg = torch.from_numpy(seg)
             seg = seg == 255   # binary mask
             # map the segmentation label to the code
-            seg_code = self.frame_lcodes['segmentation'][ann['name']]
+            seg_code = self.frame_lcodes['segmentation'][ann.name]
             if self.return_frame_by_frame:
                 frame_index = 0
             else:
-                frame_index = ann['index']
+                frame_index = ann.index
 
             if author not in segmentations.keys():
                 segmentations[author] = [None] * nframes
@@ -308,7 +309,9 @@ class DatamintDataset(DatamintBaseDataset):
 
         return augmented['image'], new_segmentations
 
-    def _seg_labels_to_names(self, seg_labels: dict | list | None) -> dict | list | None:
+    def _seg_labels_to_names(self,
+                             seg_labels: dict | list | None
+                             ) -> dict | list | None:
         """
         Convert segmentation label codes to label names.
 
@@ -330,10 +333,23 @@ class DatamintDataset(DatamintBaseDataset):
         code_to_name = self.segmentation_labels_set
         if isinstance(seg_labels, dict):
             # author -> list of frame tensors
-            return {author: [code_to_name[code.item()] for code in labels] for author, labels in seg_labels.items()}
+            seg_names = {}
+            for author, labels in seg_labels.items():
+                if isinstance(labels, Tensor):
+                    # single tensor for the author
+                    seg_names[author] = [code_to_name[code.item()-1] for code in labels]
+                elif isinstance(labels, list):
+                    # list of frame tensors
+                    seg_names[author] = [[code_to_name[code.item()-1] for code in frame_labels]
+                                         for frame_labels in labels]
+                else:
+                    _LOGGER.warning(
+                        f"Unexpected segmentation labels format for author {author}: {type(labels)}. Returning None")
+                    return None
+            return seg_names
         elif isinstance(seg_labels, list):
             # list of frame tensors
-            return [[code_to_name[code.item()] for code in labels] for labels in seg_labels]
+            return [[code_to_name[code.item()-1] for code in labels] for labels in seg_labels]
 
         _LOGGER.warning(f"Unexpected segmentation labels format: {type(seg_labels)}. Returning None")
         return None
@@ -388,6 +404,7 @@ class DatamintDataset(DatamintBaseDataset):
         try:
             if self.return_segmentations:
                 segmentations, seg_labels = self._load_segmentations(annotations, img.shape)
+                # seg_labels can be dict[str, list[Tensor]]
                 # apply mask transform
                 if self.mask_transform is not None:
                     for seglist in segmentations.values():
@@ -460,14 +477,14 @@ class DatamintDataset(DatamintBaseDataset):
         return new_item
 
     def _convert_labels_annotations(self,
-                                    annotations: list[dict],
+                                    annotations: list[Annotation],
                                     num_frames: int = None) -> dict[str, torch.Tensor]:
         """
         Converts the annotations, of the same type and scope, to tensor of shape (num_frames, num_labels)
         for each annotator.
 
         Args:
-            annotations: list of annotations
+            annotations: list of Annotation objects
             num_frames: number of frames in the video
 
         Returns:
@@ -489,14 +506,14 @@ class DatamintDataset(DatamintBaseDataset):
         if len(annotations) == 0:
             return frame_labels_byuser
         for ann in annotations:
-            user_id = ann['added_by']
+            user_id = ann.created_by
 
-            frame_idx = ann.get('index', None)
+            frame_idx = ann.index
 
             if user_id not in frame_labels_byuser.keys():
                 frame_labels_byuser[user_id] = torch.zeros(size=labels_ret_size, dtype=torch.int32)
             labels_onehot_i = frame_labels_byuser[user_id]
-            code = label2code[ann['name']]
+            code = label2code[ann.name]
             if frame_idx is None:
                 labels_onehot_i[code] = 1
             else:

{datamint-1.6.3.post1.dist-info → datamint-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamint
-Version: 1.6.3.post1
+Version: 1.7.0
 Summary: A library for interacting with the Datamint API, designed for efficient data management, processing and Deep Learning workflows.
 Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3

{datamint-1.6.3.post1.dist-info → datamint-1.7.0.dist-info}/RECORD

@@ -1,17 +1,18 @@
 datamint/__init__.py,sha256=7rKCCsaa4RBRTIfuHB708rai1xwDHLtkFNFJGKYG5D4,757
-datamint/apihandler/annotation_api_handler.py,sha256=ChwaSYjoOAVS7vuyP3-cfpDHaHwk_wXLf8QQaSU_oSM,51893
+datamint/apihandler/annotation_api_handler.py,sha256=HnWiG2ebq08mdaazTXVbkuwvh6fmKIKt8uqAOf3Y1jU,57013
 datamint/apihandler/api_handler.py,sha256=cdVSddrFCKlF_BJ81LO1aJ0OP49rssjpNEFzJ6Q7YyY,384
-datamint/apihandler/base_api_handler.py,sha256=XSxZEQEkbQpuixGDu_P9jbxUQht3Z3JgxaeiFKPkVDM,11690
+datamint/apihandler/base_api_handler.py,sha256=dWLiowyuP1XiGfNc-_D5oQSmJdfR0Quy0ToeJlkRA8s,11911
 datamint/apihandler/dto/annotation_dto.py,sha256=qId1RK1VO7dXrvGJ7dqJ31jBQB7Z8yy5x0tLSiMxTB4,7105
 datamint/apihandler/exp_api_handler.py,sha256=hFUgUgBc5rL7odK7gTW3MnrvMY1pVfJUpUdzRNobMQE,6226
-datamint/apihandler/root_api_handler.py,sha256=O8Gn1Gp3w7AYeuT_FbwH413o6P_eAYLoRiW0baGY_b4,51795
+datamint/apihandler/root_api_handler.py,sha256=qedldmtt0oNFoaxyMAskd0A5Uy-6KsuPd7Jl1jKHpGY,55450
 datamint/client_cmd_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datamint/client_cmd_tools/datamint_config.py,sha256=md7dnWrbl10lPtXKbmD9yo6onLJsajeG8Vz0ZWH1v4M,8181
 datamint/client_cmd_tools/datamint_upload.py,sha256=890USkrtaH23mNjTRYVHWce2q9jSmkUNHIP_e8fnJRM,29502
 datamint/configs.py,sha256=Bdp6NydYwyCJ2dk19_gf_o3M2ZyQOmMHpLi8wEWNHUk,1426
 datamint/dataset/__init__.py,sha256=4PlUKSvVhdfQvvuq8jQXrkdqnot-iTTizM3aM1vgSwg,47
-datamint/dataset/base_dataset.py,sha256=bSMuNHUzU7heN0awGemTn3e2zPLhuCsh-qSs_Qt6i9w,39082
-datamint/dataset/dataset.py,sha256=AwS92t5kdmpm9NKFfXFmDmZxEbbPfb_FOMn-FWfu3bE,26590
+datamint/dataset/annotation.py,sha256=qN1IMjdfLD2ceQ6va3l76jOXA8Vb_c-eBk1oWQu6hW0,7994
+datamint/dataset/base_dataset.py,sha256=9aMzfrBBw8_Atro4j325OgBPXSQtcbRwXrdIpS7bM3Q,49251
+datamint/dataset/dataset.py,sha256=fdcgxB9NKvPEdr9S6TOeAIqFW38PdhmCiYsit6u5Wxc,27314
 datamint/examples/__init__.py,sha256=zcYnd5nLVme9GCTPYH-1JpGo8xXK2WEYvhzcy_2alZc,39
 datamint/examples/example_projects.py,sha256=7Nb_EaIdzJTQa9zopqc-WhTBQWQJSoQZ_KjRS4PB4FI,2931
 datamint/experiment/__init__.py,sha256=5qQOMzoG17DEd1YnTF-vS0qiM-DGdbNh42EUo91CRhQ,34
@@ -21,7 +22,7 @@ datamint/logging.yaml,sha256=a5dsATpul7QHeUHB2TjABFjWaPXBMbO--dgn8GlRqwk,483
 datamint/utils/logging_utils.py,sha256=DvoA35ATYG3JTwfXEXYawDyKRfHeCrH0a9czfkmz8kM,1851
 datamint/utils/torchmetrics.py,sha256=lwU0nOtsSWfebyp7dvjlAggaqXtj5ohSEUXOg3L0hJE,2837
 datamint/utils/visualization.py,sha256=yaUVAOHar59VrGUjpAWv5eVvQSfztFG0eP9p5Vt3l-M,4470
-datamint-1.6.3.post1.dist-info/METADATA,sha256=ngjJxlLBEvFLCL_e6J186ZQUdHaMTvwq2JKgiEGA85g,4096
-datamint-1.6.3.post1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-datamint-1.6.3.post1.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
-datamint-1.6.3.post1.dist-info/RECORD,,
+datamint-1.7.0.dist-info/METADATA,sha256=GWsxt2qSpYc64h5DbgScsg7w-FRy1_35Gi38TJrRLOE,4090
+datamint-1.7.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+datamint-1.7.0.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
+datamint-1.7.0.dist-info/RECORD,,