Merge pull request #466 from superannotateai/1021_deprecations

deleted delete_images, assign_images(unassign)

Author: VaghinakDev

docs/source/superannotate.sdk.rst

@@ -96,8 +96,6 @@ ______
 .. automethod:: superannotate.SAClient.upload_image_annotations
 .. automethod:: superannotate.SAClient.copy_image
 .. automethod:: superannotate.SAClient.pin_image
-.. automethod:: superannotate.SAClient.assign_images
-.. automethod:: superannotate.SAClient.delete_images
 .. automethod:: superannotate.SAClient.add_annotation_bbox_to_image
 .. automethod:: superannotate.SAClient.add_annotation_point_to_image
 .. automethod:: superannotate.SAClient.add_annotation_comment_to_image

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.7
 log_cli=true
 python_files = test_*.py
-;addopts = -n auto --dist=loadscope
+addopts = -n auto --dist=loadscope

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

@@ -630,39 +630,6 @@ def pin_image(
             is_pinned=int(pin),
         )
 
-    def delete_images(
-        self, project: Union[NotEmptyStr, dict], image_names: Optional[List[str]] = None
-    ):
-        """Delete Images in project.
-
-        :param project: project name or folder path (e.g., "project1/folder1")
-        :type project: str
-        :param image_names: to be deleted images' names. If None, all the images will be deleted
-        :type image_names: list of strs
-        """
-
-        warning_msg = (
-            "We're deprecating the delete_images function. Please use delete_items instead."
-            "Learn more. \n"
-            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.delete_items"
-        )
-        logger.warning(warning_msg)
-        warnings.warn(warning_msg, DeprecationWarning)
-        project_name, folder_name = extract_project_folder(project)
-
-        if not isinstance(image_names, list) and image_names is not None:
-            raise AppException("image_names should be a list of str or None.")
-
-        response = self.controller.delete_images(
-            project_name=project_name, folder_name=folder_name, image_names=image_names
-        )
-        if response.errors:
-            raise AppException(response.errors)
-
-        logger.info(
-            f"Images deleted in project {project_name}{'/' + folder_name if folder_name else ''}"
-        )
-
     def delete_items(self, project: str, items: Optional[List[str]] = None):
         """Delete items in a given project.
 
@@ -724,91 +691,6 @@ def unassign_items(
         if response.errors:
             raise AppException(response.errors)
 
-    def assign_images(
-        self, project: Union[NotEmptyStr, dict], image_names: List[str], user: str
-    ):
-        """Assigns images to a user. The assignment role, QA or Annotator, will
-        be deduced from the user's role in the project. With SDK, the user can be
-        assigned to a role in the project with the share_project function.
-
-        :param project: project name or folder path (e.g., "project1/folder1")
-        :type project: str
-        :param image_names: list of image names to assign
-        :type image_names: list of str
-        :param user: user email
-        :type user: str
-        """
-
-        warning_msg = (
-            "We're deprecating the assign_images function. Please use assign_items instead."
-            "Learn more. \n"
-            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.assign_items"
-        )
-        logger.warning(warning_msg)
-        warnings.warn(warning_msg, DeprecationWarning)
-        project_name, folder_name = extract_project_folder(project)
-        project = self.controller.get_project_metadata(project_name).data
-
-        if project["project"].type in [
-            constants.ProjectType.VIDEO.value,
-            constants.ProjectType.DOCUMENT.value,
-        ]:
-            raise AppException(LIMITED_FUNCTIONS[project["project"].type])
-
-        contributors = (
-            self.controller.get_project_metadata(
-                project_name=project_name, include_contributors=True
-            )
-            .data["project"]
-            .users
-        )
-        contributor = None
-        for c in contributors:
-            if c["user_id"] == user:
-                contributor = user
-
-        if not contributor:
-            logger.warning(
-                f"Skipping {user}. {user} is not a verified contributor for the {project_name}"
-            )
-            return
-
-        response = self.controller.assign_images(
-            project_name, folder_name, image_names, user
-        )
-        if not response.errors:
-            logger.info(f"Assign images to user {user}")
-        else:
-            raise AppException(response.errors)
-
-    def unassign_images(
-        self, project: Union[NotEmptyStr, dict], image_names: List[NotEmptyStr]
-    ):
-        """Removes assignment of given images for all assignees. With SDK,
-        the user can be assigned to a role in the project with the share_project
-        function.
-
-        :param project: project name or folder path (e.g., "project1/folder1")
-        :type project: str
-        :param image_names: list of images to unassign
-        :type image_names: list of str
-        """
-
-        warning_msg = (
-            "We're deprecating the unassign_images function. Please use unassign_items instead."
-            "Learn more. \n"
-            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.unassign_items"
-        )
-        logger.warning(warning_msg)
-        warnings.warn(warning_msg, DeprecationWarning)
-        project_name, folder_name = extract_project_folder(project)
-
-        response = self.controller.un_assign_images(
-            project_name=project_name, folder_name=folder_name, image_names=image_names
-        )
-        if response.errors:
-            raise AppException(response.errors)
-
     def unassign_folder(self, project_name: NotEmptyStr, folder_name: NotEmptyStr):
         """Removes assignment of given folder for all assignees.
         With SDK, the user can be assigned to a role in the project

src/superannotate/lib/core/serviceproviders.py

@@ -162,22 +162,9 @@ def set_images_statuses_bulk(
     ):
         raise NotImplementedError
 
-    def delete_images(self, project_id: int, team_id: int, image_ids: List[int]):
-        raise NotImplementedError
-
     def delete_items(self, project_id: int, team_id: int, item_ids: List[int]):
         raise NotImplementedError
 
-    def assign_images(
-        self,
-        team_id: int,
-        project_id: int,
-        folder_name: str,
-        user: str,
-        image_names: list,
-    ):
-        raise NotImplementedError
-
     def assign_items(
         self,
         team_id: int,
@@ -206,15 +193,6 @@ def assign_folder(
     ):
         raise NotImplementedError
 
-    def un_assign_images(
-        self,
-        team_id: int,
-        project_id: int,
-        folder_name: str,
-        image_names: list,
-    ):
-        raise NotImplementedError
-
     def un_assign_items(
         self,
         team_id: int,

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

@@ -1665,62 +1665,6 @@ def execute(self) -> Response:
         return self._response
 
 
-class DeleteImagesUseCase(BaseUseCase):
-    CHUNK_SIZE = 1000
-
-    def __init__(
-        self,
-        project: ProjectEntity,
-        folder: FolderEntity,
-        backend_service_provider: SuperannotateServiceProvider,
-        images: BaseReadOnlyRepository,
-        image_names: List[str] = None,
-    ):
-        super().__init__()
-        self._project = project
-        self._folder = folder
-        self._images = images
-        self._backend_service = backend_service_provider
-        self._image_names = image_names
-
-    def validate_project_type(self):
-        if self._project.type in constances.LIMITED_FUNCTIONS:
-            raise AppValidationException(
-                constances.LIMITED_FUNCTIONS[self._project.type]
-            )
-
-    def execute(self):
-        if self.is_valid():
-            if self._image_names:
-                image_ids = [
-                    image.uuid
-                    for image in GetBulkImages(
-                        service=self._backend_service,
-                        project_id=self._project.id,
-                        team_id=self._project.team_id,
-                        folder_id=self._folder.uuid,
-                        images=self._image_names,
-                    )
-                    .execute()
-                    .data
-                ]
-            else:
-                condition = (
-                    Condition("team_id", self._project.team_id, EQ)
-                    & Condition("project_id", self._project.id, EQ)
-                    & Condition("folder_id", self._folder.uuid, EQ)
-                )
-                image_ids = [image.uuid for image in self._images.get_all(condition)]
-
-            for i in range(0, len(image_ids), self.CHUNK_SIZE):
-                self._backend_service.delete_images(
-                    project_id=self._project.id,
-                    team_id=self._project.team_id,
-                    image_ids=image_ids[i : i + self.CHUNK_SIZE],  # noqa: E203
-                )
-        return self._response
-
-
 class DownloadImageAnnotationsUseCase(BaseUseCase):
     def __init__(
         self,
@@ -1963,83 +1907,6 @@ def execute(self):
         return self._response
 
 
-class AssignImagesUseCase(BaseUseCase):
-    CHUNK_SIZE = 500
-
-    def __init__(
-        self,
-        service: SuperannotateServiceProvider,
-        project: ProjectEntity,
-        folder: FolderEntity,
-        image_names: list,
-        user: str,
-    ):
-        super().__init__()
-        self._project = project
-        self._folder = folder
-        self._image_names = image_names
-        self._user = user
-        self._service = service
-
-    def validate_project_type(self):
-        if self._project.type in constances.LIMITED_FUNCTIONS:
-            raise AppValidationException(
-                constances.LIMITED_FUNCTIONS[self._project.type]
-            )
-
-    def execute(self):
-        if self.is_valid():
-            for i in range(0, len(self._image_names), self.CHUNK_SIZE):
-                is_assigned = self._service.assign_images(
-                    team_id=self._project.team_id,
-                    project_id=self._project.id,
-                    folder_name=self._folder.name,
-                    user=self._user,
-                    image_names=self._image_names[
-                        i : i + self.CHUNK_SIZE  # noqa: E203
-                    ],
-                )
-                if not is_assigned:
-                    self._response.errors = AppException(
-                        f"Cant assign {', '.join(self._image_names[i: i + self.CHUNK_SIZE])}"
-                    )
-                    continue
-        return self._response
-
-
-class UnAssignImagesUseCase(BaseUseCase):
-    CHUNK_SIZE = 500
-
-    def __init__(
-        self,
-        service: SuperannotateServiceProvider,
-        project_entity: ProjectEntity,
-        folder: FolderEntity,
-        image_names: list,
-    ):
-        super().__init__()
-        self._project_entity = project_entity
-        self._folder = folder
-        self._image_names = image_names
-        self._service = service
-
-    def execute(self):
-        # todo handling to backend side
-        for i in range(0, len(self._image_names), self.CHUNK_SIZE):
-            is_un_assigned = self._service.un_assign_images(
-                team_id=self._project_entity.team_id,
-                project_id=self._project_entity.id,
-                folder_name=self._folder.name,
-                image_names=self._image_names[i : i + self.CHUNK_SIZE],  # noqa: E203
-            )
-            if not is_un_assigned:
-                self._response.errors = AppException(
-                    f"Cant un assign {', '.join(self._image_names[i: i + self.CHUNK_SIZE])}"
-                )
-
-        return self._response
-
-
 class UnAssignFolderUseCase(BaseUseCase):
     def __init__(
         self,

src/superannotate/lib/infrastructure/controller.py

@@ -801,24 +801,6 @@ def set_project_settings(self, project_name: str, new_settings: List[dict]):
         )
         return use_case.execute()
 
-    def delete_images(
-        self,
-        project_name: str,
-        folder_name: str,
-        image_names: List[str] = None,
-    ):
-        project = self._get_project(project_name)
-        folder = self._get_folder(project, folder_name)
-
-        use_case = usecases.DeleteImagesUseCase(
-            project=project,
-            folder=folder,
-            images=self.images,
-            image_names=image_names,
-            backend_service_provider=self._backend_client,
-        )
-        return use_case.execute()
-
     def delete_items(
         self,
         project_name: str,
@@ -864,31 +846,6 @@ def un_assign_items(self, project_name, folder_name, item_names):
         )
         return use_case.execute()
 
-    def assign_images(
-        self, project_name: str, folder_name: str, image_names: list, user: str
-    ):
-        project_entity = self._get_project(project_name)
-        folder = self._get_folder(project_entity, folder_name)
-        use_case = usecases.AssignImagesUseCase(
-            project=project_entity,
-            service=self._backend_client,
-            folder=folder,
-            image_names=image_names,
-            user=user,
-        )
-        return use_case.execute()
-
-    def un_assign_images(self, project_name, folder_name, image_names):
-        project = self._get_project(project_name)
-        folder = self._get_folder(project, folder_name)
-        use_case = usecases.UnAssignImagesUseCase(
-            project_entity=project,
-            service=self._backend_client,
-            folder=folder,
-            image_names=image_names,
-        )
-        return use_case.execute()
-
     def un_assign_folder(self, project_name: str, folder_name: str):
         project_entity = self._get_project(project_name)
         folder = self._get_folder(project_entity, folder_name)