Skip to content

[DAR-2606][External] Strip leading & trailing whitespaces from class names when reading Darwin JSON annotations #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2024
Merged

[DAR-2606][External] Strip leading & trailing whitespaces from class names when reading Darwin JSON annotations #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions darwin/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ def _parse_darwin_annotation(
annotation_data: Optional[Dict] = None,
) -> Optional[dt.Annotation]:
slot_names = parse_slot_names(annotation)
name: str = annotation["name"]
name: str = annotation["name"].strip()
main_annotation: Optional[dt.Annotation] = None

# Darwin JSON 2.0 representation of polygons
Expand Down Expand Up @@ -933,7 +933,7 @@ def update_annotation_data(


def _parse_darwin_video_annotation(annotation: dict) -> Optional[dt.VideoAnnotation]:
name = annotation["name"]
name = annotation["name"].strip()
frame_annotations = {}
keyframes: Dict[int, bool] = {}
frames = {**annotation.get("frames", {}), **annotation.get("sections", {})}
Expand Down Expand Up @@ -1088,7 +1088,7 @@ def _parse_darwin_raster_annotation(annotation: dict) -> Optional[dt.Annotation]
)

new_annotation = dt.Annotation(
dt.AnnotationClass(name, "raster_layer"),
dt.AnnotationClass(name.strip(), "raster_layer"),
{
"dense_rle": dense_rle,
"mask_annotation_ids_mapping": mask_annotation_ids_mapping,
Expand All @@ -1114,7 +1114,7 @@ def _parse_darwin_mask_annotation(annotation: dict) -> Optional[dt.Annotation]:
raise ValueError("Mask annotation field 'sparse_rle' must contain a null value")

new_annotation = dt.Annotation(
dt.AnnotationClass(name, "mask"),
dt.AnnotationClass(name.strip(), "mask"),
mask,
slot_names=slot_names or [],
id=id,
Expand Down
171 changes: 171 additions & 0 deletions tests/darwin/utils_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,177 @@ def test_imports_multiple_skeletetons(self, tmp_path):
== "skeleton"
)

def test_removes_class_name_whitespace(self, tmp_path):
content = """
{
"version": "2.0",
"schema_ref": "https://darwin-public.s3.eu-west-1.amazonaws.com/darwin_json/2.0/schema.json",
"item": {
"name": "000000007764.jpg",
"path": "/",
"source_info": {
"item_id": "018c4450-d91d-cbaf-5925-04d541090ad4",
"dataset": {
"name": "bbox",
"slug": "bbox",
"dataset_management_url": "https://darwin.v7labs.com/datasets/623079/dataset-management"
},
"team": {
"name": "V7 John",
"slug": "v7-john"
},
"workview_url": "https://darwin.v7labs.com/workview?dataset=623079&item=018c4450-d91d-cbaf-5925-04d541090ad4"
},
"slots": [
{
"type": "image",
"slot_name": "0",
"width": 640,
"height": 436,
"thumbnail_url": "https://darwin.v7labs.com/api/v2/teams/v7-john/files/f4fb3153-c6ab-49a7-bbcd-97da468eef08/thumbnail",
"source_files": [
{
"file_name": "000000007764.jpg",
"url": "https://darwin.v7labs.com/api/v2/teams/v7-john/uploads/a0450e59-fe5f-44df-b2f8-39f4de289ed7"
}
]
}
]
},
"annotations": [
{
"bounding_box": {
"h": 72.864,
"w": 113.739,
"x": 115.033,
"y": 93.005
},
"id": "47653e82-bfd9-49f5-9cb5-ab77295b1e65",
"instance_id": {
"value": 528
},
"name": "bbox",
"properties": [],
"slot_names": [
"0"
]
},
{
"bounding_box": {
"h": 61.609,
"w": 84.712,
"x": 303.413,
"y": 178.902
},
"id": "5d32d9de-91af-43bd-b049-223666b7615f",
"name": "curia ",
"properties": [],
"slot_names": [
"0"
]
},
{
"id": "ff661fae-7091-494a-8cdf-12f294ecb161",
"name": " foo ",
"properties": [],
"slot_names": [
"0"
],
"tag": {}
},
{
"id": "6092e58b-d9e4-46a9-b6ea-1721ec84ee96",
"mask": {},
"name": "mask_1 ",
"properties": [],
"slot_names": [
"0"
]
},
{
"id": "e0bb3df3-912f-4988-abc8-f90d06c5dfae",
"name": " __raster_layer__",
"properties": [],
"raster_layer": {
"dense_rle": [
0,
36126,
1,
4,
0,
633,
1,
7,
0,
629,
1,
11,
0,
625,
1,
16,
0,
621,
1,
19,
0,
617,
1,
23,
0,
620,
1,
20,
0,
623,
1,
17,
0,
627,
1,
13,
0,
630,
1,
11,
0,
633,
1,
7,
0,
636,
1,
4,
0,
235868
],
"mask_annotation_ids_mapping": {
"6092e58b-d9e4-46a9-b6ea-1721ec84ee96": 1
},
"total_pixels": 279040
},
"slot_names": [
"0"
]
}
]
}
"""

directory = tmp_path / "imports"
directory.mkdir()
import_file = directory / "darwin-file.json"
import_file.write_text(content)

annotation_file: dt.AnnotationFile = parse_darwin_json(import_file, None)
assert annotation_file.annotations[0].annotation_class.name == "bbox"
assert annotation_file.annotations[1].annotation_class.name == "curia"
assert annotation_file.annotations[2].annotation_class.name == "foo"
assert (
annotation_file.annotations[3].annotation_class.name == "__raster_layer__"
)
assert annotation_file.annotations[4].annotation_class.name == "mask_1"

def test_returns_true_w_json_content_type(self):
response: Response = Response()
response.headers["content-type"] = "application/json"
Expand Down