From 3c32e0c6acc451ba9da7290dec496d47ae69835a Mon Sep 17 00:00:00 2001 From: Vaghinak Basentsyan Date: Thu, 23 Jun 2022 14:48:54 +0400 Subject: [PATCH 1/5] Add polygon polyline to video --- src/superannotate_schemas/__init__.py | 2 +- src/superannotate_schemas/schemas/external/vector.py | 2 +- src/superannotate_schemas/schemas/external/video.py | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/superannotate_schemas/__init__.py b/src/superannotate_schemas/__init__.py index 0e46ed0..1ecbfb0 100644 --- a/src/superannotate_schemas/__init__.py +++ b/src/superannotate_schemas/__init__.py @@ -6,7 +6,7 @@ from superannotate_schemas.validators import AnnotationValidators -__version__ = '1.0.43dev5' +__version__ = '1.0.44dev1' __all__ = [ "__version__", diff --git a/src/superannotate_schemas/schemas/external/vector.py b/src/superannotate_schemas/schemas/external/vector.py index 59734e5..7efd2d9 100644 --- a/src/superannotate_schemas/schemas/external/vector.py +++ b/src/superannotate_schemas/schemas/external/vector.py @@ -9,7 +9,6 @@ from pydantic import conlist from pydantic.error_wrappers import ErrorWrapper -from superannotate_schemas.schemas.base import StrictPointNumber from superannotate_schemas.schemas.base import AxisPoint from superannotate_schemas.schemas.base import BaseAttribute from superannotate_schemas.schemas.base import BaseImageMetadata @@ -21,6 +20,7 @@ from superannotate_schemas.schemas.base import INVALID_DICT_MESSAGE from superannotate_schemas.schemas.base import NotEmptyStr from superannotate_schemas.schemas.base import StrictNumber +from superannotate_schemas.schemas.base import StrictPointNumber from superannotate_schemas.schemas.base import Tag from superannotate_schemas.schemas.enums import VectorAnnotationTypeEnum diff --git a/src/superannotate_schemas/schemas/external/video.py b/src/superannotate_schemas/schemas/external/video.py index d334997..3175a81 100644 --- a/src/superannotate_schemas/schemas/external/video.py +++ b/src/superannotate_schemas/schemas/external/video.py @@ -143,7 +143,7 @@ class PointInstance(BaseModel): class PolygonInstance(BaseModel): meta: PolygonInstanceMetadata - parameters: conlist(PolylineParameter, min_items=1) + parameters: conlist(PolygonParameter, min_items=1) class PolylineInstance(BaseModel): @@ -159,7 +159,9 @@ class EventInstance(BaseModel): ANNOTATION_TYPES = { VideoType.BBOX: BboxInstance, VideoType.EVENT: EventInstance, - VideoType.POINT: PointInstance + VideoType.POINT: PointInstance, + VideoType.POLYGON: PolygonInstance, + VideoType.POLYLINE: PolylineInstance } From ae23c429f923639a56cefafdbc3254ec463a5d33 Mon Sep 17 00:00:00 2001 From: Vaghinak Basentsyan Date: Wed, 29 Jun 2022 14:56:04 +0400 Subject: [PATCH 2/5] Updated vide instances list --- src/superannotate_schemas/__init__.py | 2 +- .../schemas/external/video.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/superannotate_schemas/__init__.py b/src/superannotate_schemas/__init__.py index 3362c12..02bf99b 100644 --- a/src/superannotate_schemas/__init__.py +++ b/src/superannotate_schemas/__init__.py @@ -6,7 +6,7 @@ from superannotate_schemas.validators import AnnotationValidators -__version__ = '1.0.45dev1' +__version__ = '1.0.45dev3' __all__ = [ "__version__", diff --git a/src/superannotate_schemas/schemas/external/video.py b/src/superannotate_schemas/schemas/external/video.py index 3175a81..dd4d96d 100644 --- a/src/superannotate_schemas/schemas/external/video.py +++ b/src/superannotate_schemas/schemas/external/video.py @@ -61,6 +61,14 @@ class PointTimeStamp(BaseTimeStamp): y: StrictNumber +class PolylineTimestamp(BaseTimeStamp): + points = conlist(StrictPointNumber, min_items=4) + + +class PolygonTimestamp(BaseTimeStamp): + points = conlist(StrictPointNumber, min_items=6) + + class EventTimeStamp(BaseTimeStamp): pass @@ -116,11 +124,11 @@ class BboxParameter(BaseParameter): class PolygonParameter(BaseParameter): - timestamps: conlist(StrictPointNumber, min_items=3) + timestamps: conlist(PolygonTimestamp, min_items=2) class PolylineParameter(BaseParameter): - timestamps: conlist(StrictPointNumber) + timestamps: conlist(PolylineTimestamp, min_items=2) class PointParameter(BaseParameter): @@ -167,7 +175,7 @@ class EventInstance(BaseModel): class AnnotationInstance(BaseModel): __root__: Union[ - BboxInstance, EventInstance, PointInstance + BboxInstance, EventInstance, PointInstance, PolylineInstance, PolygonInstance ] @classmethod From bdfb7d6c9cafed168f6390bdfffc8ea4446d6cec Mon Sep 17 00:00:00 2001 From: Vaghinak Basentsyan <84702976+VaghinakDev@users.noreply.github.com> Date: Wed, 29 Jun 2022 15:59:13 +0400 Subject: [PATCH 3/5] Update __init__.py --- src/superannotate_schemas/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/superannotate_schemas/__init__.py b/src/superannotate_schemas/__init__.py index 02bf99b..cd364a4 100644 --- a/src/superannotate_schemas/__init__.py +++ b/src/superannotate_schemas/__init__.py @@ -6,7 +6,7 @@ from superannotate_schemas.validators import AnnotationValidators -__version__ = '1.0.45dev3' +__version__ = '1.0.45dev4' __all__ = [ "__version__", From 9f30a7852c4155c9d8ea3647424c1bf55ae46340 Mon Sep 17 00:00:00 2001 From: Vaghinak Basentsyan Date: Wed, 29 Jun 2022 18:07:18 +0400 Subject: [PATCH 4/5] Fix points issue --- src/superannotate_schemas/__init__.py | 2 +- src/superannotate_schemas/schemas/external/video.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/superannotate_schemas/__init__.py b/src/superannotate_schemas/__init__.py index 02bf99b..cd364a4 100644 --- a/src/superannotate_schemas/__init__.py +++ b/src/superannotate_schemas/__init__.py @@ -6,7 +6,7 @@ from superannotate_schemas.validators import AnnotationValidators -__version__ = '1.0.45dev3' +__version__ = '1.0.45dev4' __all__ = [ "__version__", diff --git a/src/superannotate_schemas/schemas/external/video.py b/src/superannotate_schemas/schemas/external/video.py index dd4d96d..1b45a0d 100644 --- a/src/superannotate_schemas/schemas/external/video.py +++ b/src/superannotate_schemas/schemas/external/video.py @@ -62,11 +62,11 @@ class PointTimeStamp(BaseTimeStamp): class PolylineTimestamp(BaseTimeStamp): - points = conlist(StrictPointNumber, min_items=4) + points: conlist(StrictPointNumber, min_items=4) class PolygonTimestamp(BaseTimeStamp): - points = conlist(StrictPointNumber, min_items=6) + points: conlist(StrictPointNumber, min_items=6) class EventTimeStamp(BaseTimeStamp): From 52424b14b64ef25b4eb42f3a5b493b7f65a5bf10 Mon Sep 17 00:00:00 2001 From: Vaghinak Basentsyan <84702976+VaghinakDev@users.noreply.github.com> Date: Wed, 29 Jun 2022 18:08:22 +0400 Subject: [PATCH 5/5] Update __init__.py --- src/superannotate_schemas/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/superannotate_schemas/__init__.py b/src/superannotate_schemas/__init__.py index cd364a4..c19b4b6 100644 --- a/src/superannotate_schemas/__init__.py +++ b/src/superannotate_schemas/__init__.py @@ -6,7 +6,7 @@ from superannotate_schemas.validators import AnnotationValidators -__version__ = '1.0.45dev4' +__version__ = '1.0.45dev5' __all__ = [ "__version__",