Merge pull request #488 from superannotateai/develop

Develop

Author: VaghinakDev

.github/workflows/release.yml

@@ -14,6 +14,12 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: "3.7"
+    - name: Upgrade pip 
+      run: >-
+        python -m
+        pip install
+        pip --upgrade
+        --user
     - name: Install pypi/build
       run: >-
         python -m

pytest.ini

@@ -2,4 +2,5 @@
 minversion = 3.7
 log_cli=true
 python_files = test_*.py
-addopts = -n auto --dist=loadscope
+;pytest_plugins = ['pytest_profiling']
+;addopts = -n auto --dist=loadscope

requirements.txt

@@ -2,15 +2,13 @@ pydicom>=2.0.0
 boto3>=1.14.53
 requests==2.26.0
 requests-toolbelt>=0.9.1
-tqdm==4.48.2
+tqdm==4.64.0
 pillow>=7.2.0
-numpy>=1.19.0
 matplotlib>=3.3.1
 xmltodict==0.12.0
 opencv-python>=4.4.0.42
 wheel==0.35.1
 packaging>=20.4
-pandas>=1.1.4
 plotly==4.1.0
 ffmpeg-python>=0.2.0
 fire==0.4.0
@@ -20,3 +18,7 @@ setuptools~=57.4.0
 aiohttp==3.8.1
 email-validator>=1.0.3
 nest-asyncio==1.5.4
+jsonschema==3.2.0
+pandas>=1.1.4
+aiofiles==0.8.0
+

src/superannotate/__init__.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-__version__ = "4.4.1"
+__version__ = "4.4.2b1"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

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

@@ -1,13 +1,13 @@
 import copy
 import json
+from dataclasses import dataclass
 from pathlib import Path
 from typing import List
 from typing import Optional
 from typing import Union
 
 import lib.core as constances
 import pandas as pd
-from dataclasses import dataclass
 from lib.app.exceptions import AppException
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from lib.core import PIXEL_ANNOTATION_POSTFIX
@@ -99,6 +99,7 @@ class DataAggregator:
             ry=annotation["ry"],
             angle=annotation["angle"],
         ),
+        "tag": lambda annotation: None,
     }
 
     def __init__(
@@ -171,6 +172,18 @@ def aggregate_annotations_as_df(self):
         elif self.project_type == constances.ProjectType.DOCUMENT.name:
             return self.aggregate_document_annotations_as_df(annotation_paths)
 
+    def __add_attributes_to_raws(self, raws, attributes, element_raw):
+        for attribute_id, attribute in enumerate(attributes):
+            attribute_raw = copy.copy(element_raw)
+            attribute_raw.attributeId = attribute_id
+            attribute_raw.attributeGroupName = attribute.get("groupName")
+            attribute_raw.attributeName = attribute.get("name")
+            raws.append(attribute_raw)
+        if not attributes:
+            raws.append(element_raw)
+
+        return raws
+
     def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
         raws = []
         for annotation_path in annotation_paths:
@@ -225,6 +238,9 @@ def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
                 )
                 instance_raw.pointLabels = instance["meta"].get("pointLabels")
                 parameters = instance.get("parameters", [])
+                if instance_raw.type == "tag":
+                    attributes = instance["meta"].get("attributes", [])
+                    raws = self.__add_attributes_to_raws(raws, attributes, instance_raw)
                 for parameter_id, parameter in enumerate(parameters):
                     parameter_raw = copy.copy(instance_raw)
                     parameter_raw.parameterId = parameter_id
@@ -236,19 +252,12 @@ def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
                         timestamp_raw.timestampId = timestamp_id
                         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)
-                            attribute_raw.attributeId = attribute_id
-                            attribute_raw.attributeGroupName = attribute.get(
-                                "groupName"
-                            )
-                            attribute_raw.attributeName = attribute.get("name")
-                            raws.append(attribute_raw)
-                        if not attributes:
-                            raws.append(timestamp_raw)
+                        raws = self.__add_attributes_to_raws(
+                            raws, attributes, timestamp_raw
+                        )
                     if not timestamps:
                         raws.append(parameter_raw)
-                if not parameters:
+                if not parameters and instance_type != "tag":
                     raws.append(instance_raw)
             if not instances:
                 raws.append(raw_data)

src/superannotate/lib/app/annotation_helpers.py

@@ -86,6 +86,7 @@ def add_annotation_comment_to_json(
         "y": comment_coords[1],
         "correspondence": [{"text": comment_text, "email": comment_author}],
         "resolved": resolved,
+        "creationType": "Preannotation",  # noqa
         "createdBy": user_action,
         "updatedBy": user_action,
     }
@@ -132,7 +133,6 @@ def add_annotation_bbox_to_json(
         "type": "bbox",
         "points": {"x1": bbox[0], "y1": bbox[1], "x2": bbox[2], "y2": bbox[3]},
         "className": annotation_class_name,
-        "error": error,
         "groupId": 0,
         "pointLabels": {},
         "locked": False,
@@ -141,7 +141,8 @@ def add_annotation_bbox_to_json(
         if annotation_class_attributes is None
         else annotation_class_attributes,
     }
-
+    if error is not None:
+        annotation["error"] = error
     annotation = _add_created_updated(annotation)
     annotation_json["instances"].append(annotation)
 
@@ -175,13 +176,11 @@ def add_annotation_point_to_json(
         raise AppException("Point should be 2 element float list.")
 
     annotation_json, path = _preprocess_annotation_json(annotation_json, image_name)
-
     annotation = {
         "type": "point",
         "x": point[0],
         "y": point[1],
         "className": annotation_class_name,
-        "error": error,
         "groupId": 0,
         "pointLabels": {},
         "locked": False,
@@ -190,6 +189,8 @@ def add_annotation_point_to_json(
         if annotation_class_attributes is None
         else annotation_class_attributes,
     }
+    if error is not None:
+        annotation["error"] = error
 
     annotation = _add_created_updated(annotation)
     annotation_json["instances"].append(annotation)

src/superannotate/lib/app/helpers.py

@@ -1,3 +1,4 @@
+import os
 import uuid
 from pathlib import Path
 from typing import List
@@ -128,3 +129,21 @@ def get_name_url_duplicated_from_csv(csv_path):
         else:
             duplicate_images.append(temp)
     return images_to_upload, duplicate_images
+
+
+def get_tabulation() -> int:
+    try:
+        return int(os.get_terminal_size().columns / 2)
+    except OSError:
+        return 48
+
+
+def wrap_error(errors_list: List[Tuple[str, str]]) -> str:
+    tabulation = get_tabulation()
+    msgs = []
+    for key, value in errors_list:
+        _tabulation = tabulation - len(key)
+        if not key:
+            key, value, _tabulation = value, "", 0
+        msgs.append("{}{}{}".format(key, " " * _tabulation, value))
+    return "\n".join(msgs)

src/superannotate/lib/app/input_converters/converters/coco_converters/coco_converter.py

@@ -305,7 +305,6 @@ def make_anno_json_generator(self):
             jsons = list(Path(self.export_root).glob("*objects.json"))
 
         self.set_num_total_images(len(jsons))
-        print()
         for fpath in jsons:
             with open(fpath) as fp:
                 json_data = json.load(fp)