Merge pull request #168 from Labelbox/ms/mea-beta-release

prep for beta release

Author: msokoloff1

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-# Next Release
+# Version 2.5b0+mea (2021-06-11)
 ## Added
 * Added new `Model` and 'ModelRun` entities
 * Update client to support creating and querying for `Model`s

examples/model_assisted_labeling/image_mea.ipynb

@@ -15,7 +15,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install labelbox \\\n",
+    "!pip install labelbox==2.5b0+mea \\\n",
     "             requests \\\n",
     "             ndjson \\\n",
     "             scikit-image \\\n",
@@ -34,12 +34,6 @@
     "from labelbox.schema.ontology import OntologyBuilder, Tool\n",
     "from labelbox import Client, LabelingFrontend, MALPredictionImport\n",
     "from image_model import predict, class_mappings, load_model\n",
-    "from image_mal_utils import (\n",
-    "    visualize_bbox_ndjsons, \n",
-    "    visualize_poly_ndjsons,                         \n",
-    "    visualize_point_ndjsons, \n",
-    "    visualize_mask_ndjsons\n",
-    ")\n",
     "from io import BytesIO\n",
     "from getpass import getpass\n",
     "import uuid\n",
@@ -55,18 +49,30 @@
     "    create_mask_ndjson, \n",
     "    create_point_ndjson\n",
     ")\n",
-    "from labelbox.data.metrics.iou import datarow_miou\n",
-    "import random"
+    "from labelbox.data.metrics.iou import datarow_miou"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "wooden-western",
+   "id": "economic-chase",
    "metadata": {},
    "outputs": [],
    "source": [
-    "load_model()"
+    "# If you don't want to give google access to drive you can skip this cell\n",
+    "# and manually set `API_KEY` below.\n",
+    "\n",
+    "COLAB = \"google.colab\" in str(get_ipython())\n",
+    "if COLAB:\n",
+    "    !pip install colab-env -qU\n",
+    "    from colab_env import envvar_handler\n",
+    "    envvar_handler.envload()\n",
+    "\n",
+    "API_KEY = os.environ.get(\"LABELBOX_API_KEY\")\n",
+    "if not os.environ.get(\"LABELBOX_API_KEY\"):\n",
+    "    API_KEY = getpass(\"Please enter your labelbox api key\")\n",
+    "    if COLAB:\n",
+    "        envvar_handler.add_env(\"LABELBOX_API_KEY\", API_KEY)"
    ]
   },
   {
@@ -76,10 +82,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#ENDPOINT = \"https://api.labelbox.com/_gql\"\n",
-    "API_KEY = os.environ['LOCAL_LABELBOX_API_KEY']\n",
-    "ENDPOINT = \"http://localhost:8080/_gql\"\n",
-    "client = Client(api_key=API_KEY, endpoint=ENDPOINT)"
+    "client = Client(api_key=API_KEY)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "saved-monitor",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "load_model()"
    ]
   },
   {
@@ -222,7 +235,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print(f\"http://localhost:3000/projects/{project.uid}\")"
+    "print(f\"https://app.labelbox.com/projects/{project.uid}\")"
    ]
   },
   {
@@ -275,10 +288,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Note this will be fairly slow until we add annotation objects where data is stored as numpy arrays\n",
-    "# Or we use RLE\n",
     "\n",
-    "metic_annotations = []\n",
+    "metric_annotations = []\n",
     "grouped_predictions = defaultdict(list)\n",
     "\n",
     "for prediction in predictions:\n",
@@ -290,7 +301,7 @@
     "    if score is None:\n",
     "        continue\n",
     "        \n",
-    "    metic_annotations.append(  {\n",
+    "    metric_annotations.append(  {\n",
     "        \"uuid\" : str(uuid.uuid4()),\n",
     "        \"dataRow\" : {\n",
     "            \"id\": datarow_id,\n",
@@ -307,7 +318,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "upload_task = model_run.add_predictions(f'mea-import-{uuid.uuid4()}', predictions + metic_annotations)"
+    "upload_task = model_run.add_predictions(f'mea-import-{uuid.uuid4()}', predictions + metric_annotations)"
    ]
   },
   {

labelbox/client.py

@@ -69,7 +69,9 @@ def __init__(self,
             logger.info("Experimental features have been enabled")
 
         logger.info("Initializing Labelbox client at '%s'", endpoint)
-        self.endpoint = endpoint
+
+        # TODO: Make endpoints non-internal or support them as experimental
+        self.endpoint = endpoint.replace('/graphql', '/_gql')
         self.headers = {
             'Accept': 'application/json',
             'Content-Type': 'application/json',
@@ -139,15 +141,10 @@ def convert_value(value):
             raise ValueError("query and data cannot both be none")
         try:
             request = {
-                'url':
-                    self.endpoint.replace('/graphql', '/_gql')
-                    if experimental else self.endpoint,
-                'data':
-                    data,
-                'headers':
-                    self.headers,
-                'timeout':
-                    timeout
+                'url': self.endpoint,
+                'data': data,
+                'headers': self.headers,
+                'timeout': timeout
             }
             if files:
                 request.update({'files': files})