Skip to content

Commit c5bc124

Browse files
committed
Handle default values properly
1 parent 696c8b8 commit c5bc124

File tree

2 files changed

+33
-26
lines changed

2 files changed

+33
-26
lines changed

labelbox/schema/model_run.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -456,13 +456,16 @@ def export_labels(
456456
457457
"""
458458

459-
def export_v2(self, task_name: str,
460-
params: Optional[ModelRunExportParams]) -> Task:
461-
_params = params or {}
459+
def export_v2(self,
460+
task_name: Optional[str] = None,
461+
params: Optional[ModelRunExportParams] = {}) -> Task:
462462
mutation_name = "exportDataRowsInModelRun"
463463
create_task_query_str = """mutation exportDataRowsInModelRunPyApi($input: ExportDataRowsInModelRunInput!){
464464
%s(input: $input) {taskId} }
465465
""" % (mutation_name)
466+
if (task_name is None):
467+
task_name = f'Export Data Rows in Model Run - {self.name}'
468+
466469
params = {
467470
"input": {
468471
"taskName": task_name,
@@ -471,13 +474,13 @@ def export_v2(self, task_name: str,
471474
},
472475
"params": {
473476
"includeAttachments":
474-
_params.get('attachments', False),
477+
params.get('attachments', False),
475478
"includeMediaAttributes":
476-
_params.get('media_attributes', False),
479+
params.get('media_attributes', False),
477480
"includeMetadata":
478-
_params.get('metadata_fields', False),
481+
params.get('metadata_fields', False),
479482
"includeDataRowDetails":
480-
_params.get('data_row_details', False),
483+
params.get('data_row_details', False),
481484
# Arguments locked based on exectuion context
482485
"includeProjectDetails":
483486
False,

labelbox/schema/project.py

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -375,25 +375,29 @@ 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+
}
378387
"""
379388
Creates a project run export task with the given params and returns the task.
380389
381390
>>> export_task = export_v2("my_export_task", filter={"media_attributes": True})
382391
383392
"""
384393

385-
def export_v2(self, task_name: str,
386-
params: Optional[ProjectExportParams]) -> Task:
387-
defaultParams: ProjectExportParams = {
388-
"attachments": False,
389-
"media_attributes": False,
390-
"metadata_fields": False,
391-
"data_row_details": False,
392-
"project_details": False,
393-
"labels": False,
394-
"performance_details": False
395-
}
396-
_params: ProjectExportParams = params if params is not None else defaultParams
394+
def export_v2(self,
395+
task_name: Optional[str] = None,
396+
params: ProjectExportParams = defaultExportParams) -> Task:
397+
398+
if (task_name is None):
399+
task_name = f'Export Data Rows in Project - {self.name}'
400+
397401
mutation_name = "exportDataRowsInProject"
398402
create_task_query_str = """mutation exportDataRowsInProjectPyApi($input: ExportDataRowsInProjectInput!){
399403
%s(input: $input) {taskId} }
@@ -406,19 +410,19 @@ def export_v2(self, task_name: str,
406410
},
407411
"params": {
408412
"includeAttachments":
409-
_params.get('attachments', False),
413+
params.get('attachments', False),
410414
"includeMediaAttributes":
411-
_params.get('media_attributes', False),
415+
params.get('media_attributes', False),
412416
"includeMetadata":
413-
_params.get('metadata_fields', False),
417+
params.get('metadata_fields', False),
414418
"includeDataRowDetails":
415-
_params.get('data_row_details', False),
419+
params.get('data_row_details', False),
416420
"includeProjectDetails":
417-
_params.get('project_details', False),
421+
params.get('project_details', False),
418422
"includeLabels":
419-
_params.get('labels', False),
423+
params.get('labels', False),
420424
"includePerformanceDetails":
421-
_params.get('performance_details', False),
425+
params.get('performance_details', False),
422426
},
423427
}
424428
}

0 commit comments

Comments
 (0)