fix field name and answers

Author: farkob

labelbox/data/serialization/ndjson/classification.py

@@ -11,8 +11,8 @@
 
 
 class NDFeature(BaseModel):
-    schema_id: Optional[Cuid] = None
     name: Optional[str] = None
+    schema_id: Optional[Cuid] = None
 
     @root_validator()
     def must_set_one(cls, values):

labelbox/schema/bulk_import_request.py

@@ -675,20 +675,9 @@ class NDText(NDBase):
     #No feature schema to check
 
 
-class NDAnswer(BaseModel):
-    schemaId: Optional[Cuid] = None
-    value: Optional[str] = None
-
-    @root_validator
-    def must_set_one(cls, values):
-        if values['schemaId'] is None and values['value'] is None:
-            raise ValueError("Must set either schemaId or value for answers")
-        return values
-
-
 class NDChecklist(VideoSupported, NDBase):
     ontology_type: Literal["checklist"] = "checklist"
-    answers: List[NDAnswer] = pydantic.Field(determinant=True)
+    answers: List[NDFeatureSchema] = pydantic.Field(determinant=True)
 
     @validator('answers', pre=True)
     def validate_answers(cls, value, field):
@@ -704,7 +693,7 @@ def validate_feature_schemas(self, valid_feature_schemas_by_id,
               self).validate_feature_schemas(valid_feature_schemas_by_id,
                                              valid_feature_schemas_by_name)
         #Test the feature schemas provided to the answer field
-        if len(set([answer.value or answer.schemaId for answer in self.answers
+        if len(set([answer.name or answer.schemaId for answer in self.answers
                    ])) != len(self.answers):
             raise ValueError(
                 f"Duplicated featureSchema found for checklist {self.uuid}")
@@ -713,15 +702,15 @@ def validate_feature_schemas(self, valid_feature_schemas_by_id,
                 self.
                 name]['options'] if self.name else valid_feature_schemas_by_id[
                     self.schemaId]['options']
-            if answer.value not in options and answer.schemaId not in options:
+            if answer.name not in options and answer.schemaId not in options:
                 raise ValueError(
                     f"Feature schema provided to {self.ontology_type} invalid. Expected on of {options}. Found {answer}"
                 )
 
 
 class NDRadio(VideoSupported, NDBase):
     ontology_type: Literal["radio"] = "radio"
-    answer: NDAnswer = pydantic.Field(determinant=True)
+    answer: NDFeatureSchema = pydantic.Field(determinant=True)
 
     def validate_feature_schemas(self, valid_feature_schemas_by_id,
                                  valid_feature_schemas_by_name):
@@ -731,9 +720,9 @@ def validate_feature_schemas(self, valid_feature_schemas_by_id,
         options = valid_feature_schemas_by_name[
             self.name]['options'] if self.name else valid_feature_schemas_by_id[
                 self.schemaId]['options']
-        if self.answer.value not in options and self.answer.schemaId not in options:
+        if self.answer.name not in options and self.answer.schemaId not in options:
             raise ValueError(
-                f"Feature schema provided to {self.ontology_type} invalid. Expected on of {options}. Found {self.answer.value or self.answer.schemaId}"
+                f"Feature schema provided to {self.ontology_type} invalid. Expected on of {options}. Found {self.answer.name or self.answer.schemaId}"
             )
 
 

tests/data/assets/ndjson/classification_import_name_only.json

@@ -1,19 +1,19 @@
 [
   {
-    "answer": { "schemaId": "ckrb1sfl8099g0y91cxbd5ftb" },
+    "answer": { "name": "choice 1" },
     "name": "classification a",
     "dataRow": { "id": "ckrb1sf1i1g7i0ybcdc6oc8ct" },
     "uuid": "f6879f59-d2b5-49c2-aceb-d9e8dc478673"
   },
   {
-    "answer": [{ "schemaId": "ckrb1sfl8099e0y919v260awv" }],
+    "answer": [{ "name": "choice 2" }],
     "name": "classification b",
     "dataRow": { "id": "ckrb1sf1i1g7i0ybcdc6oc8ct" },
     "uuid": "d009925d-91a3-4f67-abd9-753453f5a584"
   },
   {
     "answer": "a value",
-    "name": "classification b",
+    "name": "classification c",
     "dataRow": { "id": "ckrb1sf1i1g7i0ybcdc6oc8ct" },
     "uuid": "d009925d-91a3-4f67-abd9-753453f5a584"
   }

tests/integration/annotation_import/conftest.py

@@ -185,7 +185,7 @@ def rectangle_inference(prediction_id_mapping):
                 "schemaId":
                     rectangle['tool']['classifications'][0]['options'][0]
                     ['featureSchemaId'],
-                "value":
+                "name":
                     rectangle['tool']['classifications'][0]['options'][0]
                     ['value']
             }