diff --git a/e2e_tests/cli/test_full_cycle.py b/e2e_tests/cli/test_full_cycle.py new file mode 100644 index 000000000..01f1df25f --- /dev/null +++ b/e2e_tests/cli/test_full_cycle.py @@ -0,0 +1,105 @@ +import shutil +from pathlib import Path + +from e2e_tests.helpers import assert_cli, run_cli_command, export_release +from e2e_tests.objects import E2EDataset, ConfigValues +from e2e_tests.cli.test_import import compare_annotations_export + + +def test_full_cycle( + local_dataset: E2EDataset, + config_values: ConfigValues, +): + """ + This test performs the following steps: + - 1: Registers a set of files from external storage to a dataset + - 2: Imports some annotations + - 3: Creates and pulls a release of the dataset + - 4: Deletes all items from the dataset + - 5: Pushes and imports the pulled files & annotations to the dataset + - 6: Deletes locally pulled copies of the dataset files + - 7: Creates and pulls a new release of the dataset + - 8: Assert that the pulled data is as expected + + It is designed to catch errors that may arise from changes to exported Darwin JSON + """ + item_type = "single_slotted" + annotation_format = "darwin" + first_release_name = "first_release" + second_release_name = "second_release" + pull_dir = Path( + f"{Path.home()}/.darwin/datasets/{config_values.team_slug}/{local_dataset.slug}" + ) + annotations_import_dir = ( + Path(__file__).parents[1] + / "data" + / "import" + / "image_annotations_with_item_level_properties" + ) + expected_filepaths = [ + f"{pull_dir}/images/image_1.jpg", + f"{pull_dir}/images/image_2.jpg", + f"{pull_dir}/images/dir1/image_3.jpg", + f"{pull_dir}/images/dir1/image_4.jpg", + f"{pull_dir}/images/dir2/image_5.jpg", + f"{pull_dir}/images/dir2/image_6.jpg", + f"{pull_dir}/images/dir1/dir3/image_7.jpg", + f"{pull_dir}/images/dir1/dir3/image_8.jpg", + ] + + # Populate the dataset with items and annotations + local_dataset.register_read_only_items(config_values, item_type) + result = run_cli_command( + f"darwin dataset import {local_dataset.name} {annotation_format} {annotations_import_dir}" + ) + assert_cli(result, 0) + + # Pull a first release of the dataset + original_release = export_release( + annotation_format, local_dataset, config_values, release_name=first_release_name + ) + result = run_cli_command( + f"darwin dataset pull {local_dataset.name}:{original_release.name}" + ) + assert_cli(result, 0) + + # Delete all items in the dataset + local_dataset.delete_items(config_values) + + # Push and import the pulled files and annotations to the dataset + result = run_cli_command( + f"darwin dataset push {local_dataset.name} {pull_dir}/images --preserve-folders" + ) + assert_cli(result, 0) + result = run_cli_command( + f"darwin dataset import {local_dataset.name} {annotation_format} {pull_dir}/releases/{first_release_name}/annotations" + ) + assert_cli(result, 0) + + # Delete local copies of the dataset files for the dataset + shutil.rmtree(f"{pull_dir}/images") + + # Pull a second release of the dataset + new_release = export_release( + annotation_format, + local_dataset, + config_values, + release_name=second_release_name, + ) + result = run_cli_command( + f"darwin dataset pull {local_dataset.name}:{new_release.name}" + ) + assert_cli(result, 0) + + # Check that all expected files have been downloaded + all_filepaths = list(pull_dir.rglob("*")) + for expected_file in expected_filepaths: + assert Path(expected_file) in all_filepaths + + # Check that all downloaded annotations are as expected + compare_annotations_export( + Path(f"{pull_dir}/releases/{first_release_name}/annotations"), + Path(f"{pull_dir}/releases/{second_release_name}/annotations"), + item_type, + unzip=False, + ) diff --git a/e2e_tests/cli/test_import.py b/e2e_tests/cli/test_import.py index 3cbfce3e5..d07f0a9dc 100644 --- a/e2e_tests/cli/test_import.py +++ b/e2e_tests/cli/test_import.py @@ -226,13 +226,15 @@ def compare_annotations_export( item_type: str, base_slot: Optional[str] = "0", annotation_format: str = "darwin", + unzip: Optional[bool] = True, ): """ Compares a set of downloaded annotation files with the imported files that resulted in those annotations. Ensures equality """ - with zipfile.ZipFile(actual_annotations_dir / "dataset.zip") as z: - z.extractall(actual_annotations_dir) + if unzip: + with zipfile.ZipFile(actual_annotations_dir / "dataset.zip") as z: + z.extractall(actual_annotations_dir) file_prefixes_to_ignore = [".", "metadata.json"] expected_annotation_files = { diff --git a/e2e_tests/cli/test_pull.py b/e2e_tests/cli/test_pull.py index 93e4f5eaa..bbcdaaaa1 100644 --- a/e2e_tests/cli/test_pull.py +++ b/e2e_tests/cli/test_pull.py @@ -16,14 +16,14 @@ def test_pull_with_remote_folder_structure( f"{Path.home()}/.darwin/datasets/{config_values.team_slug}/{local_dataset.slug}/images" ) expected_filepaths = [ - f"{pull_dir}/image_1", - f"{pull_dir}/image_2", - f"{pull_dir}/dir1/image_3", - f"{pull_dir}/dir1/image_4", - f"{pull_dir}/dir2/image_5", - f"{pull_dir}/dir2/image_6", - f"{pull_dir}/dir1/dir3/image_7", - f"{pull_dir}/dir1/dir3/image_8", + f"{pull_dir}/image_1.jpg", + f"{pull_dir}/image_2.jpg", + f"{pull_dir}/dir1/image_3.jpg", + f"{pull_dir}/dir1/image_4.jpg", + f"{pull_dir}/dir2/image_5.jpg", + f"{pull_dir}/dir2/image_6.jpg", + f"{pull_dir}/dir1/dir3/image_7.jpg", + f"{pull_dir}/dir1/dir3/image_8.jpg", ] item_type = "single_slotted" annotation_format = "darwin" diff --git a/e2e_tests/data/import/coco_annotations/output.json b/e2e_tests/data/import/coco_annotations/output.json index 5cf0f25f2..4f7aed3ba 100644 --- a/e2e_tests/data/import/coco_annotations/output.json +++ b/e2e_tests/data/import/coco_annotations/output.json @@ -17,7 +17,7 @@ "images": [ { "license": 0, - "file_name": "image_1", + "file_name": "image_1.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, @@ -30,7 +30,7 @@ }, { "license": 0, - "file_name": "image_2", + "file_name": "image_2.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, @@ -43,7 +43,7 @@ }, { "license": 0, - "file_name": "image_3", + "file_name": "image_3.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, @@ -56,7 +56,7 @@ }, { "license": 0, - "file_name": "image_4", + "file_name": "image_4.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, @@ -69,7 +69,7 @@ }, { "license": 0, - "file_name": "image_5", + "file_name": "image_5.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, @@ -82,7 +82,7 @@ }, { "license": 0, - "file_name": "image_6", + "file_name": "image_6.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, @@ -95,7 +95,7 @@ }, { "license": 0, - "file_name": "image_7", + "file_name": "image_7.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, @@ -108,7 +108,7 @@ }, { "license": 0, - "file_name": "image_8", + "file_name": "image_8.jpg", "coco_url": "n/a", "height": 1080, "width": 1920, diff --git a/e2e_tests/data/import/csv_tag_annotations/csv_tags.csv b/e2e_tests/data/import/csv_tag_annotations/csv_tags.csv index 839b66863..af77d11fa 100644 --- a/e2e_tests/data/import/csv_tag_annotations/csv_tags.csv +++ b/e2e_tests/data/import/csv_tag_annotations/csv_tags.csv @@ -1,8 +1,8 @@ -image_1, test_tag_basic -image_2, test_tag_basic -dir1/image_3, test_tag_basic -dir1/image_4, test_tag_basic -dir2/image_5, test_tag_basic -dir2/image_6, test_tag_basic -dir1/dir3/image_7, test_tag_basic -dir1/dir3/image_8, test_tag_basic \ No newline at end of file +image_1.jpg, test_tag_basic +image_2.jpg, test_tag_basic +dir1/image_3.jpg, test_tag_basic +dir1/image_4.jpg, test_tag_basic +dir2/image_5.jpg, test_tag_basic +dir2/image_6.jpg, test_tag_basic +dir1/dir3/image_7.jpg, test_tag_basic +dir1/dir3/image_8.jpg, test_tag_basic \ No newline at end of file diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_1.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_1.json index 4428eb8b7..f5ef85ade 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_1.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_1.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-94a4-6fbe-8a4d7f9fa15d", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/2ec69e41-91b2-4155-9b05-6ed995677b1e/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9dfc5eac-bf16-4380-a148-9fff6e63b9f0" } diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_2.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_2.json index 217492d92..295514451 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_2.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_2.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-ea77-8fa4-16378bafedb3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5e0b3d9d-9bf8-4166-8949-6ab7392161ad/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4920b12a-1706-47f1-b084-2d2234ed1151" } diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_3.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_3.json index a0d4f9af9..e3bf646c4 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_3.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_3.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-e8ad-986f-ad4942f1bbfc", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ddd13905-9bbb-4fab-9642-bf4604686fda/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/30ec0f13-caaa-4374-be5a-e90b3493fb73" } diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_4.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_4.json index 7da556fb6..b287cf894 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_4.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_4.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-8b50-17e9-c0f178e6eee6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3c731d84-7d7f-4ac8-bbd9-0d53f1d47195/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/609ba1a4-79da-4743-b331-e57ccd9ee518" } diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_5.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_5.json index 114a849eb..6f8489a25 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_5.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_5.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-55bf-d705-8b39dea7fde6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f95e81c-def7-4973-9152-6d0fc39e1473/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/08448a07-4e23-41f9-abbd-0dc149ef2be4" } diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_6.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_6.json index 7f0a0be13..69f01b169 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_6.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_6.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-1832-3a09-1f38557c57b4", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/4950b608-00a1-4e73-b746-bfe1ea0a1ab6/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e070e8c-03b3-40b7-a3cb-6da6bcc8d4ed" } diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_7.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_7.json index 82f5e7861..291156ad8 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_7.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_7.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5d-46ee-5117-53ba0d29d1b0", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/1e2f63eb-b7fc-482f-91f3-8caa242e63cb/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/20de7c08-20dc-4f16-b559-bbcce2f7b319" } diff --git a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_8.json b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_8.json index 72a9e2e40..396e63f72 100644 --- a/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_8.json +++ b/e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_8.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5e-908e-7b24-3d339ea72237", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ace6c9a2-d39a-43df-9fd2-9f124176810a/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/141cdb56-2494-4052-bce2-b22673e6ad68" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_1-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_1-keypoint_ellipse_polygon_bbox.json index 42210df98..299a7be8a 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_1-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_1-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01922dc5-646b-a549-6aa9-ae9f61c95747", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/469c8a89-0557-42ea-a3a1-04f90d9f6b88/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/144dc80d-6bec-4885-b5cb-a174f18000e2" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_2-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_2-keypoint_ellipse_polygon_bbox.json index 1c75907d6..dbfe75fb5 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_2-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_2-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01922dc5-646b-f0b7-9d92-ecc504bba55e", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/7ac2488d-df4e-42b1-bde2-86cbe22d526c/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/3138e283-a72f-4232-be35-0826fcf2ab01" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_3-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_3-keypoint_ellipse_polygon_bbox.json index da4fe6aed..347328378 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_3-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_3-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01922dc5-646b-8c77-0a6f-6c06085e0352", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/a8205e6b-e940-4bb1-b29d-846e78a89086/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/07d711e4-cb84-4848-a188-9b9330ea1038" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_4-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_4-keypoint_ellipse_polygon_bbox.json index 7d5f589b2..c93275f82 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_4-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_4-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01922dc5-646b-299c-e0c2-cb73dccf6d4f", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f48ba52-eee7-457b-829c-01f4af25f20f/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/d127dc20-a63f-492a-912a-f7d875c65251" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_5-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_5-keypoint_ellipse_polygon_bbox.json index 568a33245..d404f0cbc 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_5-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_5-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01922dc5-646c-c805-c2f1-3368dcbaf9ca", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/196805d6-f0da-447b-8b7b-153d20f2eeff/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/6c852f65-79cb-413e-82be-6eefc01c783e" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_6-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_6-keypoint_ellipse_polygon_bbox.json index 9b6faaac8..45ac8ad93 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_6-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_6-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01922dc5-646c-075e-209f-c3f64d2bf0a8", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/e677b814-e6c4-4bf7-a5aa-e9883b612392/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/77191998-6632-42f8-abe9-75df8304decb" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_7-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_7-keypoint_ellipse_polygon_bbox.json index 2f3814db7..c66947c21 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_7-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_7-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01922dc5-646c-98a3-3ee8-03efea8cff21", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/39540d73-2de8-4bc8-8690-c1176f6de2e2/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/1516bad4-ccd7-40fa-abbc-15a82c851f1f" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_8-keypoint_ellipse_polygon_bbox.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_8-keypoint_ellipse_polygon_bbox.json index 175420028..3947635bc 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_8-keypoint_ellipse_polygon_bbox.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-keypoint_ellipse_polygon_bbox/image_8-keypoint_ellipse_polygon_bbox.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01922dc5-646c-3e01-10b9-73f2d06e2ae4", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/52dcfc17-e1ec-45e8-af3a-924ae9764267/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/45f8df38-3022-486f-88da-fa3da2c018e0" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_1-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_1-tag_skeleton_mask_line.json index ede4b571d..cef816049 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_1-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_1-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01922dc5-646b-a549-6aa9-ae9f61c95747", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/469c8a89-0557-42ea-a3a1-04f90d9f6b88/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/144dc80d-6bec-4885-b5cb-a174f18000e2" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_2-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_2-tag_skeleton_mask_line.json index 04513a49c..cdf52a43c 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_2-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_2-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01922dc5-646b-f0b7-9d92-ecc504bba55e", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/7ac2488d-df4e-42b1-bde2-86cbe22d526c/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/3138e283-a72f-4232-be35-0826fcf2ab01" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_3-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_3-tag_skeleton_mask_line.json index b939b36a3..53437a08b 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_3-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_3-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01922dc5-646b-8c77-0a6f-6c06085e0352", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/a8205e6b-e940-4bb1-b29d-846e78a89086/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/07d711e4-cb84-4848-a188-9b9330ea1038" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_4-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_4-tag_skeleton_mask_line.json index b1e21ca65..ff79f4845 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_4-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_4-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01922dc5-646b-299c-e0c2-cb73dccf6d4f", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f48ba52-eee7-457b-829c-01f4af25f20f/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/d127dc20-a63f-492a-912a-f7d875c65251" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_5-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_5-tag_skeleton_mask_line.json index d612dbf98..1bd662c58 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_5-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_5-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01922dc5-646c-c805-c2f1-3368dcbaf9ca", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/196805d6-f0da-447b-8b7b-153d20f2eeff/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/6c852f65-79cb-413e-82be-6eefc01c783e" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_6-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_6-tag_skeleton_mask_line.json index 7105d3f08..0c9e326a3 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_6-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_6-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01922dc5-646c-075e-209f-c3f64d2bf0a8", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/e677b814-e6c4-4bf7-a5aa-e9883b612392/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/77191998-6632-42f8-abe9-75df8304decb" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_7-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_7-tag_skeleton_mask_line.json index 3f3dacc62..91975bab4 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_7-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_7-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01922dc5-646c-98a3-3ee8-03efea8cff21", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/39540d73-2de8-4bc8-8690-c1176f6de2e2/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/1516bad4-ccd7-40fa-abbc-15a82c851f1f" } diff --git a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_8-tag_skeleton_mask_line.json b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_8-tag_skeleton_mask_line.json index 053b5b58c..1b121e2fd 100644 --- a/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_8-tag_skeleton_mask_line.json +++ b/e2e_tests/data/import/image_annotations_split_in_two_files/annotations-tag_skeleton_mask_line/image_8-tag_skeleton_mask_line.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01922dc5-646c-3e01-10b9-73f2d06e2ae4", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/52dcfc17-e1ec-45e8-af3a-924ae9764267/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/45f8df38-3022-486f-88da-fa3da2c018e0" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_1.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_1.json index 65da1a963..43aae827a 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_1.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_1.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-94a4-6fbe-8a4d7f9fa15d", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/2ec69e41-91b2-4155-9b05-6ed995677b1e/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9dfc5eac-bf16-4380-a148-9fff6e63b9f0" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_2.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_2.json index 4feec191e..8fad24ab5 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_2.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_2.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-ea77-8fa4-16378bafedb3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5e0b3d9d-9bf8-4166-8949-6ab7392161ad/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4920b12a-1706-47f1-b084-2d2234ed1151" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_3.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_3.json index fe3e37855..499aef03d 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_3.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_3.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-e8ad-986f-ad4942f1bbfc", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ddd13905-9bbb-4fab-9642-bf4604686fda/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/30ec0f13-caaa-4374-be5a-e90b3493fb73" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_4.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_4.json index 13101ba83..a4429272c 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_4.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_4.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-8b50-17e9-c0f178e6eee6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3c731d84-7d7f-4ac8-bbd9-0d53f1d47195/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/609ba1a4-79da-4743-b331-e57ccd9ee518" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_5.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_5.json index 81e606669..a2de550a3 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_5.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_5.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-55bf-d705-8b39dea7fde6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f95e81c-def7-4973-9152-6d0fc39e1473/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/08448a07-4e23-41f9-abbd-0dc149ef2be4" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_6.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_6.json index 8e924e382..565ff259e 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_6.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_6.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-1832-3a09-1f38557c57b4", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/4950b608-00a1-4e73-b746-bfe1ea0a1ab6/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e070e8c-03b3-40b7-a3cb-6da6bcc8d4ed" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_7.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_7.json index a118205fc..e5bde297a 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_7.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_7.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5d-46ee-5117-53ba0d29d1b0", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/1e2f63eb-b7fc-482f-91f3-8caa242e63cb/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/20de7c08-20dc-4f16-b559-bbcce2f7b319" } diff --git a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_8.json b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_8.json index 406706c7a..f4fb60c64 100644 --- a/e2e_tests/data/import/image_annotations_with_item_level_properties/image_8.json +++ b/e2e_tests/data/import/image_annotations_with_item_level_properties/image_8.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5e-908e-7b24-3d339ea72237", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ace6c9a2-d39a-43df-9fd2-9f124176810a/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/141cdb56-2494-4052-bce2-b22673e6ad68" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_1.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_1.json index f9ded430f..c5255aa3b 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_1.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_1.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-94a4-6fbe-8a4d7f9fa15d", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/2ec69e41-91b2-4155-9b05-6ed995677b1e/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9dfc5eac-bf16-4380-a148-9fff6e63b9f0" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_2.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_2.json index c0340ee59..9a91cd116 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_2.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_2.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-ea77-8fa4-16378bafedb3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5e0b3d9d-9bf8-4166-8949-6ab7392161ad/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4920b12a-1706-47f1-b084-2d2234ed1151" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_3.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_3.json index d81446088..907c2049b 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_3.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_3.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-e8ad-986f-ad4942f1bbfc", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ddd13905-9bbb-4fab-9642-bf4604686fda/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/30ec0f13-caaa-4374-be5a-e90b3493fb73" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_4.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_4.json index 9e4d66c77..dd9c4b30d 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_4.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_4.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-8b50-17e9-c0f178e6eee6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3c731d84-7d7f-4ac8-bbd9-0d53f1d47195/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/609ba1a4-79da-4743-b331-e57ccd9ee518" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_5.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_5.json index 9097e7e6b..85799627c 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_5.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_5.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-55bf-d705-8b39dea7fde6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f95e81c-def7-4973-9152-6d0fc39e1473/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/08448a07-4e23-41f9-abbd-0dc149ef2be4" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_6.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_6.json index 52f4666d6..f784c623a 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_6.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_6.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-1832-3a09-1f38557c57b4", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/4950b608-00a1-4e73-b746-bfe1ea0a1ab6/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e070e8c-03b3-40b7-a3cb-6da6bcc8d4ed" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_7.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_7.json index 22cd4093c..6d1255994 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_7.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_7.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5d-46ee-5117-53ba0d29d1b0", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/1e2f63eb-b7fc-482f-91f3-8caa242e63cb/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/20de7c08-20dc-4f16-b559-bbcce2f7b319" } diff --git a/e2e_tests/data/import/image_annotations_with_subtypes/image_8.json b/e2e_tests/data/import/image_annotations_with_subtypes/image_8.json index 1fe063631..2105274c9 100644 --- a/e2e_tests/data/import/image_annotations_with_subtypes/image_8.json +++ b/e2e_tests/data/import/image_annotations_with_subtypes/image_8.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5e-908e-7b24-3d339ea72237", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ace6c9a2-d39a-43df-9fd2-9f124176810a/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/141cdb56-2494-4052-bce2-b22673e6ad68" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_1.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_1.json index 93c615805..1662c9c76 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_1.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_1.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01920b88-51e0-ce68-bf91-a1bab42246e0", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/b03a6b21-a3f8-492b-999f-62fbd15b444b/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/c2248b2e-9ae6-4db3-97ae-2bb6a0ab2380" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_2.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_2.json index 481e75cbc..2ec788fad 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_2.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_2.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01920b88-51e0-850c-fc38-74479d6aad3e", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5562f5ff-9ea4-43a8-8838-d5e800faea01/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/ce018659-b1b9-465b-bba7-70d894014610" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_3.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_3.json index 0099624fc..a9d1cb250 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_3.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_3.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01920b88-51e0-741b-a23a-168903e65d33", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/e7bc0204-5818-4d91-9455-975d2be5cd46/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e3bfc17-0bae-45d5-9190-59d9caef55fa" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_4.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_4.json index 327bbb96f..ed368d92d 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_4.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_4.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01920b88-51e0-304e-9e0b-dfb9287c1df7", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/aed10b03-2237-4cad-8a86-8b1c658d2409/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/2212b5a1-0dfd-427f-ae60-bc2c8a55884b" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_5.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_5.json index 536316bbd..84b0e3888 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_5.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_5.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01920b88-51e0-30eb-618d-9a8f3679edb3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/72e84b0f-4474-43f6-89e9-78f56665e9cd/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/37c060b2-b114-4af1-9d8a-46ef1900877e" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_6.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_6.json index 25679840b..a1c0f22e5 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_6.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_6.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01920b88-51e0-299f-d91b-ef85ec1507c3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3867bff6-7cb8-4083-83b7-7c74188eb621/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4910e491-2191-43b0-8c3f-cc4240457e0e" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_7.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_7.json index 0a91f20d2..5eef39020 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_7.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_7.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b88-51e0-a0ea-7996-c7856e06e238", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/18110321-6229-4f5a-89db-3ca1e3d2a39d/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/d033e648-80a7-4e51-ae34-4a904a7dfc9b" } diff --git a/e2e_tests/data/import/image_annotations_without_subtypes/image_8.json b/e2e_tests/data/import/image_annotations_without_subtypes/image_8.json index aaa83b842..45ba36bd1 100644 --- a/e2e_tests/data/import/image_annotations_without_subtypes/image_8.json +++ b/e2e_tests/data/import/image_annotations_without_subtypes/image_8.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b88-51e0-1bd8-4aea-602e6a733d30", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/75abc84b-25d1-4e68-b6d7-c455a242a8da/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/403aa7ed-25db-47e8-b871-6926e1c5a0b2" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_1.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_1.json index 81340c5da..328ad56a8 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_1.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_1.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-94a4-6fbe-8a4d7f9fa15d", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/2ec69e41-91b2-4155-9b05-6ed995677b1e/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9dfc5eac-bf16-4380-a148-9fff6e63b9f0" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_2.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_2.json index f11a3432a..69eff4fc9 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_2.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_2.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-ea77-8fa4-16378bafedb3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5e0b3d9d-9bf8-4166-8949-6ab7392161ad/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4920b12a-1706-47f1-b084-2d2234ed1151" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_3.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_3.json index 9e4a699aa..c9c1c1ec1 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_3.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_3.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-e8ad-986f-ad4942f1bbfc", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ddd13905-9bbb-4fab-9642-bf4604686fda/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/30ec0f13-caaa-4374-be5a-e90b3493fb73" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_4.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_4.json index fd71b89a4..4af306407 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_4.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_4.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-8b50-17e9-c0f178e6eee6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3c731d84-7d7f-4ac8-bbd9-0d53f1d47195/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/609ba1a4-79da-4743-b331-e57ccd9ee518" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_5.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_5.json index a9bcba7d8..8ff9892d9 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_5.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_5.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-55bf-d705-8b39dea7fde6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f95e81c-def7-4973-9152-6d0fc39e1473/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/08448a07-4e23-41f9-abbd-0dc149ef2be4" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_6.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_6.json index afdce5011..3684f556f 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_6.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_6.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-1832-3a09-1f38557c57b4", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/4950b608-00a1-4e73-b746-bfe1ea0a1ab6/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e070e8c-03b3-40b7-a3cb-6da6bcc8d4ed" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_7.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_7.json index bcc8a3e44..19918a227 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_7.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_7.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5d-46ee-5117-53ba0d29d1b0", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/1e2f63eb-b7fc-482f-91f3-8caa242e63cb/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/20de7c08-20dc-4f16-b559-bbcce2f7b319" } diff --git a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_8.json b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_8.json index 6fea144e9..0b2ae560c 100644 --- a/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_8.json +++ b/e2e_tests/data/import/image_new_annotations_with_item_level_properties/image_8.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5e-908e-7b24-3d339ea72237", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ace6c9a2-d39a-43df-9fd2-9f124176810a/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/141cdb56-2494-4052-bce2-b22673e6ad68" } diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_1.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_1.json index 9388f7b20..994bde7e1 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_1.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_1.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-94a4-6fbe-8a4d7f9fa15d", @@ -19,7 +19,7 @@ }, "slots": [ { - "type": "image", + "type": "image.jpg", "slot_name": "0", "width": 1920, "height": 1080, diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_2.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_2.json index 047ccf7d0..74778af52 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_2.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_2.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01920b92-1d5d-ea77-8fa4-16378bafedb3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5e0b3d9d-9bf8-4166-8949-6ab7392161ad/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4920b12a-1706-47f1-b084-2d2234ed1151" } diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_3.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_3.json index acf1ee737..d04dfb70e 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_3.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_3.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-e8ad-986f-ad4942f1bbfc", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ddd13905-9bbb-4fab-9642-bf4604686fda/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/30ec0f13-caaa-4374-be5a-e90b3493fb73" } diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_4.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_4.json index 5466811d6..5abb2be92 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_4.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_4.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01920b92-1d5d-8b50-17e9-c0f178e6eee6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3c731d84-7d7f-4ac8-bbd9-0d53f1d47195/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/609ba1a4-79da-4743-b331-e57ccd9ee518" } diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_5.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_5.json index 46ea3cb8b..8dcbcb7f2 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_5.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_5.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-55bf-d705-8b39dea7fde6", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f95e81c-def7-4973-9152-6d0fc39e1473/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/08448a07-4e23-41f9-abbd-0dc149ef2be4" } diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_6.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_6.json index 9c707e0c9..dc896b0c7 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_6.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_6.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01920b92-1d5d-1832-3a09-1f38557c57b4", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/4950b608-00a1-4e73-b746-bfe1ea0a1ab6/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e070e8c-03b3-40b7-a3cb-6da6bcc8d4ed" } diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_7.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_7.json index 44f1c246e..ab5c04796 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_7.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_7.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5d-46ee-5117-53ba0d29d1b0", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/1e2f63eb-b7fc-482f-91f3-8caa242e63cb/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/20de7c08-20dc-4f16-b559-bbcce2f7b319" } diff --git a/e2e_tests/data/import/image_new_annotations_with_properties/image_8.json b/e2e_tests/data/import/image_new_annotations_with_properties/image_8.json index 16e03b845..39da838ab 100644 --- a/e2e_tests/data/import/image_new_annotations_with_properties/image_8.json +++ b/e2e_tests/data/import/image_new_annotations_with_properties/image_8.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b92-1d5e-908e-7b24-3d339ea72237", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ace6c9a2-d39a-43df-9fd2-9f124176810a/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/141cdb56-2494-4052-bce2-b22673e6ad68" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_1.json b/e2e_tests/data/import/image_new_basic_annotations/image_1.json index c35c9c871..50e8c0acb 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_1.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_1.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_1", + "name": "image_1.jpg", "path": "/", "source_info": { "item_id": "01920b88-51e0-ce68-bf91-a1bab42246e0", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/b03a6b21-a3f8-492b-999f-62fbd15b444b/thumbnail", "source_files": [ { - "file_name": "image_1", + "file_name": "image_1.jpg", "storage_key": "darwin-py/images/image_1.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/c2248b2e-9ae6-4db3-97ae-2bb6a0ab2380" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_2.json b/e2e_tests/data/import/image_new_basic_annotations/image_2.json index 58f01c0b7..7c54f74be 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_2.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_2.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_2", + "name": "image_2.jpg", "path": "/", "source_info": { "item_id": "01920b88-51e0-850c-fc38-74479d6aad3e", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5562f5ff-9ea4-43a8-8838-d5e800faea01/thumbnail", "source_files": [ { - "file_name": "image_2", + "file_name": "image_2.jpg", "storage_key": "darwin-py/images/image_2.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/ce018659-b1b9-465b-bba7-70d894014610" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_3.json b/e2e_tests/data/import/image_new_basic_annotations/image_3.json index f73ac8f17..92eaa5a29 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_3.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_3.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_3", + "name": "image_3.jpg", "path": "/dir1", "source_info": { "item_id": "01920b88-51e0-741b-a23a-168903e65d33", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/e7bc0204-5818-4d91-9455-975d2be5cd46/thumbnail", "source_files": [ { - "file_name": "image_3", + "file_name": "image_3.jpg", "storage_key": "darwin-py/images/image_3.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e3bfc17-0bae-45d5-9190-59d9caef55fa" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_4.json b/e2e_tests/data/import/image_new_basic_annotations/image_4.json index dd8377785..fc9505809 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_4.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_4.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_4", + "name": "image_4.jpg", "path": "/dir1", "source_info": { "item_id": "01920b88-51e0-304e-9e0b-dfb9287c1df7", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/aed10b03-2237-4cad-8a86-8b1c658d2409/thumbnail", "source_files": [ { - "file_name": "image_4", + "file_name": "image_4.jpg", "storage_key": "darwin-py/images/image_4.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/2212b5a1-0dfd-427f-ae60-bc2c8a55884b" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_5.json b/e2e_tests/data/import/image_new_basic_annotations/image_5.json index e4281e572..2bcaba25d 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_5.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_5.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_5", + "name": "image_5.jpg", "path": "/dir2", "source_info": { "item_id": "01920b88-51e0-30eb-618d-9a8f3679edb3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/72e84b0f-4474-43f6-89e9-78f56665e9cd/thumbnail", "source_files": [ { - "file_name": "image_5", + "file_name": "image_5.jpg", "storage_key": "darwin-py/images/image_5.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/37c060b2-b114-4af1-9d8a-46ef1900877e" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_6.json b/e2e_tests/data/import/image_new_basic_annotations/image_6.json index 44a2fe297..42d766ba2 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_6.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_6.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_6", + "name": "image_6.jpg", "path": "/dir2", "source_info": { "item_id": "01920b88-51e0-299f-d91b-ef85ec1507c3", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3867bff6-7cb8-4083-83b7-7c74188eb621/thumbnail", "source_files": [ { - "file_name": "image_6", + "file_name": "image_6.jpg", "storage_key": "darwin-py/images/image_6.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4910e491-2191-43b0-8c3f-cc4240457e0e" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_7.json b/e2e_tests/data/import/image_new_basic_annotations/image_7.json index 3cfc7e80c..0b032846a 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_7.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_7.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_7", + "name": "image_7.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b88-51e0-a0ea-7996-c7856e06e238", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/18110321-6229-4f5a-89db-3ca1e3d2a39d/thumbnail", "source_files": [ { - "file_name": "image_7", + "file_name": "image_7.jpg", "storage_key": "darwin-py/images/image_7.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/d033e648-80a7-4e51-ae34-4a904a7dfc9b" } diff --git a/e2e_tests/data/import/image_new_basic_annotations/image_8.json b/e2e_tests/data/import/image_new_basic_annotations/image_8.json index 48f1314d6..6071bf44c 100644 --- a/e2e_tests/data/import/image_new_basic_annotations/image_8.json +++ b/e2e_tests/data/import/image_new_basic_annotations/image_8.json @@ -2,7 +2,7 @@ "version": "2.0", "schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json", "item": { - "name": "image_8", + "name": "image_8.jpg", "path": "/dir1/dir3", "source_info": { "item_id": "01920b88-51e0-1bd8-4aea-602e6a733d30", @@ -26,7 +26,7 @@ "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/75abc84b-25d1-4e68-b6d7-c455a242a8da/thumbnail", "source_files": [ { - "file_name": "image_8", + "file_name": "image_8.jpg", "storage_key": "darwin-py/images/image_8.jpg", "url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/403aa7ed-25db-47e8-b871-6926e1c5a0b2" } diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_1.xml b/e2e_tests/data/import/pascal_voc_annotations/image_1.xml index 4e19ec558..353df6edd 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_1.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_1.xml @@ -1 +1 @@ -imagesimage_1images/image_1darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesimage_1.jpgimages/image_1.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_2.xml b/e2e_tests/data/import/pascal_voc_annotations/image_2.xml index 201c58e62..128fee2d9 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_2.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_2.xml @@ -1 +1 @@ -imagesimage_2images/image_2darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesimage_2.jpgimages/image_2.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_3.xml b/e2e_tests/data/import/pascal_voc_annotations/image_3.xml index 9d1d121af..d3f0f3507 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_3.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_3.xml @@ -1 +1 @@ -imagesdir1/image_3images/image_3darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesdir1/image_3.jpgimages/image_3.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_4.xml b/e2e_tests/data/import/pascal_voc_annotations/image_4.xml index 2dc5225cb..165408e48 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_4.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_4.xml @@ -1 +1 @@ -imagesdir1/image_4images/image_4darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesdir1/image_4.jpgimages/image_4.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_5.xml b/e2e_tests/data/import/pascal_voc_annotations/image_5.xml index 028ff26e6..16a0ebca1 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_5.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_5.xml @@ -1 +1 @@ -imagesdir2/image_5images/image_5darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesdir2/image_5.jpgimages/image_5.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_6.xml b/e2e_tests/data/import/pascal_voc_annotations/image_6.xml index b8750999e..1a4d9658e 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_6.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_6.xml @@ -1 +1 @@ -imagesdir2/image_6images/image_6darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesdir2/image_6.jpgimages/image_6.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_7.xml b/e2e_tests/data/import/pascal_voc_annotations/image_7.xml index 434c19dce..61c1ea42c 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_7.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_7.xml @@ -1 +1 @@ -imagesdir1/dir3/image_7images/image_7darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesdir1/dir3/image_7.jpgimages/image_7.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/data/import/pascal_voc_annotations/image_8.xml b/e2e_tests/data/import/pascal_voc_annotations/image_8.xml index 21cf80168..eb8ee873f 100644 --- a/e2e_tests/data/import/pascal_voc_annotations/image_8.xml +++ b/e2e_tests/data/import/pascal_voc_annotations/image_8.xml @@ -1 +1 @@ -imagesdir1/dir3/image_8images/image_8darwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file +imagesdir1/dir3/image_8.jpgimages/image_8.jpgdarwin1920108030test_bounding_box_basicUnspecified00681512test_bounding_box_basicUnspecified0016182320 \ No newline at end of file diff --git a/e2e_tests/helpers.py b/e2e_tests/helpers.py index b4537a476..7ffdf887d 100644 --- a/e2e_tests/helpers.py +++ b/e2e_tests/helpers.py @@ -196,6 +196,7 @@ def export_release( annotation_format: str, local_dataset: E2EDataset, config_values: ConfigValues, + release_name: Optional[str] = "all-files", ) -> Release: """ Creates an export of all items in the given dataset. @@ -206,7 +207,6 @@ def export_release( team_slug = config_values.team_slug api_key = config_values.api_key base_url = config_values.server - export_name = "all-files" create_export_url = ( f"{base_url}/api/v2/teams/{team_slug}/datasets/{dataset_slug}/exports" ) @@ -221,7 +221,7 @@ def export_release( "include_authorship": False, "include_export_token": False, "format": f"{annotation_format}", - "name": f"{export_name}", + "name": f"{release_name}", } headers = { "accept": "application/json", @@ -239,7 +239,7 @@ def export_release( response = requests.get(list_export_url, headers=headers) exports = response.json() for export in exports: - if export["name"] == export_name and export["status"] == "complete": + if export["name"] == release_name and export["status"] == "complete": export_data = export ready = True diff --git a/e2e_tests/objects.py b/e2e_tests/objects.py index 8a538a15c..d0639be89 100644 --- a/e2e_tests/objects.py +++ b/e2e_tests/objects.py @@ -142,6 +142,28 @@ def get_annotation_data( return item_annotations, annotation_classes, properties + def delete_items(self, config_values: ConfigValues) -> None: + """ + Permanently deletes all items in the dataset + """ + headers = { + "Content-Type": "application/json", + "Accept": "application/json", + "Authorization": f"ApiKey {config_values.api_key}", + } + payload = { + "filters": { + "dataset_ids": [self.id], + "item_ids": [str(item.id) for item in self.items], + } + } + response = requests.delete( + f"{config_values.server}/api/v2/teams/{config_values.team_slug}/items", + headers=headers, + json=payload, + ) + response.raise_for_status() + def get_read_only_registration_payload( item_type: str, @@ -166,7 +188,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_1_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_1", + "name": "image_1.jpg", }, { "path": path or "/", @@ -175,7 +197,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_2_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_2", + "name": "image_2.jpg", }, { "path": path or "dir1", @@ -184,7 +206,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_3_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_3", + "name": "image_3.jpg", }, { "path": path or "dir1", @@ -193,7 +215,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_4_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_4", + "name": "image_4.jpg", }, { "path": path or "dir2", @@ -202,7 +224,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_5_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_5", + "name": "image_5.jpg", }, { "path": path or "dir2", @@ -211,7 +233,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_6_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_6", + "name": "image_6.jpg", }, { "path": path or "dir1/dir3", @@ -220,7 +242,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_7_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_7", + "name": "image_7.jpg", }, { "path": path or "dir1/dir3", @@ -229,7 +251,7 @@ def get_read_only_registration_payload( "storage_thumbnail_key": "darwin-py/images/image_8_thumbnail.jpg", "height": 1080, "width": 1920, - "name": "image_8", + "name": "image_8.jpg", }, ], "multi_slotted": [