Skip to content

Commit 089f0a7

Browse files
committed
Docs, mypy fixes
1 parent be1ee2e commit 089f0a7

File tree

2 files changed

+31
-27
lines changed

2 files changed

+31
-27
lines changed

labelbox/schema/project.py

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -402,28 +402,29 @@ def _string_from_dict(dictionary: dict, value_with_quotes=False) -> str:
402402
self.uid)
403403
time.sleep(sleep_time)
404404

405-
"""
406-
Creates a project run export task with the given params and returns the task.
407-
408-
>>> task = project.export_v2(
409-
>>> filters={
410-
>>> "last_activity_at": ["2000-01-01 00:00:00", "2050-01-01 00:00:00"],
411-
>>> "label_created_at": ["2000-01-01 00:00:00", "2050-01-01 00:00:00"]
412-
>>> },
413-
>>> params={
414-
>>> "include_performance_details": False,
415-
>>> "include_labels": True
416-
>>> })
417-
>>> task.wait_till_done()
418-
>>> task.result
419-
420-
421-
"""
405+
422406

423407
def export_v2(self,
424408
task_name: Optional[str] = None,
425409
filters: Optional[ProjectExportFilters] = None,
426410
params: Optional[ProjectExportParams] = None) -> Task:
411+
"""
412+
Creates a project run export task with the given params and returns the task.
413+
414+
For more information visit: https://docs.labelbox.com/docs/exports-v2#export-from-a-project-python-sdk
415+
416+
>>> task = project.export_v2(
417+
>>> filters={
418+
>>> "last_activity_at": ["2000-01-01 00:00:00", "2050-01-01 00:00:00"],
419+
>>> "label_created_at": ["2000-01-01 00:00:00", "2050-01-01 00:00:00"]
420+
>>> },
421+
>>> params={
422+
>>> "include_performance_details": False,
423+
>>> "include_labels": True
424+
>>> })
425+
>>> task.wait_till_done()
426+
>>> task.result
427+
"""
427428

428429
_params = params or ProjectExportParams({
429430
"attachments": False,
@@ -450,14 +451,16 @@ def _get_timezone() -> str:
450451
create_task_query_str = """mutation exportDataRowsInProjectPyApi($input: ExportDataRowsInProjectInput!){
451452
%s(input: $input) {taskId} }
452453
""" % (mutation_name)
454+
455+
search_query = []
453456
query_params = {
454457
"input": {
455458
"taskName": task_name,
456459
"filters": {
457460
"projectId": self.uid,
458461
"searchQuery": {
459462
"scope": None,
460-
"query": []
463+
"query": search_query
461464
}
462465
},
463466
"params": {
@@ -477,14 +480,15 @@ def _get_timezone() -> str:
477480
}
478481
}
479482

480-
if _filters.get('last_activity_at') is not None:
483+
484+
if "last_activity_at" in _filters and _filters['last_activity_at'] is not None:
481485
if timezone is None:
482486
timezone = _get_timezone()
483487
values = _filters['last_activity_at']
484488
start, end = values
485489
if (start is not None and end is not None):
486490
[_validate_datetime(date) for date in values]
487-
query_params["input"]["filters"]['searchQuery']['query'].append(
491+
search_query.append(
488492
{
489493
"type": "data_row_last_activity_at",
490494
"value": {
@@ -498,7 +502,7 @@ def _get_timezone() -> str:
498502
})
499503
elif (start is not None):
500504
_validate_datetime(start)
501-
query_params["input"]["filters"]['searchQuery']['query'].append(
505+
search_query.append(
502506
{
503507
"type": "data_row_last_activity_at",
504508
"value": {
@@ -509,7 +513,7 @@ def _get_timezone() -> str:
509513
})
510514
elif (end is not None):
511515
_validate_datetime(end)
512-
query_params["input"]["filters"]['searchQuery']['query'].append(
516+
search_query.append(
513517
{
514518
"type": "data_row_last_activity_at",
515519
"value": {
@@ -519,14 +523,14 @@ def _get_timezone() -> str:
519523
}
520524
})
521525

522-
if _filters.get('label_created_at') is not None:
526+
if "label_created_at" in _filters and _filters["label_created_at"] is not None:
523527
if timezone is None:
524528
timezone = _get_timezone()
525529
values = _filters['label_created_at']
526530
start, end = values
527531
if (start is not None and end is not None):
528532
[_validate_datetime(date) for date in values]
529-
query_params["input"]["filters"]['searchQuery']['query'].append(
533+
search_query.append(
530534
{
531535
"type": "labeled_at",
532536
"value": {
@@ -539,7 +543,7 @@ def _get_timezone() -> str:
539543
})
540544
elif (start is not None):
541545
_validate_datetime(start)
542-
query_params["input"]["filters"]['searchQuery']['query'].append(
546+
search_query.append(
543547
{
544548
"type": "labeled_at",
545549
"value": {
@@ -549,7 +553,7 @@ def _get_timezone() -> str:
549553
})
550554
elif (end is not None):
551555
_validate_datetime(end)
552-
query_params["input"]["filters"]['searchQuery']['query'].append(
556+
search_query.append(
553557
{
554558
"type": "labeled_at",
555559
"value": {

tests/integration/test_project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def test_project_export_v2(configured_project_with_label):
6666
filters={"last_activity_at": [None, "2050-01-01 00:00:00"]})
6767

6868
task_from = project.export_v2(
69-
filters={"last_activity_at": ["2000-01-01 00:00:00", None]})
69+
filters={"label_created_at": ["2000-01-01 00:00:00", None]})
7070

7171
assert task.name == task_name
7272
task.wait_till_done()

0 commit comments

Comments
 (0)