Fix merge issues

Author: Val Brodsky

libs/labelbox/src/labelbox/schema/__init__.py

@@ -1,29 +1,28 @@
-import labelbox.schema.asset_attachment
-import labelbox.schema.bulk_import_request
 import labelbox.schema.annotation_import
+import labelbox.schema.asset_attachment
+import labelbox.schema.batch
 import labelbox.schema.benchmark
+import labelbox.schema.catalog
 import labelbox.schema.data_row
+import labelbox.schema.data_row_metadata
 import labelbox.schema.dataset
+import labelbox.schema.iam_integration
+import labelbox.schema.identifiable
+import labelbox.schema.identifiables
 import labelbox.schema.invite
 import labelbox.schema.label
 import labelbox.schema.labeling_frontend
 import labelbox.schema.labeling_service
+import labelbox.schema.media_type
 import labelbox.schema.model
 import labelbox.schema.model_run
 import labelbox.schema.ontology
+import labelbox.schema.ontology_kind
 import labelbox.schema.organization
 import labelbox.schema.project
+import labelbox.schema.project_overview
 import labelbox.schema.review
 import labelbox.schema.role
 import labelbox.schema.task
 import labelbox.schema.user
 import labelbox.schema.webhook
-import labelbox.schema.data_row_metadata
-import labelbox.schema.batch
-import labelbox.schema.iam_integration
-import labelbox.schema.media_type
-import labelbox.schema.identifiables
-import labelbox.schema.identifiable
-import labelbox.schema.catalog
-import labelbox.schema.ontology_kind
-import labelbox.schema.project_overview

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

@@ -1,21 +1,8 @@
-from labelbox.schema.media_type import MediaType
 import pytest
-
-from pytest_cases import parametrize, fixture_ref
+from pytest_cases import fixture_ref, parametrize
 
 from labelbox.exceptions import MALValidationError
-from labelbox.schema.bulk_import_request import (
-    NDChecklist,
-    NDClassification,
-    NDMask,
-    NDPolygon,
-    NDPolyline,
-    NDRectangle,
-    NDText,
-    NDTextEntity,
-    NDTool,
-    _validate_ndjson,
-)
+from labelbox.schema.media_type import MediaType
 
 """
 - These NDlabels are apart of bulkImportReqeust and should be removed once bulk import request is removed