Merge branch 'test-refactor' into develop

Author: dshabin

pytest.ini

@@ -1,3 +1,3 @@
 [pytest]
-timeout = 300
+timeout = 600
 timeout_method=thread

superannotate/api.py

@@ -2,6 +2,7 @@
 import json
 import logging
 import sys
+import time
 from pathlib import Path
 
 import requests
@@ -137,14 +138,20 @@ def send_request(self, req_type, path, params=None, json_req=None):
             for key, value in params.items():
                 if isinstance(value, str):
                     params[key] = value.replace("\\", "\\\\")
-
         req = requests.Request(
             method=req_type, url=url, json=json_req, params=params
         )
         if self._session is None:
             self._session = self._create_session()
         prepared = self._session.prepare_request(req)
         resp = self._session.send(request=prepared, verify=self._verify)
+        if resp.status_code not in [200,201]:
+            time.sleep(4)
+            resp = self._session.send(request=prepared, verify=self._verify)
+
+        if req_type.lower() == "get" and not resp.text:
+            time.sleep(4)
+            resp = self._session.send(request=prepared, verify=self._verify)
         return resp
 
     def _create_session(self):
@@ -153,11 +160,11 @@ def _create_session(self):
             total=5,
             read=5,
             connect=5,
-            backoff_factor=0.3,
+            backoff_factor=2,
             # use on any request type
             method_whitelist=False,
             # force retry on those status responses
-            status_forcelist=(501, 502, 503, 504, 505, 506, 507, 508, 510, 511),
+            status_forcelist=(501, 502, 503, 504, 505, 506, 507, 508, 510, 511, 403, 400),
             raise_on_status=False
         )
         adapter = requests.adapters.HTTPAdapter(

tests/common.py

@@ -1,3 +1,4 @@
+import time
 from pathlib import Path
 import superannotate as sa
 
@@ -14,11 +15,8 @@ def upload_project(
     if isinstance(project_path, str):
         project_path = Path(project_path)
 
-    projects = sa.search_projects(project_name, return_metadata=True)
-    for project in projects:
-        sa.delete_project(project)
-
-    project = sa.create_project(project_name, description, ptype)
+    from .test_assign_images import safe_create_project
+    project = safe_create_project(project_name,description,ptype)
 
     sa.create_annotation_classes_from_classes_json(
         project,
@@ -35,5 +33,5 @@ def upload_project(
     sa.upload_annotations_from_folder_to_project(
         project, project_path, from_s3_bucket=from_s3_bucket
     )
-
+    time.sleep(2)
     return project

tests/consensus_benchmark/test_benchmark.py

@@ -1,3 +1,4 @@
+import time
 from pathlib import Path
 
 import superannotate as sa
@@ -17,22 +18,27 @@ def test_benchmark():
     export_path = test_root / 'consensus_benchmark' / 'consensus_test_data'
     if len(sa.search_projects(project_name)) != 0:
         sa.delete_project(project_name)
-
+    time.sleep(2)
     sa.create_project(project_name, "test bench", "Vector")
+    time.sleep(2)
     for i in range(1, 4):
         sa.create_folder(project_name, "consensus_" + str(i))
+    time.sleep(2)
     sa.create_annotation_classes_from_classes_json(
         project_name, export_path / 'classes' / 'classes.json'
     )
+    time.sleep(2)
     sa.upload_images_from_folder_to_project(
         project_name, export_path / "images", annotation_status="Completed"
     )
+    time.sleep(2)
     for i in range(1, 4):
         sa.upload_images_from_folder_to_project(
             project_name + '/consensus_' + str(i),
             export_path / "images",
             annotation_status="Completed"
         )
+    time.sleep(2)
     sa.upload_annotations_from_folder_to_project(project_name, export_path)
     for i in range(1, 4):
         sa.upload_annotations_from_folder_to_project(

tests/consensus_benchmark/test_consensus.py

@@ -1,3 +1,4 @@
+import time
 from pathlib import Path
 
 import superannotate as sa
@@ -16,13 +17,15 @@ def test_consensus():
     export_path = test_root / 'consensus_benchmark' / 'consensus_test_data'
     if len(sa.search_projects(project_name)) != 0:
         sa.delete_project(project_name)
-
+    time.sleep(2)
     sa.create_project(project_name, "test bench", "Vector")
+    time.sleep(2)
     for i in range(1, 4):
         sa.create_folder(project_name, "consensus_" + str(i))
     sa.create_annotation_classes_from_classes_json(
         project_name, export_path / 'classes' / 'classes.json'
     )
+    time.sleep(2)
     sa.upload_images_from_folder_to_project(
         project_name, export_path / "images", annotation_status="Completed"
     )

tests/converter_test/test_conversion.py

@@ -1,3 +1,4 @@
+import time
 from pathlib import Path
 from mixpanel import json_dumps
 
@@ -154,10 +155,12 @@ def test_upload_annotations_with_template_id(tmpdir):
     project_name = "test_templates"
     for project in sa.search_projects(project_name):
         sa.delete_project(project)
+    time.sleep(2)
     project = sa.create_project(project_name, "test", "Vector")
     sa.upload_images_from_folder_to_project(
         project, "./tests/sample_coco_with_templates"
     )
+    time.sleep(2)
     input_dir = Path("tests") / "sample_coco_with_templates"
     out_path = Path(
         tmpdir
@@ -168,5 +171,6 @@ def test_upload_annotations_with_template_id(tmpdir):
         "keypoint_detection"
     )
     sa.upload_annotations_from_folder_to_project(project, out_path)
+    time.sleep(2)
     image_metadata = sa.get_image_annotations(project_name, "t.png")
     assert image_metadata['annotation_json']['instances'][0]['templateId'] == -1

tests/sample_project_vector/example_image_1.jpg___objects.json

@@ -220,7 +220,7 @@
           "id": 117846
         }
       ],
-      "templateId": 91,
+      "templateId": -1,
       "trackingId": "cbde2787e76c41be77c1079e8d090252ad701ea",
       "createdAt": null,
       "createdBy": null,
@@ -1315,7 +1315,7 @@
       "locked": false,
       "visible": false,
       "attributes": [],
-      "templateId": 92,
+      "templateId": -1,
       "trackingId": "2c89e809614523cf56c9aeab932e90b87aaf5e4f",
       "createdAt": null,
       "createdBy": null,
@@ -1552,7 +1552,7 @@
       "locked": false,
       "visible": false,
       "attributes": [],
-      "templateId": 92,
+      "templateId": -1,
       "trackingId": "bab62dc810b0cee390f8d5fb5fa62fade3c8da7",
       "createdAt": null,
       "createdBy": null,
@@ -1789,7 +1789,7 @@
       "locked": false,
       "visible": false,
       "attributes": [],
-      "templateId": 92,
+      "templateId": -1,
       "trackingId": "f8f542a9e9da918d5d5cb8eed9052713302089",
       "createdAt": null,
       "createdBy": null,
@@ -2028,7 +2028,7 @@
       "locked": false,
       "visible": false,
       "attributes": [],
-      "templateId": 89,
+      "templateId": -1,
       "trackingId": "4fd95b7d6d95b7b84750e65aa89c70b9c86eb3b8",
       "createdAt": null,
       "createdBy": null,
@@ -2267,7 +2267,7 @@
       "locked": false,
       "visible": false,
       "attributes": [],
-      "templateId": 89,
+      "templateId": -1,
       "trackingId": "8894b2a1727f62631d26e885a5aaf9bc2ac2a578",
       "createdAt": null,
       "createdBy": null,
@@ -2506,7 +2506,7 @@
       "locked": false,
       "visible": false,
       "attributes": [],
-      "templateId": 89,
+      "templateId": -1,
       "trackingId": "2fe1f0c6c4af879955d6f19cfcf113a6b929b73",
       "createdAt": null,
       "createdBy": null,

tests/test_annotation_adding.py

@@ -1,23 +1,19 @@
+import time
 from pathlib import Path
 import json
 
 import superannotate as sa
-
-PROJECT_NAME = "Example Project test annotation add"
-PROJECT_NAME_NOINIT = "Example Project test annotation add no init"
-PROJECT_DESCRIPTION = "test vector"
-PATH_TO_SAMPLE_PROJECT = Path("./tests/sample_project_vector")
+from .test_assign_images import safe_create_project
 
 
 def test_add_bbox(tmpdir):
     tmpdir = Path(tmpdir)
 
-    projects_found = sa.search_projects(PROJECT_NAME, return_metadata=True)
-    for pr in projects_found:
-        if pr["name"] == PROJECT_NAME:
-            sa.delete_project(pr)
+    PROJECT_NAME = "Example Project test annotation add"
+    PROJECT_DESCRIPTION = "test vector"
+    PATH_TO_SAMPLE_PROJECT = Path("./tests/sample_project_vector")
 
-    project = sa.create_project(PROJECT_NAME, PROJECT_DESCRIPTION, "Vector")
+    project = safe_create_project(PROJECT_NAME,PROJECT_DESCRIPTION,"Vector")
     sa.upload_images_from_folder_to_project(
         PROJECT_NAME, PATH_TO_SAMPLE_PROJECT, annotation_status="InProgress"
     )
@@ -40,8 +36,8 @@ def test_add_bbox(tmpdir):
         project, PATH_TO_SAMPLE_PROJECT
     )
 
+    time.sleep(2)
     images = sa.search_images(project, "example_image_1")
-
     image_name = images[0]
     annotations = sa.get_image_annotations(project,
                                            image_name)["annotation_json"]
@@ -77,10 +73,10 @@ def test_add_bbox(tmpdir):
         project, image_name, "hey", [100, 100], "hovnatan@superannotate.com",
         True
     )
+    time.sleep(2)
     annotations_new = sa.get_image_annotations(project,
                                                image_name)["annotation_json"]
     json.dump(annotations_new, open(tmpdir / "new_anns.json", "w"))
-
     assert len(annotations_new["instances"]) + len(
         annotations_new["comments"]
     ) == len(annotations["instances"]) + len(annotations["comments"]) + 8
@@ -101,19 +97,15 @@ def test_add_bbox(tmpdir):
 
 def test_add_bbox_noinit(tmpdir):
     tmpdir = Path(tmpdir)
+    PROJECT_NAME_NOINIT = "Example Project test annotation add no init"
+    PROJECT_DESCRIPTION = "tt"
+    PATH_TO_SAMPLE_PROJECT = Path("./tests/sample_project_vector")
 
-    projects_found = sa.search_projects(
-        PROJECT_NAME_NOINIT, return_metadata=True
-    )
-    for pr in projects_found:
-        sa.delete_project(pr)
-
-    project = sa.create_project(
-        PROJECT_NAME_NOINIT, PROJECT_DESCRIPTION, "Vector"
-    )
+    project = safe_create_project(PROJECT_NAME_NOINIT,PROJECT_DESCRIPTION,"Vector")
     sa.upload_images_from_folder_to_project(
         project, PATH_TO_SAMPLE_PROJECT, annotation_status="InProgress"
     )
+    time.sleep(2)
     sa.create_annotation_classes_from_classes_json(
         project, PATH_TO_SAMPLE_PROJECT / "classes" / "classes.json"
     )
@@ -127,11 +119,13 @@ def test_add_bbox_noinit(tmpdir):
     sa.add_annotation_polygon_to_image(
         project, image_name, [100, 100, 500, 500, 200, 300], "test_add"
     )
+    time.sleep(2)
     annotations_new = sa.get_image_annotations(project,
                                                image_name)["annotation_json"]
 
     assert len(annotations_new["instances"]) == 2
     export = sa.prepare_export(project, include_fuse=True)
+    time.sleep(2)
     sa.download_export(project, export, tmpdir)
 
     non_empty_annotations = 0

tests/test_annotation_class_new.py

@@ -1,42 +1,41 @@
+import time
 from pathlib import Path
 import pytest
 import superannotate as sa
-
-PROJECT_NAME = "test annotation class new 1"
-PROJECT_NAME_JSON = "test annotation class new json 2"
+from .test_assign_images import safe_create_project
 
 
 def test_anntotation_class_new():
-    projects = sa.search_projects(PROJECT_NAME, return_metadata=True)
-    for project in projects:
-        sa.delete_project(project)
-
-    sa.create_project(PROJECT_NAME, "tt", "Vector")
 
+    PROJECT_NAME = "test_anntotation_class_new"
+    safe_create_project(PROJECT_NAME,'test','Vector')
+    time.sleep(2)
     sa.create_annotation_class(PROJECT_NAME, "tt", "#FFFFFF")
 
+    time.sleep(2)
+
     assert len(sa.search_annotation_classes(PROJECT_NAME)) == 1
 
     sa.create_annotation_class(PROJECT_NAME, "tt", "#FFFFFF")
-
+    time.sleep(2)
     assert len(sa.search_annotation_classes(PROJECT_NAME)) == 1
 
 
 def test_anntotation_class_new_json():
-    projects = sa.search_projects(PROJECT_NAME_JSON, return_metadata=True)
-    for project in projects:
-        sa.delete_project(project)
 
-    sa.create_project(PROJECT_NAME_JSON, "tt", "Vector")
+    PROJECT_NAME_JSON = "test_anntotation_class_new_json"
+    safe_create_project(PROJECT_NAME_JSON,'test','Vector')
 
     sa.create_annotation_classes_from_classes_json(
         PROJECT_NAME_JSON, "./tests/sample_project_vector/classes/classes.json"
     )
 
+    time.sleep(2)
     assert len(sa.search_annotation_classes(PROJECT_NAME_JSON)) == 4
 
     sa.create_annotation_classes_from_classes_json(
         PROJECT_NAME_JSON, "./tests/sample_project_vector/classes/classes.json"
     )
+    time.sleep(2)
 
     assert len(sa.search_annotation_classes(PROJECT_NAME_JSON)) == 4