Merge remote-tracking branch 'origin/folder_structure2'

Author: hovnatan

tests/consensus_benchmark/consensus_test_data/images/berlin_000000_000019_leftImg8bit.png

@@ -3,7 +3,7 @@
 import superannotate as sa
 
 test_root = Path().resolve() / 'tests'
-project_name = "consensus_enhanced"
+project_name = "benchmark_enhanced"
 
 
 def test_benchmark():
@@ -15,13 +15,32 @@ def test_benchmark():
         'attributes', 'folderName', 'score'
     ]
     export_path = test_root / 'consensus_benchmark' / 'consensus_test_data'
+    if len(sa.search_projects(project_name)) != 0:
+        sa.delete_project(project_name)
+
+    sa.create_project(project_name, "test bench", "Vector")
+    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'
+    )
+    sa.upload_images_from_folder_to_project(
+        project_name, export_path / "images"
+    )
+    for i in range(1, 4):
+        sa.upload_images_from_folder_to_project(
+            project_name + '/consensus_' + str(i), export_path / "images"
+        )
+    sa.upload_annotations_from_folder_to_project(project_name, export_path)
+    for i in range(1, 4):
+        sa.upload_annotations_from_folder_to_project(
+            project_name + '/consensus_' + str(i),
+            export_path / ('consensus_' + str(i))
+        )
+
     for annot_type in annot_types:
         res_df = sa.benchmark(
-            project_name,
-            gt_folder_name,
-            folder_names,
-            export_root=export_path,
-            annot_type=annot_type
+            project_name, gt_folder_name, folder_names, annot_type=annot_type
         )
         #test content of projectName column
         assert sorted(res_df['folderName'].unique()) == folder_names

tests/consensus_benchmark/consensus_test_data/images/bielefeld_000000_000321_leftImg8bit.png

@@ -14,11 +14,33 @@ def test_consensus():
         'attributes', 'folderName', 'score'
     ]
     export_path = test_root / 'consensus_benchmark' / 'consensus_test_data'
+    if len(sa.search_projects(project_name)) != 0:
+        sa.delete_project(project_name)
+
+    sa.create_project(project_name, "test bench", "Vector")
+    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'
+    )
+    sa.upload_images_from_folder_to_project(
+        project_name, export_path / "images"
+    )
+    for i in range(1, 4):
+        sa.upload_images_from_folder_to_project(
+            project_name + '/consensus_' + str(i), export_path / "images"
+        )
+    sa.upload_annotations_from_folder_to_project(project_name, export_path)
+    for i in range(1, 4):
+        sa.upload_annotations_from_folder_to_project(
+            project_name + '/consensus_' + str(i),
+            export_path / ('consensus_' + str(i))
+        )
+
     for annot_type in annot_types:
         res_df = sa.consensus(
             project_name,
             folder_names,
-            export_root=export_path,
             annot_type=annot_type
         )
         #test content of projectName column