Fix friday-999, friday-984

Author: VaghinakDev

pytest.ini

@@ -1,5 +1,5 @@
 [pytest]
-minversion = 3.0
+minversion = 3.7
 log_cli=true
 python_files = test_*.py
 addopts = -n auto --dist=loadscope

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

@@ -12,12 +12,6 @@
 from typing import Union
 
 import boto3
-from pydantic import StrictBool
-from pydantic import conlist
-from pydantic import parse_obj_as
-from pydantic.error_wrappers import ValidationError
-from tqdm import tqdm
-
 import lib.core as constances
 from lib.app.annotation_helpers import add_annotation_bbox_to_json
 from lib.app.annotation_helpers import add_annotation_comment_to_json
@@ -58,7 +52,12 @@
 from lib.core.types import PriorityScore
 from lib.core.types import Project
 from lib.infrastructure.controller import Controller
+from pydantic import conlist
+from pydantic import parse_obj_as
+from pydantic import StrictBool
+from pydantic.error_wrappers import ValidationError
 from superannotate.logger import get_default_logger
+from tqdm import tqdm
 
 logger = get_default_logger()
 
@@ -397,10 +396,10 @@ def rename_project(project: NotEmptyStr, new_name: NotEmptyStr):
     )
     if response.errors:
         raise AppException(response.errors)
-    return ProjectSerializer(response.data).serialize()
     logger.info(
-        "Successfully renamed project %s to %s.", project, response.data["name"]
+        "Successfully renamed project %s to %s.", project, response.data.name
     )
+    return ProjectSerializer(response.data).serialize()
 
 
 @Trackable
@@ -3135,7 +3134,7 @@ def attach_items(
     unique_attachments = parse_obj_as(List[AttachmentEntity], unique_attachments)
     uploaded, fails, duplicated = [], [], []
     if unique_attachments:
-        logger.info(f"Attaching  {len(unique_attachments)} file(s) to project {project}.")
+        logger.info(f"Attaching {len(unique_attachments)} file(s) to project {project}.")
         response = Controller.get_default().attach_items(
             project_name=project_name,
             folder_name=folder_name,

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

@@ -175,7 +175,7 @@ class AnnotationStatuses(StrictStr):
     def validate(cls, value: Union[str]) -> Union[str]:
         if value.lower() not in AnnotationStatus.values():
             raise TypeError(
-                f"Available annotation_statuses are {', '.join(AnnotationStatus.titles())}. "
+                f"Available an``notation_statuses are {', '.join(AnnotationStatus.titles())}. "
             )
         return value
 

src/superannotate/lib/app/serializers.py

@@ -4,9 +4,8 @@
 from typing import Set
 from typing import Union
 
-from pydantic import BaseModel
-
 import superannotate.lib.core as constance
+from pydantic import BaseModel
 from superannotate.lib.core.entities import BaseEntity
 from superannotate.lib.core.entities import ImageEntity
 from superannotate.lib.core.entities import ProjectEntity

src/superannotate/lib/core/conditions.py

@@ -12,6 +12,17 @@
 CONDITION_LE = "<="
 
 
+class EmptyCondition:
+    def __or__(self, other):
+        return other
+
+    def __and__(self, other):
+        return other
+
+    def build_query(self):
+        return ""
+
+
 class Condition:
     def __init__(self, key: str, value: Any, condition_type: str):
         self._key = key
@@ -21,16 +32,6 @@ def __init__(self, key: str, value: Any, condition_type: str):
 
     @staticmethod
     def get_empty_condition():
-        class EmptyCondition:
-            def __or__(self, other):
-                return other
-
-            def __and__(self, other):
-                return other
-
-            def build_query(self):
-                return ""
-
         return EmptyCondition()
 
     def __str__(self):
@@ -46,10 +47,12 @@ def __or__(self, other):
     def __and__(self, other):
         if isinstance(other, tuple) or isinstance(other, list):
             for elem in other:
+                if isinstance(other, EmptyCondition):
+                    continue
                 if not isinstance(other, Condition):
                     raise Exception("Support the only Condition types")
-            return self.__and__(elem)
-        elif not isinstance(other, Condition):
+                return self.__and__(elem)
+        elif not isinstance(other, (Condition, EmptyCondition)):
             raise Exception("Support the only Condition types")
         QueryCondition = namedtuple("QueryCondition", ("condition", "query"))
         self._condition_set.append(QueryCondition(CONDITION_AND, other.build_query()))

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

@@ -1,6 +1,6 @@
 from lib.core.entities.base import AttachmentEntity
-from lib.core.entities.base import ProjectEntity
 from lib.core.entities.base import BaseEntity as TmpBaseEntity
+from lib.core.entities.base import ProjectEntity
 from lib.core.entities.base import SettingEntity
 from lib.core.entities.integrations import IntegrationEntity
 from lib.core.entities.items import DocumentEntity
@@ -14,7 +14,6 @@
 from lib.core.entities.project_entities import ImageEntity
 from lib.core.entities.project_entities import ImageInfoEntity
 from lib.core.entities.project_entities import MLModelEntity
-# from lib.core.entities.project_entities import ProjectEntity
 from lib.core.entities.project_entities import S3FileEntity
 from lib.core.entities.project_entities import TeamEntity
 from lib.core.entities.project_entities import UserEntity
@@ -26,6 +25,7 @@
 from superannotate_schemas.schemas.internal.video import (
     VideoAnnotation as VideoExportAnnotation,
 )
+# from lib.core.entities.project_entities import ProjectEntity
 
 __all__ = [
     # base

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

@@ -1,8 +1,8 @@
 import uuid
 from datetime import datetime
-from typing import Optional
-from typing import List
 from typing import Any
+from typing import List
+from typing import Optional
 from typing import Union
 
 from lib.core.enums import AnnotationStatus

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

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

src/superannotate/lib/core/types.py

@@ -1,29 +1,15 @@
 from typing import Optional
-from typing import Union
 
 from pydantic import BaseModel
 from pydantic import constr
 from pydantic import Extra
-from pydantic import StrictStr
-from pydantic.error_wrappers import ErrorWrapper
-from pydantic.error_wrappers import ValidationError
 from superannotate_schemas.schemas.classes import AttributeGroup as AttributeGroupSchema
 
 NotEmptyStr = constr(strict=True, min_length=1)
 
 AttributeGroup = AttributeGroupSchema
 
 
-class AnnotationType(StrictStr):
-    @classmethod
-    def validate(cls, value: str) -> Union[str]:
-        if value not in ANNOTATION_TYPES.keys():
-            raise ValidationError(
-                [ErrorWrapper(TypeError(f"invalid value {value}"), "type")], cls
-            )
-        return value
-
-
 class Project(BaseModel):
     name: NotEmptyStr
 

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

@@ -11,7 +11,6 @@
 from lib.core.entities import ProjectEntity
 from lib.core.entities import TmpBaseEntity
 from lib.core.entities import TmpImageEntity
-from lib.core.entities import VideoEntity
 from lib.core.exceptions import AppException
 from lib.core.exceptions import AppValidationException
 from lib.core.exceptions import BackendError
@@ -54,7 +53,8 @@ def serialize_entity(entity: Entity, project: ProjectEntity):
                 tmp_entity.segmentation_status = None
             return TmpImageEntity(**tmp_entity.dict(by_alias=True))
         elif project.type == constances.ProjectType.VIDEO.value:
-            return VideoEntity(**entity.dict(by_alias=True))
+            return
+
         elif project.type == constances.ProjectType.DOCUMENT.value:
             return DocumentEntity(**entity.dict(by_alias=True))
         return entity
@@ -245,6 +245,7 @@ def execute(self) -> Response:
         if self.is_valid():
             duplications = []
             attached = []
+            self.reporter.start_progress(self.attachments_count, "Attaching URLs")
             for i in range(0, self.attachments_count, self.CHUNK_SIZE):
                 attachments = self._attachments[i: i + self.CHUNK_SIZE]  # noqa: E203
                 response = self._backend_service.get_bulk_images(
@@ -276,6 +277,8 @@ def execute(self) -> Response:
                         self._response.errors = AppException(backend_response["error"])
                     else:
                         attached.extend(backend_response)
+                self.reporter.update_progress(len(attachments))
+            self.reporter.finish_progress()
             self._response.data = attached, duplications
         return self._response
 
@@ -363,7 +366,7 @@ def execute(self):
                         include_annotations=self._include_annotations,
                     )
                     if not poll_id:
-                        skipped_images.append(chunk_to_copy)
+                        skipped_items.extend(chunk_to_copy)
                         continue
                     try:
                         self._backend_service.await_progress(
@@ -467,4 +470,3 @@ def execute(self):
 
             self._response.data = list(set(items) - set(moved_images))
         return self._response
-