Merge branch 'develop' of https://github.com/Labelbox/labelbox-python into ms/fix-annotation-import-tests

Author: Matt Sokoloff

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+# Version 3.36.1 (2023-01-24)
+### Fixed
+* `confidence` is now optional for TextEntity
+
+# Version 3.36.0 (2023-01-23)
+### Fixed
+* `confidence` attribute is now supported for TextEntity and Line predictions
+
+# Version 3.35.0 (2023-01-18)
+### Fixed
+* Retry 520 errors when uploading files
+
 # Version 3.34.0 (2022-12-22)
 ### Added
 * Added `get_by_name()` method to MetadataOntology object to access both custom and reserved metadata by name.

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.9-slim-bullseye
 
 RUN pip install pytest pytest-cases pytest-rerunfailures
 RUN apt-get -y update

Makefile

@@ -21,7 +21,7 @@ test-staging: build
 		-e LABELBOX_TEST_ENVIRON="staging" \
 		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \
-		local/labelbox-python:test pytest $(PATH_TO_TEST)
+		local/labelbox-python:test pytest -n 10 $(PATH_TO_TEST)
 
 test-prod: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \

docs/source/conf.py

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

examples/annotation_import/image.ipynb

@@ -20,15 +20,15 @@
       },
       "source": [
         "<td>\n",
-        "<a href=\"https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_import/image_annotation_import.ipynb\" target=\"_blank\"><img\n",
+        "<a href=\"https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_import/image.ipynb\" target=\"_blank\"><img\n",
         "src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"></a>\n",
         "</td>\n",
         "\n",
         "\n",
         "\n",
         "\n",
         "<td>\n",
-        "<a href=\"https://github.com/Labelbox/labelbox-python/tree/develop/examples/annotation_import/image_annotation_import.ipynb\" target=\"_blank\"><img\n",
+        "<a href=\"https://github.com/Labelbox/labelbox-python/tree/develop/examples/annotation_import/image.ipynb\" target=\"_blank\"><img\n",
         "src=\"https://img.shields.io/badge/GitHub-100000?logo=github&logoColor=white\" alt=\"GitHub\"></a>\n",
         "</td>"
       ]
@@ -810,13 +810,6 @@
         "    ]\n",
         ")\n",
         "\n",
-        "# Create urls to mask data for upload\n",
-        "def signing_function(obj_bytes: bytes) -> str:\n",
-        "    url = client.upload_data(content=obj_bytes, sign=True)\n",
-        "    return url\n",
-        "\n",
-        "label.add_url_to_masks(signing_function)\n",
-        "\n",
         "# Convert our label from a Labelbox class object to the underlying NDJSON format required for upload \n",
         "label_ndjson = list(NDJsonConverter.serialize([label]))"
       ],