datamint 2.4.1__tar.gz → 2.4.2__tar.gz

{datamint-2.4.1 → datamint-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamint
-Version: 2.4.1
+Version: 2.4.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

{datamint-2.4.1 → datamint-2.4.2}/datamint/api/endpoints/annotations_api.py

@@ -6,7 +6,6 @@ from ..entity_base_api import ApiConfig, CreatableEntityApi, DeletableEntityApi
 from .models_api import ModelsApi
 from datamint.entities.annotation import Annotation
 from datamint.entities.resource import Resource
-from datamint.entities.project import Project
 from datamint.api.dto import AnnotationType, CreateAnnotationDto, LineGeometry, BoxGeometry, CoordinateSystem, Geometry
 import numpy as np
 import os

{datamint-2.4.1 → datamint-2.4.2}/datamint/api/endpoints/resources_api.py

@@ -2,9 +2,9 @@ from typing import Any, Optional, Sequence, TypeAlias, Literal, IO
 from ..base_api import ApiConfig, BaseApi
 from ..entity_base_api import CreatableEntityApi, DeletableEntityApi
 from datamint.entities.resource import Resource
-from datamint.entities.project import Project
 from datamint.entities.annotation import Annotation
 from datamint.exceptions import DatamintException, ResourceNotFoundError
+from datamint.api.dto import AnnotationType
 import httpx
 from datetime import date
 import json
@@ -147,7 +147,8 @@ class ResourcesApi(CreatableEntityApi[Resource], DeletableEntityApi[Resource]):
 
         return super().get_list(limit=limit, params=payload)
 
-    def get_annotations(self, resource: str | Resource) -> Sequence[Annotation]:
+    def get_annotations(self, resource: str | Resource, 
+                        annotation_type: AnnotationType | str | None = None) -> Sequence[Annotation]:
         """Get annotations for a specific resource.
 
         Args:
@@ -156,7 +157,9 @@ class ResourcesApi(CreatableEntityApi[Resource], DeletableEntityApi[Resource]):
         Returns:
             A sequence of Annotation objects associated with the specified resource.
         """
-        return self.annotations_api.get_list(resource=resource)
+        return self.annotations_api.get_list(resource=resource,
+                                             load_ai_segmentations=True,
+                                             annotation_type=annotation_type)
 
     @staticmethod
     def __process_files_parameter(file_path: str | Sequence[str | IO | pydicom.Dataset]

{datamint-2.4.1 → datamint-2.4.2}/datamint/entities/resource.py

@@ -176,11 +176,7 @@ class Resource(BaseEntity):
     ) -> Sequence['Annotation']:
         """Get annotations associated with this resource."""
 
-        annotations = self._api.get_annotations(self)
-
-        if annotation_type:
-            annotation_type = AnnotationType(annotation_type)
-            annotations = [a for a in annotations if a.annotation_type == annotation_type]
+        annotations = self._api.get_annotations(self, annotation_type=annotation_type)
         return annotations
 
     # def get_projects(

{datamint-2.4.1 → datamint-2.4.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "datamint"
 description = "A library for interacting with the Datamint API, designed for efficient data management, processing and Deep Learning workflows."
-version = "2.4.1"
+version = "2.4.2"
 dynamic = ["dependencies"]
 requires-python = ">=3.10"
 readme = "README.md"

datamint-2.4.1/datamint/api/__init__.py

@@ -1,3 +0,0 @@
-from .client import Api
-
-__all__ = ['Api']