Revert "SDK release 3.48.0 (#1140)"

This reverts commit d921b3d.

Author: yamini-labelbox

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/google/yapf
-    rev: v0.44.0
+    rev: v0.33.0
     hooks:
       - id: yapf
         name: "yapf"

CHANGELOG.md

@@ -1,19 +1,4 @@
 # Changelog
-# Version 3.48.0 (2023-06-13)
-## Added
-* Support for ISO format to exports V2 date filters
-* Support to specify confidence for all free-text annotations
-
-## Changed
-* Removed backports library and replaced it with python dateutil package to parse iso strings
-
-## Notebooks
-* Added predictions to model run example
-* Added notebook to run yolov8 and sam on video and upload to LB
-* Updated google colab notebooks to reflect raster segmentation tool being released on 6/13
-* Updated radio NDJSON annotations format to support confidence
-* Added confidence to all free-text annotations (ndjson)
-* Fixed issues with cv2 library rooting from the Geospatial notebook used a png map with a signed URL with an expired token
 
 # Version 3.47.1 (2023-05-24)
 ## Fixed

docs/source/conf.py

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

examples/README.md

@@ -180,14 +180,14 @@
         "nested_radio_annotation_ndjson = {\n",
         "    \"name\": \"nested_radio_question\",\n",
         "    \"answer\": {\n",
-        "        \"name\": \"first_radio_answer\",\n",
-        "          \"classifications\": [{\n",
-        "              \"name\": \"sub_radio_question\",\n",
-        "              \"answer\": {\n",
-        "                  \"name\": \"first_sub_radio_answer\"\n",
-        "              }\n",
-        "          }]\n",
-        "    }\n",
+        "        \"name\": \"first_radio_answer\"\n",
+        "    },\n",
+        "    \"classifications\": [{\n",
+        "        \"name\": \"sub_radio_question\",\n",
+        "        \"answer\": {\n",
+        "            \"name\": \"first_sub_radio_answer\"\n",
+        "        }\n",
+        "    }]\n",
         "}\n",
         "\n",
         "\n",
@@ -431,8 +431,19 @@
       "metadata": {},
       "source": [
         "# Identifying what values in the numpy array correspond to the mask annotation\n",
-        "color = (255, 255, 255)\n",
-        "mask_data = lb_types.MaskData(url=\"https://storage.googleapis.com/labelbox-datasets/image_sample_data/raster_seg.png\")\n",
+        "color = (0, 0, 0)\n",
+        "\n",
+        "# convert a polygon to mask\n",
+        "im_height, im_width = 100,100 # need to provide the height and width of image\n",
+        "mask_data = lb_types.MaskData(arr=\n",
+        "                     polygon_annotation.value.draw(height=im_height,width=im_width,color=color))\n",
+        "\n",
+        "# convert a 2D array to 3D array\n",
+        "arr_2d = np.zeros((100,100), dtype=\"uint8\")\n",
+        "mask_data = lb_types.MaskData.from_2D_arr(arr_2d)\n",
+        "\n",
+        "# a 3D array where 3rd axis is RGB values\n",
+        "mask_data = lb_types.MaskData(arr=np.zeros([400,450,3],dtype=\"uint8\"))\n",
         "\n",
         "# Python annotation\n",
         "mask_annotation = lb_types.ObjectAnnotation(\n",
@@ -444,8 +455,8 @@
         "mask_annotation_ndjson = {\n",
         "  \"name\": \"mask\",\n",
         "  \"classifications\": [],\n",
-        "  \"mask\": {\"instanceURI\": \"https://storage.googleapis.com/labelbox-datasets/image_sample_data/raster_seg.png\",\n",
-        "  \"colorRGB\": (255, 255, 255)}\n",
+        "  \"mask\": {\"instanceURI\": \"https://storage.labelbox.com/cjhfn5y6s0pk507024nz1ocys%2F1d60856c-59b7-3060-2754-83f7e93e0d01-1?Expires=1666901963361&KeyName=labelbox-assets-key-3&Signature=t-2s2DB4YjFuWEFak0wxYqfBfZA\",\n",
+        "  \"colorRGB\": (0, 0, 0)}\n",
         "}"
       ],
       "cell_type": "code",
@@ -735,7 +746,7 @@
         "                        options=[lb.Option(value=\"first_sub_radio_answer\")]),\n",
         "                ]),\n",
         "        lb.Tool(tool=lb.Tool.Type.POLYGON, name=\"polygon\"),\n",
-        "        lb.Tool(tool=lb.Tool.Type.RASTER_SEGMENTATION, name=\"mask\"),\n",
+        "        lb.Tool(tool=lb.Tool.Type.SEGMENTATION, name=\"mask\"),\n",
         "        lb.Tool(tool=lb.Tool.Type.POINT, name=\"point\"),\n",
         "        lb.Tool(tool=lb.Tool.Type.LINE, name=\"polyline\"),\n",
         "        lb.Tool(tool=lb.Tool.Type.RELATIONSHIP, name=\"relationship\")\n",
@@ -820,7 +831,7 @@
     {
       "metadata": {},
       "source": [
-        "label = []\n",
+        "labels = []\n",
         "annotations = [\n",
         "    radio_annotation,\n",
         "    nested_radio_annotation,\n",
@@ -837,7 +848,7 @@
         "    bbox_target,\n",
         "    relationship,\n",
         "]\n",
-        "label.append(\n",
+        "labels.append(\n",
         "    lb_types.Label(data=lb_types.ImageData(global_key=global_key),\n",
         "                   annotations=annotations))"
       ],
@@ -856,7 +867,7 @@
     {
       "metadata": {},
       "source": [
-        "ndjson_label = []\n",
+        "ndjson_labels = []\n",
         "annotations = [\n",
         "    radio_annotation_ndjson,\n",
         "    nested_radio_annotation_ndjson,\n",
@@ -879,7 +890,7 @@
         "            \"globalKey\": global_key\n",
         "        },\n",
         "    })\n",
-        "    ndjson_label.append(annotation)"
+        "    ndjson_labels.append(annotation)"
       ],
       "cell_type": "code",
       "outputs": [],
@@ -908,7 +919,7 @@
         "    client=client,\n",
         "    project_id=project.uid,\n",
         "    name=\"mal_job\" + str(uuid.uuid4()),\n",
-        "    predictions=label\n",
+        "    predictions=labels\n",
         ")\n",
         "upload_job.wait_until_done()\n",
         "\n",
@@ -937,10 +948,11 @@
         "#     client = client, \n",
         "#     project_id = project.uid, \n",
         "#     name=\"label_import_job\"+str(uuid.uuid4()),  \n",
-        "#     labels=label)\n",
+        "#     labels=ndjson_labels)\n",
         "\n",
         "# print(\"Errors:\", upload_job.errors)\n",
-        "# print(\"Status of uploads: \", upload_job.statuses)"
+        "# print(\"Status of uploads: \", upload_job.statuses)\n",
+        "# print(\" \")"
       ],
       "cell_type": "code",
       "outputs": [],