Merge pull request #168 from superannotateai/re-design-sdk

Re design sdk

Author: dshabin

.gitignore

@@ -1,5 +1,6 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
+*.pyc
 *.py[cod]
 *$py.class
 *mypy*

src/superannotate/__init__.py

@@ -243,7 +243,6 @@
     "upload_videos_from_folder_to_project",
     # Annotation Section
     "create_annotation_class",
-    "delete_annotation_class",
     "prepare_export",
     "download_export",
     "set_images_annotation_statuses",

src/superannotate/lib/app/helpers.py

@@ -131,7 +131,7 @@ def check_types(obj, **kwargs):
         if attr_name == "return":
             continue
         try:
-            if attr_type.__origin__ is list:
+            if getattr(attr_type, "__origin__") and attr_type.__origin__ is list:
                 if attr_type.__args__:
                     for elem in kwargs[attr_name]:
                         if type(elem) in attr_type.__args__:
@@ -140,7 +140,7 @@ def check_types(obj, **kwargs):
                             errors.append(f"Invalid input {attr_name}")
                 elif not isinstance(kwargs[attr_name], list):
                     errors.append(f"Argument {attr_name} is not of type {attr_type}")
-            elif attr_type.__origin__ is Union:
+            elif getattr(attr_type, "__origin__") and attr_type.__origin__ is Union:
                 if kwargs.get(attr_name) and not isinstance(
                     kwargs[attr_name], attr_type.__args__
                 ):

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

@@ -130,7 +130,7 @@ def upload_image(image_path: str):
 
         paths = []
 
-        if isinstance(extensions,str):
+        if isinstance(extensions, str):
             extensions = extensions.strip().split(",")
 
         for extension in extensions:
@@ -264,7 +264,7 @@ def _upload_annotations(
 
         annotations_path = folder
         with tempfile.TemporaryDirectory() as temp_dir:
-            if format != 'SuperAnnotate':
+            if format != "SuperAnnotate":
                 import_annotation(
                     input_dir=folder,
                     output_dir=temp_dir,

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

@@ -462,12 +462,12 @@ def search_folders(
     :rtype: list of strs or dicts
     """
 
-    if not folder_name:
-        data = controller.get_project_folders(project).data
-    else:
-        data = controller.search_folder(
-            project_name=project, name=folder_name, include_users=return_metadata
-        ).data
+    response = controller.search_folders(
+        project_name=project, folder_name=folder_name, include_users=return_metadata
+    )
+    if response.errors:
+        raise AppException(response.errors)
+    data = response.data
     if return_metadata:
         return [BaseSerializers(folder).serialize() for folder in data]
     return [folder.name for folder in data]
@@ -1166,9 +1166,11 @@ def unassign_images(project: Union[str, dict], image_names: List[str]):
     """
     project_name, folder_name = extract_project_folder(project)
 
-    controller.un_assign_images(
+    response = controller.un_assign_images(
         project_name=project_name, folder_name=folder_name, image_names=image_names
     )
+    if response.errors:
+        raise AppException(response.errors)
 
 
 @Trackable
@@ -1183,7 +1185,11 @@ def unassign_folder(project_name: str, folder_name: str):
     :param folder_name: folder name to remove assignees
     :type folder_name: str
     """
-    controller.un_assign_folder(project_name=project_name, folder_name=folder_name)
+    response = controller.un_assign_folder(
+        project_name=project_name, folder_name=folder_name
+    )
+    if response.errors:
+        raise AppException(response.errors)
 
 
 @Trackable
@@ -2697,7 +2703,18 @@ def stop_model_training(model):
     :return: the metadata of the now, stopped model
     :rtype: dict
     """
-    response = controller.stop_model_training(model["id"])
+
+    model_id = None
+    if isinstance(model, dict):
+        model_id = model['id']
+    else:
+        res = controller.search_models(name=model).data
+        if len(res):
+            model_id = res[0]['id']
+        else:
+            raise AppException("Model not found.")
+
+    response = controller.stop_model_training(model_id=model_id)
 
     if not response.errors:
         logger.info("Stopped model training")
@@ -3525,4 +3542,4 @@ def aggregate_annotations_as_df(
         include_tags,
         verbose,
         folder_names,
-    )
+    )

src/superannotate/lib/app/serializers.py

@@ -27,11 +27,11 @@ def serialize(self):
         data = super().serialize()
         users = []
         for user in data["users"]:
-            user["user_role"] = constance.UserRole.get_name(data["user_role"])
+            user["user_role"] = constance.UserRole.get_name(user["user_role"])
             users.append(user)
         data["users"] = users
         for user in data["pending_invitations"]:
-            user["user_role"] = constance.UserRole.get_name(data["user_role"])
+            user["user_role"] = constance.UserRole.get_name(user["user_role"])
         return data
 
 

src/superannotate/lib/core/conditions.py

@@ -20,6 +20,20 @@ def __init__(self, key: str, value: Any, condition_type: str):
         self._type = condition_type
         self._condition_set = []  # type: List[NamedTuple]
 
+    @staticmethod
+    def get_empty_condition():
+        class EmptyCondition:
+            def __or__(self, other):
+                return other
+
+            def __and__(self, other):
+                return other
+
+            def build_query(self):
+                return ""
+
+        return EmptyCondition()
+
     def __str__(self):
         return f"{self._key}{self._type}{self._value}"
 

src/superannotate/lib/core/entities.py

@@ -47,6 +47,11 @@ def __init__(
         name: str = None,
         project_type: int = None,
         description: str = None,
+        attachment_name: str = None,
+        attachment_path: str = None,
+        creator_id: str = None,
+        entropy_status: int = None,
+        sharing_status: int = None,
         status: int = None,
         folder_id: int = None,
         upload_state: int = None,
@@ -62,6 +67,11 @@ def __init__(
         self.name = name
         self.project_type = project_type
         self.description = description
+        self.attachment_name = attachment_name
+        self.attachment_path = attachment_path
+        self.creator_id = creator_id
+        self.entropy_status = entropy_status
+        self.sharing_status = sharing_status
         self.status = status
         self.folder_id = folder_id
         self.upload_state = upload_state
@@ -92,6 +102,11 @@ def to_dict(self):
             "type": self.project_type,
             "description": self.description,
             "status": self.status,
+            "attachment_path": self.attachment_path,
+            "attachment_name": self.attachment_name,
+            "entropy_status": self.entropy_status,
+            "sharing_status": self.sharing_status,
+            "creator_id": self.creator_id,
             "folder_id": self.folder_id,
             "upload_state": self.upload_state,
             "users": self.users,

src/superannotate/lib/core/enums.py

@@ -31,6 +31,7 @@ class ProjectType(BaseTitledEnum):
 
 
 class UserRole(BaseTitledEnum):
+    SUPER_AMIN = "Superadmin", 1
     ADMIN = "Admin", 2
     ANNOTATOR = "Annotator", 3
     QA = "QA", 4

src/superannotate/lib/core/serviceproviders.py

@@ -287,4 +287,4 @@ def run_segmentation(
     def run_prediction(
         self, team_id: int, project_id: int, ml_model_id: int, image_ids: list
     ):
-        raise NotImplementedError
+        raise NotImplementedError