updated search folders

VaghinakDev · VaghinakDev · commit aa5e4b70e7fb · 2022-11-25T18:01:29.000+04:00
diff --git a/src/superannotate/lib/app/interface/sdk_interface.py b/src/superannotate/lib/app/interface/sdk_interface.py
@@ -328,8 +328,8 @@ def create_folder(self, project: NotEmptyStr, folder_name: NotEmptyStr):
             folder = res.data
             logger.info(f"Folder {folder.name} created in project {project.name}")
             return FolderSerializer(folder).serialize(
-                    exclude={"completedCount", "is_root"}
-                )
+                exclude={"completedCount", "is_root"}
+            )
         if res.errors:
             raise AppException(res.errors)
 
@@ -432,7 +432,7 @@ def search_folders(
             condition &= Condition("includeUsers", return_metadata, EQ)
         if status:
             condition &= Condition(
-                "status", constants.ProjectStatus.get_value(status), EQ
+                "status", constants.FolderStatus.get_value(status), EQ
             )
         response = self.controller.folders.list(project, condition)
         if response.errors:
@@ -539,6 +539,7 @@ def search_annotation_classes(
 
         :param project: project name
         :type project: str
+
         :param name_contains:  search string. Returns those classes,
          where the given string is found anywhere within its name. If None, all annotation classes will be returned.
         :type name_contains: str
diff --git a/src/superannotate/lib/core/__init__.py b/src/superannotate/lib/core/__init__.py
@@ -2,6 +2,7 @@
 
 from superannotate.lib.core.config import Config
 from superannotate.lib.core.enums import AnnotationStatus
+from superannotate.lib.core.enums import FolderStatus
 from superannotate.lib.core.enums import ImageQuality
 from superannotate.lib.core.enums import ProjectStatus
 from superannotate.lib.core.enums import ProjectType
@@ -105,6 +106,7 @@
 INVALID_JSON_MESSAGE = "Invalid json"
 
 __alL__ = (
+    FolderStatus,
     ProjectStatus,
     ProjectType,
     UserRole,
diff --git a/src/superannotate/lib/core/conditions.py b/src/superannotate/lib/core/conditions.py
@@ -1,7 +1,6 @@
 from collections import namedtuple
 from typing import Any
 from typing import List
-from typing import NamedTuple
 
 CONDITION_OR = "|"
 CONDITION_AND = "&"
@@ -11,15 +10,17 @@
 CONDITION_LT = "<"
 CONDITION_LE = "<="
 
-QueryCondition = namedtuple("QueryCondition", ("condition", "query", "pair"))
+QueryCondition = namedtuple("QueryCondition", ("condition", "pair", "item"))
 
 
 class Condition:
     def __init__(self, key: str, value: Any, condition_type: str):
         self._key = key
         self._value = value
         self._type = condition_type
-        self._condition_set = []  # type: List[NamedTuple]
+        self._condition_set: List[QueryCondition] = [
+            QueryCondition(CONDITION_AND, {key: value}, self)
+        ]
 
     @staticmethod
     def get_empty_condition():
@@ -32,13 +33,10 @@ def __or__(self, other):
         if not isinstance(other, Condition):
             raise Exception("Support the only Condition types")
 
-        self._condition_set.append(
-            QueryCondition(
-                CONDITION_OR,
-                other.build_query(),
-                {other._key: other._value} if type(other) == Condition else {},
+        for _condition in other._condition_set:
+            self._condition_set.append(
+                QueryCondition(CONDITION_OR, _condition.pair, _condition.item)
             )
-        )
         return self
 
     def __and__(self, other):
@@ -52,19 +50,23 @@ def __and__(self, other):
         elif not isinstance(other, (Condition, EmptyCondition)):
             raise Exception("Support the only Condition types")
 
-        self._condition_set.append(
-            QueryCondition(
-                CONDITION_AND,
-                other.build_query(),
-                {other._key: other._value} if type(other) == Condition else {},
+        for _condition in other._condition_set:
+            self._condition_set.append(
+                QueryCondition(CONDITION_AND, _condition.pair, _condition.item)
             )
-        )
         return self
 
+    def _build(self):
+        return f"{self._key}{self._type}{self._value}"
+
     def build_query(self):
-        return str(self) + "".join(
-            [f"{condition[0]}{condition[1]}" for condition in self._condition_set]
-        )
+        items = []
+        for condition in self._condition_set:
+            if not items:
+                items.append(condition.item._build())
+            else:
+                items.extend([condition.condition, condition.item._build()])
+        return "".join(items)
 
     def get_as_params_dict(self) -> dict:
         params = None if isinstance(self, EmptyCondition) else {self._key: self._value}
@@ -75,7 +77,7 @@ def get_as_params_dict(self) -> dict:
 
 class EmptyCondition(Condition):
     def __init__(self, *args, **kwargs):  # noqa
-        ...
+        self._condition_set = []
 
     def __or__(self, other):
         return other
diff --git a/src/superannotate/lib/core/enums.py b/src/superannotate/lib/core/enums.py
@@ -41,6 +41,9 @@ def get_name(cls, value):
     def get_value(cls, name):
         for enum in list(cls):
             if enum.__doc__.lower() == name.lower():
+                if isinstance(enum.value, int):
+                    if enum.value < 0:
+                        return ""
                 return enum.value
 
     @classmethod
@@ -101,15 +104,15 @@ class ImageQuality(BaseTitledEnum):
 
 
 class ProjectStatus(BaseTitledEnum):
-    Undefined = "Undefined", 0
+    Undefined = "Undefined", -1
     NotStarted = "NotStarted", 1
     InProgress = "InProgress", 2
     Completed = "Completed", 3
     OnHold = "OnHold", 4
 
 
 class FolderStatus(BaseTitledEnum):
-    Undefined = "Undefined", 0
+    Undefined = "Undefined", -1
     NotStarted = "NotStarted", 1
     InProgress = "InProgress", 2
     Completed = "Completed", 3
diff --git a/src/superannotate/lib/infrastructure/services/folder.py b/src/superannotate/lib/infrastructure/services/folder.py
@@ -8,7 +8,7 @@
 
 class FolderService(BaseFolderService):
     URL_BASE = "folder"
-    URL_LIST = "folders"
+    URL_LIST = "/folders"
     URL_UPDATE = "folder/{}"
     URL_GET_BY_NAME = "folder/getFolderByName"
     URL_DELETE_MULTIPLE = "image/delete/images"
@@ -34,6 +34,12 @@ def list(self, condition: Condition = None):
             query_params=condition.get_as_params_dict() if condition else None,
         )
 
+    def update(self, project: entities.ProjectEntity, folder: entities.FolderEntity):
+        params = {"project_id": project.id}
+        return self.client.request(
+            self.URL_UPDATE.format(folder.id), "put", data=folder.dict(), params=params
+        )
+
     def delete_multiple(
         self, project: entities.ProjectEntity, folders: List[entities.FolderEntity]
     ):
@@ -69,9 +75,3 @@ def assign(
             params={"project_id": project.id},
             data={"folder_name": folder.name, "assign_user_ids": users},
         )
-
-    def update(self, project: entities.ProjectEntity, folder: entities.FolderEntity):
-        params = {"project_id": project.id}
-        return self.client.request(
-            self.URL_UPDATE.format(folder.id), "put", data=folder.dict(), params=params
-        )
diff --git a/tests/data_set/invalid_annotations/video.mp4.json b/tests/data_set/invalid_annotations/video.mp4.json
@@ -0,0 +1,112 @@
+{
+  "metadata": {
+    "width": "1920",
+    "height": 10.80,
+    "status": "InProgress",
+    "url": "https://drive.google.com/uc?export=download&id=1wTd4NeE3Jt39k9DL_5GIqrO6R_hucsps",
+    "duration": 30571000,
+    "projectId": 165611,
+    "error": false,
+    "annotatorEmail": "A34@3.4@htfd.cm",
+    "qaEmail": "43@fd.dcs",
+    "lastAction": {
+      "timestamp": 1635510590705,
+      "email": "varduhi@superannotate.com"
+    }
+  },
+  "instances": [
+    {
+      "meta": {
+        "type": "bbox",
+        "classId": 879460,
+        "pointLabels": {
+          "ds": "s"
+        },
+        "createdBy": {
+          "email": "varduhi@superannotate.com",
+          "role": "Admin"
+        },
+        "createdAt": "2021-10-29T12.29.45.668Z",
+        "updatedBy": {
+          "email": "varduhi@superannotate.com",
+          "role": "qwert"
+        },
+        "updatedAt": "2021-10-29T12:29:50.696Z",
+        "start": 0,
+        "end": 30571000
+      },
+      "parameters": [
+        {
+          "start": 0,
+          "end": 30571000,
+          "timestamps": [
+            {
+              "points": {
+                "x": 595.85,
+                "y1": 223.82,
+                "x2": 1278.92,
+                "y2": 874.41
+              },
+              "timestamp": 0,
+              "attributes": [
+                {
+                }
+              ]
+            },
+            {
+              "points": {
+                "x1": 595.85,
+                "y1": 223.82,
+                "x2": 1278.92,
+                "y2": 874.41
+              },
+              "timestamp": 30571000,
+              "attributes": [
+                {
+                },
+                {
+                  "groupName": "numeric group"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "meta": {
+        "type": "bbox",
+        "start": 0,
+        "end": 30571000
+      },
+      "parameters": [
+        {
+          "start": 0,
+          "end": 3057.1000,
+          "timestamps": [
+            {
+              "points": {
+                "x": 595.85,
+                "y1": 223.82,
+                "x2": 1278.92,
+                "y2": 874.41
+              },
+              "timestamp": 0,
+              "attributes": [
+                {
+                },
+                {
+                  "groupName": "numeric group"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "tags": [
+    6,
+    null
+  ]
+}
diff --git a/tests/integration/annotations/validations/test_video_annotation_validation.py b/tests/integration/annotations/validations/test_video_annotation_validation.py
@@ -0,0 +1,23 @@
+import os
+import json
+from unittest import TestCase
+from unittest.mock import patch
+
+from src.superannotate import SAClient
+from tests import DATA_SET_PATH
+
+sa = SAClient()
+
+
+class TestVectorValidators(TestCase):
+    PROJECT_NAME = "video annotation upload with ree text and numeric"
+    PROJECT_DESCRIPTION = "desc"
+    PROJECT_TYPE = "Video"
+    ANNOTATIONS_PATH = "invalid_annotations/video.mp4.json"
+
+    # @patch('builtins.print')
+    def test_free_text_numeric_invalid(self):
+        json_data = json.load(open(os.path.join(DATA_SET_PATH, self.ANNOTATIONS_PATH)))
+        is_valid = sa.validate_annotations("video", json_data)
+        assert not is_valid
+
diff --git a/tests/integration/annotations/video/test_get_annotations_per_frame.py b/tests/integration/annotations/video/test_get_annotations_per_frame.py
@@ -6,19 +6,20 @@
 
 from src.superannotate import SAClient
 from tests.integration.base import BaseTestCase
+from tests import DATA_SET_PATH
 
 sa = SAClient()
 
 
 class TestGetAnnotations(BaseTestCase):
     PROJECT_NAME = "test attach video urls"
-    PATH_TO_URLS = "data_set/attach_video_for_annotation.csv"
-    PATH_TO_URLS_WITHOUT_NAMES = "data_set/attach_urls_with_no_name.csv"
-    PATH_TO_50K_URLS = "data_set/501_urls.csv"
+    PATH_TO_URLS = "attach_video_for_annotation.csv"
+    PATH_TO_URLS_WITHOUT_NAMES = "attach_urls_with_no_name.csv"
+    PATH_TO_50K_URLS = "501_urls.csv"
     PROJECT_DESCRIPTION = "desc"
-    ANNOTATIONS_PATH = "data_set/video_convertor_annotations"
+    ANNOTATIONS_PATH = "video_convertor_annotations"
     VIDEO_NAME = "video.mp4"
-    CLASSES_PATH = "data_set/video_annotation/classes/classes.json"
+    CLASSES_PATH = "video_annotation/classes/classes.json"
     PROJECT_TYPE = "Video"
 
     @property
@@ -27,15 +28,12 @@ def csv_path(self):
 
     @property
     def classes_path(self):
-        return os.path.join(self.folder_path, self.CLASSES_PATH)
+        return os.path.join(DATA_SET_PATH, self.CLASSES_PATH)
 
-    @property
-    def folder_path(self):
-        return Path(__file__).parent.parent.parent
 
     @property
     def annotations_path(self):
-        return os.path.join(self.folder_path, self.ANNOTATIONS_PATH)
+        return os.path.join(DATA_SET_PATH, self.ANNOTATIONS_PATH)
 
     def test_video_annotation_upload(self):
         sa.create_annotation_classes_from_classes_json(self.PROJECT_NAME, self.classes_path)
diff --git a/tests/integration/folders/test_folders.py b/tests/integration/folders/test_folders.py
@@ -267,8 +267,12 @@ def test_create_long_name(self):
 
     def test_search_folder(self):
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
-        sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_2)
+        time.sleep(1)
         folders = sa.search_folders(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1, return_metadata=True)
         assert len(folders) == 1
         assert folders[0]['name'] == self.TEST_FOLDER_NAME_1
-        assert folders[0]['status'] == 'NotStarted'
+        assert folders[0]['status'] == 'NotStarted'
+        folders = sa.search_folders(self.PROJECT_NAME, status='Completed', return_metadata=True)
+        assert len(folders) == 0
+        folders = sa.search_folders(self.PROJECT_NAME, status='Undefined', return_metadata=True)
+        assert len(folders) == 0
diff --git a/tests/unit/test_conditions.py b/tests/unit/test_conditions.py
