MODEL-1448: Fixed formatting, switched to pydantic class approach

Author: dubininsergey

libs/labelbox/src/labelbox/client.py

@@ -2218,19 +2218,41 @@ def get_embedding_by_name(self, name: str) -> Embedding:
                                                         dict(name=name))
 
     def upsert_label_feedback(self, label_id: str, feedback: str,
-                              scores: Dict[str, float]) -> Entity.Label:
+                              scores: Dict[str, float]) -> List[Entity.Label]:
         """
+        Submits the label feedback which is a free-form text and numeric
+        label scores.
 
         Args:
             label_id: Target label ID
             feedback: Free text comment regarding the label
-            scores: A dict of scores, the key is a score name and the value is the score value
-        Returns: A list of LabelScore instances
+            scores: A dict of scores, the key is a score name and the value is
+            the score value
 
-        """
-        mutation_str = """mutation UpsertAutoQaLabelFeedbackPyApi($labelId: ID!, $feedback: String!, $scores: Json!){
-            upsertAutoQaLabelFeedback(input: {labelId: $labelId, feedback: $feedback, scores: $scores}) { id scores {id name score} }
-        }
+        Returns:
+            A list of LabelScore instances
+        """
+        mutation_str = """
+        mutation UpsertAutoQaLabelFeedbackPyApi(
+            $labelId: ID!
+            $feedback: String!
+            $scores: Json!
+            ) {
+            upsertAutoQaLabelFeedback(
+                input: {
+                    labelId: $labelId,
+                    feedback: $feedback,
+                    scores: $scores
+                    }
+            ) {
+                id
+                scores {
+                id
+                name
+                score
+                }
+            }
+            }
         """
         res = self.execute(mutation_str, {
             "labelId": label_id,
@@ -2239,4 +2261,7 @@ def upsert_label_feedback(self, label_id: str, feedback: str,
         })
         scores_raw = res["upsertAutoQaLabelFeedback"]["scores"]
 
-        return [Entity.LabelScore(self, x) for x in scores_raw]
+        return [
+            labelbox.LabelScore(name=x['name'], score=x['score'])
+            for x in scores_raw
+        ]

libs/labelbox/src/labelbox/orm/model.py

@@ -382,7 +382,6 @@ class Entity(metaclass=EntityMeta):
         CatalogSlice: Type[labelbox.CatalogSlice]
         ModelSlice: Type[labelbox.ModelSlice]
         TaskQueue: Type[labelbox.TaskQueue]
-        LabelScore: Type[labelbox.LabelScore]
 
     @classmethod
     def _attributes_of_type(cls, attr_type):

libs/labelbox/src/labelbox/schema/label_score.py

@@ -1,8 +1,7 @@
-from labelbox.orm.db_object import DbObject
-from labelbox.orm.model import Field
+from labelbox import pydantic_compat
 
 
-class LabelScore(DbObject):
+class LabelScore(pydantic_compat.BaseModel):
     """
     a label score
 
@@ -12,8 +11,5 @@ class LabelScore(DbObject):
 
     """
 
-    name = Field.String("name")
-    data_row_count = Field.Float("score")
-
-    def __init__(self, client, *args, **kwargs):
-        super().__init__(client, *args, **kwargs)
+    name: str
+    score: float

libs/labelbox/tests/integration/test_label.py

@@ -1,10 +1,9 @@
+import os
 import time
 
-from labelbox import Client
 import pytest
-import os
 
-from labelbox import Label
+from labelbox import Client, Label
 
 
 def test_labels(configured_project_with_label):
@@ -30,10 +29,10 @@ def test_labels(configured_project_with_label):
 
 # TODO: Skipping this test in staging due to label not updating
 @pytest.mark.skipif(
-    condition=os.environ["LABELBOX_TEST_ENVIRON"] == "onprem"
-    or os.environ["LABELBOX_TEST_ENVIRON"] == "staging"
-    or os.environ["LABELBOX_TEST_ENVIRON"] == "local"
-    or os.environ["LABELBOX_TEST_ENVIRON"] == "custom",
+    condition=os.environ["LABELBOX_TEST_ENVIRON"] == "onprem" or
+    os.environ["LABELBOX_TEST_ENVIRON"] == "staging" or
+    os.environ["LABELBOX_TEST_ENVIRON"] == "local" or
+    os.environ["LABELBOX_TEST_ENVIRON"] == "custom",
     reason="does not work for onprem",
 )
 def test_label_update(configured_project_with_label):
@@ -83,8 +82,8 @@ def test_upsert_label_scores(configured_project_with_label, client: Client):
 
     label = next(project.labels())
 
-    scores = client.upsert_label_feedback(
-        label_id=label.uid, feedback="That's a great label!", scores={"overall": 5}
-    )
+    scores = client.upsert_label_feedback(label_id=label.uid,
+                                          feedback="That's a great label!",
+                                          scores={"overall": 5})
     assert len(scores) == 1
     assert scores[0].score == 5