Skip to content

Commit 007c28b

Browse files
authored
[SDK-519] Remove streamable param from export_v2 methods (#1370)
2 parents c2d9cf5 + c15509c commit 007c28b

File tree

5 files changed

+54
-17
lines changed

5 files changed

+54
-17
lines changed

labelbox/schema/data_row.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ def export(
188188
>>> task.wait_till_done()
189189
>>> task.result
190190
"""
191-
task = DataRow.export_v2(client,
192-
data_rows,
193-
global_keys,
194-
task_name,
195-
params,
196-
streamable=True)
191+
task = DataRow._export(client,
192+
data_rows,
193+
global_keys,
194+
task_name,
195+
params,
196+
streamable=True)
197197
return ExportTask(task)
198198

199199
@staticmethod
@@ -203,7 +203,6 @@ def export_v2(
203203
global_keys: Optional[List[str]] = None,
204204
task_name: Optional[str] = None,
205205
params: Optional[CatalogExportParams] = None,
206-
streamable: bool = False,
207206
) -> Task:
208207
"""
209208
Creates a data rows export task with the given list, params and returns the task.
@@ -228,7 +227,18 @@ def export_v2(
228227
>>> task.wait_till_done()
229228
>>> task.result
230229
"""
230+
return DataRow._export(client, data_rows, global_keys, task_name,
231+
params)
231232

233+
@staticmethod
234+
def _export(
235+
client: "Client",
236+
data_rows: Optional[List[Union[str, "DataRow"]]] = None,
237+
global_keys: Optional[List[str]] = None,
238+
task_name: Optional[str] = None,
239+
params: Optional[CatalogExportParams] = None,
240+
streamable: bool = False,
241+
) -> Task:
232242
_params = params or CatalogExportParams({
233243
"attachments": False,
234244
"metadata_fields": False,

labelbox/schema/dataset.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,15 +619,14 @@ def export(
619619
>>> task.wait_till_done()
620620
>>> task.result
621621
"""
622-
task = self.export_v2(task_name, filters, params, streamable=True)
622+
task = self._export(task_name, filters, params, streamable=True)
623623
return ExportTask(task)
624624

625625
def export_v2(
626626
self,
627627
task_name: Optional[str] = None,
628628
filters: Optional[DatasetExportFilters] = None,
629629
params: Optional[CatalogExportParams] = None,
630-
streamable: bool = False,
631630
) -> Task:
632631
"""
633632
Creates a dataset export task with the given params and returns the task.
@@ -646,7 +645,15 @@ def export_v2(
646645
>>> task.wait_till_done()
647646
>>> task.result
648647
"""
648+
return self._export(task_name, filters, params)
649649

650+
def _export(
651+
self,
652+
task_name: Optional[str] = None,
653+
filters: Optional[DatasetExportFilters] = None,
654+
params: Optional[CatalogExportParams] = None,
655+
streamable: bool = False,
656+
) -> Task:
650657
_params = params or CatalogExportParams({
651658
"attachments": False,
652659
"metadata_fields": False,

labelbox/schema/model_run.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,21 +518,28 @@ def export(self,
518518
>>> export_task = export("my_export_task", params={"media_attributes": True})
519519
520520
"""
521-
task = self.export_v2(task_name, params, streamable=True)
521+
task = self._export(task_name, params, streamable=True)
522522
return ExportTask(task)
523523

524524
def export_v2(
525525
self,
526526
task_name: Optional[str] = None,
527527
params: Optional[ModelRunExportParams] = None,
528-
streamable: bool = False,
529528
) -> Task:
530529
"""
531530
Creates a model run export task with the given params and returns the task.
532531
533532
>>> export_task = export_v2("my_export_task", params={"media_attributes": True})
534533
535534
"""
535+
return self._export(task_name, params)
536+
537+
def _export(
538+
self,
539+
task_name: Optional[str] = None,
540+
params: Optional[ModelRunExportParams] = None,
541+
streamable: bool = False,
542+
) -> Task:
536543
mutation_name = "exportDataRowsInModelRun"
537544
create_task_query_str = (
538545
f"mutation {mutation_name}PyApi"
@@ -541,7 +548,7 @@ def export_v2(
541548

542549
_params = params or ModelRunExportParams()
543550

544-
queryParams = {
551+
query_params = {
545552
"input": {
546553
"taskName": task_name,
547554
"filters": {
@@ -563,7 +570,7 @@ def export_v2(
563570
}
564571
}
565572
res = self.client.execute(create_task_query_str,
566-
queryParams,
573+
query_params,
567574
error_log_key="errors")
568575
res = res[mutation_name]
569576
task_id = res["taskId"]

labelbox/schema/project.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,15 +477,14 @@ def export(
477477
>>> task.wait_till_done()
478478
>>> task.result
479479
"""
480-
task = self.export_v2(task_name, filters, params, streamable=True)
480+
task = self._export(task_name, filters, params, streamable=True)
481481
return ExportTask(task)
482482

483483
def export_v2(
484484
self,
485485
task_name: Optional[str] = None,
486486
filters: Optional[ProjectExportFilters] = None,
487487
params: Optional[ProjectExportParams] = None,
488-
streamable: bool = False,
489488
) -> Task:
490489
"""
491490
Creates a project export task with the given params and returns the task.
@@ -506,7 +505,15 @@ def export_v2(
506505
>>> task.wait_till_done()
507506
>>> task.result
508507
"""
508+
return self._export(task_name, filters, params)
509509

510+
def _export(
511+
self,
512+
task_name: Optional[str] = None,
513+
filters: Optional[ProjectExportFilters] = None,
514+
params: Optional[ProjectExportParams] = None,
515+
streamable: bool = False,
516+
) -> Task:
510517
_params = params or ProjectExportParams({
511518
"attachments": False,
512519
"metadata_fields": False,

labelbox/schema/slice.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,13 @@ def export(self,
138138
>>> task.wait_till_done()
139139
>>> task.result
140140
"""
141-
task = self.export_v2(task_name, params, streamable=True)
141+
task = self._export(task_name, params, streamable=True)
142142
return ExportTask(task)
143143

144144
def export_v2(
145145
self,
146146
task_name: Optional[str] = None,
147147
params: Optional[CatalogExportParams] = None,
148-
streamable: bool = False,
149148
) -> Task:
150149
"""
151150
Creates a slice export task with the given params and returns the task.
@@ -156,7 +155,14 @@ def export_v2(
156155
>>> task.wait_till_done()
157156
>>> task.result
158157
"""
158+
return self._export(task_name, params)
159159

160+
def _export(
161+
self,
162+
task_name: Optional[str] = None,
163+
params: Optional[CatalogExportParams] = None,
164+
streamable: bool = False,
165+
) -> Task:
160166
_params = params or CatalogExportParams({
161167
"attachments": False,
162168
"metadata_fields": False,

0 commit comments

Comments
 (0)