Merge remote-tracking branch 'origin/develop' into sdk_copy_iamge

# Conflicts:
#	src/superannotate/lib/app/interface/sdk_interface.py
#	src/superannotate/lib/core/usecases/images.py
#	src/superannotate/lib/infrastructure/controller.py

Author: Vaghinak Basentsyan

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

@@ -5,7 +5,6 @@
 import os
 import tempfile
 import time
-from collections import namedtuple
 from pathlib import Path
 from typing import Iterable
 from typing import List
@@ -1732,7 +1731,9 @@ def upload_videos_from_folder_to_project(
                     f"{len(duplicates)} already existing images found that won't be uploaded."
                 )
             if not images_to_upload:
-                logger.warning(f"{len(duplicates)} already existing images found that won't be uploaded.")
+                logger.warning(
+                    f"{len(duplicates)} already existing images found that won't be uploaded."
+                )
                 continue
             if use_case.is_valid():
                 with tqdm(

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

@@ -18,10 +18,10 @@
 
 class CreateFolderUseCase(BaseUseCase):
     def __init__(
-            self,
-            project: ProjectEntity,
-            folder: FolderEntity,
-            folders: BaseManageableRepository,
+        self,
+        project: ProjectEntity,
+        folder: FolderEntity,
+        folders: BaseManageableRepository,
     ):
         super().__init__()
         self._project = project
@@ -32,12 +32,12 @@ def validate_folder(self):
         if not self._folder.name:
             raise AppValidationException("Folder name cannot be empty.")
         if (
-                len(
-                    set(self._folder.name).intersection(
-                        constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
-                    )
+            len(
+                set(self._folder.name).intersection(
+                    constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
                 )
-                > 0
+            )
+            > 0
         ):
             self._folder.name = "".join(
                 "_"
@@ -56,14 +56,13 @@ def execute(self):
         return self._response
 
 
-
 class GetFolderUseCase(BaseUseCase):
     def __init__(
-            self,
-            project: ProjectEntity,
-            folders: BaseReadOnlyRepository,
-            folder_name: str,
-            team_id: int,
+        self,
+        project: ProjectEntity,
+        folders: BaseReadOnlyRepository,
+        folder_name: str,
+        team_id: int,
     ):
         super().__init__()
         self._project = project
@@ -73,9 +72,9 @@ def __init__(
 
     def execute(self):
         condition = (
-                Condition("name", self._folder_name, EQ)
-                & Condition("team_id", self._team_id, EQ)
-                & Condition("project_id", self._project.uuid, EQ)
+            Condition("name", self._folder_name, EQ)
+            & Condition("team_id", self._team_id, EQ)
+            & Condition("project_id", self._project.uuid, EQ)
         )
         try:
             self._response.data = self._folders.get_one(condition)
@@ -86,12 +85,12 @@ def execute(self):
 
 class SearchFoldersUseCase(BaseUseCase):
     def __init__(
-            self,
-            project: ProjectEntity,
-            folders: BaseReadOnlyRepository,
-            condition: Condition,
-            folder_name: str = None,
-            include_users=False,
+        self,
+        project: ProjectEntity,
+        folders: BaseReadOnlyRepository,
+        condition: Condition,
+        folder_name: str = None,
+        include_users=False,
     ):
         super().__init__()
         self._project = project
@@ -102,10 +101,10 @@ def __init__(
 
     def execute(self):
         condition = (
-                self._condition
-                & Condition("project_id", self._project.uuid, EQ)
-                & Condition("team_id", self._project.team_id, EQ)
-                & Condition("includeUsers", self._include_users, EQ)
+            self._condition
+            & Condition("project_id", self._project.uuid, EQ)
+            & Condition("team_id", self._project.team_id, EQ)
+            & Condition("includeUsers", self._include_users, EQ)
         )
         if self._folder_name:
             condition &= Condition("name", self._folder_name, EQ)
@@ -115,10 +114,10 @@ def execute(self):
 
 class DeleteFolderUseCase(BaseUseCase):
     def __init__(
-            self,
-            project: ProjectEntity,
-            folders: BaseManageableRepository,
-            folders_to_delete: List[FolderEntity],
+        self,
+        project: ProjectEntity,
+        folders: BaseManageableRepository,
+        folders_to_delete: List[FolderEntity],
     ):
         super().__init__()
         self._project = project
@@ -137,7 +136,7 @@ def execute(self):
 
 class UpdateFolderUseCase(BaseUseCase):
     def __init__(
-            self, folders: BaseManageableRepository, folder: FolderEntity,
+        self, folders: BaseManageableRepository, folder: FolderEntity,
     ):
         super().__init__()
         self._folders = folders
@@ -147,12 +146,12 @@ def validate_folder(self):
         if not self._folder.name:
             raise AppValidationException("Folder name cannot be empty.")
         if (
-                len(
-                    set(self._folder.name).intersection(
-                        constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
-                    )
+            len(
+                set(self._folder.name).intersection(
+                    constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
                 )
-                > 0
+            )
+            > 0
         ):
             self._folder.name = "".join(
                 "_"
@@ -175,11 +174,11 @@ def execute(self):
 
 class AssignFolderUseCase(BaseUseCase):
     def __init__(
-            self,
-            service: SuerannotateServiceProvider,
-            project_entity: ProjectEntity,
-            folder: FolderEntity,
-            users: List[str],
+        self,
+        service: SuerannotateServiceProvider,
+        project_entity: ProjectEntity,
+        folder: FolderEntity,
+        users: List[str],
     ):
         super().__init__()
         self._service = service

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

@@ -52,12 +52,12 @@
 
 class GetImagesUseCase(BaseUseCase):
     def __init__(
-            self,
-            project: ProjectEntity,
-            folder: FolderEntity,
-            images: BaseReadOnlyRepository,
-            annotation_status: str = None,
-            image_name_prefix: str = None,
+        self,
+        project: ProjectEntity,
+        folder: FolderEntity,
+        images: BaseReadOnlyRepository,
+        annotation_status: str = None,
+        image_name_prefix: str = None,
     ):
         super().__init__()
         self._project = project
@@ -74,18 +74,18 @@ def validate_project_type(self):
 
     def validate_annotation_status(self):
         if (
-                self._annotation_status
-                and self._annotation_status.lower()
-                not in constances.AnnotationStatus.values()
+            self._annotation_status
+            and self._annotation_status.lower()
+            not in constances.AnnotationStatus.values()
         ):
             raise AppValidationException("Invalid annotations status.")
 
     def execute(self):
         if self.is_valid():
             condition = (
-                    Condition("team_id", self._project.team_id, EQ)
-                    & Condition("project_id", self._project.uuid, EQ)
-                    & Condition("folder_id", self._folder.uuid, EQ)
+                Condition("team_id", self._project.team_id, EQ)
+                & Condition("project_id", self._project.uuid, EQ)
+                & Condition("folder_id", self._folder.uuid, EQ)
             )
             if self._image_name_prefix:
                 condition = condition & Condition("name", self._image_name_prefix, EQ)
@@ -102,12 +102,12 @@ def execute(self):
 
 class GetImageUseCase(BaseUseCase):
     def __init__(
-            self,
-            project: ProjectEntity,
-            folder: FolderEntity,
-            image_name: str,
-            images: BaseReadOnlyRepository,
-            service: SuerannotateServiceProvider,
+        self,
+        project: ProjectEntity,
+        folder: FolderEntity,
+        image_name: str,
+        images: BaseReadOnlyRepository,
+        service: SuerannotateServiceProvider,
     ):
         super().__init__()
         self._project = project
@@ -137,11 +137,11 @@ def execute(self):
 
 class GetAllImagesUseCase(BaseUseCase):
     def __init__(
-            self,
-            project: ProjectEntity,
-            service_provider: SuerannotateServiceProvider,
-            annotation_status: str = None,
-            name_prefix: str = None,
+        self,
+        project: ProjectEntity,
+        service_provider: SuerannotateServiceProvider,
+        annotation_status: str = None,
+        name_prefix: str = None,
     ):
         super().__init__()
         self._project = project
@@ -155,9 +155,9 @@ def annotation_status(self):
 
     def execute(self):
         condition = (
-                Condition("team_id", self._project.team_id, EQ)
-                & Condition("project_id", self._project.uuid, EQ)
-                & Condition("folder_id", 0, EQ)
+            Condition("team_id", self._project.team_id, EQ)
+            & Condition("project_id", self._project.uuid, EQ)
+            & Condition("folder_id", 0, EQ)
         )
         if self._annotation_status:
             condition &= Condition("annotation_status", self.annotation_status, EQ)
@@ -1991,13 +1991,7 @@ def validate_limitations(self):
         errors = []
         if response.data.folder_limit.remaining_image_count < 1:
             errors.append(constances.ATTACH_FOLDER_LIMIT_ERROR_MESSAGE)
-        elif (
-                self._move
-                and self._to_project.uuid != self._from_project.uuid
-                and response.data.project_limit.remaining_image_count < 1
-        ):
-            errors.append(constances.ATTACH_PROJECT_LIMIT_ERROR_MESSAGE)
-        elif not self._move and response.data.project_limit.remaining_image_count < 1:
+        elif self._to_project.uuid != self._from_project.uuid and response.data.project_limit.remaining_image_count < 1:
             errors.append(constances.ATTACH_PROJECT_LIMIT_ERROR_MESSAGE)
         if errors:
             raise AppValidationException("\n".join(errors))
@@ -2031,7 +2025,7 @@ def execute(self) -> Response:
                 image=image_bytes,
                 project_settings=self._project_settings,
                 upload_path=auth_data["filePath"],
-                s3_repo=self._to_upload_s3_repo
+                s3_repo=self._to_upload_s3_repo,
             ).execute()
             if s3_response.errors:
                 raise AppException(s3_response.errors)
@@ -2043,7 +2037,9 @@ def execute(self) -> Response:
                 folder=self._to_folder,
                 attachments=[image_entity],
                 backend_service_provider=self._backend_service,
-                annotation_status=image.annotation_status_code if self._copy_annotation_status else None,
+                annotation_status=image.annotation_status_code
+                if self._copy_annotation_status
+                else None,
                 upload_state_code=constances.UploadState.BASIC.value,
             ).execute()
             self._response.data = image_entity
@@ -2613,8 +2609,8 @@ def execute(self):
         failed_annotations = []
         for _ in range(0, len(self.annotations_to_upload), self.AUTH_DATA_CHUNK_SIZE):
             annotations_to_upload = self.annotations_to_upload[
-                                    _: _ + self.AUTH_DATA_CHUNK_SIZE  # noqa: E203
-                                    ]
+                _ : _ + self.AUTH_DATA_CHUNK_SIZE  # noqa: E203
+            ]
 
             if self._pre_annotation:
                 response = self._backend_service.get_pre_annotation_upload_data(
@@ -2689,7 +2685,7 @@ def execute(self):
         return self._response
 
     def upload_to_s3(
-            self, image_id: int, image_info, bucket, from_s3, image_id_name_map
+        self, image_id: int, image_info, bucket, from_s3, image_id_name_map
     ):
         if from_s3:
             file = io.BytesIO()
@@ -2712,14 +2708,14 @@ def upload_to_s3(
         )
         if self._project.project_type == constances.ProjectType.PIXEL.value:
             mask_filename = (
-                    image_id_name_map[image_id].name + constances.ANNOTATION_MASK_POSTFIX
+                image_id_name_map[image_id].name + constances.ANNOTATION_MASK_POSTFIX
             )
             if from_s3:
                 file = io.BytesIO()
-                s3_object = self._client_s3_bucket.Objcect(
-                    self._client_s3_bucket, self._folder_path + mask_filename
+                s3_object = from_s3.Object(
+                    self._client_s3_bucket, f"{self._folder_path}/{mask_filename}"
                 )
-                s3_object.download_file(file)
+                s3_object.download_fileobj(file)
                 file.seek(0)
             else:
                 with open(f"{self._folder_path}/{mask_filename}", "rb") as mask_file: