Fixed 348, 349, 351

Author: Vaghinak Basentsyan

docs/source/conf.py

@@ -53,3 +53,6 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = []
+
+set_type_checking_flag = False
+always_document_param_types = False

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

@@ -1291,7 +1291,7 @@ def upload_images_from_folder_to_project(
     project: Union[NotEmptyStr, dict],
     folder_path: Union[NotEmptyStr, Path],
     extensions: Optional[
-        Union[List[NotEmptyStr], Tuple[str]]
+        Union[List[NotEmptyStr], Tuple[NotEmptyStr]]
     ] = constances.DEFAULT_IMAGE_EXTENSIONS,
     annotation_status="NotStarted",
     from_s3_bucket=None,
@@ -3437,7 +3437,7 @@ def aggregate_annotations_as_df(
     include_comments: Optional[StrictBool] = False,
     include_tags: Optional[StrictBool] = False,
     verbose: Optional[StrictBool] = True,
-    folder_names: Optional[NotEmptyStr] = None,
+    folder_names: Optional[List[NotEmptyStr]] = None,
 ):
     """Aggregate annotations as pandas dataframe from project root.
 

src/superannotate/lib/core/__init__.py

@@ -59,6 +59,9 @@
 )
 ATTACHING_FILES_MESSAGE = "Attaching {} file(s) to project {}."
 
+ATTACHING_UPLOAD_STATE_ERROR = "You cannot attach URLs in this type of project. Please attach it in an external storage project."
+UPLOADING_UPLOAD_STATE_ERROR = "You cannot upload files in this type of project. Please upload it in an basic storage project."
+
 DEPRECATED_VIDEO_PROJECTS_MESSAGE = (
     "The function does not support projects containing videos attached with URLs"
 )

src/superannotate/lib/core/usecases/images.py

@@ -1131,6 +1131,10 @@ def s3_repo(self):
         )
 
     def validate_project_type(self):
+        if self._project.upload_state == constances.UploadState.EXTERNAL.value:
+            raise AppValidationException(constances.UPLOADING_UPLOAD_STATE_ERROR)
+
+    def validate_deprecation(self):
         if self._project.project_type in [
             constances.ProjectType.VIDEO.value,
             constances.ProjectType.DOCUMENT.value,
@@ -1309,6 +1313,10 @@ def validate_extensions(self):
             raise AppValidationException("")
 
     def validate_project_type(self):
+        if self._project.upload_state == constances.UploadState.EXTERNAL.value:
+            raise AppValidationException(constances.UPLOADING_UPLOAD_STATE_ERROR)
+
+    def validate_deprecation(self):
         if self._project.project_type in constances.LIMITED_FUNCTIONS:
             raise AppValidationException(
                 constances.LIMITED_FUNCTIONS[self._project.project_type]
@@ -1907,6 +1915,11 @@ def validate_limitations(self):
         ):
             raise AppValidationException(constances.ATTACH_USER_LIMIT_ERROR_MESSAGE)
 
+    def validate_upload_state(self):
+        if (self._upload_state_code and self._upload_state_code != self._project.upload_state) \
+                or self._project.upload_state == constances.UploadState.BASIC.value:
+            raise AppValidationException(constances.ATTACHING_UPLOAD_STATE_ERROR)
+
     @property
     def annotation_status_code(self):
         if self._annotation_status:
@@ -3549,6 +3562,10 @@ def __init__(
         self._limit = limit
         self._limitation_response = None
 
+    def validate_upload_state(self):
+        if self._project.upload_state == constances.UploadState.EXTERNAL.value:
+            raise AppValidationException(constances.UPLOADING_UPLOAD_STATE_ERROR)
+
     @property
     def limitation_response(self):
         if not self._limitation_response:

src/superannotate/version.py

@@ -1,2 +1 @@
 __version__ = "5.0.0b40"
-

tests/integration/test_depricated_functions_document.py

@@ -161,7 +161,7 @@ def test_deprecated_functions(self):
         except AppException as e:
             self.assertIn(self.EXCEPTION_MESSAGE_DOCUMENT_VIDEO, str(e))
         try:
-            sa.copy_images(self.PROJECT_NAME, [self.UPLOAD_IMAGE_NAME], self.PROJECT_NAME_2)
+            sa.copy_images(self.PROJECT_NAME, [self.UPLOAD_IMAGE_NAME], self.PROJECT_NAME)
         except AppException as e:
             self.assertIn(self.EXCEPTION_MESSAGE, str(e))
         try:

tests/integration/test_depricated_functions_video.py

@@ -157,7 +157,7 @@ def test_deprecated_functions(self):
         except AppException as e:
             self.assertIn(self.EXCEPTION_MESSAGE_DOCUMENT_VIDEO, str(e))
         try:
-            sa.copy_images(self.PROJECT_NAME, [self.UPLOAD_IMAGE_NAME], self.PROJECT_NAME_2)
+            sa.copy_images(self.PROJECT_NAME, [self.UPLOAD_IMAGE_NAME], self.PROJECT_NAME)
         except AppException as e:
             self.assertIn(self.EXCEPTION_MESSAGE, str(e))
         try:

tests/integration/test_vaidate_upload_state.py

@@ -0,0 +1,57 @@
+import os
+from os.path import dirname
+
+import src.superannotate as sa
+from src.superannotate import AppException
+from src.superannotate.lib.core import ATTACHING_UPLOAD_STATE_ERROR
+from src.superannotate.lib.core import UPLOADING_UPLOAD_STATE_ERROR
+from tests.integration.base import BaseTestCase
+
+
+class TestVectorUploadStateCode(BaseTestCase):
+    PROJECT_NAME = "TestVectorUploadStateCode"
+    PROJECT_DESCRIPTION = "Desc"
+    PROJECT_TYPE = "Vector"
+    TEST_FOLDER_PATH = "data_set"
+    TEST_IMAGES_PATH = "sample_project_vector"
+    PATH_TO_URLS = "attach_urls.csv"
+    PATH_TO_VIDEOS = "sample_videos"
+    IMAGE_NAME = "example_image_1.jpg"
+
+    @property
+    def folder_path(self):
+        return os.path.join(dirname(dirname(__file__)), self.TEST_FOLDER_PATH)
+
+    @property
+    def attachments(self):
+        return os.path.join(dirname(dirname(__file__)), self.PATH_TO_URLS)
+
+    def test_attach_wrong_upload_state(self):
+        sa.upload_image_to_project(self.PROJECT_NAME,
+                                   os.path.join(self.folder_path, self.TEST_IMAGES_PATH, self.IMAGE_NAME))
+        with self.assertRaisesRegexp(AppException, ATTACHING_UPLOAD_STATE_ERROR):
+            sa.attach_image_urls_to_project(self.PROJECT_NAME, os.path.join(self.folder_path, self.PATH_TO_URLS))
+
+    def test_upload_images_wrong_upload_state(self):
+        sa.attach_image_urls_to_project(self.PROJECT_NAME, os.path.join(self.folder_path, self.PATH_TO_URLS))
+        with self.assertRaisesRegexp(AppException, UPLOADING_UPLOAD_STATE_ERROR):
+            sa.upload_images_from_folder_to_project(
+                self.PROJECT_NAME,
+                os.path.join(self.folder_path, self.TEST_IMAGES_PATH)
+            )
+
+    def test_upload_image_wrong_upload_state(self):
+        sa.attach_image_urls_to_project(self.PROJECT_NAME, os.path.join(self.folder_path, self.PATH_TO_URLS))
+        with self.assertRaisesRegexp(AppException, UPLOADING_UPLOAD_STATE_ERROR):
+            sa.upload_image_to_project(
+                self.PROJECT_NAME,
+                os.path.join(self.folder_path, self.TEST_IMAGES_PATH, self.IMAGE_NAME)
+            )
+
+    def test_videos_image_wrong_upload_state(self):
+        sa.attach_image_urls_to_project(self.PROJECT_NAME, os.path.join(self.folder_path, self.PATH_TO_URLS))
+        with self.assertRaisesRegexp(AppException, UPLOADING_UPLOAD_STATE_ERROR):
+            sa.upload_videos_from_folder_to_project(
+                self.PROJECT_NAME,
+                os.path.join(self.folder_path, self.PATH_TO_VIDEOS)
+            )