Skip to content

Commit a28b9ee

Browse files
committed
CR changes
1 parent 35c0363 commit a28b9ee

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

labelbox/schema/model_run.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -458,29 +458,31 @@ def export_labels(
458458

459459
def export_v2(self,
460460
task_name: Optional[str] = None,
461-
params: Optional[ModelRunExportParams] = {}) -> Task:
461+
params: Optional[ModelRunExportParams] = None) -> Task:
462462
mutation_name = "exportDataRowsInModelRun"
463463
create_task_query_str = """mutation exportDataRowsInModelRunPyApi($input: ExportDataRowsInModelRunInput!){
464464
%s(input: $input) {taskId} }
465465
""" % (mutation_name)
466466
if (task_name is None):
467467
task_name = f'Export Data Rows in Model Run - {self.name}'
468468

469-
params = {
469+
_params = params or ModelRunExportParams()
470+
471+
queryParams = {
470472
"input": {
471473
"taskName": task_name,
472474
"filters": {
473475
"modelRunId": self.uid
474476
},
475477
"params": {
476478
"includeAttachments":
477-
params.get('attachments', False),
479+
_params.get('attachments', False),
478480
"includeMediaAttributes":
479-
params.get('media_attributes', False),
481+
_params.get('media_attributes', False),
480482
"includeMetadata":
481-
params.get('metadata_fields', False),
483+
_params.get('metadata_fields', False),
482484
"includeDataRowDetails":
483-
params.get('data_row_details', False),
485+
_params.get('data_row_details', False),
484486
# Arguments locked based on exectuion context
485487
"includeProjectDetails":
486488
False,
@@ -493,7 +495,7 @@ def export_v2(self,
493495
}
494496
res = self.client.execute(
495497
create_task_query_str,
496-
params,
498+
queryParams,
497499
)
498500
res = res[mutation_name]
499501
task_id = res["taskId"]

labelbox/schema/project.py

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -375,15 +375,6 @@ def _validate_datetime(string_date: str) -> bool:
375375
self.uid)
376376
time.sleep(sleep_time)
377377

378-
defaultExportParams: ProjectExportParams = {
379-
"attachments": False,
380-
"media_attributes": False,
381-
"metadata_fields": False,
382-
"data_row_details": False,
383-
"project_details": False,
384-
"labels": False,
385-
"performance_details": False
386-
}
387378
"""
388379
Creates a project run export task with the given params and returns the task.
389380
@@ -393,11 +384,21 @@ def _validate_datetime(string_date: str) -> bool:
393384

394385
def export_v2(self,
395386
task_name: Optional[str] = None,
396-
params: ProjectExportParams = defaultExportParams) -> Task:
387+
params: Optional[ProjectExportParams] = None) -> Task:
397388

398389
if (task_name is None):
399390
task_name = f'Export Data Rows in Project - {self.name}'
400391

392+
_params = params or ProjectExportParams({
393+
"attachments": False,
394+
"media_attributes": False,
395+
"metadata_fields": False,
396+
"data_row_details": False,
397+
"project_details": False,
398+
"labels": False,
399+
"performance_details": False
400+
})
401+
401402
mutation_name = "exportDataRowsInProject"
402403
create_task_query_str = """mutation exportDataRowsInProjectPyApi($input: ExportDataRowsInProjectInput!){
403404
%s(input: $input) {taskId} }
@@ -410,19 +411,19 @@ def export_v2(self,
410411
},
411412
"params": {
412413
"includeAttachments":
413-
params.get('attachments', False),
414+
_params.get('attachments', False),
414415
"includeMediaAttributes":
415-
params.get('media_attributes', False),
416+
_params.get('media_attributes', False),
416417
"includeMetadata":
417-
params.get('metadata_fields', False),
418+
_params.get('metadata_fields', False),
418419
"includeDataRowDetails":
419-
params.get('data_row_details', False),
420+
_params.get('data_row_details', False),
420421
"includeProjectDetails":
421-
params.get('project_details', False),
422+
_params.get('project_details', False),
422423
"includeLabels":
423-
params.get('labels', False),
424+
_params.get('labels', False),
424425
"includePerformanceDetails":
425-
params.get('performance_details', False),
426+
_params.get('performance_details', False),
426427
},
427428
}
428429
}

0 commit comments

Comments
 (0)