Skip to content

Update pixel schema #7

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
dshabin merged 3 commits into from
Jan 18, 2022
Merged

Update pixel schema #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1ee13e
Update pixel schema
dshabin Jan 18, 2022
7d7384b
Add tests
dshabin Jan 18, 2022
e538ca1
Update Base model import
dshabin Jan 18, 2022
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: 8 additions & 0 deletions src/superannotate_schemas/schemas/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from pydantic import StrRegexError
from pydantic import ValidationError
from pydantic.error_wrappers import ErrorWrapper
from pydantic.errors import EnumMemberError
from pydantic import validator
from pydantic.validators import strict_str_validator
from pydantic.color import Color
Expand All @@ -32,6 +33,13 @@
from superannotate_schemas.schemas.constances import INVALID_DICT_MESSAGE


def enum_error_handling(self) -> str:
permitted = ", ".join(repr(v.value) for v in self.enum_values)
return f"Invalid value, permitted: {permitted}"


EnumMemberError.__str__ = enum_error_handling

NotEmptyStr = constr(strict=True, min_length=1)

StrictNumber = Union[StrictInt, StrictFloat]
Expand Down
1 change: 0 additions & 1 deletion src/superannotate_schemas/schemas/external/pixel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class AnnotationPart(BaseModel):

class AnnotationInstance(BaseImageAnnotationInstance):
parts: List[AnnotationPart]
class_name: StrictStr = Field(alias="className")
attributes: Optional[List[Attribute]] = Field(list())


Expand Down
3 changes: 2 additions & 1 deletion src/superannotate_schemas/schemas/internal/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from superannotate_schemas.schemas.base import Tag
from superannotate_schemas.schemas.base import NotEmptyStr

from pydantic import BaseModel
from superannotate_schemas.schemas.base import BaseModel

from pydantic import Field
from pydantic import StrictStr

Expand Down
2 changes: 1 addition & 1 deletion src/superannotate_schemas/schemas/internal/pixel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from superannotate_schemas.schemas.base import BaseImageAnnotationInstance
from superannotate_schemas.schemas.base import Tag
from superannotate_schemas.schemas.base import Comment
from superannotate_schemas.schemas.base import BaseModel

from pydantic import BaseModel
from pydantic import StrictInt
from pydantic import Field

Expand Down
2 changes: 1 addition & 1 deletion src/superannotate_schemas/schemas/internal/vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from superannotate_schemas.schemas.base import VectorAnnotationTypeEnum
from superannotate_schemas.schemas.base import StrictNumber
from superannotate_schemas.schemas.base import INVALID_DICT_MESSAGE
from superannotate_schemas.schemas.base import BaseModel

from pydantic import BaseModel
from pydantic import StrictInt
from pydantic import StrictFloat
from pydantic import conlist
Expand Down
2 changes: 1 addition & 1 deletion src/superannotate_schemas/schemas/internal/video.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from superannotate_schemas.schemas.base import Tag
from superannotate_schemas.schemas.base import AnnotationStatusEnum

from pydantic import BaseModel
from superannotate_schemas.schemas.base import BaseModel
from pydantic import StrictFloat
from pydantic import constr
from pydantic import Field
Expand Down
160 changes: 160 additions & 0 deletions tests/test_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2050,3 +2050,163 @@ def test_validate_vector_empty_annotation(self):
data = json.loads(f.read())
validator = AnnotationValidators.get_validator("vector")(data)
self.assertTrue(validator.is_valid())


def test_validate_pixel_annotation_instance_without_class_name(self):
with tempfile.TemporaryDirectory() as tmpdir_name:
with open(f"{tmpdir_name}/pixel.json", "w") as pix_json:
pix_json.write(
'''
{
"metadata": {
"name": "example_image_1.jpg",
"lastAction": {
"email": "shab.prog@gmail.com",
"timestamp": 1637306216
}
},
"instances": [
{
"creationType": "Preannotation",
"classId": 887060,
"visible": true,
"probability": 100,
"attributes": [
{
"id": 1223660,
"groupId": 358141,
"name": "no",
"groupName": "small"
}
],
"parts": [
{
"color": "#000447"
}
]
}
],
"tags": [],
"comments": []
}
'''
)

with open(f"{tmpdir_name}/pixel.json", "r") as f:
data = json.loads(f.read())
validator = AnnotationValidators.get_validator("pixel")(data)
self.assertTrue(validator.is_valid())


def test_validate_document_wrong_meta_data(self):
with tempfile.TemporaryDirectory() as tmpdir_name:
path = f"{tmpdir_name}/test_validate_document_annotation_without_classname.json"
with open(path, "w") as test_validate_document_annotation_without_classname:
test_validate_document_annotation_without_classname.write(
'''
{
"metadata": {
"name": "text_file_example_1",
"status": "NotStarted",
"width": ["fsda" ,1],
"height" : ["dfsadfsdf"],
"is_pinned": "afdasdfadf",
"url": "https://sa-public-files.s3.us-west-2.amazonaws.com/Text+project/text_file_example_1.txt",
"projectId": 167826,
"annotatorEmail": null,
"qaEmail": null,
"lastAction": {
"email": "some.email@gmail.com",
"timestamp": 1636620976450
}
},
"instances": [],
"tags": [],
"freeText": ""
}
'''
)
with open(path, "r") as f:
data = json.loads(f.read())
validator = AnnotationValidators.get_validator("vector")(data)
validator.is_valid()
print(validator.generate_report())
self.assertFalse(validator.is_valid())
self.assertEqual(len(validator.generate_report()), 155)

def test_validate_vector_empty_annotation_bad_role(self):
with tempfile.TemporaryDirectory() as tmpdir_name:
with open(f"{tmpdir_name}/vector_empty.json", "w") as vector_empty:
vector_empty.write(
'''
{
"metadata":{
"lastAction":{
"email":"test@test.com",
"timestamp":1641910273710
},
"width":480,
"height":270,
"name":"1 copy_001.jpg",
"projectId":181302,
"isPredicted":false,
"status":"Completed",
"pinned":false,
"annotatorEmail":null,
"qaEmail":null
},
"comments":[

],
"tags":[

],
"instances":[
{
"type":"rbbox",
"classId":901659,
"probability":100,
"points":{
"x1":213.57,
"y1":74.08,
"x2":275.65,
"y2":128.66,
"x3":238.51,
"y3":170.92,
"x4":176.43,
"y4":116.34
},
"groupId":0,
"pointLabels":{

},
"locked":false,
"visible":true,
"attributes":[

],
"trackingId":null,
"error":null,
"createdAt":"2022-01-11T14:11:30.772Z",
"createdBy":{
"email":"test@test.com",
"role":"bad_role"
},
"creationType":"Manual",
"updatedAt":"2022-01-11T14:11:35.852Z",
"updatedBy":{
"email":"test@test.com",
"role":"Admin"
},
"className":"df"
}
]
}
'''
)

with open(f"{tmpdir_name}/vector_empty.json", "r") as f:
data = json.loads(f.read())
validator = AnnotationValidators.get_validator("vector")(data)
self.assertFalse(validator.is_valid())
self.assertEqual(len(validator.generate_report()), 113)