add label.uid

Author: Matt Sokoloff

labelbox/data/annotation_types/label.py

@@ -1,5 +1,6 @@
 from collections import defaultdict
-from typing import Any, Callable, Dict, List, Union
+
+from typing import Any, Callable, Dict, List, Union, Optional
 
 from pydantic import BaseModel, validator
 
@@ -10,11 +11,13 @@
 from .data import VideoData, TextData, RasterData
 from .geometry import Mask
 from .metrics import ScalarMetric
+from .types import Cuid
 from .annotation import (ClassificationAnnotation, ObjectAnnotation,
                          VideoClassificationAnnotation, VideoObjectAnnotation)
 
 
 class Label(BaseModel):
+    uid: Optional[Cuid] = None
     data: Union[VideoData, RasterData, TextData]
     annotations: List[Union[ClassificationAnnotation, ObjectAnnotation,
                             VideoObjectAnnotation,

labelbox/data/serialization/labelbox_v1/label.py

@@ -121,11 +121,11 @@ class LBV1Label(BaseModel):
                  List[LBV1LabelAnnotationsVideo]] = Field(..., alias='Label')
     data_row_id: str = Field(..., alias="DataRow ID")
     row_data: str = Field(None, alias="Labeled Data")
+    id: Optional[str] = Field(None, alias = 'ID')
     external_id: Optional[str] = Field(None, alias="External ID")
 
     created_by: Optional[str] = Extra('Created By')
     project_name: Optional[str] = Extra('Project Name')
-    id: Optional[str] = Extra('ID')
     created_at: Optional[str] = Extra('Created At')
     updated_at: Optional[str] = Extra('Updated At')
     seconds_to_label: Optional[float] = Extra('Seconds to Label')
@@ -149,9 +149,9 @@ def to_common(self) -> Label:
         else:
             annotations = self.label.to_common()
             data = self._infer_media_type()
-            print(data)
 
         return Label(data=data,
+                     uid = self.id,
                      annotations=annotations,
                      extra={
                          field.alias: getattr(self, field_name)
@@ -168,6 +168,7 @@ def from_common(cls, label: Label):
             label_ = LBV1LabelAnnotations.from_common(label.annotations)
 
         return LBV1Label(label=label_,
+                         id = label.uid,
                          data_row_id=label.data.uid,
                          row_data=label.data.url,
                          external_id=label.data.external_id,