label container notebook

Matt Sokoloff · Matt Sokoloff · commit 32b15a80bae5 · 2021-07-22T14:17:49.000-04:00
diff --git a/examples/annotation_types/annotation_type_basics.ipynb b/examples/annotation_types/annotation_type_basics.ipynb
diff --git a/examples/annotation_types/label_containers.ipynb b/examples/annotation_types/label_containers.ipynb
diff --git a/labelbox/__init__.py b/labelbox/__init__.py
@@ -16,6 +16,6 @@
 from labelbox.schema.asset_attachment import AssetAttachment
 from labelbox.schema.webhook import Webhook
 from labelbox.schema.prediction import Prediction, PredictionModel
-from labelbox.schema.ontology import Ontology
+from labelbox.schema.ontology import Ontology, OntologyBuilder, Classification, Option, Tool
 from labelbox.schema.role import Role, ProjectRole
 from labelbox.schema.invite import Invite, InviteLimit
diff --git a/labelbox/client.py b/labelbox/client.py
@@ -503,3 +503,4 @@ def get_roles(self):
             Roles are used for user management.
         """
         return role.get_roles(self)
+
diff --git a/labelbox/data/annotation_types/collection.py b/labelbox/data/annotation_types/collection.py
@@ -5,7 +5,7 @@
 
 from tqdm import tqdm
 
-from labelbox.schema.ontology import OntologyBuilder
+from labelbox import OntologyBuilder
 from labelbox.orm.model import Entity
 from ..generator import PrefetchGenerator
 from .label import Label
@@ -62,7 +62,7 @@ def add_to_dataset(self,
         upload_task = dataset.create_data_rows([{
             'row_data': label.data.url,
             'external_id': label.data.external_id
-        } for label in self])
+        } for label in self._data])
         upload_task.wait_till_done()
 
         data_row_lookup = {
@@ -128,6 +128,7 @@ def __iter__(self) -> "LabelCollection":
 
     def __next__(self) -> Label:
         if self._index == len(self._data):
+            self._index = 0
             raise StopIteration
 
         value = self._data[self._index]
diff --git a/labelbox/data/annotation_types/label.py b/labelbox/data/annotation_types/label.py
@@ -2,7 +2,7 @@
 
 from pydantic import BaseModel
 
-from labelbox.schema.ontology import Classification as OClassification, OntologyBuilder, Option
+from labelbox import Classification as OClassification, OntologyBuilder, Option
 from labelbox.orm.model import Entity
 from .classification import ClassificationAnswer
 from .data import VideoData, TextData, RasterData
diff --git a/labelbox/data/serialization/labelbox_v1/classification.py b/labelbox/data/serialization/labelbox_v1/classification.py
@@ -30,8 +30,8 @@ def from_common(cls, radio: Radio, schema_id: Cuid, **extra) -> "LBV1Radio":
                    answer=LBV1ClassificationAnswer(
                        schema_id=radio.answer.schema_id,
                        title=radio.answer.name,
-                       value=radio.answer.extra['value'],
-                       feature_id=radio.answer.extra['feature_id']),
+                       value=radio.answer.extra.get('value'),
+                       feature_id=radio.answer.extra.get('feature_id')),
                    **extra)
 
 
@@ -56,8 +56,8 @@ def from_common(cls, checklist: Checklist, schema_id: Cuid,
                        LBV1ClassificationAnswer(
                            schema_id=answer.schema_id,
                            title=answer.name,
-                           value=answer.extra['value'],
-                           feature_id=answer.extra['feature_id'])
+                           value=answer.extra.get('value'),
+                           feature_id=answer.extra.get('feature_id'))
                        for answer in checklist.answer
                    ],
                    **extra)
diff --git a/labelbox/data/serialization/labelbox_v1/converter.py b/labelbox/data/serialization/labelbox_v1/converter.py
@@ -1,14 +1,14 @@
 from requests.exceptions import HTTPError
 import labelbox
-from typing import Any, Callable, Dict, Generator, Iterable
+from typing import Any, Dict, Generator, Iterable
 import logging
 
 import ndjson
 import requests
 from google.api_core import retry
 
 from .label import LBV1Label
-from ...annotation_types.collection import (LabelData, LabelGenerator,
+from ...annotation_types.collection import (LabelContainer, LabelGenerator,
                                             PrefetchGenerator)
 
 logger = logging.getLogger(__name__)
@@ -53,9 +53,7 @@ def label_generator():
 
     @staticmethod
     def serialize(
-        labels: LabelData,
-        signer: Callable[[bytes],
-                         str]) -> Generator[Dict[str, Any], None, None]:
+        labels: LabelContainer) -> Generator[Dict[str, Any], None, None]:
         """
         Converts a labelbox common object to the labelbox json export format
 
@@ -65,7 +63,7 @@ def serialize(
             A generator for accessing the labelbox json export representation of the data
         """
         for label in labels:
-            res = LBV1Label.from_common(label, signer)
+            res = LBV1Label.from_common(label)
             yield res.dict(by_alias=True)
 
 
diff --git a/labelbox/data/serialization/labelbox_v1/label.py b/labelbox/data/serialization/labelbox_v1/label.py
@@ -1,5 +1,5 @@
 from labelbox.utils import camel_case
-from typing import Callable, List, Optional, Union
+from typing import List, Optional, Union
 
 from pydantic import BaseModel, Field
 
@@ -158,16 +158,21 @@ def to_common(self) -> Label:
                      })
 
     @classmethod
-    def from_common(cls, label: Label, signer: Callable[[bytes], str]):
+    def from_common(cls, label: Label):
         if isinstance(label.annotations[0],
                       (VideoObjectAnnotation, VideoClassificationAnnotation)):
             label_ = LBV1LabelAnnotationsVideo.from_common(label.annotations)
         else:
             label_ = LBV1LabelAnnotations.from_common(label.annotations)
 
+        if label.data.url is None:
+            raise ValueError("Url attribute required for serializing data objects. "
+                             "Use <LabelCollection,LabelGenerator>.add_url_to_data "
+                             "or <LabelCollection,LabelGenerator>.add_to_dataset")
+
         return LBV1Label(label=label_,
                          data_row_id=label.data.uid,
-                         row_data=label.data.create_url(signer),
+                         row_data=label.data.url,
                          external_id=label.data.external_id,
                          **label.extra)
 
diff --git a/labelbox/schema/ontology.py b/labelbox/schema/ontology.py
@@ -1,15 +1,12 @@
-import abc
 from dataclasses import dataclass, field
-from enum import Enum, auto
+from enum import Enum
 import colorsys
 
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from labelbox.schema.project import Project
-from labelbox.orm import query
-from labelbox.orm.db_object import DbObject, Updateable, BulkDeletable
-from labelbox.orm.model import Entity, Field, Relationship
-from labelbox.utils import snake_case, camel_case
+from labelbox.orm.db_object import DbObject
+from labelbox.orm.model import Field, Relationship
 from labelbox.exceptions import InconsistentOntologyException
 
 
@@ -335,7 +332,7 @@ def _update_colors(self):
                 self.tools[index].color = '#%02x%02x%02x' % rgb_color
 
     @classmethod
-    def from_project(cls, project: Project):
+    def from_project(cls, project: "Project"):
         ontology = project.ontology().normalized
         return OntologyBuilder.from_dict(ontology)
 
diff --git a/labelbox/schema/project.py b/labelbox/schema/project.py
@@ -17,6 +17,7 @@
 from labelbox.orm.db_object import DbObject, Updateable, Deletable
 from labelbox.orm.model import Entity, Field, Relationship
 from labelbox.pagination import PaginatedCollection
+#from labelbox.data.serialization import LBV1Converter
 
 try:
     datetime.fromisoformat  # type: ignore[attr-defined]
@@ -199,7 +200,11 @@ def export_queued_data_rows(self, timeout_seconds=120):
                 self.uid)
             time.sleep(sleep_time)
 
-    def export_labels(self, timeout_seconds=60):
+    def export_labels(self):
+        json_data = self.export_labels_json()
+        return LBV1Converter.deserialize(json_data)
+
+    def export_labels_json(self, timeout_seconds = 60):
         """ Calls the server-side Label exporting that generates a JSON
         payload, and returns the URL to that payload.
 
@@ -221,7 +226,9 @@ def export_labels(self, timeout_seconds=60):
             res = self.client.execute(query_str, {id_param: self.uid})
             res = res["exportLabels"]
             if not res["shouldPoll"]:
-                return res["downloadUrl"]
+                response = requests.get(res["downloadUrl"])
+                response.raise_for_status()
+                return response.json()
 
             timeout_seconds -= sleep_time
             if timeout_seconds <= 0:
diff --git a/labelbox/schema/user.py b/labelbox/schema/user.py
@@ -1,9 +1,7 @@
-from labelbox.schema.project import Project
 from labelbox.orm.db_object import DbObject
 from labelbox.orm.model import Field, Relationship
 from labelbox.schema.role import Role
 
-
 class User(DbObject):
     """ A User is a registered Labelbox user (for example you) associated with
     data they create or import and an Organization they belong to.
@@ -41,7 +39,7 @@ class User(DbObject):
     org_role = Relationship.ToOne("OrgRole", False)
 
     def update_org_role(self, role: Role):
-        """ Updated the `User`s organization role. 
+        """ Updated the `User`s organization role.
 
         See client.get_roles() to get all valid roles
         If you a user is converted from project level permissions to org level permissions and then convert back, their permissions will remain for each individual project
@@ -52,7 +50,7 @@ def update_org_role(self, role: Role):
         """
         user_id_param = "userId"
         role_id_param = "roleId"
-        query_str = """mutation SetOrganizationRolePyApi($%s: ID!, $%s: ID!) { 
+        query_str = """mutation SetOrganizationRolePyApi($%s: ID!, $%s: ID!) {
             setOrganizationRole(data: {userId: $userId, roleId: $roleId}) { id name }}
         """ % (user_id_param, role_id_param)
 
@@ -61,7 +59,7 @@ def update_org_role(self, role: Role):
             role_id_param: role.uid
         })
 
-    def remove_from_project(self, project: Project):
+    def remove_from_project(self, project: "Project"):
         """ Removes a User from a project. Only used for project based users.
         Project based user means their org role is "NONE"
 
@@ -71,13 +69,13 @@ def remove_from_project(self, project: Project):
         """
         self.upsert_project_role(project, self.client.get_roles()['NONE'])
 
-    def upsert_project_role(self, project: Project, role: Role):
+    def upsert_project_role(self, project: "Project", role: Role):
         """ Updates or replaces a User's role in a project.
 
         Args:
             project (Project): The project to update the users permissions for
             role (Role): The role to assign to this user in this project.
-        
+
         """
         org_role = self.org_role()
         if org_role.name.upper() != 'NONE':
diff --git a/tests/data/annotation_types/test_collection.py b/tests/data/annotation_types/test_collection.py
@@ -12,7 +12,7 @@
 from labelbox.data.annotation_types.geometry.mask import Mask
 from labelbox.data.annotation_types.geometry.point import Point
 from labelbox.data.annotation_types.label import Label
-from labelbox.schema.ontology import OntologyBuilder, Tool
+from labelbox import OntologyBuilder, Tool
 
 
 @pytest.fixture
@@ -43,12 +43,12 @@ def create_data_row(self, row_data, external_id=None):
     def create_data_rows(self, args):
         for arg in args:
             self.exports.append(
-                SimpleNamespace(row_data=arg[DataRow.row_data],
-                                external_id=arg[DataRow.external_id],
+                SimpleNamespace(row_data=arg['row_data'],
+                                external_id=arg['external_id'],
                                 uid=self.uid))
         return self
 
-    def wait_til_done(self):
+    def wait_till_done(self):
         pass
 
     def export_data_rows(self):
diff --git a/tests/data/annotation_types/test_label.py b/tests/data/annotation_types/test_label.py
@@ -5,7 +5,7 @@
 
 from labelbox.data.annotation_types.label import Label
 from labelbox.data.annotation_types.data.raster import RasterData
-from labelbox.schema.ontology import OntologyBuilder, Tool, Classification as OClassification, Option
+from labelbox import OntologyBuilder, Tool, Classification as OClassification, Option
 
 
 def test_schema_assignment_geometry():
diff --git a/tests/data/serialization/labelbox_v1/test_image.py b/tests/data/serialization/labelbox_v1/test_image.py
@@ -8,7 +8,7 @@ def test_image():
         payload = json.load(file)
 
     collection = LBV1Converter.deserialize([payload])
-    serialized = next(LBV1Converter.serialize(collection, None))
+    serialized = next(LBV1Converter.serialize(collection))
 
     assert serialized.keys() == payload.keys()
     for key in serialized:
diff --git a/tests/data/serialization/labelbox_v1/test_text.py b/tests/data/serialization/labelbox_v1/test_text.py
@@ -7,7 +7,7 @@ def test_text():
     with open('tests/data/assets/labelbox_v1/text_export.json', 'r') as file:
         payload = json.load(file)
     collection = LBV1Converter.deserialize([payload])
-    serialized = next(LBV1Converter.serialize(collection, None))
+    serialized = next(LBV1Converter.serialize(collection))
 
     assert serialized.keys() == payload.keys()
     for key in serialized:
diff --git a/tests/data/serialization/labelbox_v1/test_video.py b/tests/data/serialization/labelbox_v1/test_video.py
@@ -16,7 +16,7 @@ def test_video():
     payload = json.load(
         open('tests/data/assets/labelbox_v1/video_export.json', 'r'))
     collection = LBV1Converter.deserialize([payload])
-    serialized = next(LBV1Converter.serialize(collection, None))
+    serialized = next(LBV1Converter.serialize(collection))
 
     assert serialized.keys() == payload.keys()
     for key in serialized:
diff --git a/tests/integration/test_ontology.py b/tests/integration/test_ontology.py
@@ -1,11 +1,8 @@
-from typing import Any, Dict, List, Union
 
 import pytest
 
-from labelbox import LabelingFrontend
 from labelbox.exceptions import InconsistentOntologyException
-from labelbox.schema.ontology import Tool, Classification, Option, \
-    Ontology, OntologyBuilder
+from labelbox import Tool, Classification, Option, OntologyBuilder
 
 _SAMPLE_ONTOLOGY = {
     "tools": [{
