Merge branch 'develop' into PTDT-1107

Author: Tim-Kerr

Makefile

@@ -44,4 +44,5 @@ test-custom: build
 		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_CUSTOM=${LABELBOX_TEST_API_KEY_CUSTOM} \
 		-e LABELBOX_TEST_GRAPHQL_API_ENDPOINT=${LABELBOX_TEST_GRAPHQL_API_ENDPOINT} \
+		-e LABELBOX_TEST_REST_API_ENDPOINT=${LABELBOX_TEST_REST_API_ENDPOINT} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST)

examples/README.md

@@ -36,8 +36,8 @@ Train a model using data annotated on Labelbox
 
 | Notebook                    | Github                            | Google Colab |
 | --------------------------- | --------------------------------- | ------------ |
-| Object Detection (Detectron2)            | [Github](coco_object.ipynb)  | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/master/examples/integrations/detectron2/coco_object.ipynb) |
-| Panoptic Detection (Detectron2)          | [Github](coco_panoptic.ipynb)    | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/master/examples/integrations/detectron2/coco_panoptic.ipynb)
+| Object Detection (Detectron2)            | [Github](examples/integrations/detectron2/coco_object.ipynb)  | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/master/examples/integrations/detectron2/coco_object.ipynb) |
+| Panoptic Detection (Detectron2)          | [Github](examples/integrations/detectron2/coco_panoptic.ipynb)    | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/master/examples/integrations/detectron2/coco_panoptic.ipynb)
 ------
 
 ## [Annotation Import (Ground Truth & MAL)](annotation_import)

examples/annotation_import/image.ipynb

@@ -271,15 +271,14 @@
         "# Bounding box with nested classification\n",
         "bbox_with_radio_subclass_annotation = lb_types.ObjectAnnotation(\n",
         "    name=\"bbox_with_radio_subclass\",\n",
-        "    confidence=0.5, # must match your ontology feature's name\n",
         "    value=lb_types.Rectangle(\n",
         "        start=lb_types.Point(x=933, y=541), # Top left\n",
         "        end=lb_types.Point(x=191, y=330), # Bottom right\n",
         "    ),\n",
         "    classifications=[\n",
         "    \tlb_types.ClassificationAnnotation(\n",
         "        \tname=\"sub_radio_question\",\n",
-        "      \t\tvalue=lb_types.Radio(answer=lb_types.ClassificationAnswer(name=\"first_sub_radio_answer\", confidence=0.5))\n",
+        "      \t\tvalue=lb_types.Radio(answer=lb_types.ClassificationAnswer(name=\"first_sub_radio_answer\"))\n",
         "    )\n",
         "  ]\n",
         ")\n",
@@ -313,7 +312,6 @@
         "# Python AnotationTypes \n",
         "polygon_annotation = lb_types.ObjectAnnotation(\n",
         "  name = \"polygon\",  # must match your ontology feature's name \n",
-        "  confidence = 0.5, \n",
         "  value=lb_types.Polygon( # Coordinates for the verticies of your polygon\n",
         "        points=[lb_types.Point(x=1489.581,y=183.934), lb_types.Point(x=2278.306,y=256.885), lb_types.Point(x=2428.197,y=200.437), lb_types.Point(x=2560.0,y=335.419),\n",
         "                lb_types.Point(x=2557.386,y=503.165), lb_types.Point(x=2320.596,y=503.103), lb_types.Point(x=2156.083, y=628.943), lb_types.Point(x=2161.111,y=785.519),\n",
@@ -401,7 +399,6 @@
         "# Python Annotation\n",
         "point_annotation = lb_types.ObjectAnnotation(\n",
         "  name = \"point\",  # must match your ontology feature's name\n",
-        "  confidence=0.5,\n",
         "  value = lb_types.Point(x=1166.606, y=1441.768),\n",
         ")\n",
         "\n",
@@ -629,7 +626,10 @@
         "      name=\"point\"), \n",
         "    lb.Tool( # Polyline tool given the name \"line\"\n",
         "      tool=lb.Tool.Type.LINE,\n",
-        "      name=\"polyline\")]\n",
+        "      name=\"polyline\"),\n",
+        "    lb.Tool( # Relationship tool given the name \"relationship\"\n",
+        "      tool=lb.Tool.Type.RELATIONSHIP,\n",
+        "      name=\"relationship\")]\n",
         ")\n",
         "\n",
         "ontology = client.create_ontology(\"Image Prediction Import Demo\", ontology_builder.asdict(), media_type=lb.MediaType.Image)"
@@ -865,4 +865,4 @@
       "execution_count": null
     }
   ]
-}
+}

examples/annotation_import/pdf.ipynb

@@ -120,12 +120,14 @@
     {
       "metadata": {},
       "source": [
-        "tool_name = \"super\"\n",
         "ontology_builder = lb.OntologyBuilder(\n",
         "  tools=[ \n",
         "    lb.Tool( # Entity tool given the name \"NER\"\n",
         "      tool=lb.Tool.Type.NER, \n",
-        "      name= tool_name)]\n",
+        "      name= \"NER\"),\n",
+        "    lb.Tool( # Relationship tool given the name \"relationship\"\n",
+        "      tool=lb.Tool.Type.RELATIONSHIP, \n",
+        "      name=\"relationship\")]\n",
         "    )"
       ],
       "cell_type": "code",