Skip to content

[ANN-2419][internal] Make mask annotation's sparse_rle field optional #659

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 2 commits into from
Sep 13, 2023
Merged

[ANN-2419][internal] Make mask annotation's sparse_rle field optional #659

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
762ff9d
[ANN-2419][internal] Make mask annotation's sparse_rle field optional
AndriiKlymchuk Sep 13, 2023
ff2ebd8
fix equality comparisons
AndriiKlymchuk Sep 13, 2023
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
9 changes: 3 additions & 6 deletions darwin/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,19 +764,16 @@ def _parse_darwin_raster_annotation(annotation: dict) -> Optional[dt.Annotation]


def _parse_darwin_mask_annotation(annotation: dict) -> Optional[dt.Annotation]:
if not annotation.get("mask"):
raise ValueError("Mask annotation must have a 'mask' field")

Copy link
Contributor Author

@AndriiKlymchuk AndriiKlymchuk Sep 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need in this condition as it checked one more time below.

id: Optional[str] = annotation.get("id")
name: Optional[str] = annotation.get("name")
mask: Optional[dt.JSONFreeForm] = annotation.get("mask")
slot_names: Optional[List[str]] = parse_slot_names(annotation)

if not id or not name or not mask or not slot_names:
if not id or not name or mask is None or not slot_names:
raise ValueError("Mask annotation must have an 'id', 'name', 'slot_names' and 'mask' field")

if (not "sparse_rle" in mask) or (not mask["sparse_rle"]) == None:
raise ValueError("Mask annotation must have a 'sparse_rle' field containing a null value")
if ("sparse_rle" in mask) and (mask["sparse_rle"] is not None):
raise ValueError("Mask annotation field 'sparse_rle' must contain a null value")

new_annotation = dt.Annotation(
dt.AnnotationClass(name, "mask"),
Expand Down