Fixing more tests

Author: Val Brodsky

libs/labelbox/tests/data/annotation_import/conftest.py

@@ -622,12 +622,15 @@ def configured_project(client, initial_dataset, ontology, rand_gen, image_url):
     data_row_ids = []
 
     ontologies = ontology["tools"] + ontology["classifications"]
+    data_row_data = []
     for ind in range(len(ontologies)):
-        data_row_ids.append(
-            dataset.create_data_row(
-                row_data=image_url,
-                global_key=f"gk_{ontologies[ind]['name']}_{rand_gen(str)}",
-            ).uid)
+        data_row_data.append({
+            "row_data": image_url,
+            "global_key": f"gk_{ontologies[ind]['name']}_{rand_gen(str)}"
+        })
+    task = dataset.create_data_rows(data_row_data)
+    task.wait_till_done()
+    data_row_ids = [row['id'] for row in task.result]
     project._wait_until_data_rows_are_processed(data_row_ids=data_row_ids,
                                                 sleep_interval=3)
 

libs/labelbox/tests/integration/test_data_rows.py

@@ -362,10 +362,6 @@ def test_create_data_row_with_invalid_input(dataset, image_url):
     with pytest.raises(ResourceCreationError) as exc:
         dataset.create_data_row("asdf")
 
-    dr = {"row_data": image_url}
-    with pytest.raises(ResourceCreationError) as exc:
-        dataset.create_data_row(dr, row_data=image_url)
-
 
 def test_create_data_row_with_metadata(mdo, dataset, image_url):
     client = dataset.client

libs/labelbox/tests/integration/test_dataset.py

@@ -2,7 +2,7 @@
 import requests
 from unittest.mock import MagicMock
 from labelbox import Dataset
-from labelbox.exceptions import ResourceNotFoundError, InvalidQueryError
+from labelbox.exceptions import ResourceNotFoundError, ResourceCreationError
 
 from labelbox.schema.internal.descriptor_file_creator import DescriptorFileCreator
 
@@ -128,7 +128,7 @@ def test_create_pdf(dataset):
     },
                             media_type="PDF")
 
-    with pytest.raises(InvalidQueryError):
+    with pytest.raises(ResourceCreationError):
         # Wrong media type
         dataset.create_data_row(row_data={
             "pdfUrl":

libs/labelbox/tests/integration/test_project_model_config.py

@@ -1,30 +1,54 @@
+from _pytest import config
 import pytest
 from labelbox.exceptions import ResourceNotFoundError
 
-def test_add_single_model_config(configured_project, model_config):
-    project_model_config_id = configured_project.add_model_config(model_config.uid)
 
-    assert set(config.uid for config in configured_project.project_model_configs()) == set([project_model_config_id])
+def test_add_single_model_config(chat_evaluation_project_create_dataset,
+                                 model_config):
+    configured_project = chat_evaluation_project_create_dataset
+    project_model_config_id = configured_project.add_model_config(
+        model_config.uid)
 
-    assert configured_project.delete_project_model_config(project_model_config_id)
+    assert set(config.uid
+               for config in configured_project.project_model_configs()) == set(
+                   [project_model_config_id])
 
+    assert configured_project.delete_project_model_config(
+        project_model_config_id)
 
-def test_add_multiple_model_config(client, rand_gen, configured_project, model_config, valid_model_id):
-    second_model_config = client.create_model_config(rand_gen(str), valid_model_id, {"param": "value"})
-    first_project_model_config_id = configured_project.add_model_config(model_config.uid)
-    second_project_model_config_id = configured_project.add_model_config(second_model_config.uid)
-    expected_model_configs = set([first_project_model_config_id, second_project_model_config_id])
 
-    assert set(config.uid for config in configured_project.project_model_configs()) == expected_model_configs
+def test_add_multiple_model_config(client, rand_gen,
+                                   chat_evaluation_project_create_dataset,
+                                   model_config, valid_model_id):
+    configured_project = chat_evaluation_project_create_dataset
+    second_model_config = client.create_model_config(rand_gen(str),
+                                                     valid_model_id,
+                                                     {"param": "value"})
+    first_project_model_config_id = configured_project.add_model_config(
+        model_config.uid)
+    second_project_model_config_id = configured_project.add_model_config(
+        second_model_config.uid)
+    expected_model_configs = set(
+        [first_project_model_config_id, second_project_model_config_id])
+
+    assert set(
+        config.uid for config in configured_project.project_model_configs()
+    ) == expected_model_configs
 
     for project_model_config_id in expected_model_configs:
-        assert configured_project.delete_project_model_config(project_model_config_id)
+        assert configured_project.delete_project_model_config(
+            project_model_config_id)
 
 
-def test_delete_project_model_config(configured_project, model_config):
-    assert configured_project.delete_project_model_config(configured_project.add_model_config(model_config.uid))
+def test_delete_project_model_config(chat_evaluation_project_create_dataset,
+                                     model_config):
+    configured_project = chat_evaluation_project_create_dataset
+    assert configured_project.delete_project_model_config(
+        configured_project.add_model_config(model_config.uid))
     assert not len(configured_project.project_model_configs())
 
+
 def test_delete_nonexistant_project_model_config(configured_project):
     with pytest.raises(ResourceNotFoundError):
-        configured_project.delete_project_model_config("nonexistant_project_model_config")
+        configured_project.delete_project_model_config(
+            "nonexistant_project_model_config")