superannotate 4.4.10.dev7__tar.gz → 4.4.10.dev8__tar.gz

{superannotate-4.4.10.dev7/src/superannotate.egg-info → superannotate-4.4.10.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: superannotate
-Version: 4.4.10.dev7
+Version: 4.4.10.dev8
 Summary: Python SDK to SuperAnnotate platform
 Home-page: https://github.com/superannotateai/superannotate-python-sdk
 Author: SuperAnnotate AI

{superannotate-4.4.10.dev7 → superannotate-4.4.10.dev8}/src/superannotate/__init__.py

@@ -3,7 +3,7 @@ import os
 import sys
 import typing
 
-__version__ = "4.4.10dev7"
+__version__ = "4.4.10dev8"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

{superannotate-4.4.10.dev7 → superannotate-4.4.10.dev8}/src/superannotate/lib/core/entities/project.py

@@ -161,6 +161,15 @@ class MLModelEntity(TimedBaseModel):
         extra = Extra.ignore
 
 
+class UserEntity(BaseModel):
+    id: Optional[str]
+    first_name: Optional[str]
+    last_name: Optional[str]
+    email: Optional[str]
+    picture: Optional[str]
+    user_role: Optional[int]
+
+
 class TeamEntity(BaseModel):
     id: Optional[int]
     name: Optional[str]
@@ -168,6 +177,6 @@ class TeamEntity(BaseModel):
     type: Optional[str]
     user_role: Optional[str]
     is_default: Optional[bool]
-    users: Optional[List[Any]]
+    users: Optional[List[UserEntity]]
     pending_invitations: Optional[List[Any]]
     creator_id: Optional[str]

{superannotate-4.4.10.dev7 → superannotate-4.4.10.dev8}/src/superannotate/lib/core/usecases/annotations.py

@@ -1037,7 +1037,6 @@ class GetVideoAnnotationsPerFrame(BaseReportableUseCase):
 
     def execute(self):
         if self.is_valid():
-            self.reporter.disable_info()
             response = GetAnnotations(
                 config=self._config,
                 reporter=Reporter(log_info=False),
@@ -1046,10 +1045,9 @@ class GetVideoAnnotationsPerFrame(BaseReportableUseCase):
                 item_names=[self._video_name],
                 service_provider=self._service_provider,
             ).execute()
-            self.reporter.enable_info()
             if response.data:
                 generator = VideoFrameGenerator(response.data[0], fps=self._fps)
-                self.reporter.log_info(
+                logger.info(
                     f"Getting annotations for {generator.frames_count} frames from {self._video_name}."
                 )
                 if response.errors:
@@ -1412,21 +1410,10 @@ class GetAnnotations(BaseReportableUseCase):
             self._item_names = [
                 i for i in self._item_names if not (i in seen or seen.add(i))
             ]
-        elif self._item_names is None:
-            self._item_names_provided = False
-            condition = Condition("project_id", self._project.id, EQ) & Condition(
-                "folder_id", self._folder.id, EQ
-            )
-
-            self._item_names = [
-                item.name for item in self._service_provider.items.list(condition).data
-            ]
-        else:
-            self._item_names = []
 
     def _prettify_annotations(self, annotations: List[dict]):
         re_struct = {}
-        if self._item_names_provided:
+        if self._item_names:
             for annotation in annotations:
                 re_struct[annotation["metadata"]["name"]] = annotation
             try:
@@ -1528,19 +1515,25 @@ class GetAnnotations(BaseReportableUseCase):
                         self._project, self._folder, self._item_names
                     )
                 )
-            else:
+                len_items, len_provided_items = len(items), len(self._item_names)
+                if len_items != len_provided_items:
+                    self.reporter.log_warning(
+                        f"Could not find annotations for {len_provided_items - len_items}/{len_provided_items} items."
+                    )
+            elif self._item_names is None:
                 condition = Condition("project_id", self._project.id, EQ) & Condition(
                     "folder_id", self._folder.id, EQ
                 )
                 items = get_or_raise(self._service_provider.items.list(condition))
+            else:
+                items = []
             id_item_map = {i.id: i for i in items}
-
             if not items:
                 logger.info("No annotations to download.")
                 self._response.data = []
                 return self._response
             items_count = len(items)
-            logger.info(
+            self.reporter.log_info(
                 f"Getting {items_count} annotations from "
                 f"{self._project.name}{f'/{self._folder.name}' if self._folder.name != 'root' else ''}."
             )
@@ -1563,12 +1556,8 @@ class GetAnnotations(BaseReportableUseCase):
                 logger.error(e)
                 self._response.errors = AppException("Can't get annotations.")
                 return self._response
-            received_items_count = len(annotations)
             self.reporter.finish_progress()
-            if items_count > received_items_count:
-                self.reporter.log_warning(
-                    f"Could not find annotations for {items_count - received_items_count}/{items_count} items."
-                )
+
             self._response.data = self._prettify_annotations(annotations)
         return self._response
 

{superannotate-4.4.10.dev7 → superannotate-4.4.10.dev8/src/superannotate.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: superannotate
-Version: 4.4.10.dev7
+Version: 4.4.10.dev8
 Summary: Python SDK to SuperAnnotate platform
 Home-page: https://github.com/superannotateai/superannotate-python-sdk
 Author: SuperAnnotate AI