@ -297,47 +297,47 @@ class JobUpdateAPITestCase(APITestCase):
self . assertEqual ( response . data [ " id " ] , self . job . id )
self . assertEqual ( response . data [ " id " ] , self . job . id )
self . assertEqual ( response . data [ " status " ] , data . get ( ' status ' , self . job . status ) )
self . assertEqual ( response . data [ " status " ] , data . get ( ' status ' , self . job . status ) )
assignee = self . job . assignee . id if self . job . assignee else None
assignee = self . job . assignee . id if self . job . assignee else None
self . assertEqual ( response . data [ " assignee " ] data . get ( ' assignee ' , assignee ) )
self . assertEqual ( response . data [ " assignee " ] [" id " ] , data . get ( ' assignee _id ' , assignee ) )
self . assertEqual ( response . data [ " start_frame " ] , self . job . segment . start_frame )
self . assertEqual ( response . data [ " start_frame " ] , self . job . segment . start_frame )
self . assertEqual ( response . data [ " stop_frame " ] , self . job . segment . stop_frame )
self . assertEqual ( response . data [ " stop_frame " ] , self . job . segment . stop_frame )
def test_api_v1_jobs_id_admin ( self ) :
def test_api_v1_jobs_id_admin ( self ) :
data = { " status " : StatusChoice . COMPLETED , " assignee " : self . owner . id }
data = { " status " : StatusChoice . COMPLETED , " assignee _id " : self . owner . id }
response = self . _run_api_v1_jobs_id ( self . job . id , self . admin , data )
response = self . _run_api_v1_jobs_id ( self . job . id , self . admin , data )
self . _check_request ( response , data )
self . _check_request ( response , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . admin , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . admin , data )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
def test_api_v1_jobs_id_owner ( self ) :
def test_api_v1_jobs_id_owner ( self ) :
data = { " status " : StatusChoice . VALIDATION , " assignee " : self . annotator . id }
data = { " status " : StatusChoice . VALIDATION , " assignee _id " : self . annotator . id }
response = self . _run_api_v1_jobs_id ( self . job . id , self . owner , data )
response = self . _run_api_v1_jobs_id ( self . job . id , self . owner , data )
self . _check_request ( response , data )
self . _check_request ( response , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . owner , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . owner , data )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
def test_api_v1_jobs_id_annotator ( self ) :
def test_api_v1_jobs_id_annotator ( self ) :
data = { " status " : StatusChoice . ANNOTATION , " assignee " : self . user . id }
data = { " status " : StatusChoice . ANNOTATION , " assignee _id " : self . user . id }
response = self . _run_api_v1_jobs_id ( self . job . id , self . annotator , data )
response = self . _run_api_v1_jobs_id ( self . job . id , self . annotator , data )
self . _check_request ( response , data )
self . _check_request ( response , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . annotator , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . annotator , data )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
def test_api_v1_jobs_id_observer ( self ) :
def test_api_v1_jobs_id_observer ( self ) :
data = { " status " : StatusChoice . ANNOTATION , " assignee " : self . admin . id }
data = { " status " : StatusChoice . ANNOTATION , " assignee _id " : self . admin . id }
response = self . _run_api_v1_jobs_id ( self . job . id , self . observer , data )
response = self . _run_api_v1_jobs_id ( self . job . id , self . observer , data )
self . assertEqual ( response . status_code , status . HTTP_403_FORBIDDEN )
self . assertEqual ( response . status_code , status . HTTP_403_FORBIDDEN )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . observer , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . observer , data )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
def test_api_v1_jobs_id_user ( self ) :
def test_api_v1_jobs_id_user ( self ) :
data = { " status " : StatusChoice . ANNOTATION , " assignee " : self . user . id }
data = { " status " : StatusChoice . ANNOTATION , " assignee _id " : self . user . id }
response = self . _run_api_v1_jobs_id ( self . job . id , self . user , data )
response = self . _run_api_v1_jobs_id ( self . job . id , self . user , data )
self . assertEqual ( response . status_code , status . HTTP_403_FORBIDDEN )
self . assertEqual ( response . status_code , status . HTTP_403_FORBIDDEN )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . user , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , self . user , data )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
self . assertEqual ( response . status_code , status . HTTP_404_NOT_FOUND )
def test_api_v1_jobs_id_no_auth ( self ) :
def test_api_v1_jobs_id_no_auth ( self ) :
data = { " status " : StatusChoice . ANNOTATION , " assignee " : self . user . id }
data = { " status " : StatusChoice . ANNOTATION , " assignee _id " : self . user . id }
response = self . _run_api_v1_jobs_id ( self . job . id , None , data )
response = self . _run_api_v1_jobs_id ( self . job . id , None , data )
self . assertEqual ( response . status_code , status . HTTP_401_UNAUTHORIZED )
self . assertEqual ( response . status_code , status . HTTP_401_UNAUTHORIZED )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , None , data )
response = self . _run_api_v1_jobs_id ( self . job . id + 10 , None , data )
@ -356,7 +356,7 @@ class JobPartialUpdateAPITestCase(JobUpdateAPITestCase):
self . _check_request ( response , data )
self . _check_request ( response , data )
def test_api_v1_jobs_id_admin_partial ( self ) :
def test_api_v1_jobs_id_admin_partial ( self ) :
data = { " assignee " : self . user . id }
data = { " assignee _id " : self . user . id }
response = self . _run_api_v1_jobs_id ( self . job . id , self . owner , data )
response = self . _run_api_v1_jobs_id ( self . job . id , self . owner , data )
self . _check_request ( response , data )
self . _check_request ( response , data )
@ -1073,9 +1073,11 @@ class TaskGetAPITestCase(APITestCase):
self . assertEqual ( response . data [ " size " ] , db_task . data . size )
self . assertEqual ( response . data [ " size " ] , db_task . data . size )
self . assertEqual ( response . data [ " mode " ] , db_task . mode )
self . assertEqual ( response . data [ " mode " ] , db_task . mode )
owner = db_task . owner . id if db_task . owner else None
owner = db_task . owner . id if db_task . owner else None
self . assertEqual ( response . data [ " owner " ] , owner )
response_owner = response . data [ " owner " ] [ " id " ] if response . data [ " owner " ] else None
self . assertEqual ( response_owner , owner )
assignee = db_task . assignee . id if db_task . assignee else None
assignee = db_task . assignee . id if db_task . assignee else None
self . assertEqual ( response . data [ " assignee " ] , assignee )
response_assignee = response . data [ " assignee " ] [ " id " ] if response . data [ " assignee " ] else None
self . assertEqual ( response_assignee , assignee )
self . assertEqual ( response . data [ " overlap " ] , db_task . overlap )
self . assertEqual ( response . data [ " overlap " ] , db_task . overlap )
self . assertEqual ( response . data [ " segment_size " ] , db_task . segment_size )
self . assertEqual ( response . data [ " segment_size " ] , db_task . segment_size )
self . assertEqual ( response . data [ " image_quality " ] , db_task . data . image_quality )
self . assertEqual ( response . data [ " image_quality " ] , db_task . data . image_quality )
@ -1179,11 +1181,13 @@ class TaskUpdateAPITestCase(APITestCase):
mode = data . get ( " mode " , db_task . mode )
mode = data . get ( " mode " , db_task . mode )
self . assertEqual ( response . data [ " mode " ] , mode )
self . assertEqual ( response . data [ " mode " ] , mode )
owner = db_task . owner . id if db_task . owner else None
owner = db_task . owner . id if db_task . owner else None
owner = data . get ( " owner " , owner )
owner = data . get ( " owner_id " , owner )
self . assertEqual ( response . data [ " owner " ] , owner )
response_owner = response . data [ " owner " ] [ " id " ] if response . data [ " owner " ] else None
self . assertEqual ( response_owner , owner )
assignee = db_task . assignee . id if db_task . assignee else None
assignee = db_task . assignee . id if db_task . assignee else None
assignee = data . get ( " assignee " , assignee )
assignee = data . get ( " assignee_id " , assignee )
self . assertEqual ( response . data [ " assignee " ] , assignee )
response_assignee = response . data [ " assignee " ] [ " id " ] if response . data [ " assignee " ] else None
self . assertEqual ( response_assignee , assignee )
self . assertEqual ( response . data [ " overlap " ] , db_task . overlap )
self . assertEqual ( response . data [ " overlap " ] , db_task . overlap )
self . assertEqual ( response . data [ " segment_size " ] , db_task . segment_size )
self . assertEqual ( response . data [ " segment_size " ] , db_task . segment_size )
image_quality = data . get ( " image_quality " , db_task . data . image_quality )
image_quality = data . get ( " image_quality " , db_task . data . image_quality )
@ -1213,7 +1217,7 @@ class TaskUpdateAPITestCase(APITestCase):
def test_api_v1_tasks_id_admin ( self ) :
def test_api_v1_tasks_id_admin ( self ) :
data = {
data = {
" name " : " new name for the task " ,
" name " : " new name for the task " ,
" owner " : self . owner . id ,
" owner _id " : self . owner . id ,
" labels " : [ {
" labels " : [ {
" name " : " non-vehicle " ,
" name " : " non-vehicle " ,
" attributes " : [ {
" attributes " : [ {
@ -1229,7 +1233,7 @@ class TaskUpdateAPITestCase(APITestCase):
def test_api_v1_tasks_id_user ( self ) :
def test_api_v1_tasks_id_user ( self ) :
data = {
data = {
" name " : " new name for the task " ,
" name " : " new name for the task " ,
" owner " : self . assignee . id ,
" owner _id " : self . assignee . id ,
" labels " : [ {
" labels " : [ {
" name " : " car " ,
" name " : " car " ,
" attributes " : [ {
" attributes " : [ {
@ -1277,7 +1281,7 @@ class TaskPartialUpdateAPITestCase(TaskUpdateAPITestCase):
data = {
data = {
" name " : " new name for the task " ,
" name " : " new name for the task " ,
" owner " : self . owner . id
" owner _id " : self . owner . id
}
}
self . _check_api_v1_tasks_id ( self . admin , data )
self . _check_api_v1_tasks_id ( self . admin , data )
# Now owner is updated, but self.db_tasks are obsolete
# Now owner is updated, but self.db_tasks are obsolete
@ -1300,8 +1304,8 @@ class TaskPartialUpdateAPITestCase(TaskUpdateAPITestCase):
self . _check_api_v1_tasks_id ( self . user , data )
self . _check_api_v1_tasks_id ( self . user , data )
data = {
data = {
" owner " : self . observer . id ,
" owner _id " : self . observer . id ,
" assignee " : self . annotator . id
" assignee _id " : self . annotator . id
}
}
self . _check_api_v1_tasks_id ( self . user , data )
self . _check_api_v1_tasks_id ( self . user , data )
@ -1339,8 +1343,9 @@ class TaskCreateAPITestCase(APITestCase):
self . assertEqual ( response . status_code , status . HTTP_201_CREATED )
self . assertEqual ( response . status_code , status . HTTP_201_CREATED )
self . assertEqual ( response . data [ " name " ] , data [ " name " ] )
self . assertEqual ( response . data [ " name " ] , data [ " name " ] )
self . assertEqual ( response . data [ " mode " ] , " " )
self . assertEqual ( response . data [ " mode " ] , " " )
self . assertEqual ( response . data [ " owner " ] , data . get ( " owner " , user . id ) )
self . assertEqual ( response . data [ " owner " ] [ " id " ] , data . get ( " owner_id " , user . id ) )
self . assertEqual ( response . data [ " assignee " ] , data . get ( " assignee " ) )
assignee = response . data [ " assignee " ] [ " id " ] if response . data [ " assignee " ] else None
self . assertEqual ( assignee , data . get ( " assignee_id " , None ) )
self . assertEqual ( response . data [ " bug_tracker " ] , data . get ( " bug_tracker " , " " ) )
self . assertEqual ( response . data [ " bug_tracker " ] , data . get ( " bug_tracker " , " " ) )
self . assertEqual ( response . data [ " overlap " ] , data . get ( " overlap " , None ) )
self . assertEqual ( response . data [ " overlap " ] , data . get ( " overlap " , None ) )
self . assertEqual ( response . data [ " segment_size " ] , data . get ( " segment_size " , 0 ) )
self . assertEqual ( response . data [ " segment_size " ] , data . get ( " segment_size " , 0 ) )
@ -1377,7 +1382,7 @@ class TaskCreateAPITestCase(APITestCase):
def test_api_v1_tasks_user ( self ) :
def test_api_v1_tasks_user ( self ) :
data = {
data = {
" name " : " new name for the task " ,
" name " : " new name for the task " ,
" owner " : self . assignee . id ,
" owner _id " : self . assignee . id ,
" labels " : [ {
" labels " : [ {
" name " : " car " ,
" name " : " car " ,
" attributes " : [ {
" attributes " : [ {
@ -1548,6 +1553,16 @@ class TaskDataAPITestCase(APITestCase):
video . write ( data . read ( ) )
video . write ( data . read ( ) )
cls . _image_sizes [ filename ] = img_sizes
cls . _image_sizes [ filename ] = img_sizes
filename = " test_rotated_90_video.mp4 "
path = os . path . join ( os . path . dirname ( __file__ ) , ' assets ' , ' test_rotated_90_video.mp4 ' )
container = av . open ( path , ' r ' )
for frame in container . decode ( video = 0 ) :
# pyav ignores rotation record in metadata when decoding frames
img_sizes = [ ( frame . height , frame . width ) ] * container . streams . video [ 0 ] . frames
break
container . close ( )
cls . _image_sizes [ filename ] = img_sizes
filename = os . path . join ( " videos " , " test_video_1.mp4 " )
filename = os . path . join ( " videos " , " test_video_1.mp4 " )
path = os . path . join ( settings . SHARE_ROOT , filename )
path = os . path . join ( settings . SHARE_ROOT , filename )
os . makedirs ( os . path . dirname ( path ) )
os . makedirs ( os . path . dirname ( path ) )
@ -1653,8 +1668,8 @@ class TaskDataAPITestCase(APITestCase):
response = self . _get_task ( user , task_id )
response = self . _get_task ( user , task_id )
expected_status_code = status . HTTP_200_OK
expected_status_code = status . HTTP_200_OK
if user == self . user and " owner " in spec and spec [ " owner " ] != user . id and \
if user == self . user and " owner _id " in spec and spec [ " owner _id " ] != user . id and \
" assignee " in spec and spec [ " assignee " ] != user . id :
" assignee _id " in spec and spec [ " assignee _id " ] != user . id :
expected_status_code = status . HTTP_403_FORBIDDEN
expected_status_code = status . HTTP_403_FORBIDDEN
self . assertEqual ( response . status_code , expected_status_code )
self . assertEqual ( response . status_code , expected_status_code )
@ -1736,8 +1751,8 @@ class TaskDataAPITestCase(APITestCase):
def _test_api_v1_tasks_id_data ( self , user ) :
def _test_api_v1_tasks_id_data ( self , user ) :
task_spec = {
task_spec = {
" name " : " my task #1 " ,
" name " : " my task #1 " ,
" owner " : self . owner . id ,
" owner _id " : self . owner . id ,
" assignee " : self . assignee . id ,
" assignee _id " : self . assignee . id ,
" overlap " : 0 ,
" overlap " : 0 ,
" segment_size " : 100 ,
" segment_size " : 100 ,
" labels " : [
" labels " : [
@ -2003,7 +2018,7 @@ class TaskDataAPITestCase(APITestCase):
os . path . join ( settings . SHARE_ROOT , " videos " )
os . path . join ( settings . SHARE_ROOT , " videos " )
)
)
task_spec = {
task_spec = {
" name " : " my video with meta info task #1 1 " ,
" name " : " my video with meta info task #1 3 " ,
" overlap " : 0 ,
" overlap " : 0 ,
" segment_size " : 0 ,
" segment_size " : 0 ,
" labels " : [
" labels " : [
@ -2022,6 +2037,47 @@ class TaskDataAPITestCase(APITestCase):
self . _test_api_v1_tasks_id_data_spec ( user , task_spec , task_data , self . ChunkType . VIDEO ,
self . _test_api_v1_tasks_id_data_spec ( user , task_spec , task_data , self . ChunkType . VIDEO ,
self . ChunkType . VIDEO , image_sizes , StorageMethodChoice . CACHE )
self . ChunkType . VIDEO , image_sizes , StorageMethodChoice . CACHE )
task_spec = {
" name " : " my cached video task #14 " ,
" overlap " : 0 ,
" segment_size " : 0 ,
" labels " : [
{ " name " : " car " } ,
{ " name " : " person " } ,
]
}
task_data = {
" client_files[0] " : open ( os . path . join ( os . path . dirname ( __file__ ) , ' assets ' , ' test_rotated_90_video.mp4 ' ) , ' rb ' ) ,
" image_quality " : 70 ,
" use_zip_chunks " : True
}
image_sizes = self . _image_sizes [ ' test_rotated_90_video.mp4 ' ]
self . _test_api_v1_tasks_id_data_spec ( user , task_spec , task_data , self . ChunkType . IMAGESET ,
self . ChunkType . VIDEO , image_sizes , StorageMethodChoice . FILE_SYSTEM )
task_spec = {
" name " : " my video task #15 " ,
" overlap " : 0 ,
" segment_size " : 0 ,
" labels " : [
{ " name " : " car " } ,
{ " name " : " person " } ,
]
}
task_data = {
" client_files[0] " : open ( os . path . join ( os . path . dirname ( __file__ ) , ' assets ' , ' test_rotated_90_video.mp4 ' ) , ' rb ' ) ,
" image_quality " : 70 ,
" use_cache " : True ,
" use_zip_chunks " : True
}
image_sizes = self . _image_sizes [ ' test_rotated_90_video.mp4 ' ]
self . _test_api_v1_tasks_id_data_spec ( user , task_spec , task_data , self . ChunkType . IMAGESET ,
self . ChunkType . VIDEO , image_sizes , StorageMethodChoice . CACHE )
def test_api_v1_tasks_id_data_admin ( self ) :
def test_api_v1_tasks_id_data_admin ( self ) :
self . _test_api_v1_tasks_id_data ( self . admin )
self . _test_api_v1_tasks_id_data ( self . admin )
@ -2034,8 +2090,8 @@ class TaskDataAPITestCase(APITestCase):
def test_api_v1_tasks_id_data_no_auth ( self ) :
def test_api_v1_tasks_id_data_no_auth ( self ) :
data = {
data = {
" name " : " my task #3 " ,
" name " : " my task #3 " ,
" owner " : self . owner . id ,
" owner _id " : self . owner . id ,
" assignee " : self . assignee . id ,
" assignee _id " : self . assignee . id ,
" overlap " : 0 ,
" overlap " : 0 ,
" segment_size " : 100 ,
" segment_size " : 100 ,
" labels " : [
" labels " : [
@ -2080,8 +2136,8 @@ class JobAnnotationAPITestCase(APITestCase):
def _create_task ( self , owner , assignee ) :
def _create_task ( self , owner , assignee ) :
data = {
data = {
" name " : " my task #1 " ,
" name " : " my task #1 " ,
" owner " : owner . id ,
" owner _id " : owner . id ,
" assignee " : assignee . id ,
" assignee _id " : assignee . id ,
" overlap " : 0 ,
" overlap " : 0 ,
" segment_size " : 100 ,
" segment_size " : 100 ,
" labels " : [
" labels " : [
@ -3355,6 +3411,9 @@ class TaskAnnotationAPITestCase(JobAnnotationAPITestCase):
+ polygon_shapes_with_attrs
+ polygon_shapes_with_attrs
annotations [ " tags " ] = tags_with_attrs + tags_wo_attrs
annotations [ " tags " ] = tags_with_attrs + tags_wo_attrs
elif annotation_format == " ImageNet 1.0 " :
annotations [ " tags " ] = tags_wo_attrs
else :
else :
raise Exception ( " Unknown format {} " . format ( annotation_format ) )
raise Exception ( " Unknown format {} " . format ( annotation_format ) )
Kruchinin
5 years ago