Fix LabelingService classes

Author: Val Brodsky

libs/labelbox/src/labelbox/schema/labeling_service.py

@@ -5,15 +5,15 @@
 
 from labelbox.exceptions import LabelboxError, ResourceNotFoundError
 
-from labelbox.pydantic_compat import BaseModel, Field
+from pydantic import BaseModel, Field
 from labelbox.utils import _CamelCaseMixin
 from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
 from labelbox.schema.labeling_service_status import LabelingServiceStatus
 
 Cuid = Annotated[str, Field(min_length=25, max_length=25)]
 
 
-class LabelingService(BaseModel):
+class LabelingService(_CamelCaseMixin):
     """
     Labeling service for a project. This is a service that can be requested to label data for a project.
     """
@@ -31,9 +31,6 @@ def __init__(self, **kwargs):
             raise RuntimeError(
                 "Please enable experimental in client to use LabelingService")
 
-    class Config(_CamelCaseMixin.Config):
-        ...
-
     @classmethod
     def start(cls, client, project_id: Cuid) -> 'LabelingService':
         """

libs/labelbox/src/labelbox/schema/labeling_service_dashboard.py

@@ -4,7 +4,7 @@
 
 from labelbox.exceptions import ResourceNotFoundError
 from labelbox.pagination import PaginatedCollection
-from labelbox.pydantic_compat import BaseModel, root_validator, Field
+from pydantic import BaseModel, root_validator, Field
 from labelbox.schema.search_filters import SearchFilter, build_search_filter
 from labelbox.utils import _CamelCaseMixin
 from .ontology_kind import EditorTaskType
@@ -39,7 +39,7 @@ class LabelingServiceDashboardTags(BaseModel):
     type: str
 
 
-class LabelingServiceDashboard(BaseModel):
+class LabelingServiceDashboard(_CamelCaseMixin):
     """
     Represent labeling service data for a project
 
@@ -105,9 +105,6 @@ def service_type(self):
 
         return sentence_case(self.media_type.value)
 
-    class Config(_CamelCaseMixin.Config):
-        ...
-
     @classmethod
     def get(cls, client, project_id: str) -> 'LabelingServiceDashboard':
         """

libs/labelbox/src/labelbox/schema/search_filters.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from typing import List, Literal, Union
 
-from labelbox.pydantic_compat import BaseModel, validator
+from pydantic import BaseModel, field_validator
 from labelbox.schema.labeling_service_status import LabelingServiceStatus
 from labelbox.utils import format_iso_datetime
 
@@ -106,7 +106,6 @@ class WorkspaceFilter(BaseSearchFilter):
 class TagFilter(BaseSearchFilter):
     """
     Filter for project tags
-    
     values are tag ids
     """
     operation: Literal[OperationType.Tag] = OperationType.Tag
@@ -123,7 +122,7 @@ class ProjectStageFilter(BaseSearchFilter):
     operator: IdOperator
     values: List[LabelingServiceStatus]
 
-    @validator('values', pre=True)
+    @field_validator('values')
     def validate_values(cls, values):
         disallowed_values = [LabelingServiceStatus.Missing]
         for value in values:

libs/labelbox/tests/data/annotation_types/test_metrics.py

@@ -24,6 +24,7 @@ def test_legacy_scalar_metric():
             'extra': {},
         }],
         'extra': {},
+        'is_benchmark_reference': False
     }
     assert label.model_dump(exclude_none=True) == expected
 
@@ -76,6 +77,7 @@ def test_custom_scalar_metric(feature_name, subclass_name, aggregation, value):
             'extra': {}
         }],
         'extra': {},
+        'is_benchmark_reference': False
     }
     assert label.model_dump(exclude_none=True) == expected
 
@@ -123,6 +125,7 @@ def test_custom_confusison_matrix_metric(feature_name, subclass_name,
             'extra': {}
         }],
         'extra': {},
+        'is_benchmark_reference': False
     }
     assert label.model_dump(exclude_none=True) == expected