Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2d25838
Added limitations tests
Oct 5, 2021
c4e4818
Add video converter
dshabin Oct 5, 2021
c81fa1f
Add unclassified
dshabin Oct 5, 2021
9b7cb07
Add video annotation validation - tests
dshabin Oct 6, 2021
46c59ae
run validate
dshabin Oct 7, 2021
d4564be
Add time convert - json class method
dshabin Oct 8, 2021
bc494ec
Added annotation validators
Oct 5, 2021
dd8ae51
Fix zero timestamp
dshabin Oct 11, 2021
68e8496
Add interactive usecase video
dshabin Oct 12, 2021
e93e8df
remove unused
dshabin Oct 12, 2021
840c971
Fix single video upload
dshabin Oct 12, 2021
172aeef
Merge pull request #238 from superannotateai/sdk_validations
VaghinakDev Oct 14, 2021
dd53110
Merge
dshabin Oct 14, 2021
3306666
Rebase develop
dshabin Oct 14, 2021
dd86128
Rebase friday
dshabin Oct 14, 2021
417a8be
Rebase friday
dshabin Oct 14, 2021
4fbb7fb
tod
Oct 18, 2021
902fc6b
Fix already existing logs - progress bar
dshabin Oct 20, 2021
4d7a0f7
Fix video already exist log
dshabin Oct 20, 2021
ee636de
rename var
dshabin Oct 20, 2021
b3b702b
Fixed tests
Oct 21, 2021
7260ca7
Add validators
dshabin Oct 21, 2021
d0a93ac
Fix log
dshabin Oct 21, 2021
c39391e
develop-rebase
dshabin Oct 21, 2021
f3d991e
Fix validator use case
dshabin Oct 21, 2021
88cf07a
sdk validation
Oct 22, 2021
832e329
Merge pull request #252 from superannotateai/sdk_validators_
VaghinakDev Oct 22, 2021
0b79c8d
Merge pull request #251 from superannotateai/test_fix
VaghinakDev Oct 22, 2021
236ff68
merge validations
dshabin Oct 22, 2021
59f0fa7
Fix video annotation
dshabin Oct 22, 2021
59baf15
Merge pull request #235 from superannotateai/sdk-278
dshabin Oct 22, 2021
7cfe317
Fix logs
dshabin Oct 22, 2021
5d4ba95
Fix excluded path
dshabin Oct 22, 2021
8148123
Fix cli target fps
dshabin Oct 22, 2021
bcbd51a
Added Reporter
Oct 25, 2021
41d742f
Add text annotations
dshabin Oct 25, 2021
831ef00
Added Reporter
Oct 25, 2021
9cb70ce
merge friday
dshabin Oct 25, 2021
ec9b4e1
merge friday
dshabin Oct 25, 2021
4ea5101
Merge pull request #254 from superannotateai/document_annotations
dshabin Oct 25, 2021
7cabf0b
make validate - add doc validation
dshabin Oct 25, 2021
f6fd32a
Merge pull request #255 from superannotateai/doc_annotations
VaghinakDev Oct 25, 2021
de1247e
Add invalid json test
dshabin Oct 25, 2021
a731b32
Fix json validation
dshabin Oct 25, 2021
55521ff
Add logs
dshabin Oct 25, 2021
44e78df
Add invalid json test
dshabin Oct 25, 2021
edf6bf8
Fix json validation
dshabin Oct 25, 2021
e8510ae
Merge pull request #257 from superannotateai/doc_annotations
VaghinakDev Oct 26, 2021
377a730
Change opencv-version
dshabin Oct 26, 2021
04c3050
Fix video logs - frames extract
dshabin Oct 26, 2021
6a1a6ce
formating
dshabin Oct 26, 2021
8cc64db
merge friday
dshabin Oct 26, 2021
ed1af5d
Tests moved to annotations folder
Oct 26, 2021
0ede646
Merge branch 'friday' into sdk-354
dshabin Oct 26, 2021
9ac9c76
Change opencv version
dshabin Oct 26, 2021
bac713a
Fix video frame test
dshabin Oct 26, 2021
3765700
Added video convertor
Oct 26, 2021
9966763
Merge pull request #244 from superannotateai/sdk-354
dshabin Oct 26, 2021
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
2 changes: 2 additions & 0 deletions src/superannotate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
from superannotate.lib.app.interface.sdk_interface import (
upload_videos_from_folder_to_project,
)
from superannotate.lib.app.interface.sdk_interface import validate_annotations
from superannotate.version import __version__


Expand All @@ -166,6 +167,7 @@
"controller",
# Utils
"AppException",
"validate_annotations",
#
"init",
"set_auth_token",
Expand Down
15 changes: 12 additions & 3 deletions src/superannotate/lib/app/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import boto3
import pandas as pd
from superannotate.lib.app.exceptions import PathError
from superannotate.lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
from superannotate.lib.core import PIXEL_ANNOTATION_POSTFIX
from superannotate.lib.core import VECTOR_ANNOTATION_POSTFIX

Expand Down Expand Up @@ -55,7 +56,13 @@ def get_local_annotation_paths(
[
str(i)
for i in all_not_folders
if i.name.endswith((VECTOR_ANNOTATION_POSTFIX, PIXEL_ANNOTATION_POSTFIX))
if i.name.endswith(
(
VECTOR_ANNOTATION_POSTFIX,
PIXEL_ANNOTATION_POSTFIX,
ATTACHED_VIDEO_ANNOTATION_POSTFIX,
)
)
]
)
if recursive:
Expand All @@ -82,8 +89,10 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
for data in paginator.paginate(Bucket=s3_bucket, Prefix=folder_path):
for annotation in data["Contents"]:
key = annotation["Key"]
if key.endswith(VECTOR_ANNOTATION_POSTFIX) or key.endswith(
PIXEL_ANNOTATION_POSTFIX
if (
key.endswith(VECTOR_ANNOTATION_POSTFIX)
or key.endswith(PIXEL_ANNOTATION_POSTFIX)
or key.endswith(ATTACHED_VIDEO_ANNOTATION_POSTFIX)
):
if not recursive and "/" in key[len(folder_path) + 1 :]:
continue
Expand Down
2 changes: 1 addition & 1 deletion src/superannotate/lib/app/interface/cli_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def upload_videos(
self,
project,
folder,
target_fps=1,
target_fps=None,
recursive=False,
extensions=constances.DEFAULT_VIDEO_EXTENSIONS,
set_annotation_status=constances.AnnotationStatus.NOT_STARTED.name,
Expand Down
Loading