Merge branch 'friday' into 1708_implimentation

Author: VaghinakDev

.pre-commit-config.yaml

@@ -36,11 +36,6 @@ repos:
       - id: check-byte-order-marker
       - id: trailing-whitespace
       - id: end-of-file-fixer
-  - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: ''  # pick a git hash / tag to point to
-    hooks:
-      - id: editorconfig-checker
-        alias: ec
 #  - repo: 'https://github.com/asottile/dead'
 #    rev: v1.3.0
 #    hooks:

pytest.ini

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

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

@@ -214,6 +214,10 @@ def aggregate_annotations_as_df(self):
             return self.aggregate_video_annotations_as_df(annotation_paths)
         elif self.project_type is constances.ProjectType.DOCUMENT:
             return self.aggregate_document_annotations_as_df(annotation_paths)
+        else:
+            raise AppException(
+                f"The function is not supported for {self.project_type.name} projects."
+            )
 
     def __add_attributes_to_raws(self, raws, attributes, element_raw):
         for attribute_id, attribute in enumerate(attributes):

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

@@ -19,9 +19,9 @@
 from typing_extensions import Literal
 
 if sys.version_info < (3, 11):
-    from typing_extensions import TypedDict, NotRequired  # noqa
+    from typing_extensions import TypedDict, NotRequired, Required  # noqa
 else:
-    from typing import TypedDict, NotRequired  # noqa
+    from typing import TypedDict, NotRequired, Required  # noqa
 
 import boto3
 from pydantic import StrictBool
@@ -111,7 +111,7 @@ class PriorityScore(TypedDict):
 
 
 class Attachment(TypedDict, total=False):
-    url: str
+    url: Required[str]  # noqa
     name: NotRequired[str]  # noqa
 
 
@@ -2022,8 +2022,8 @@ def upload_images_to_project(
             return uploaded, failed_images, duplications
         raise AppException(use_case.response.errors)
 
-    @staticmethod
     def aggregate_annotations_as_df(
+        self,
         project_root: Union[NotEmptyStr, Path],
         project_type: PROJECT_TYPE,
         folder_names: Optional[List[Union[Path, NotEmptyStr]]] = None,

src/superannotate/lib/core/__init__.py

@@ -35,7 +35,7 @@ def setup_logging(level=DEFAULT_LOGGING_LEVEL, file_path=LOG_FILE_LOCATION):
     global _loggers
     if not _loggers.get("sa"):
         logger = logging.getLogger("sa")
-        logger.propagate = False
+        logger.propagate = True
         logger.setLevel(level)
         stream_handler = logging.StreamHandler()
         formatter = Formatter("SA-PYTHON-SDK - %(levelname)s - %(message)s")

tests/data_set/sample_explore_export/classes/classes.json

@@ -0,0 +1 @@
+[{"id":1115467,"project_id":79598,"name":"tag_class","color":"#A613DA","type":"tag","createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-08-22T06:51:36.000Z","attribute_groups":[{"group_type":"radio","id":391880,"class_id":1115467,"name":"group_single","createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z","attributes":[{"id":1710830,"group_id":391880,"project_id":79598,"name":"single_atr1","count":0,"createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z"},{"id":1710831,"group_id":391880,"project_id":79598,"name":"single_atr2","count":0,"createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z"},{"id":1710832,"group_id":391880,"project_id":79598,"name":"single_atr3","count":0,"createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z"}],"default_value":null},{"group_type":"checklist","id":391881,"class_id":1115467,"name":"group_multi","createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z","attributes":[{"id":1710833,"group_id":391881,"project_id":79598,"name":"multi_atr1","count":0,"createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z"},{"id":1710834,"group_id":391881,"project_id":79598,"name":"multi_atr2","count":0,"createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z"},{"id":1710835,"group_id":391881,"project_id":79598,"name":"multi_atr3","count":0,"createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z"}],"default_value":[]},{"group_type":"numeric","id":391882,"class_id":1115467,"name":"group_numeric","createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z","attributes":[]},{"group_type":"text","id":391883,"class_id":1115467,"name":"group_text","createdAt":"2022-08-22T06:51:36.000Z","updatedAt":"2022-08-22T06:51:36.000Z","attributes":[]}]},{"id":1115466,"project_id":79598,"name":"car","color":"#74F950","type":"object","createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-03-31T08:38:07.000Z","attribute_groups":[]},{"id":1115465,"project_id":79598,"name":"tree","color":"#045D6B","type":"object","createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-03-31T08:38:07.000Z","attribute_groups":[]},{"id":1115464,"project_id":79598,"name":"animal","color":"#D5562D","type":"object","createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-08-22T06:53:18.000Z","attribute_groups":[{"group_type":"radio","id":391884,"class_id":1115464,"name":"gr_single","createdAt":"2022-08-22T06:53:18.000Z","updatedAt":"2022-08-22T06:53:18.000Z","attributes":[{"id":1710846,"group_id":391884,"project_id":79598,"name":"atr_sng1","count":0,"createdAt":"2022-08-22T06:53:19.000Z","updatedAt":"2022-08-22T06:53:19.000Z"},{"id":1710847,"group_id":391884,"project_id":79598,"name":"atr_sng2","count":0,"createdAt":"2022-08-22T06:53:19.000Z","updatedAt":"2022-08-22T06:53:19.000Z"},{"id":1710848,"group_id":391884,"project_id":79598,"name":"atr_sng3","count":0,"createdAt":"2022-08-22T06:53:19.000Z","updatedAt":"2022-08-22T06:53:19.000Z"}],"default_value":"atr_sng1"},{"group_type":"checklist","id":391885,"class_id":1115464,"name":"gr_multi","createdAt":"2022-08-22T06:53:18.000Z","updatedAt":"2022-08-22T06:53:18.000Z","attributes":[{"id":1710849,"group_id":391885,"project_id":79598,"name":"atr_mlt1","count":0,"createdAt":"2022-08-22T06:53:19.000Z","updatedAt":"2022-08-22T06:53:19.000Z"},{"id":1710850,"group_id":391885,"project_id":79598,"name":"atr_mlt2","count":0,"createdAt":"2022-08-22T06:53:19.000Z","updatedAt":"2022-08-22T06:53:19.000Z"},{"id":1710851,"group_id":391885,"project_id":79598,"name":"atr_mlt3","count":0,"createdAt":"2022-08-22T06:53:19.000Z","updatedAt":"2022-08-22T06:53:19.000Z"}],"default_value":["atr_mlt2","atr_mlt3"]},{"group_type":"text","id":391886,"class_id":1115464,"name":"gr_txt","createdAt":"2022-08-22T06:53:18.000Z","updatedAt":"2022-08-22T06:53:18.000Z","attributes":[]},{"group_type":"numeric","id":391887,"class_id":1115464,"name":"gr_num","createdAt":"2022-08-22T06:53:18.000Z","updatedAt":"2022-08-22T06:53:18.000Z","attributes":[]}]},{"id":1115463,"project_id":79598,"name":"human","color":"#582E8F","type":"object","createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-03-31T08:38:07.000Z","attribute_groups":[{"group_type":"radio","id":279400,"class_id":1115463,"name":"human_group","createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-03-31T08:38:07.000Z","attributes":[{"id":1334310,"group_id":279400,"project_id":79598,"name":"human_atr1","count":0,"createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-03-31T08:38:07.000Z"},{"id":1334311,"group_id":279400,"project_id":79598,"name":"human_atr2","count":0,"createdAt":"2022-03-31T08:38:07.000Z","updatedAt":"2022-03-31T08:38:07.000Z"}],"default_value":null}]}]

tests/data_set/sample_explore_export/file_example.jpg.json

@@ -0,0 +1 @@
+{"metadata":{"height":3840,"width":5760,"name":"file_example.jpg","lastAction":{"email":"arturn@superannotate.com","timestamp":1676214999521},"projectId":79598,"isPredicted":false,"status":"InProgress","pinned":false,"annotatorEmail":"automation_sa@mailinator.com","qaEmail":null},"instances":[{"type":"bbox","classId":1115463,"probability":100,"points":{"x1":4104.16,"x2":5598.13,"y1":2699.6,"y2":3470.08},"groupId":0,"pointLabels":{"0":"point1","2":"point3"},"locked":false,"attributes":[],"trackingId":null,"error":null,"createdAt":"2022-04-04T11:49:22.636Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2023-02-12T15:01:57.999Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"human"},{"type":"polygon","classId":1115465,"probability":100,"points":[3015.3,1275.7,2770.47,457.45,3414.77,393.02,3840,1533.42,3421.21,1552.75,3182.82,1391.68],"exclude":[],"groupId":0,"pointLabels":{},"locked":true,"attributes":[],"trackingId":null,"error":null,"createdAt":"2022-08-22T06:56:12.069Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2022-08-22T06:56:50.652Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"tree"},{"type":"polyline","classId":1115465,"probability":100,"points":[412.35,2718.93,1211.28,3466.31],"groupId":0,"pointLabels":{},"locked":false,"attributes":[],"trackingId":null,"error":null,"createdAt":"2022-08-22T06:57:17.116Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2022-08-22T06:57:17.116Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"tree"},{"type":"ellipse","classId":1115466,"probability":100,"cx":1659.06,"cy":2245.37,"rx":853.69,"ry":840.8,"angle":0,"groupId":0,"pointLabels":{},"locked":false,"attributes":[],"trackingId":null,"error":null,"createdAt":"2022-08-22T06:57:46.016Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2022-08-22T06:57:46.016Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"car"},{"type":"point","classId":1115464,"probability":100,"x":960,"y":676.51,"groupId":0,"pointLabels":{},"locked":false,"attributes":[{"id":1710850,"groupId":391885,"name":"atr_mlt2","groupName":"gr_multi"}],"trackingId":null,"error":null,"createdAt":"2022-08-22T06:58:00.668Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2022-08-22T07:00:20.210Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"animal"},{"type":"rbbox","classId":1115464,"probability":100,"points":{"x1":3723.71,"y1":513.84,"x2":4458.83,"y2":255.21,"x3":4773.48,"y3":1149.59,"x4":4038.36,"y4":1408.22},"groupId":0,"pointLabels":{},"locked":false,"attributes":[],"trackingId":null,"error":null,"createdAt":"2022-08-22T06:58:27.367Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2022-08-22T07:00:43.136Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"animal"},{"type":"cuboid","classId":1115464,"probability":100,"points":{"f1":{"x":2467.65,"y":2847.79},"f2":{"x":3775.57,"y":3021.74},"r1":{"x":2177.72,"y":3311.69},"r2":{"x":3485.64,"y":3485.64}},"groupId":0,"pointLabels":{},"locked":false,"attributes":[{"id":1710846,"groupId":391884,"name":"atr_sng1","groupName":"gr_single"},{"id":1710850,"groupId":391885,"name":"atr_mlt2","groupName":"gr_multi"},{"id":1710851,"groupId":391885,"name":"atr_mlt3","groupName":"gr_multi"},{"groupId":391886,"name":"text","groupName":"gr_txt"},{"groupId":391887,"name":3,"groupName":"gr_num"}],"trackingId":null,"error":null,"createdAt":"2022-08-22T06:59:05.288Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2022-08-22T06:59:42.086Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"animal"},{"type":"tag","classId":1115467,"probability":100,"attributes":[{"id":1710830,"groupId":391880,"name":"single_atr1","groupName":"group_single"},{"id":1710835,"groupId":391881,"name":"multi_atr3","groupName":"group_multi"},{"id":1710834,"groupId":391881,"name":"multi_atr2","groupName":"group_multi"},{"groupId":391882,"name":43,"groupName":"group_numeric"},{"groupId":391883,"name":"tag instance","groupName":"group_text"}],"createdAt":"2022-08-22T06:55:16.784Z","createdBy":{"email":"arturn@superannotate.com","role":"Admin"},"creationType":"Manual","updatedAt":"2022-08-22T06:55:48.591Z","updatedBy":{"email":"arturn@superannotate.com","role":"Admin"},"className":"tag_class"}],"comments":[],"tags":[]}

tests/integration/aggregations/test_df_processing.py

@@ -1,8 +1,8 @@
 import os
 from pathlib import Path
 
-import pytest
 from src.superannotate import SAClient
+from src.superannotate import AppException
 from tests.integration.base import BaseTestCase
 
 sa = SAClient()
@@ -28,6 +28,10 @@ def test_filter_instances(self):
             {"example_image_1.jpg", "example_image_2.jpg"},
         )
 
+    def test_invalid_project_type(self):
+        with self.assertRaisesRegexp(AppException, "The function is not supported for PointCloud projects."):
+            sa.aggregate_annotations_as_df(self.folder_path, "PointCloud")
+
 
 class TestDFWithTagInstance(BaseTestCase):
     PROJECT_TYPE = "Vector"
@@ -40,3 +44,4 @@ def folder_path(self):
     def test_filter_instances(self):
         df = sa.aggregate_annotations_as_df(self.folder_path, self.PROJECT_TYPE)
         self.assertEqual(df.iloc[0]["type"], "tag")
+

tests/integration/annotations/test_upload_annotations_from_folder_to_project.py

@@ -120,3 +120,34 @@ def test_upload_big_annotations(self):
         assert [len(annotation["instances"]) > 1 for annotation in annotations].count(
             True
         ) == 4
+
+
+
+class TestExporeExportUploadVector(BaseTestCase):
+    PROJECT_NAME = "Test-TestExporeExportUploadVector"
+    PROJECT_DESCRIPTION = "Desc"
+    PROJECT_TYPE = "Vector"
+    TEST_FOLDER_PATH = "data_set/sample_explore_export"
+
+    @property
+    def data_set(self):
+        return Path(__file__).parent.parent.parent
+
+    @property
+    def folder_path(self):
+        return os.path.join(Path(__file__).parent.parent.parent, self.TEST_FOLDER_PATH)
+
+    def test_annotation_folder_upload_download(self):
+        sa.attach_items(
+            self.PROJECT_NAME,
+            [
+                {"name": "file_example.jpg", "url": "url_"}
+            ],
+        )
+        sa.create_annotation_classes_from_classes_json(
+            self.PROJECT_NAME, f"{self.folder_path}/classes/classes.json"
+        )
+        uploaded, _, _ = sa.upload_annotations_from_folder_to_project(
+            self.PROJECT_NAME, self.folder_path
+        )
+        assert len(uploaded) == 1

tests/integration/items/test_attach_items.py

@@ -1,6 +1,8 @@
 import os
 from pathlib import Path
+from unittest import TestCase
 
+from src.superannotate import AppException
 from src.superannotate import SAClient
 from tests.integration.base import BaseTestCase
 
@@ -71,3 +73,17 @@ def test_limitation(self):
         self.assertRaises(
             Exception, sa.attach_items, self.PROJECT_NAME, self.scv_path_50k
         )
+
+
+class TestAttachItemsVectorArguments(TestCase):
+    PROJECT_NAME = "TestAttachItemsVectorArguments"
+
+    def test_attach_items_invalid_payload(self):
+        error_msg = [
+            "attachments", "str type expected",
+            "value is not a valid path",
+            r"attachments\[0].url", "field required"
+        ]
+        pattern = r"(\s+)" + r"(\s+)".join(error_msg)
+        with self.assertRaisesRegexp(AppException, pattern):
+            sa.attach_items(self.PROJECT_NAME, [{'name': "name"}])