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

Author: Matt Sokoloff

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+# Next Release
+
+## Removed
+* Deprecated functions
+    - project.reviews()
+    - project.create_prediction()
+    - project.create_prediction_model()
+    - project.create_label()
+
 # Version 2.7.0 (2021-06-27)
 ## Added
 * Added `dataset.export_data_rows()` which returns all `DataRows` for a `Dataset`.

Makefile

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

examples/assets/2560px-Kitano_Street_Kobe01s5s4110.jpg

@@ -153,7 +153,7 @@
    "source": [
     "project = client.create_project(name=\"debugging_mal_project\")\n",
     "dataset = client.create_dataset(name=\"debugging_mal_dataset\")\n",
-    "test_img_url = \"https://upload.wikimedia.org/wikipedia/commons/thumb/0/08/Kitano_Street_Kobe01s5s4110.jpg/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
+    "test_img_url = \"https://raw.githubusercontent.com/Labelbox/labelbox-python/develop/examples/assets/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
     "data_row = dataset.create_data_row(row_data=test_img_url)\n",
     "editor = next(\n",
     "    client.get_labeling_frontends(where=LabelingFrontend.name == 'editor'))\n",
@@ -336,7 +336,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.2"
+   "version": "3.8.8"
   }
  },
  "nbformat": 4,

examples/model_assisted_labeling/debugging_mal.ipynb

@@ -174,7 +174,7 @@
     "# Note see Ontology, Project, and Project_setup notebooks for more information on this section.\n",
     "project = client.create_project(name=\"image_mal_project\")\n",
     "dataset = client.create_dataset(name=\"image_mal_dataset\")\n",
-    "test_img_url = \"https://upload.wikimedia.org/wikipedia/commons/thumb/0/08/Kitano_Street_Kobe01s5s4110.jpg/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
+    "test_img_url = \"https://raw.githubusercontent.com/Labelbox/labelbox-python/develop/examples/assets/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
     "dataset.create_data_row(row_data=test_img_url)\n",
     "editor = next(\n",
     "    client.get_labeling_frontends(where=LabelingFrontend.name == \"Editor\"))\n",
@@ -548,9 +548,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.2"
+   "version": "3.8.8"
   }
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}

examples/model_assisted_labeling/image_mal.ipynb

@@ -140,7 +140,7 @@
     "])\n",
     "project = client.create_project(name=\"image_mal_project\")\n",
     "dataset = client.create_dataset(name=\"image_mal_dataset\")\n",
-    "test_img_url = \"https://upload.wikimedia.org/wikipedia/commons/thumb/0/08/Kitano_Street_Kobe01s5s4110.jpg/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
+    "test_img_url = \"https://raw.githubusercontent.com/Labelbox/labelbox-python/develop/examples/assets/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
     "data_row = dataset.create_data_row(row_data=test_img_url)\n",
     "editor = next(\n",
     "    client.get_labeling_frontends(where=LabelingFrontend.name == 'editor'))\n",
@@ -374,7 +374,7 @@
     }
    ],
    "source": [
-    "os.environ['upload_file_url'] = file_data['uploadFile']['url']\n",
+    "os.environ['upload_file_url'] = ndjson_url\n",
     "!wget -O- --user-agent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36  (KHTML, like Gecko) Chrome/81.0.4044.138  Safari/537.36' \\\n",
     "      $upload_file_url | cat"
    ]
@@ -412,7 +412,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.2"
+   "version": "3.8.8"
   }
  },
  "nbformat": 4,

examples/model_assisted_labeling/mal_basics.ipynb

@@ -169,7 +169,7 @@
     "# Note see Ontology, Project, and Project_setup notebooks for more information on this section.\n",
     "project = client.create_project(name=\"subclass_mal_project\")\n",
     "dataset = client.create_dataset(name=\"subclass_mal_dataset\")\n",
-    "test_img_url = \"https://upload.wikimedia.org/wikipedia/commons/thumb/0/08/Kitano_Street_Kobe01s5s4110.jpg/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
+    "test_img_url = \"https://raw.githubusercontent.com/Labelbox/labelbox-python/develop/examples/assets/2560px-Kitano_Street_Kobe01s5s4110.jpg\"\n",
     "dataset.create_data_row(row_data=test_img_url)\n",
     "editor = next(\n",
     "    client.get_labeling_frontends(where=LabelingFrontend.name == 'editor'))\n",
@@ -552,7 +552,7 @@
     "# Wait for upload to finish (Will take up to five minutes)\n",
     "upload_task.wait_until_done()\n",
     "# Review the upload status\n",
-    "for status in upload_tasks.statuses:\n",
+    "for status in upload_task.statuses:\n",
     "    print(status)"
    ]
   },