merge

Author: dshabin

requirements.txt

@@ -1,6 +1,6 @@
 pydicom>=2.0.0
 boto3>=1.14.53
-requests>=2.25.1
+requests=2.26.0
 requests-toolbelt>=0.9.1
 tqdm>=4.48.2
 pillow>=7.2.0

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

@@ -390,7 +390,7 @@ def delete_folders(project: str, folder_names: List[str]):
 
 
 @Trackable
-@validate_input
+# @validate_input
 def get_project_and_folder_metadata(project: Union[str, dict]):
     """Returns project and folder metadata tuple. If folder part is empty,
     than returned folder part is set to None.
@@ -884,7 +884,9 @@ def get_project_settings(project: Union[str, dict]):
     """
     project_name, folder_name = extract_project_folder(project)
     settings = controller.get_project_settings(project_name=project_name)
-    settings = [BaseSerializers(attribute).serialize() for attribute in settings.data]
+    settings = [
+        SettingsSerializer(attribute).serialize() for attribute in settings.data
+    ]
     return settings
 
 
@@ -2487,20 +2489,22 @@ def upload_annotations_from_folder_to_project(
     failed_annotations = []
     missing_annotations = []
     chunk_size = 10
-    for i in tqdm(range(0, len(annotation_paths), chunk_size)):
-        response = controller.upload_annotations_from_folder(
-            project_name=project_name,
-            folder_name=folder_name,
-            folder_path=folder_path,
-            annotation_paths=annotation_paths[i : i + chunk_size],  # noqa: E203
-            client_s3_bucket=from_s3_bucket,
-        )
-        if response.errors:
-            logger.warning(response.errors)
-        if response.data:
-            uploaded_annotations.extend(response.data[0])
-            missing_annotations.extend(response.data[1])
-            failed_annotations.extend(response.data[2])
+    with tqdm(total=len(annotation_paths)) as progress_bar:
+        for i in range(0, len(annotation_paths), chunk_size):
+            response = controller.upload_annotations_from_folder(
+                project_name=project_name,
+                folder_name=folder_name,
+                folder_path=folder_path,
+                annotation_paths=annotation_paths[i : i + chunk_size],  # noqa: E203
+                client_s3_bucket=from_s3_bucket,
+            )
+            if response.errors:
+                logger.warning(response.errors)
+            if response.data:
+                uploaded_annotations.extend(response.data[0])
+                missing_annotations.extend(response.data[1])
+                failed_annotations.extend(response.data[2])
+            progress_bar.update(chunk_size)
     return uploaded_annotations, failed_annotations, missing_annotations
 
 

src/superannotate/lib/core/entities.py

@@ -225,6 +225,10 @@ def __init__(
         folder_id: int = None,
         annotator_id: int = None,
         annotator_name: str = None,
+        qa_id: str = None,
+        qa_name: str = None,
+        entropy_value: int = None,
+        approval_status: bool = None,
         is_pinned: bool = None,
         meta: ImageInfoEntity = ImageInfoEntity(),
     ):
@@ -236,7 +240,11 @@ def __init__(
         self.project_id = project_id
         self.annotation_status_code = annotation_status_code
         self.folder_id = folder_id
+        self.qa_id = qa_id
+        self.qa_name = qa_name
+        self.entropy_value = entropy_value
         self.annotator_id = annotator_id
+        self.approval_status = approval_status
         self.annotator_name = annotator_name
         self.is_pinned = is_pinned
         self.meta = meta
@@ -250,6 +258,10 @@ def to_dict(self):
             "project_id": self.project_id,
             "annotation_status": self.annotation_status_code,
             "folder_id": self.folder_id,
+            "qa_id": self.qa_id,
+            "qa_name": self.qa_name,
+            "entropy_value": self.entropy_value,
+            "approval_status": self.approval_status,
             "annotator_id": self.annotator_id,
             "annotator_name": self.annotator_name,
             "is_pinned": self.is_pinned,