CR changes

Author: mnoszczak

labelbox/schema/export_params.py

@@ -0,0 +1,25 @@
+import sys
+
+from typing import Optional
+if sys.version_info >= (3, 8):
+    from typing import TypedDict
+else:
+    from typing_extensions import TypedDict
+
+
+class DataRowParams(TypedDict):
+    include_data_row_details: Optional[bool]
+    include_media_attributes: Optional[bool]
+    include_metadata_fields: Optional[bool]
+    include_attachments: Optional[bool]
+
+
+class ProjectExportParams(DataRowParams):
+    include_project_details: Optional[bool]
+    include_label_details: Optional[bool]
+    include_performance_details: Optional[bool]
+
+
+class ModelRunExportParams(DataRowParams):
+    # TODO: Add model run fields
+    pass

labelbox/schema/filters.py

@@ -12,7 +12,7 @@
 from labelbox.orm.query import results_query_part
 from labelbox.orm.model import Field, Relationship, Entity
 from labelbox.orm.db_object import DbObject, experimental
-from labelbox.schema.filters import ModelRunExportFilter
+from labelbox.schema.export_params import ModelRunExportParams
 from labelbox.schema.task import Task
 from labelbox.schema.user import User  # type: ignore
 
@@ -457,7 +457,8 @@ def export_labels(
     """
 
     def export_labels_v2(self, task_name: str,
-                         filter: Optional[ModelRunExportFilter]) -> Task:
+                         params: Optional[ModelRunExportParams]) -> Task:
+        _params = params or {}
         mutation_name = "exportDataRows"
         create_task_query_str = """mutation exportDataRowsPyApi($input: ExportDataRowsInput!){
           %s(input: $input) {taskId} }
@@ -471,14 +472,13 @@ def export_labels_v2(self, task_name: str,
                 },
                 "params": {
                     "includeAttachments":
-                        filter["attachments"]
-                        if filter and "attachments" in filter else False,
+                        _params.get('include_attachments', False),
                     "includeMediaAttributes":
-                        filter['media_attributes']
-                        if filter and 'media_attributes' in filter else False,
+                        _params.get('include_media_attributes', False),
                     "includeMetadata":
-                        filter['metadata_fields']
-                        if filter and 'metadata_fields' in filter else False,
+                        _params.get('include_metadata_fields', False),
+                    "includeDataRowDetails":
+                        _params.get('include_data_row_details', False),
                     # Arguments locked based on exectuion context
                     "includeModelRuns":
                         True,

labelbox/schema/model_run.py

@@ -116,11 +116,13 @@ def test_model_run_export_labels(model_run_with_model_run_data_rows):
 
 def test_model_run_export_labels_v2(model_run_with_model_run_data_rows):
     task_name = "test_task"
-    task = model_run_with_model_run_data_rows.export_labels_v2(
-        task_name, filter={"media_attributes: true"})
+    params = {"media_attributes": True}
+    task = model_run_with_model_run_data_rows.export_labels_v2(task_name,
+                                                               params=params)
     assert task.name == task_name
     task.wait_till_done()
     assert task.status == "COMPLETE"
+    # TODO: Download result and check it
 
 
 @pytest.mark.skipif(condition=os.environ['LABELBOX_TEST_ENVIRON'] == "onprem",