Merge pull request #301 from Labelbox/develop

3.6.1

Author: msokoloff1

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+# Version 3.6.1 (2021-04-10)
+* Fix import error that appears when exporting labels
+
 # Version 3.6.0 (2021-04-10)
 ## Added
 * Bulk export metadata with `DataRowMetadataOntology.bulk_export()`

examples/model_diagnostics/model_diagnostics_demo.ipynb

@@ -121,20 +121,16 @@
     "import uuid\n",
     "import numpy as np\n",
     "from skimage import measure\n",
-    "import requests\n",
     "from tqdm import notebook\n",
     "import requests\n",
-    "import csv\n",
-    "import os\n",
     "\n",
     "from labelbox.schema.ontology import OntologyBuilder, Tool\n",
     "from labelbox.data.metrics.group import get_label_pairs\n",
     "from labelbox.data.metrics import feature_miou_metric, feature_confusion_matrix_metric\n",
     "from labelbox import Client, LabelingFrontend, MALPredictionImport\n",
     "from labelbox.data.serialization import NDJsonConverter\n",
     "from labelbox.data.annotation_types import (\n",
-    "    ScalarMetric, \n",
-    "    LabelList, \n",
+    "    LabelList,\n",
     "    Label, \n",
     "    ImageData, \n",
     "    MaskData,\n",
@@ -573,4 +569,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}

examples/model_diagnostics/model_diagnostics_guide.ipynb

@@ -124,30 +124,24 @@
    "outputs": [],
    "source": [
     "import uuid\n",
-    "import numpy as np\n",
+    "\n",
     "from tqdm import notebook\n",
-    "import csv\n",
-    "import ndjson\n",
-    "import os\n",
     "\n",
-    "from labelbox.data.metrics.group import get_label_pairs\n",
-    "from labelbox.data.metrics import feature_miou_metric, feature_confusion_matrix_metric\n",
-    "from labelbox import Client, LabelingFrontend, MALPredictionImport, OntologyBuilder\n",
-    "from labelbox.data.metrics.iou import data_row_miou\n",
-    "from labelbox.data.serialization import NDJsonConverter\n",
+    "from labelbox import Client, OntologyBuilder\n",
     "from labelbox.data.annotation_types import (\n",
-    "    ScalarMetric, \n",
-    "    LabelList, \n",
-    "    Label, \n",
-    "    ImageData, \n",
+    "    LabelList,\n",
+    "    Label,\n",
     "    MaskData,\n",
     "    Mask,\n",
     "    Polygon,\n",
     "    Line,\n",
-    "    Point, \n",
-    "    Rectangle, \n",
+    "    Point,\n",
+    "    Rectangle,\n",
     "    ObjectAnnotation\n",
-    ")"
+    ")\n",
+    "from labelbox.data.metrics import feature_miou_metric, feature_confusion_matrix_metric\n",
+    "from labelbox.data.metrics.group import get_label_pairs\n",
+    "from labelbox.data.serialization import NDJsonConverter"
    ]
   },
   {
@@ -299,10 +293,7 @@
    "outputs": [],
    "source": [
     "signer = lambda _bytes: client.upload_data(content=_bytes, sign=True)\n",
-    "predictions.add_url_to_masks(signer) \\\n",
-    "         .add_url_to_data(signer) \\\n",
-    "         .assign_feature_schema_ids(OntologyBuilder.from_project(project)) \\\n",
-    "         .add_to_dataset(dataset, client.upload_data)"
+    "predictions.add_url_to_masks(signer).assign_feature_schema_ids(OntologyBuilder.from_project(project))"
    ]
   },
   {
@@ -435,4 +426,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}

labelbox/__init__.py

@@ -1,5 +1,5 @@
 name = "labelbox"
-__version__ = "3.6.0"
+__version__ = "3.6.1"
 
 from labelbox.schema.project import Project
 from labelbox.client import Client

labelbox/data/annotation_types/label.py

@@ -3,6 +3,7 @@
 
 from pydantic import BaseModel, validator
 
+import labelbox
 from labelbox.schema import ontology
 from .annotation import (ClassificationAnnotation, ObjectAnnotation,
                          VideoClassificationAnnotation, VideoObjectAnnotation)
@@ -12,7 +13,6 @@
 from .metrics import ScalarMetric, ConfusionMatrixMetric
 from .types import Cuid
 from ..ontology import get_feature_schema_lookup
-from ... import Dataset
 
 
 class Label(BaseModel):
@@ -103,7 +103,7 @@ def add_url_to_masks(self, signer) -> "Label":
             mask.create_url(signer)
         return self
 
-    def create_data_row(self, dataset: "Dataset",
+    def create_data_row(self, dataset: "labelbox.Dataset",
                         signer: Callable[[bytes], str]) -> "Label":
         """
         Creates a data row and adds to the given dataset.