Merge branch 'master' into da/export

Author: ardila

nucleus/prediction.py

@@ -76,6 +76,7 @@ def to_payload(self) -> dict:
         payload = super().to_payload()
         if self.confidence is not None:
             payload[CONFIDENCE_KEY] = self.confidence
+        if self.class_pdf is not None:
             payload[CLASS_PDF_KEY] = self.class_pdf
 
         return payload
@@ -94,7 +95,7 @@ def from_json(cls, payload: dict):
             confidence=payload.get(CONFIDENCE_KEY, None),
             annotation_id=payload.get(ANNOTATION_ID_KEY, None),
             metadata=payload.get(METADATA_KEY, {}),
-            class_pdf=payload.get(CLASS_PDF_KEY, {}),
+            class_pdf=payload.get(CLASS_PDF_KEY, None),
         )
 
 
@@ -125,6 +126,7 @@ def to_payload(self) -> dict:
         payload = super().to_payload()
         if self.confidence is not None:
             payload[CONFIDENCE_KEY] = self.confidence
+        if self.class_pdf is not None:
             payload[CLASS_PDF_KEY] = self.class_pdf
 
         return payload
@@ -142,5 +144,5 @@ def from_json(cls, payload: dict):
             confidence=payload.get(CONFIDENCE_KEY, None),
             annotation_id=payload.get(ANNOTATION_ID_KEY, None),
             metadata=payload.get(METADATA_KEY, {}),
-            class_pdf=payload.get(CLASS_PDF_KEY, {}),
+            class_pdf=payload.get(CLASS_PDF_KEY, None),
         )

tests/helpers.py

@@ -105,6 +105,11 @@ def reference_id_from_url(url):
         "confidence": 0.10 * i,
         "class_pdf": TEST_BOX_MODEL_PDF,
     }
+    if i != 0
+    else {
+        **TEST_BOX_ANNOTATIONS[i],
+        "confidence": 0.10 * i,
+    }
     for i in range(len(TEST_BOX_ANNOTATIONS))
 ]
 
@@ -114,6 +119,11 @@ def reference_id_from_url(url):
         "confidence": 0.10 * i,
         "class_pdf": None,
     }
+    if i != 0
+    else {
+        **TEST_POLYGON_ANNOTATIONS[i],
+        "confidence": 0.10 * i,
+    }
     for i in range(len(TEST_POLYGON_ANNOTATIONS))
 ]