from s3 upload

Author: hovnatan

superannotate/db/projects.py

@@ -1658,7 +1658,7 @@ def upload_images_from_s3_bucket_to_project(
         if res["progress"] != "1":
             raise SABaseException(
                 response.status_code,
-                "Couldn't upload to project from S3 " + response.text
+                "Couldn't upload to project from S3 " + str(res)
             )
     if image_quality_in_editor is not None:
         set_project_default_image_quality_in_editor(project, old_quality)
@@ -1679,7 +1679,6 @@ def _get_upload_from_s3_bucket_to_project_status(project):
             response.status_code,
             "Couldn't get upload to project from S3 status " + response.text
         )
-    print(response.text)
     return response.json()
 
 

tests/test_direct_s3_upload.py

@@ -6,7 +6,8 @@
 
 import superannotate as sa
 
-TEST_PROJECT_NAME = "test_direct_s3_upload"
+TEST_PROJECT_NAME = "test_direct_s3_upload1"
+TEST_PROJECT_NAME2 = "test_direct_s3_upload_folder_2"
 S3_BUCKET = 'superannotate-python-sdk-test'
 S3_FOLDER = 'sample_project_vector'
 
@@ -39,3 +40,37 @@ def test_direct_s3_upload():
                     on_s3.append(key)
 
     assert len(on_s3) == sa.get_project_image_count(project)
+
+
+def test_direct_s3_upload_folder():
+    projects_found = sa.search_projects(
+        TEST_PROJECT_NAME2, return_metadata=True
+    )
+    for pr in projects_found:
+        sa.delete_project(pr)
+
+    project = sa.create_project(TEST_PROJECT_NAME2, "a", "Vector")
+    print(project["id"])
+
+    csv = (Path.home() / ".aws" / "credentials").read_text().splitlines()
+
+    access_key_id = csv[1].split(" = ")[1]
+    access_secret = csv[2].split(" = ")[1]
+
+    sa.create_folder(project, "folder1")
+    project_folder = project["name"] + "/folder1"
+    sa.upload_images_from_s3_bucket_to_project(
+        project_folder, access_key_id, access_secret, S3_BUCKET, S3_FOLDER
+    )
+    s3_client = boto3.client('s3')
+    paginator = s3_client.get_paginator('list_objects_v2')
+    response_iterator = paginator.paginate(Bucket=S3_BUCKET, Prefix=S3_FOLDER)
+    on_s3 = []
+    for response in response_iterator:
+        if 'Contents' in response:
+            for object_data in response['Contents']:
+                key = object_data['Key']
+                if key[-4:] in [".jpg", ".png"]:
+                    on_s3.append(key)
+
+    assert len(on_s3) == len(sa.search_images(project_folder))