datamint 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

datamint/dataset/base_dataset.py

@@ -1,6 +1,6 @@
 import os
 import requests
-from tqdm import tqdm
+from tqdm.auto import tqdm
 from typing import Optional, Callable, Any, Literal
 import logging
 import shutil
@@ -225,26 +225,34 @@ class DatamintBaseDataset:
         else:
             self._check_version()
 
+    def _init_metainfo(self) -> None:
+        # get the server info
+        self.project_info = self.get_info()
+        self.metainfo = self._get_datasetinfo().asdict().copy()
+        self.metainfo['updated_at'] = None
+        self.metainfo['resources'] = []
+        self.metainfo['all_annotations'] = self.all_annotations
+        self.images_metainfo = self.metainfo['resources']
+
     def _load_metadata(self) -> bool:
         """Load and process dataset metadata."""
         if hasattr(self, 'metainfo'):
             _LOGGER.warning("Metadata already loaded.")
         metadata_path = os.path.join(self.dataset_dir, 'dataset.json')
         if not os.path.isfile(metadata_path):
-            # get the server info
-            self.project_info = self.get_info()
-            self.metainfo = self._get_datasetinfo().asdict().copy()
-            self.metainfo['updated_at'] = None
-            self.metainfo['resources'] = []
-            self.metainfo['all_annotations'] = self.all_annotations
-            self.images_metainfo = self.metainfo['resources']
+            self._init_metainfo()
             return False
         else:
             with open(metadata_path, 'r') as file:
                 self.metainfo = json.load(file)
         self.images_metainfo = self.metainfo['resources']
         # Convert annotations from dict to Annotation objects
-        self._convert_metainfo_to_clsobj()
+        try:
+            self._convert_metainfo_to_clsobj()
+        except Exception as e:
+            _LOGGER.warning(f"Failed to convert annotations. Redownloading dataset. {type(e)}")
+            self._init_metainfo()
+            return False
         return True
 
     def _convert_metainfo_to_clsobj(self):
@@ -552,13 +560,12 @@ class DatamintBaseDataset:
         """Get project information from API."""
         if hasattr(self, 'project_info') and self.project_info is not None:
             return self.project_info
-        project = self.api.projects.get_by_name(self.project_name).asdict()
-        if 'error' in project:
-            available_projects = project['all_projects']
+        project = self.api.projects.get_by_name(self.project_name)
+        if project is None:
             raise DatamintDatasetException(
-                f"Project with name '{self.project_name}' not found. "
-                f"Available projects: {available_projects}"
+                f"Project with name '{self.project_name}' not found."
             )
+        project = project.asdict()
         self.project_info = project
         self.dataset_id = project['dataset_id']
         return project
@@ -898,8 +905,10 @@ class DatamintBaseDataset:
         ################
 
         ### ANNOTATIONS ###
+        _LOGGER.info("Fetching new annotations...")
         all_annotations = self.api.annotations.get_list(worklist_id=self.project_info['worklist_id'],
-                                                        status='published' if self.all_annotations else None)
+                                                        status=None if self.all_annotations else 'published',
+                                                        load_ai_segmentations=self.all_annotations)
 
         # group annotations by resource ID
         annotations_by_resource: dict[str, list[Annotation]] = {}

{datamint-2.0.0.dist-info → datamint-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamint
-Version: 2.0.0
+Version: 2.0.2
 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
@@ -16,6 +16,7 @@ Requires-Dist: aiohttp (>=3.0.0,<4.0.0)
 Requires-Dist: aioresponses (>=0.7.8,<0.8.0) ; extra == "dev"
 Requires-Dist: albumentations (>=2.0.0)
 Requires-Dist: datamintapi (==0.0.*)
+Requires-Dist: httpx
 Requires-Dist: humanize (>=4.0.0,<5.0.0)
 Requires-Dist: lazy-loader (>=0.3.0)
 Requires-Dist: lightning

{datamint-2.0.0.dist-info → datamint-2.0.2.dist-info}/RECORD

@@ -24,7 +24,7 @@ datamint/client_cmd_tools/datamint_upload.py,sha256=jPzvlNeBZfOOxuG6ryswJ8OG4jXu
 datamint/configs.py,sha256=Bdp6NydYwyCJ2dk19_gf_o3M2ZyQOmMHpLi8wEWNHUk,1426
 datamint/dataset/__init__.py,sha256=4PlUKSvVhdfQvvuq8jQXrkdqnot-iTTizM3aM1vgSwg,47
 datamint/dataset/annotation.py,sha256=qN1IMjdfLD2ceQ6va3l76jOXA8Vb_c-eBk1oWQu6hW0,7994
-datamint/dataset/base_dataset.py,sha256=ghVfy_WB3sZD29J5rWQhccEi1DD_qsif5B4gcPlhepU,49285
+datamint/dataset/base_dataset.py,sha256=wj98E7T1SGpDeQxO7urfwvkej7EStivZ79VDAqpiJC8,49595
 datamint/dataset/dataset.py,sha256=It-HOTi83ls4ww2qCAvFYU0_OLLrFclj0QQapMYgDAE,27333
 datamint/entities/__init__.py,sha256=tbHE7rZb0R9Hm-Dc8VWEq3PlRl7BYOzffumrV0ZdsMs,444
 datamint/entities/annotation.py,sha256=ochAEh_JqxAe_FyYTNUfPT47KiIAG7CkBTim52bu7M8,6636
@@ -44,7 +44,7 @@ datamint/logging.yaml,sha256=tOMxtc2UmwlIMTK6ljtnBwTco1PNrPeq3mx2iMuSbiw,482
 datamint/utils/logging_utils.py,sha256=9pRoaPrWu2jOdDCiAoUsjEdP5ZwaealWL3hjUqFvx9g,4022
 datamint/utils/torchmetrics.py,sha256=lwU0nOtsSWfebyp7dvjlAggaqXtj5ohSEUXOg3L0hJE,2837
 datamint/utils/visualization.py,sha256=yaUVAOHar59VrGUjpAWv5eVvQSfztFG0eP9p5Vt3l-M,4470
-datamint-2.0.0.dist-info/METADATA,sha256=38a-ojBv46DcXTJx8IQiE_DgOyWjela2l1S-ikBHHgs,4182
-datamint-2.0.0.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-datamint-2.0.0.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
-datamint-2.0.0.dist-info/RECORD,,
+datamint-2.0.2.dist-info/METADATA,sha256=ZgeoG6zkWqtzGiUQtgFFAfkoQtdRhcMv1wnf6Jx1SdQ,4203
+datamint-2.0.2.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+datamint-2.0.2.dist-info/entry_points.txt,sha256=mn5H6jPjO-rY0W0CAZ6Z_KKWhMLvyVaSpoqk77jlTI4,145
+datamint-2.0.2.dist-info/RECORD,,