Fix uploads from google cloud, azure

Author: hovnatan

superannotate/db/images.py

@@ -720,7 +720,7 @@ def get_image_bytes(project, image_name, variant='original'):
         raise SABaseException(
             0, "Image download variant should be either original or lores"
         )
-    image = get_image_metadata(project, image_name)
+    image = get_image_metadata((project, project_folder), image_name)
     team_id, project_id, image_id, folder_id = image["team_id"], image[
         "project_id"], image["id"], image['folder_id']
     params = {
@@ -1221,7 +1221,7 @@ def set_images_annotation_statuses(project, image_names, annotation_status):
         data["image_names"] = image_names[start_index:start_index + NUM_TO_SEND]
         response = _api.send_request(
             req_type='PUT',
-            path=f'/image/updateAnnotationStatusBulk',
+            path='/image/updateAnnotationStatusBulk',
             params=params,
             json_req=data
         )

superannotate/db/project_api.py

@@ -105,7 +105,6 @@ def get_project_and_folder_metadata(project):
     :rtype: dict
     """
     if isinstance(project, dict):
-        project = project
         folder = None
     elif isinstance(project, tuple):
         if len(project) != 2:

superannotate/db/projects.py

@@ -766,9 +766,6 @@ def __create_image(
         "team_id": str(team_id),
         "images": [],
         "annotation_status": annotation_status,
-        "team_id": str(team_id),
-        "images": [],
-        "annotation_status": annotation_status,
         "meta": {},
         "upload_state": upload_state_code
     }
@@ -1226,7 +1223,7 @@ def upload_images_from_public_urls_to_project(
         finish_event.set()
         tqdm_thread.join()
         images_uploaded_paths, images_not_uploaded_paths, duplicate_images_paths = upload_images_to_project(
-            project,
+            (project, project_folder),
             images_to_upload,
             annotation_status=annotation_status,
             image_quality_in_editor=image_quality_in_editor
@@ -1312,7 +1309,7 @@ def upload_images_from_google_cloud_to_project(
                 path_to_url[str(image_save_pth)] = image_blob.name
                 images_to_upload.append(image_save_pth)
         images_uploaded_paths, images_not_uploaded_paths, duplicate_images_paths = upload_images_to_project(
-            project,
+            (project, project_folder),
             images_to_upload,
             annotation_status=annotation_status,
             image_quality_in_editor=image_quality_in_editor
@@ -1408,7 +1405,7 @@ def upload_images_from_azure_blob_to_project(
                 path_to_url[str(image_save_pth)] = image_blob.name
                 images_to_upload.append(image_save_pth)
         images_uploaded_paths, images_not_uploaded_paths, duplicate_images_paths = upload_images_to_project(
-            project,
+            (project, project_folder),
             images_to_upload,
             annotation_status=annotation_status,
             image_quality_in_editor=image_quality_in_editor

superannotate/version.py

@@ -1 +1 @@
-__version__ = "4.1.2b1"
+__version__ = "4.1.2b2"

tests/test_ml_funcs.py

@@ -1,4 +1,3 @@
-import os
 from pathlib import Path
 
 import pytest
@@ -84,9 +83,7 @@ def test_run_segmentation():
 
     image_names_pixel = sa.search_images(PROJECT_NAME_PIXEL_SEGMENTATION)
     with pytest.raises(SABaseException) as e:
-        res = sa.run_segmentation(
-            PROJECT_NAME_VECTOR, image_names_pixel, model_auto
-        )
+        sa.run_segmentation(PROJECT_NAME_VECTOR, image_names_pixel, model_auto)
         assert str(e) == "Operation not supported for given project type"
     with pytest.raises(SABaseException) as e:
         sa.run_segmentation(

tests/test_preannotation_upload.py

@@ -1,4 +1,3 @@
-import os
 from pathlib import Path
 
 import pytest

tests/test_preannotation_upload_cli.py

@@ -1,4 +1,3 @@
-import os
 import subprocess
 import time
 from pathlib import Path

tests/test_recursive_folder.py

@@ -1,9 +1,6 @@
 import json
 from pathlib import Path
 import time
-import os
-
-import pytest
 
 import superannotate as sa
 

tests/test_video.py

@@ -2,8 +2,6 @@
 import time
 from pathlib import Path
 
-import pytest
-
 import superannotate as sa
 
 PROJECT_NAME1 = "test video upload1"