PR Get rid of camelcase

Author: Val Brodsky

labelbox/data/annotation_types/ner/document_entity.py

@@ -2,10 +2,12 @@
 
 from pydantic import BaseModel, validator
 
+from labelbox.utils import _CamelCaseMixin
 
-class DocumentTextSelection(BaseModel):
-    tokenIds: List[str]
-    groupId: str
+
+class DocumentTextSelection(_CamelCaseMixin, BaseModel):
+    token_ids: List[str]
+    group_id: str
     page: int
 
     @validator("page")
@@ -15,7 +17,7 @@ def validate_page(cls, v):
         return v
 
 
-class DocumentEntity(BaseModel):
+class DocumentEntity(_CamelCaseMixin, BaseModel):
     """ Represents a text entity """
     name: str
-    textSelections: List[DocumentTextSelection]
+    text_selections: List[DocumentTextSelection]

labelbox/data/serialization/ndjson/objects.py

@@ -374,10 +374,10 @@ def from_common(cls,
 
 class NDDocumentEntity(NDBaseObject, ConfidenceMixin):
     name: str
-    textSelections: List[DocumentTextSelection]
+    text_selections: List[DocumentTextSelection]
 
     def to_common(self) -> DocumentEntity:
-        return TextEntity(name=self.name, textSelections=self.textSelections)
+        return TextEntity(name=self.name, text_selections=self.text_selections)
 
         return obj.from_common(annotation.value, subclasses, annotation.name,
                                annotation.feature_schema_id, annotation.extra,
@@ -393,7 +393,7 @@ def from_common(cls,
                     data: Union[ImageData, TextData],
                     confidence: Optional[float] = None) -> "NDDocumentEntity":
 
-        return cls(textSelections=document_entity.textSelections,
+        return cls(text_selections=document_entity.text_selections,
                    dataRow=DataRow(id=data.uid),
                    name=name,
                    schema_id=feature_schema_id,

tests/data/annotation_types/test_ner.py

@@ -11,14 +11,14 @@ def test_ner():
 
 def test_document_entity():
     document_entity = DocumentEntity(name="tool_name",
-                                     textSelections=[
+                                     text_selections=[
                                          DocumentTextSelection(
-                                             tokenIds=["1", "2"],
-                                             groupId="1",
+                                             token_ids=["1", "2"],
+                                             group_id="1",
                                              page=1)
                                      ])
 
     assert document_entity.name == "tool_name"
-    assert document_entity.textSelections[0].tokenIds == ["1", "2"]
-    assert document_entity.textSelections[0].groupId == "1"
-    assert document_entity.textSelections[0].page == 1
+    assert document_entity.text_selections[0].token_ids == ["1", "2"]
+    assert document_entity.text_selections[0].group_id == "1"
+    assert document_entity.text_selections[0].page == 1

tests/integration/annotation_import/conftest.py

@@ -168,10 +168,10 @@ def configured_project_pdf(client, ontology, rand_gen, pdf_url):
 
 
 @pytest.fixture
-def dataset_pdf_entity(client, rand_gen, pdf_entity_row_data):
+def dataset_pdf_entity(client, rand_gen, pdf_entity_data_row):
     dataset = client.create_dataset(name=rand_gen(str))
     data_row_ids = []
-    data_row = dataset.create_data_row(pdf_entity_row_data)
+    data_row = dataset.create_data_row(pdf_entity_data_row)
     data_row_ids.append(data_row.uid)
     yield dataset, data_row_ids
     dataset.delete()

tests/integration/annotation_import/test_bulk_import_request.py

@@ -297,8 +297,8 @@ def test_pdf_document_entity(client, configured_project_without_data_rows,
                              dataset_pdf_entity, rand_gen):
     # for content "Metal-insulator (MI) transitions have been one of the" in OCR JSON extract tests/assets/arxiv-pdf_data_99-word-token-pdfs_0801.3483-lb-textlayer.json
     document_text_selection = DocumentTextSelection(
-        groupId="2f4336f4-a07e-4e0a-a9e1-5629b03b719b",
-        tokenIds=[
+        group_id="2f4336f4-a07e-4e0a-a9e1-5629b03b719b",
+        token_ids=[
             "3f984bf3-1d61-44f5-b59a-9658a2e3440f",
             "3bf00b56-ff12-4e52-8cc1-08dbddb3c3b8",
             "6e1c3420-d4b7-4c5a-8fd6-ead43bf73d80",
@@ -311,7 +311,7 @@ def test_pdf_document_entity(client, configured_project_without_data_rows,
         page=1)
 
     entities_annotation_document_entity = DocumentEntity(
-        name="named_entity", textSelections=[document_text_selection])
+        name="named_entity", text_selections=[document_text_selection])
     entities_annotation = ObjectAnnotation(
         name="named-entity", value=entities_annotation_document_entity)
 

tests/integration/conftest.py

@@ -178,7 +178,7 @@ def pdf_url(client):
 
 
 @pytest.fixture(scope="session")
-def pdf_entity_row_data(client):
+def pdf_entity_data_row(client):
     pdf_url = client.upload_file(
         'tests/assets/arxiv-pdf_data_99-word-token-pdfs_0801.3483.pdf')
     text_layer_url = client.upload_file(