@ -35,6 +35,12 @@ def generate_image_files(count):
return images
def get_cloud_storage_content ( username , cloud_storage_id , manifest ) :
with make_api_client ( username ) as api_client :
( _ , response ) = api_client . cloud_storages_api . cloudstorages_retrieve_content ( cloud_storage_id , manifest_path = manifest )
data = json . loads ( response . data )
return data
@pytest.mark.usefixtures ( ' dontchangedb ' )
class TestGetTasks :
@ -272,7 +278,10 @@ class TestGetTaskDataset:
self . _test_export_project ( ' admin1 ' , task [ ' id ' ] , format = ' CVAT for images 1.1 ' )
@pytest.mark.usefixtures ( " changedb " )
@pytest.mark.usefixtures ( " restore_cvat_data " )
class TestPostTaskData :
_USERNAME = ' admin1 '
@staticmethod
def _wait_until_task_is_created ( api : TasksApi , task_id : int ) - > RqStatus :
for _ in range ( 100 ) :
@ -282,14 +291,14 @@ class TestPostTaskData:
sleep ( 1 )
raise Exception ( ' Cannot create task ' )
def _test_create_task ( self , username , spec , data , file s) :
def _test_create_task ( self , username , spec , data , content_type, * * kwarg s) :
with make_api_client ( username ) as api_client :
( task , response ) = api_client . tasks_api . create ( TaskWriteRequest ( * * spec )
( task , response ) = api_client . tasks_api . create ( TaskWriteRequest ( * * spec ) , * * kwargs )
assert response . status == HTTPStatus . CREATED
task_data = DataRequest ( * * data , client_files = list ( files . values ( ) ) )
task_data = DataRequest ( * * data
( _ , response ) = api_client . tasks_api . create_data ( task . id , task_data ,
_content_type = " multipart/form-data " )
_content_type = content_type , * * kwargs )
assert response . status == HTTPStatus . ACCEPTED
status = self . _wait_until_task_is_created ( api_client . tasks_api , task . id )
@ -298,9 +307,8 @@ class TestPostTaskData:
return task . id
def test_can_create_task_with_defined_start_and_stop_frames ( self ) :
username = ' admin1 '
task_spec = {
' name ' : f ' test { username } to create a task with defined start and stop frames ' ,
' name ' : f ' test { self . _USERNAME } to create a task with defined start and stop frames ' ,
" labels " : [ {
" name " : " car " ,
" color " : " #ff00ff " ,
@ -319,15 +327,38 @@ class TestPostTaskData:
task_data = {
' image_quality ' : 75 ,
' start_frame ' : 2 ,
' stop_frame ' : 5
}
task_files = {
f ' client_files[ { i } ] ' : image for i , image in enumerate ( generate_image_files ( 7 ) )
' stop_frame ' : 5 ,
' client_files ' : generate_image_files ( 7 ) ,
}
task_id = self . _test_create_task ( username , task_spec , task_data , task_files )
task_id = self . _test_create_task ( self . _USERNAME , task_spec , task_data , content_type = " multipart/form-data " )
# check task size
with make_api_client ( username ) as api_client :
with make_api_client ( self . _USERNAME ) as api_client :
( task , _ ) = api_client . tasks_api . retrieve ( task_id )
assert task . size == 4
@pytest.mark.parametrize ( ' cloud_storage_id, manifest, org ' , [
( 1 , ' manifest.jsonl ' , ' ' ) , # public bucket
( 2 , ' sub/manifest.jsonl ' , ' org2 ' ) , # private bucket
] )
def test_create_task_with_cloud_storage_files ( self , cloud_storage_id , manifest , org ) :
cloud_storage_content = get_cloud_storage_content ( self . _USERNAME , cloud_storage_id , manifest )
cloud_storage_content . append ( manifest )
task_spec = {
" name " : f " Task with files from cloud storage { cloud_storage_id } " ,
" labels " : [ {
" name " : " car " ,
} ] ,
}
data_spec = {
' image_quality ' : 75 ,
' use_cache ' : True ,
' storage ' : ' cloud_storage ' ,
' cloud_storage_id ' : cloud_storage_id ,
' server_files ' : cloud_storage_content ,
}
_ = self . _test_create_task ( self . _USERNAME , task_spec , data_spec , content_type = " application/json " , org = org )
Maria Khrustaleva
4 years ago
committed by
GitHub