update to tests

Author: jtsodapop

CHANGELOG.md

@@ -1,14 +1,17 @@
 # Changelog
 
 # Version 0.0.0 (YYYY-MM-DD) - In Progress
+
+### Added
+* Global Keys for data rows
+    * Assign global keys to a data row with `client.assign_global_keys_to_data_rows`
+    * Get data rows using global keys with `client.get_data_row_ids_for_global_keys` and `client.get_data_rows_for_global_keys`
+# Version 3.26.2 (2022-09-06)
 ### Added
 * Support for document (pdf) de/serialization from exports
     * Use the `LBV1Converter.serialize()` and `LBV1Converter.deserialize()` methods
 * Support for document (pdf) de/serialization for imports
     * Use the `NDJsonConverter.serialize()` and `NDJsonConverter.deserialize()` methods
-* Global Keys for data rows
-    * Assign global keys to a data row with `client.assign_global_keys_to_data_rows`
-    * Get data rows using global keys with `client.get_data_row_ids_for_global_keys` and `client.get_data_rows_for_global_keys`
 
 # Version 3.26.1 (2022-08-23)
 ### Changed

docs/source/conf.py

@@ -21,7 +21,7 @@
 copyright = '2021, Labelbox'
 author = 'Labelbox'
 
-release = '3.26.1'
+release = '3.26.2'
 
 # -- General configuration ---------------------------------------------------
 

examples/annotation_import/pdf_mal.ipynb

@@ -56,7 +56,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "8d8d554f",
    "metadata": {},
    "outputs": [],
@@ -103,7 +103,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 56,
+   "execution_count": 3,
    "id": "6ffec272",
    "metadata": {},
    "outputs": [],
@@ -243,14 +243,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 38,
+   "execution_count": 7,
    "id": "5cbe5b5a",
    "metadata": {},
    "outputs": [],
    "source": [
     "box_annotation = ObjectAnnotation(\n",
     "    name='box', \n",
-    "    extra={'unit': 'POINTS','page': 1}, \n",
+    "    extra={'unit': 'POINTS','page': 0}, #pages are 0-indexed, 0 indicates page 1 \n",
     "    value=Rectangle(\n",
     "        extra={}, \n",
     "        start=Point(x=557,y=898),\n",
@@ -260,7 +260,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 39,
+   "execution_count": 8,
    "id": "4896ea42",
    "metadata": {},
    "outputs": [],
@@ -302,23 +302,31 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 51,
+   "execution_count": 9,
    "id": "64ac1f74",
    "metadata": {},
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/Users/jonathantso/opt/anaconda3/lib/python3.8/site-packages/labelbox/data/annotation_types/classification/classification.py:85: UserWarning: Dropdown classification is deprecated and will be removed in a future release\n",
+      "  warnings.warn(\"Dropdown classification is deprecated and will be \"\n"
+     ]
+    },
     {
      "data": {
       "text/plain": [
        "{'uid': None,\n",
        " 'data': ImageData(im_bytes=None,file_path=None,url=None,arr=None),\n",
-       " 'annotations': [ObjectAnnotation(name='box', feature_schema_id=None, extra={'unit': 'POINTS', 'page': 1}, value=Rectangle(extra={}, start=Point(extra={}, x=557.0, y=898.0), end=Point(extra={}, x=852.0, y=1140.0)), classifications=[]),\n",
+       " 'annotations': [ObjectAnnotation(name='box', feature_schema_id=None, extra={'unit': 'POINTS', 'page': 0}, value=Rectangle(extra={}, start=Point(extra={}, x=557.0, y=898.0), end=Point(extra={}, x=852.0, y=1140.0)), classifications=[]),\n",
        "  ClassificationAnnotation(name='text', feature_schema_id=None, extra={}, value=Text(answer='the answer to the text question')),\n",
        "  ClassificationAnnotation(name='checklist', feature_schema_id=None, extra={}, value=Checklist(name='checklist', answer=[ClassificationAnswer(name='first_checklist_answer', feature_schema_id=None, extra={}, keyframe=None), ClassificationAnswer(name='second_checklist_answer', feature_schema_id=None, extra={}, keyframe=None)])),\n",
        "  ClassificationAnnotation(name='radio', feature_schema_id=None, extra={}, value=Radio(answer=ClassificationAnswer(name='second_radio_answer', feature_schema_id=None, extra={}, keyframe=None)))],\n",
        " 'extra': {}}"
       ]
      },
-     "execution_count": 51,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -361,38 +369,38 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 52,
+   "execution_count": 10,
    "id": "8794d8aa",
    "metadata": {
-    "scrolled": true
+    "scrolled": false
    },
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "[{'uuid': 'fd4475d6-8ece-44d0-ba55-feeac4cfa9e8',\n",
-       "  'dataRow': {'id': 'cl76eelhd0fm3071n9ropffkr'},\n",
+       "[{'uuid': '4a1ca900-85d7-4643-883e-277170000f9c',\n",
+       "  'dataRow': {'id': 'cl7hrmmi90m5c0y6h5nk00u02'},\n",
        "  'name': 'box',\n",
-       "  'classifications': [],\n",
-       "  'page': 1,\n",
+       "  'page': 0,\n",
        "  'unit': 'POINTS',\n",
+       "  'classifications': [],\n",
        "  'bbox': {'top': 898.0, 'left': 557.0, 'height': 242.0, 'width': 295.0}},\n",
        " {'name': 'text',\n",
        "  'answer': 'the answer to the text question',\n",
-       "  'uuid': 'fc1913c6-b735-4dea-bd25-c18152a4715f',\n",
-       "  'dataRow': {'id': 'cl76eelhd0fm3071n9ropffkr'}},\n",
+       "  'uuid': '35588dd3-9050-4471-ac13-a8ed6ac1fd4a',\n",
+       "  'dataRow': {'id': 'cl7hrmmi90m5c0y6h5nk00u02'}},\n",
        " {'name': 'checklist',\n",
-       "  'uuid': '9d7b2e57-d68f-4388-867a-af2a9b233719',\n",
-       "  'dataRow': {'id': 'cl76eelhd0fm3071n9ropffkr'},\n",
+       "  'uuid': '38bc716c-d199-4e6e-bd31-0d2128716444',\n",
+       "  'dataRow': {'id': 'cl7hrmmi90m5c0y6h5nk00u02'},\n",
        "  'answer': [{'name': 'first_checklist_answer'},\n",
        "   {'name': 'second_checklist_answer'}]},\n",
        " {'name': 'radio',\n",
        "  'answer': {'name': 'second_radio_answer'},\n",
-       "  'uuid': 'ad60897f-ea1a-47de-b923-459339764921',\n",
-       "  'dataRow': {'id': 'cl76eelhd0fm3071n9ropffkr'}}]"
+       "  'uuid': '8a21a248-9669-4465-b0c0-5a8d75903c8f',\n",
+       "  'dataRow': {'id': 'cl7hrmmi90m5c0y6h5nk00u02'}}]"
       ]
      },
-     "execution_count": 52,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -405,7 +413,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 53,
+   "execution_count": 11,
    "id": "787524ac",
    "metadata": {},
    "outputs": [],
@@ -420,10 +428,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 57,
+   "execution_count": 13,
    "id": "eb5116f9",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Errors: []\n"
+     ]
+    }
+   ],
    "source": [
     "# Errors will appear for each annotation that failed.\n",
     "# Empty list means that there were no errors\n",

labelbox/__init__.py

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

labelbox/data/annotation_types/metrics/scalar.py

@@ -5,7 +5,7 @@
 
 from .base import ConfidenceValue, BaseMetric
 
-ScalarMetricValue = confloat(ge=0, le=10_000)
+ScalarMetricValue = confloat(ge=0, le=100_000_000)
 ScalarMetricConfidenceValue = Dict[ConfidenceValue, ScalarMetricValue]
 
 

labelbox/schema/dataset.py

@@ -360,6 +360,9 @@ def convert_item(item):
                 if "externalId" in item:
                     external_id = item.pop("externalId")
                     item["external_id"] = external_id
+                if "globalKey" in item:
+                    global_key = item.pop("globalKey")
+                    item["globalKey"] = global_key
                 validate_conversational_data(messages)
                 one_conversation = \
                     {

tests/integration/test_data_rows.py

@@ -625,6 +625,10 @@ def test_data_row_bulk_creation_with_unique_global_keys(dataset, sample_image):
 def test_data_row_bulk_creation_with_same_global_keys(dataset, sample_image):
     global_key_1 = str(uuid.uuid4())
 
+
+def test_create_data_rows_with_global_key(dataset, sample_image):
+    global_key_1 = str(uuid.uuid4())
+    global_key_2 = str(uuid.uuid4())
     task = dataset.create_data_rows([{
         DataRow.row_data: sample_image,
         DataRow.global_key: global_key_1