Move test, rename params

Author: mnoszczak

labelbox/schema/project.py

@@ -287,11 +287,10 @@ def label_generator(self, timeout_seconds=600, **kwargs):
             return LBV1Converter.deserialize_video(json_data, self.client)
         return LBV1Converter.deserialize(json_data)
 
-    def export_labels(
-            self,
-            download=False,
-            timeout_seconds=1800,
-            **kwargs) -> Optional[Union[str, List[Dict[Any, Any]]]]:
+    def export_labels(self,
+                      download=False,
+                      timeout_seconds=1800,
+                      **kwargs) -> Optional[Union[str, List[Dict[Any, Any]]]]:
         """ Calls the server-side Label exporting that generates a JSON
         payload, and returns the URL to that payload.
 
@@ -384,7 +383,7 @@ def _validate_datetime(string_date: str) -> bool:
     """
 
     def export_v2(self, task_name: str,
-                         params: Optional[ProjectExportParams]) -> Task:
+                  params: Optional[ProjectExportParams]) -> Task:
         _params = params or {}
         mutation_name = "exportDataRowsInProject"
         create_task_query_str = """mutation exportDataRowsInProjectPyApi($input: ExportDataRowsInProjectInput!){
@@ -398,19 +397,19 @@ def export_v2(self, task_name: str,
                 },
                 "params": {
                     "includeAttachments":
-                        _params.get('include_attachments', False),
+                        _params.get('attachments', False),
                     "includeMediaAttributes":
-                        _params.get('include_media_attributes', False),
+                        _params.get('media_attributes', False),
                     "includeMetadata":
-                        _params.get('include_metadata_fields', False),
+                        _params.get('metadata_fields', False),
                     "includeDataRowDetails":
-                        _params.get('include_data_row_details', False),
+                        _params.get('data_row_details', False),
                     "includeProjectDetails":
-                        _params.get('include_project_details', False),
+                        _params.get('project_details', False),
                     "includeLabels":
-                        _params.get('include_labels', False),
+                        _params.get('labels', False),
                     "includePerformanceDetails":
-                        _params.get('include_performance_details', False),
+                        _params.get('performance_details', False),
                 },
             }
         }

tests/integration/test_label.py

@@ -1,4 +1,3 @@
-import json
 import time
 
 import pytest
@@ -44,49 +43,6 @@ def test_label_export(configured_project_with_label):
     # The new exporter doesn't work with the create_label mutation
 
 
-def test_export_v2(configured_project_with_label):
-    project, _, _, label = configured_project_with_label
-    label_id = label.uid
-    # Wait for exporter to retrieve latest labels
-    time.sleep(10)
-    task_name = "test_label_export_v2"
-
-    # TODO: Right now we don't have a way to test this
-    include_performance_details = True
-    task = project.export_v2(
-        task_name,
-        params={
-            "include_performance_details": include_performance_details,
-            "include_labels": True
-        })
-    assert task.name == task_name
-    task.wait_till_done()
-    assert task.status == "COMPLETE"
-
-    def download_result(result_url):
-        response = requests.get(result_url)
-        response.raise_for_status()
-        data = [json.loads(line) for line in response.text.splitlines()]
-        return data
-
-    task_results = download_result(task.result_url)
-
-    for task_result in task_results:
-        assert len(task_result['errors']) == 0
-        task_project = task_result['projects'][project.uid]
-        task_project_label_ids_set = set(
-            map(lambda prediction: prediction['id'], task_project['labels']))
-        assert label_id in task_project_label_ids_set
-
-        # TODO: Add back in when we have a way to test this
-        # if include_performance_details:
-        #     assert 'include_performance_details' in task_result and task_result[
-        #         'include_performance_details'] is not None
-        # else:
-        #     assert 'include_performance_details' not in task_result or task_result[
-        #         'include_performance_details'] is None
-
-
 # TODO: Skipping this test in staging due to label not updating
 @pytest.mark.skipif(condition=os.environ['LABELBOX_TEST_ENVIRON'] == "onprem" or
                     os.environ['LABELBOX_TEST_ENVIRON'] == "staging" or

tests/integration/test_project.py

@@ -1,3 +1,4 @@
+import json
 import time
 import os
 
@@ -41,6 +42,49 @@ def test_project(client, rand_gen):
     assert project not in projects
 
 
+def test_project_export_v2(configured_project_with_label):
+    project, _, _, label = configured_project_with_label
+    label_id = label.uid
+    # Wait for exporter to retrieve latest labels
+    time.sleep(10)
+    task_name = "test_label_export_v2"
+
+    # TODO: Right now we don't have a way to test this
+    include_performance_details = True
+    task = project.export_v2(
+        task_name,
+        params={
+            "include_performance_details": include_performance_details,
+            "include_labels": True
+        })
+    assert task.name == task_name
+    task.wait_till_done()
+    assert task.status == "COMPLETE"
+
+    def download_result(result_url):
+        response = requests.get(result_url)
+        response.raise_for_status()
+        data = [json.loads(line) for line in response.text.splitlines()]
+        return data
+
+    task_results = download_result(task.result_url)
+
+    for task_result in task_results:
+        assert len(task_result['errors']) == 0
+        task_project = task_result['projects'][project.uid]
+        task_project_label_ids_set = set(
+            map(lambda prediction: prediction['id'], task_project['labels']))
+        assert label_id in task_project_label_ids_set
+
+        # TODO: Add back in when we have a way to test this
+        # if include_performance_details:
+        #     assert 'include_performance_details' in task_result and task_result[
+        #         'include_performance_details'] is not None
+        # else:
+        #     assert 'include_performance_details' not in task_result or task_result[
+        #         'include_performance_details'] is None
+
+
 def test_update_project_resource_tags(client, rand_gen):
 
     def delete_tag(tag_id: str):