Skip to content

Commit

Permalink
Import item-level properties without annotations (#948)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JBWilkie
JBWilkie authored Oct 24, 2024
1 parent 3ead5c9 commit 1a17d18
Show file tree
Hide file tree
Showing 10 changed files with 429 additions and 1 deletion.
3 changes: 2 additions & 1 deletion darwin/importer/importer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,8 @@ def process_local_file(local_file):
files_to_not_track = [
file_to_track
for file_to_track in parsed_files
if not file_to_track.annotations and (not delete_for_empty)
if not (file_to_track.annotations or file_to_track.item_properties)
and (not delete_for_empty)
]

for file in files_to_not_track:
Expand Down
11 changes: 11 additions & 0 deletions e2e_tests/cli/test_import.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,17 @@ def test_import_existing_item_level_properties(
)


def test_item_level_properties_can_be_imported_without_annotations(
local_dataset: E2EDataset, config_values: ConfigValues
) -> None:
run_import_test(
local_dataset,
config_values,
item_type="single_slotted",
annotations_subdir="image_annotations_item_level_properties_no_annotations",
)


def test_item_level_property_classes_are_created_on_import(
local_dataset: E2EDataset, config_values: ConfigValues
) -> None:
Expand Down
52 changes: 52 additions & 0 deletions e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": "2.0",
"schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json",
"item": {
"name": "image_1",
"path": "/",
"source_info": {
"item_id": "01920b92-1d5d-94a4-6fbe-8a4d7f9fa15d",
"dataset": {
"name": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"slug": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"dataset_management_url": "https://staging.v7labs.com/datasets/339501/dataset-management"
},
"team": {
"name": "E2E Testing",
"slug": "e2e-testing"
},
"workview_url": "https://staging.v7labs.com/workview?dataset=339501&item=01920b92-1d5d-94a4-6fbe-8a4d7f9fa15d"
},
"slots": [
{
"type": "image",
"slot_name": "0",
"width": 1920,
"height": 1080,
"thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/2ec69e41-91b2-4155-9b05-6ed995677b1e/thumbnail",
"source_files": [
{
"file_name": "image_1",
"storage_key": "darwin-py/images/image_1.jpg",
"url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9dfc5eac-bf16-4380-a148-9fff6e63b9f0"
}
]
}
]
},
"annotations": [],
"properties": [
{
"name": "test_item_level_property_multi_select",
"value": "1"
},
{
"name": "test_item_level_property_multi_select",
"value": "2"
},
{
"name": "test_item_level_property_single_select",
"value": "1"
}
]
}
52 changes: 52 additions & 0 deletions e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": "2.0",
"schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json",
"item": {
"name": "image_2",
"path": "/",
"source_info": {
"item_id": "01920b92-1d5d-ea77-8fa4-16378bafedb3",
"dataset": {
"name": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"slug": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"dataset_management_url": "https://staging.v7labs.com/datasets/339501/dataset-management"
},
"team": {
"name": "E2E Testing",
"slug": "e2e-testing"
},
"workview_url": "https://staging.v7labs.com/workview?dataset=339501&item=01920b92-1d5d-ea77-8fa4-16378bafedb3"
},
"slots": [
{
"type": "image",
"slot_name": "0",
"width": 1920,
"height": 1080,
"thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/5e0b3d9d-9bf8-4166-8949-6ab7392161ad/thumbnail",
"source_files": [
{
"file_name": "image_2",
"storage_key": "darwin-py/images/image_2.jpg",
"url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/4920b12a-1706-47f1-b084-2d2234ed1151"
}
]
}
]
},
"annotations": [],
"properties": [
{
"name": "test_item_level_property_multi_select",
"value": "1"
},
{
"name": "test_item_level_property_multi_select",
"value": "2"
},
{
"name": "test_item_level_property_single_select",
"value": "1"
}
]
}
52 changes: 52 additions & 0 deletions e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_3.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": "2.0",
"schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json",
"item": {
"name": "image_3",
"path": "/dir1",
"source_info": {
"item_id": "01920b92-1d5d-e8ad-986f-ad4942f1bbfc",
"dataset": {
"name": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"slug": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"dataset_management_url": "https://staging.v7labs.com/datasets/339501/dataset-management"
},
"team": {
"name": "E2E Testing",
"slug": "e2e-testing"
},
"workview_url": "https://staging.v7labs.com/workview?dataset=339501&item=01920b92-1d5d-e8ad-986f-ad4942f1bbfc"
},
"slots": [
{
"type": "image",
"slot_name": "0",
"width": 1920,
"height": 1080,
"thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/ddd13905-9bbb-4fab-9642-bf4604686fda/thumbnail",
"source_files": [
{
"file_name": "image_3",
"storage_key": "darwin-py/images/image_3.jpg",
"url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/30ec0f13-caaa-4374-be5a-e90b3493fb73"
}
]
}
]
},
"annotations": [],
"properties": [
{
"name": "test_item_level_property_multi_select",
"value": "1"
},
{
"name": "test_item_level_property_multi_select",
"value": "2"
},
{
"name": "test_item_level_property_single_select",
"value": "1"
}
]
}
52 changes: 52 additions & 0 deletions e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_4.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": "2.0",
"schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json",
"item": {
"name": "image_4",
"path": "/dir1",
"source_info": {
"item_id": "01920b92-1d5d-8b50-17e9-c0f178e6eee6",
"dataset": {
"name": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"slug": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"dataset_management_url": "https://staging.v7labs.com/datasets/339501/dataset-management"
},
"team": {
"name": "E2E Testing",
"slug": "e2e-testing"
},
"workview_url": "https://staging.v7labs.com/workview?dataset=339501&item=01920b92-1d5d-8b50-17e9-c0f178e6eee6"
},
"slots": [
{
"type": "image",
"slot_name": "0",
"width": 1920,
"height": 1080,
"thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/3c731d84-7d7f-4ac8-bbd9-0d53f1d47195/thumbnail",
"source_files": [
{
"file_name": "image_4",
"storage_key": "darwin-py/images/image_4.jpg",
"url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/609ba1a4-79da-4743-b331-e57ccd9ee518"
}
]
}
]
},
"annotations": [],
"properties": [
{
"name": "test_item_level_property_multi_select",
"value": "1"
},
{
"name": "test_item_level_property_multi_select",
"value": "2"
},
{
"name": "test_item_level_property_single_select",
"value": "1"
}
]
}
52 changes: 52 additions & 0 deletions e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_5.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": "2.0",
"schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json",
"item": {
"name": "image_5",
"path": "/dir2",
"source_info": {
"item_id": "01920b92-1d5d-55bf-d705-8b39dea7fde6",
"dataset": {
"name": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"slug": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"dataset_management_url": "https://staging.v7labs.com/datasets/339501/dataset-management"
},
"team": {
"name": "E2E Testing",
"slug": "e2e-testing"
},
"workview_url": "https://staging.v7labs.com/workview?dataset=339501&item=01920b92-1d5d-55bf-d705-8b39dea7fde6"
},
"slots": [
{
"type": "image",
"slot_name": "0",
"width": 1920,
"height": 1080,
"thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/8f95e81c-def7-4973-9152-6d0fc39e1473/thumbnail",
"source_files": [
{
"file_name": "image_5",
"storage_key": "darwin-py/images/image_5.jpg",
"url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/08448a07-4e23-41f9-abbd-0dc149ef2be4"
}
]
}
]
},
"annotations": [],
"properties": [
{
"name": "test_item_level_property_multi_select",
"value": "1"
},
{
"name": "test_item_level_property_multi_select",
"value": "2"
},
{
"name": "test_item_level_property_single_select",
"value": "1"
}
]
}
52 changes: 52 additions & 0 deletions e2e_tests/data/import/image_annotations_item_level_properties_no_annotations/image_6.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": "2.0",
"schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json",
"item": {
"name": "image_6",
"path": "/dir2",
"source_info": {
"item_id": "01920b92-1d5d-1832-3a09-1f38557c57b4",
"dataset": {
"name": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"slug": "test_dataset_2edf4430-1a35-45a2-8c45-b0325968bee2",
"dataset_management_url": "https://staging.v7labs.com/datasets/339501/dataset-management"
},
"team": {
"name": "E2E Testing",
"slug": "e2e-testing"
},
"workview_url": "https://staging.v7labs.com/workview?dataset=339501&item=01920b92-1d5d-1832-3a09-1f38557c57b4"
},
"slots": [
{
"type": "image",
"slot_name": "0",
"width": 1920,
"height": 1080,
"thumbnail_url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/files/4950b608-00a1-4e73-b746-bfe1ea0a1ab6/thumbnail",
"source_files": [
{
"file_name": "image_6",
"storage_key": "darwin-py/images/image_6.jpg",
"url": "https://staging.v7labs.com/api/v2/teams/e2e-testing/uploads/9e070e8c-03b3-40b7-a3cb-6da6bcc8d4ed"
}
]
}
]
},
"annotations": [],
"properties": [
{
"name": "test_item_level_property_multi_select",
"value": "1"
},
{
"name": "test_item_level_property_multi_select",
"value": "2"
},
{
"name": "test_item_level_property_single_select",
"value": "1"
}
]
}
Loading

0 comments on commit 1a17d18

Please sign in to comment.