PR feedback + fix tests

Author: Val Brodsky

libs/labelbox/src/labelbox/exceptions.py

@@ -152,7 +152,7 @@ class ProcessingWaitTimeout(Exception):
     """Raised when waiting for the data rows to be processed takes longer than allowed"""
 
 
-def _error_message_for_unparsed_graphql_error(error_string: str) -> str:
+def error_message_for_unparsed_graphql_error(error_string: str) -> str:
     """
     Since our client only parses certain graphql errors, this function is used to
     extract the error message from the error string when the error is not

libs/labelbox/src/labelbox/schema/project.py

@@ -13,7 +13,7 @@
 
 from labelbox import parser
 from labelbox import utils
-from labelbox.exceptions import _error_message_for_unparsed_graphql_error
+from labelbox.exceptions import error_message_for_unparsed_graphql_error
 from labelbox.exceptions import (InvalidQueryError, LabelboxError,
                                  ProcessingWaitTimeout, ResourceConflict,
                                  ResourceNotFoundError)
@@ -1275,7 +1275,7 @@ def add_model_config(self, model_config_id: str) -> str:
             if e.message.startswith(
                     "Unknown error: "
             ):  # unfortunate hack to handle unparsed graphql errors
-                error_content = _error_message_for_unparsed_graphql_error(
+                error_content = error_message_for_unparsed_graphql_error(
                     e.message)
             else:
                 error_content = e.message

libs/labelbox/src/labelbox/schema/project_model_config.py

@@ -1,6 +1,6 @@
 from labelbox.orm.db_object import DbObject
 from labelbox.orm.model import Field, Relationship
-from labelbox.exceptions import LabelboxError, _error_message_for_unparsed_graphql_error
+from labelbox.exceptions import LabelboxError, error_message_for_unparsed_graphql_error
 
 
 class ProjectModelConfig(DbObject):
@@ -38,7 +38,7 @@ def delete(self) -> bool:
             if e.message.startswith(
                     "Unknown error: "
             ):  # unfortunate hack to handle unparsed graphql errors
-                error_content = _error_message_for_unparsed_graphql_error(
+                error_content = error_message_for_unparsed_graphql_error(
                     e.message)
             else:
                 error_content = e.message

libs/labelbox/tests/integration/test_project_model_config.py

@@ -3,9 +3,9 @@
 from labelbox.exceptions import ResourceNotFoundError
 
 
-def test_add_single_model_config(chat_evaluation_project_create_dataset,
+def test_add_single_model_config(live_chat_evaluation_project_with_new_dataset,
                                  model_config):
-    configured_project = chat_evaluation_project_create_dataset
+    configured_project = live_chat_evaluation_project_with_new_dataset
     project_model_config_id = configured_project.add_model_config(
         model_config.uid)
 
@@ -18,9 +18,9 @@ def test_add_single_model_config(chat_evaluation_project_create_dataset,
 
 
 def test_add_multiple_model_config(client, rand_gen,
-                                   chat_evaluation_project_create_dataset,
+                                   live_chat_evaluation_project_with_new_dataset,
                                    model_config, valid_model_id):
-    configured_project = chat_evaluation_project_create_dataset
+    configured_project = live_chat_evaluation_project_with_new_dataset
     second_model_config = client.create_model_config(rand_gen(str),
                                                      valid_model_id,
                                                      {"param": "value"})
@@ -40,9 +40,9 @@ def test_add_multiple_model_config(client, rand_gen,
             project_model_config_id)
 
 
-def test_delete_project_model_config(chat_evaluation_project_create_dataset,
+def test_delete_project_model_config(live_chat_evaluation_project_with_new_dataset,
                                      model_config):
-    configured_project = chat_evaluation_project_create_dataset
+    configured_project = live_chat_evaluation_project_with_new_dataset
     assert configured_project.delete_project_model_config(
         configured_project.add_model_config(model_config.uid))
     assert not len(configured_project.project_model_configs())

libs/labelbox/tests/unit/test_exceptions.py

@@ -1,13 +1,13 @@
 import pytest
 
-from labelbox.exceptions import _error_message_for_unparsed_graphql_error
+from labelbox.exceptions import error_message_for_unparsed_graphql_error
 
 
 @pytest.mark.parametrize('exception_message, expected_result', [
-    ("Unparsed errors on query execution: [{'message': 'Cannot create model config for project because model setup is complete'",
+    ("Unparsed errors on query execution: [{'message': 'Cannot create model config for project because model setup is complete'}]",
      "Cannot create model config for project because model setup is complete"),
     ("blah blah blah", "Unknown error"),
 ])
 def test_client_unparsed_exception_messages(exception_message, expected_result):
-    assert _error_message_for_unparsed_graphql_error(
+    assert error_message_for_unparsed_graphql_error(
         exception_message) == expected_result

libs/labelbox/tests/unit/test_project.py

@@ -31,6 +31,7 @@ def test_project_editor_task_type(api_editor_task_type,
             "allowedMediaType": "IMAGE",
             "queueMode": "BATCH",
             "setupComplete": "2021-06-01T00:00:00.000Z",
+            "modelSetupComplete": None,
         })
 
     assert project.editor_task_type == expected_editor_task_type