Merge pull request #438 from superannotateai/friday

Friday

Author: VaghinakDev

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.7
 log_cli=true
 python_files = test_*.py
-;addopts = -n auto --dist=loadscope
+addopts = -n auto --dist=loadscope

requirements_dev.txt

@@ -1,2 +1,2 @@
-superannotate_schemas>=v1.0.43dev3
+superannotate_schemas>=v1.0.43dev5
 

src/superannotate/__init__.py

@@ -211,8 +211,7 @@
 
 __author__ = "Superannotate"
 
-WORKING_DIR = os.path.split(os.path.realpath(__file__))[0]
-sys.path.append(WORKING_DIR)
+sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 logging.getLogger("botocore").setLevel(logging.CRITICAL)
 logger = get_default_logger()
 

src/superannotate/lib/app/analytics/aggregators.py

@@ -85,6 +85,22 @@ class DocumentRawData:
 
 
 class DataAggregator:
+    MAPPERS = {
+        "event": lambda annotation: None,
+        "bbox": lambda annotation: annotation["points"],
+        "polygon": lambda annotation: annotation["points"],
+        "polyline": lambda annotation: annotation["points"],
+        "cuboid": lambda annotation: annotation["points"],
+        "point": lambda annotation: {"x": annotation["x"], "y": annotation["y"]},
+        "annotation_type": lambda annotation: dict(
+            cx=annotation["cx"],
+            cy=annotation["cy"],
+            rx=annotation["rx"],
+            ry=annotation["ry"],
+            angle=annotation["angle"],
+        ),
+    }
+
     def __init__(
         self,
         project_type: str,
@@ -186,11 +202,12 @@ def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
             # append instances
             instances = annotation_data.get("instances", [])
             for idx, instance in enumerate(instances):
+                instance_type = instance["meta"].get("type", "event")
                 instance_raw = copy.copy(raw_data)
                 instance_raw.instanceId = int(idx)
                 instance_raw.instanceStart = instance["meta"].get("start")
                 instance_raw.instanceEnd = instance["meta"].get("end")
-                instance_raw.type = instance["meta"].get("type")
+                instance_raw.type = instance_type
                 instance_raw.className = instance["meta"].get("className")
                 instance_raw.createdAt = instance["meta"].get("createdAt")
                 instance_raw.createdBy = (
@@ -217,7 +234,7 @@ def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
                     for timestamp_id, timestamp in enumerate(timestamps):
                         timestamp_raw = copy.copy(parameter_raw)
                         timestamp_raw.timestampId = timestamp_id
-                        timestamp_raw.meta = timestamp.get("points")
+                        timestamp_raw.meta = self.MAPPERS[instance_type](timestamp)
                         attributes = timestamp.get("attributes", [])
                         for attribute_id, attribute in enumerate(attributes):
                             attribute_raw = copy.copy(timestamp_raw)
@@ -467,8 +484,7 @@ def __append_annotation(annotation_dict):
                             ]
                         ):
                             logger.warning(
-                                "Annotation class group value %s not in classes json. Skipping.",
-                                attribute_name,
+                                f"Annotation class group value {attribute_name} not in classes json. Skipping."
                             )
                             continue
                         annotation_dict = {

src/superannotate/lib/app/interface/sdk_interface.py

@@ -2144,6 +2144,8 @@ def upload_image_to_project(
         raise AppException(response.errors)
 
 
+@Trackable
+@validate_arguments
 def search_models(
     name: Optional[NotEmptyStr] = None,
     type_: Optional[NotEmptyStr] = None,
@@ -2303,7 +2305,7 @@ def delete_annotations(
 
     :param project: project name or folder path (e.g., "project1/folder1")
     :type project: str
-    :param item_names:  image names. If None, all image annotations from a given project/folder will be deleted.
+    :param item_names:  item names. If None, all item annotations from a given project/folder will be deleted.
     :type item_names: list of strs
     """
 

src/superannotate/lib/core/data_handlers.py

@@ -47,7 +47,7 @@ def get_annotation_class(self, name: str) -> AnnotationClass:
 
     @lru_cache()
     def get_attribute_group(
-            self, annotation_class: AnnotationClass, attr_group_name: str
+        self, annotation_class: AnnotationClass, attr_group_name: str
     ) -> AttributeGroup:
         for attr_group in annotation_class.attribute_groups:
             if attr_group.name == attr_group_name:
@@ -114,10 +114,10 @@ def handle(self, annotation: dict):
 
 class MissingIDsHandler(BaseAnnotationDateHandler):
     def __init__(
-            self,
-            annotation_classes: List[AnnotationClass],
-            templates: List[dict],
-            reporter: Reporter,
+        self,
+        annotation_classes: List[AnnotationClass],
+        templates: List[dict],
+        reporter: Reporter,
     ):
         super().__init__(annotation_classes)
         self.validate_existing_classes(annotation_classes)
@@ -187,7 +187,7 @@ def handle(self, annotation: dict):
             template["name"]: template["id"] for template in self._templates
         }
         for annotation_instance in (
-                i for i in annotation["instances"] if i.get("type", None) == "template"
+            i for i in annotation["instances"] if i.get("type", None) == "template"
         ):
             annotation_instance["templateId"] = template_name_id_map.get(
                 annotation_instance.get("templateName", ""), -1
@@ -244,10 +244,14 @@ def _point_handler(time_stamp):
     HANDLERS: Dict[str, Callable] = {
         AnnotationTypes.EVENT: lambda timestamp: {},
         AnnotationTypes.BBOX: lambda timestamp: {"points": timestamp["points"]},
-        AnnotationTypes.POINT: lambda timestamp: {"x": timestamp["x"], "y": timestamp["y"]},
+        AnnotationTypes.POINT: lambda timestamp: {
+            "x": timestamp["x"],
+            "y": timestamp["y"],
+        },
         AnnotationTypes.POLYLINE: lambda timestamp: {"points": timestamp["points"]},
         AnnotationTypes.POLYGON: lambda timestamp: {
-            "points": timestamp["points"], "exclude": timestamp.get("exclude", [])
+            "points": timestamp["points"],
+            "exclude": timestamp.get("exclude", []),
         },
     }
 
@@ -315,7 +319,9 @@ def convert_timestamp(timestamp):
                         editor_instance["timeline"][timestamp]["active"] = False
                     handler: Callable = self.HANDLERS.get(meta["type"])
                     if handler:
-                        editor_instance["timeline"][timestamp].update(handler(timestamp_data))
+                        editor_instance["timeline"][timestamp].update(
+                            handler(timestamp_data)
+                        )
                     # if timestamp_data.get("points", None):
                     #     editor_instance["timeline"][timestamp][
                     #         "points"
@@ -357,10 +363,10 @@ def convert_timestamp(timestamp):
                                 (group_name, attr_name)
                             )
                     attributes_to_add = (
-                            existing_attributes_in_current_instance - active_attributes
+                        existing_attributes_in_current_instance - active_attributes
                     )
                     attributes_to_delete = (
-                            active_attributes - existing_attributes_in_current_instance
+                        active_attributes - existing_attributes_in_current_instance
                     )
                     if attributes_to_add or attributes_to_delete:
                         editor_instance["timeline"][timestamp][

src/superannotate/lib/core/usecases/images.py

@@ -1620,7 +1620,7 @@ def execute(self) -> Response:
                 polling_states[response.get("poll_id")] = False
 
         if not polling_states:
-            self._response.errors = AppException("Invalid image names or empty folder.")
+            self._response.errors = AppException("Invalid item names or empty folder.")
         else:
             for poll_id in polling_states:
                 timeout_start = time.time()

src/superannotate/lib/core/usecases/models.py

@@ -8,6 +8,7 @@
 
 import boto3
 import lib.core as constances
+from lib.core.enums import ProjectType
 import pandas as pd
 import requests
 from botocore.exceptions import ClientError
@@ -68,7 +69,8 @@ def validate_fuse(self):
             and self._include_fuse
         ):
             raise AppValidationException(
-                f"Include fuse functionality is not supported for  projects containing {self._project.type} attached with URLs"
+                "Include fuse functionality is not supported for  projects containing "
+                f"{ProjectType.get_name(self._project.type)} attached with URLs"
             )
 
     def validate_folder_names(self):
@@ -202,17 +204,16 @@ def upload_to_s3_from_folder(self, source: str, folder_path: str):
 
         def _upload_file_to_s3(_to_s3_bucket, _path, _s3_key) -> None:
             _to_s3_bucket.upload_file(str(_path), _s3_key)
-            self.reporter.update_progress()
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
             results = []
-            self.reporter.start_progress(len(files_to_upload), "Uploading")
+            self.reporter.start_spinner()
             for path in files_to_upload:
                 s3_key = f"{folder_path + '/' if folder_path else ''}{str(Path(path).relative_to(Path(source)))}"
                 results.append(
                     executor.submit(_upload_file_to_s3, to_s3_bucket, path, s3_key)
                 )
-            self.reporter.finish_progress()
+            self.reporter.stop_spinner()
 
     def download_to_local_storage(self, destination: str, extract_zip=False):
         exports = self._service.get_exports(
@@ -227,22 +228,25 @@ def download_to_local_storage(self, destination: str, extract_zip=False):
         if not export:
             raise AppException("Export not found.")
         export_status = export["status"]
-
-        while export_status != ExportStatus.COMPLETE.value:
-            logger.info("Waiting 5 seconds for export to finish on server.")
-            time.sleep(5)
-
-            export = self._service.get_export(
-                team_id=self._project.team_id,
-                project_id=self._project.id,
-                export_id=export["id"],
-            )
-            if "error" in export:
-                raise AppException(export["error"])
-            export_status = export["status"]
-            if export_status in (ExportStatus.ERROR.value, ExportStatus.CANCELED.value):
-                raise AppException("Couldn't download export.")
-
+        if export_status != ExportStatus.COMPLETE.value:
+            logger.info("Waiting for export to finish on server.")
+            self.reporter.start_spinner()
+            while export_status != ExportStatus.COMPLETE.value:
+                export = self._service.get_export(
+                    team_id=self._project.team_id,
+                    project_id=self._project.id,
+                    export_id=export["id"],
+                )
+                if "error" in export:
+                    raise AppException(export["error"])
+                export_status = export["status"]
+                if export_status in (
+                    ExportStatus.ERROR.value,
+                    ExportStatus.CANCELED.value,
+                ):
+                    self.reporter.stop_spinner()
+                    raise AppException("Couldn't download export.")
+            self.reporter.stop_spinner()
         filename = Path(export["path"]).name
         filepath = Path(destination) / filename
         with requests.get(export["download"], stream=True) as response: