Fix issues

Author: VaghinakDev

pytest.ini

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

setup.py

@@ -40,5 +40,5 @@
     entry_points={
         'console_scripts': ['superannotatecli = superannotate.lib.app.bin.superannotate:main']
     },
-    python_requires='>=3.6'
+    python_requires='>=3.7'
 )

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

@@ -3212,7 +3212,7 @@ def copy_items(
     to_project_name, destination_folder = extract_project_folder(destination)
     if project_name != to_project_name:
         raise AppException(
-            "Source and destination projects should be the same for copy_images"
+            "Source and destination projects should be the same"
         )
 
     response = Controller.get_default().copy_items(

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

@@ -108,7 +108,7 @@ def __eq__(self, other):
 
 
 class Setting(BaseModel):
-    attribute:  NotEmptyStr
+    attribute: NotEmptyStr
     value: Union[NotEmptyStr, float, int]
 
     class Config:

src/superannotate/lib/core/entities/items.py

@@ -31,7 +31,7 @@ class TmpImageEntity(Entity):
     segmentation_status: Optional[SegmentationStatus] = Field(
         SegmentationStatus.NOT_STARTED
     )
-    approval_status: bool = None
+    approval_status: Optional[bool] = Field(None)
 
     class Config:
         extra = Extra.ignore

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

@@ -584,7 +584,7 @@ def execute(self):
                     project_id=self._project.uuid,
                     from_folder_id=self._from_folder.uuid,
                     to_folder_id=self._to_folder.uuid,
-                    images=self._image_names[i : i + self.CHUNK_SIZE],
+                    items=self._image_names[i : i + self.CHUNK_SIZE],
                     include_annotations=self._include_annotations,
                     include_pin=self._include_pin,
                 )

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

@@ -321,37 +321,31 @@ def _validate_limitations(self, items_count):
         if items_count > response.data.project_limit.remaining_image_count:
             raise AppValidationException(constances.COPY_PROJECT_LIMIT_ERROR_MESSAGE)
 
-    def validate_project_type(self):
-        if self._project.project_type in constances.LIMITED_FUNCTIONS:
-            raise AppValidationException(
-                constances.LIMITED_FUNCTIONS[self._project.project_type]
-            )
-
     def validate_item_names(self):
         if self._item_names:
             self._item_names = list(set(self._item_names))
 
     def execute(self):
         if self.is_valid():
-            skipped_images, duplications = [], []
-            if not self._item_names:
+            if self._item_names:
+                items = self._items
+            else:
                 condition = (
                         Condition("team_id", self._project.team_id, EQ)
                         & Condition("project_id", self._project.uuid, EQ)
                         & Condition("folder_id", self._from_folder.uuid, EQ)
                 )
-                items = self._items.get_all(condition)
-                items_to_copy = [item.name for item in items]
-            else:
-                items = self._backend_service.get_bulk_images(
-                    project_id=self._project.uuid,
-                    team_id=self._project.team_id,
-                    folder_id=self._to_folder.uuid,
-                    images=self._item_names,
-                )
-                duplications = [item["name"] for item in items]
-                items_to_copy = set(self._item_names) - set(duplications)
-                skipped_images = duplications
+                items = [item.name for item in self._items.get_all(condition)]
+
+            existing_items = self._backend_service.get_bulk_images(
+                project_id=self._project.uuid,
+                team_id=self._project.team_id,
+                folder_id=self._to_folder.uuid,
+                images=items,
+            )
+            duplications = [item["name"] for item in existing_items]
+            items_to_copy = list(set(items) - set(duplications))
+            skipped_images = duplications
             try:
                 self._validate_limitations(len(items_to_copy))
             except AppValidationException as e:
@@ -382,7 +376,7 @@ def execute(self):
                         self._response.errors = AppException(e)
                         return self._response
                 self.reporter.log_info(
-                    f"Copied {len(items_to_copy)}/{len(items)} items(s) from "
+                    f"Copied {len(items_to_copy)}/{len(items)} item(s) from "
                     f"{self._project.name}{'' if self._from_folder.is_root else f'/{self._from_folder.name}'} to "
                     f"{self._project.name}{'' if self._to_folder.is_root else f'/{self._to_folder.name}'}"
                 )
@@ -394,14 +388,14 @@ class MoveItems(BaseReportableUseCae):
     CHUNK_SIZE = 1000
 
     def __init__(
-        self,
-        reporter: Reporter,
-        project: ProjectEntity,
-        from_folder: FolderEntity,
-        to_folder: FolderEntity,
-        item_names: List[str],
-        items: BaseReadOnlyRepository,
-        backend_service_provider: SuperannotateServiceProvider,
+            self,
+            reporter: Reporter,
+            project: ProjectEntity,
+            from_folder: FolderEntity,
+            to_folder: FolderEntity,
+            item_names: List[str],
+            items: BaseReadOnlyRepository,
+            backend_service_provider: SuperannotateServiceProvider,
     ):
         super().__init__(reporter)
         self._project = project
@@ -452,11 +446,11 @@ def execute(self):
                         project_id=self._project.uuid,
                         from_folder_id=self._from_folder.uuid,
                         to_folder_id=self._to_folder.uuid,
-                        images=items[i : i + self.CHUNK_SIZE],  # noqa: E203
+                        images=items[i: i + self.CHUNK_SIZE],  # noqa: E203
                     )
                 )
             self.reporter.log_info(
-                f"Moved {len(moved_images)}/{len(items)} items(s) from "
+                f"Moved {len(moved_images)}/{len(items)} item(s) from "
                 f"{self._project.name}{'' if self._from_folder.is_root else f'/{self._from_folder.name}'} to "
                 f"{self._project.name}{'' if self._to_folder.is_root else f'/{self._to_folder.name}'}"
             )

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

@@ -753,7 +753,7 @@ def execute(self):
             old_settings = self._settings.get_all()
             attr_id_mapping = {}
             for setting in old_settings:
-                attr_id_mapping[setting.attribute] = setting.uuid
+                attr_id_mapping[setting.attribute] = setting.id
 
             new_settings_to_update = []
             for new_setting in self._to_update:

src/superannotate/version.py

@@ -1 +1 @@
-__version__ = "4.3.3dev1"
+__version__ = "4.3.3dev2"

tests/integration/annotations/test_annotation_class_new.py

@@ -8,7 +8,6 @@
 
 class TestAnnotationClasses(BaseTestCase):
     PROJECT_NAME = "test_annotation_class_new"
-    PROJECT_NAME_JSON = "test_annotation_class_json"
     PROJECT_DESCRIPTION = "desc"
     PROJECT_TYPE = "Vector"
 
@@ -34,11 +33,11 @@ def test_annotation_classes_filter(self):
 
     def test_create_annotation_class_from_json(self):
         sa.create_annotation_classes_from_classes_json(
-            self.PROJECT_NAME_JSON, self.classes_json
+            self.PROJECT_NAME, self.classes_json
         )
-        self.assertEqual(len(sa.search_annotation_classes(self.PROJECT_NAME_JSON)), 4)
+        self.assertEqual(len(sa.search_annotation_classes(self.PROJECT_NAME)), 4)
 
         sa.create_annotation_classes_from_classes_json(
-            self.PROJECT_NAME_JSON, self.classes_json
+            self.PROJECT_NAME, self.classes_json
         )
-        self.assertEqual(len(sa.search_annotation_classes(self.PROJECT_NAME_JSON)), 4)
+        self.assertEqual(len(sa.search_annotation_classes(self.PROJECT_NAME)), 4)