Merge pull request #522 from superannotateai/develop

Develop

Author: VaghinakDev

.readthedocs.yml

@@ -23,4 +23,3 @@ python:
   install:
     - requirements: requirements.txt
     - requirements: requirements_extra.txt
-    - requirements: requirements_prod.txt

docs/source/superannotate.sdk.rst

@@ -34,6 +34,7 @@ ________
 .. automethod:: superannotate.SAClient.upload_images_to_project
 .. automethod:: superannotate.SAClient.attach_items_from_integrated_storage
 .. automethod:: superannotate.SAClient.upload_image_to_project
+.. automethod:: superannotate.SAClient.upload_annotations
 .. automethod:: superannotate.SAClient.delete_annotations
 .. _ref_upload_images_from_folder_to_project:
 .. automethod:: superannotate.SAClient.upload_images_from_folder_to_project
@@ -94,6 +95,7 @@ Subsets
 ______
 
 .. automethod:: superannotate.SAClient.get_subsets
+.. automethod:: superannotate.SAClient.add_items_to_subset
 
 ----------
 

requirements.txt

@@ -13,7 +13,7 @@ plotly==4.1.0
 ffmpeg-python>=0.2.0
 fire==0.4.0
 mixpanel==4.8.3
-pydantic>=1.8.2
+pydantic>=1.10.2
 setuptools~=57.4.0
 aiohttp==3.8.1
 email-validator>=1.0.3

src/superannotate/__init__.py

@@ -1,7 +1,9 @@
 import os
 import sys
 
-__version__ = "4.4.4"
+
+__version__ = "4.4.5b
+
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

src/superannotate/lib/app/common.py

@@ -71,14 +71,3 @@ def tqdm_converter(total_num, images_converted, images_not_converted, finish_eve
             else:
                 pbar.update(total_num - pbar.n)
                 break
-
-
-def get_annotation_json_name(image_name, project_type):
-    if project_type == "Vector":
-        return image_name + "___objects.json"
-    else:
-        return image_name + "___pixel.json"
-
-
-def get_annotation_png_name(image_name):
-    return image_name + "___save.png"

src/superannotate/lib/app/exceptions.py

@@ -5,9 +5,3 @@ class PathError(AppException):
     """
     User input Error
     """
-
-
-class EmptyOutputError(AppException):
-    """
-    Empty Output Error
-    """

src/superannotate/lib/app/helpers.py

@@ -2,42 +2,17 @@
 import uuid
 from pathlib import Path
 from typing import List
-from typing import Optional
 from typing import Tuple
 from typing import Union
 
 import boto3
 import pandas as pd
 from superannotate.lib.app.exceptions import AppException
-from superannotate.lib.app.exceptions import PathError
 from superannotate.lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from superannotate.lib.core import PIXEL_ANNOTATION_POSTFIX
 from superannotate.lib.core import VECTOR_ANNOTATION_POSTFIX
 
 
-def split_project_path(project_path: str) -> Tuple[str, Optional[str]]:
-    path = Path(project_path)
-    if len(path.parts) > 3:
-        raise PathError("There can be no sub folders in the project")
-    elif len(path.parts) == 2:
-        project_name, folder_name = path.parts
-    else:
-        project_name, folder_name = path.name, ""
-
-    return project_name, folder_name
-
-
-def extract_project_folder(user_input: Union[str, dict]) -> Tuple[str, Optional[str]]:
-    if isinstance(user_input, str):
-        return split_project_path(user_input)
-    elif isinstance(user_input, dict):
-        project_path = user_input.get("name")
-        if not project_path:
-            raise PathError("Invalid project path")
-        return split_project_path(user_input["name"])
-    raise PathError("Invalid project path")
-
-
 def get_annotation_paths(folder_path, s3_bucket=None, recursive=False):
     annotation_paths = []
     if s3_bucket:

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

@@ -9,12 +9,12 @@
 from typing import Tuple
 
 import lib.core as constants
-from lib.app.helpers import extract_project_folder
 from lib.app.interface.types import validate_arguments
 from lib.core import CONFIG
 from lib.core.exceptions import AppException
 from lib.infrastructure.controller import Controller
 from lib.infrastructure.repositories import ConfigRepository
+from lib.infrastructure.utils import extract_project_folder
 from mixpanel import Mixpanel
 from superannotate import __version__
 

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

@@ -6,11 +6,11 @@
 
 import lib.core as constances
 from lib import __file__ as lib_path
-from lib.app.helpers import split_project_path
 from lib.app.input_converters.conversion import import_annotation
 from lib.app.interface.sdk_interface import SAClient
 from lib.core.entities import ConfigEntity
 from lib.infrastructure.repositories import ConfigRepository
+from lib.infrastructure.utils import split_project_path
 
 
 class CLIFacade:
@@ -176,9 +176,7 @@ def _upload_annotations(
     ):
         project_folder_name = project
         project_name, folder_name = split_project_path(project)
-        project = (
-            SAClient().controller.get_project_metadata(project_name=project_name).data
-        )
+        project = SAClient().controller.get_project(project_name)
         if not format:
             format = "SuperAnnotate"
         if not dataset_name and format == "COCO":