Merge remote-tracking branch 'origin/main' into feature/ml-1318-aau-o…

…n-the-sdk-when-i-look-at-the-code-i-see-the-backbone-of
kili-technology · Aug 24, 2023 · b911848 · b911848
2 parents e119835 + debb2fe
commit b911848
Show file tree

Hide file tree

Showing 28 changed files with 1,003 additions and 266 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           fail: true
           debug: false
-          args: "--quiet --no-progress --insecure './**/*.md' './src/kili/**/*.py'"
+          args: "-qq --no-progress --insecure './**/*.md' './src/kili/**/*.py'"
 
   build-test:
     runs-on: ubuntu-latest

diff --git a/docs/sdk/tutorials/importing_coco.md b/docs/sdk/tutorials/importing_coco.md
@@ -703,7 +703,7 @@ for image_id in external_id_array:
                 "kind": "POSE_ESTIMATION",
                 "mid": str(coco_ann["id"]) + "_keypoints_" + body_part,
                 "points": [],
-                "type": "marker",
+                "type": "pose",
             }
             for x, y, visibility, point_type in zip(
                 keypoints[::3],
@@ -717,12 +717,12 @@ for image_id in external_id_array:
                     continue
                 kili_keypoint_ann["points"].append(
                     {
-                        "categories": [{"name": point_type}],
                         "children": {},
                         "code": point_type,
                         "jobName": "POSE_ESTIMATION_JOB",
                         "mid": str(coco_ann["id"]) + "_keypoints_" + point_type,
                         "name": point_type,
+                        "type": "marker",
                         "point": point_to_normalized_point(
                             point={"x": x, "y": y},
                             img_height=img_height,

diff --git a/docs/sdk/tutorials/importing_pascalvoc.md b/docs/sdk/tutorials/importing_pascalvoc.md
diff --git a/docs/sdk/tutorials/pixel_level_masks.md b/docs/sdk/tutorials/pixel_level_masks.md
@@ -154,9 +154,9 @@ annotations = [
     {
         "boundingPoly": [{"normalizedVertices": contour} for contour in contours],
         "categories": [{"name": "HUMAN", "confidence": 100}],
-        "mid": randint(100, 1000),
+        "mid": str(randint(100, 1000)),
         "score": None,
-        "type": "polygon",
+        "type": "semantic",
     }
 ]
 json_response = {"JOB_0": {"annotations": annotations}}

diff --git a/docs/tutorials.md b/docs/tutorials.md
@@ -46,6 +46,8 @@ The label parsing [tutorial](https://python-sdk-docs.kili-technology.com/latest/
 
 This [tutorial](https://python-sdk-docs.kili-technology.com/latest/sdk/tutorials/importing_coco/) shows how to import COCO annotations into Kili.
 
+This [tutorial](https://python-sdk-docs.kili-technology.com/latest/sdk/tutorials/importing_pascalvoc/) shows how to import PascalVOC annotations into Kili.
+
 On this [tutorial](https://python-sdk-docs.kili-technology.com/latest/sdk/tutorials/geojson/), you will learn how to import GeoJSON annotations into Kili, and how to export Kili annotations to GeoJSON.
 
 ## Managing workflows

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -49,6 +49,7 @@ nav:
           - DICOM: sdk/tutorials/medical_imaging.md
           - Tagtog: sdk/tutorials/tagtog_to_kili.md
           - COCO: sdk/tutorials/importing_coco.md
+          - PascalVOC: sdk/tutorials/importing_pascalvoc.md
           - GeoJSON: sdk/tutorials/geojson.md
       - Managing Workflows: sdk/tutorials/set_up_workflows.md
       - Exporting Project Data:

diff --git a/recipes/importing_coco.ipynb b/recipes/importing_coco.ipynb
@@ -995,7 +995,7 @@
     "                \"kind\": \"POSE_ESTIMATION\",\n",
     "                \"mid\": str(coco_ann[\"id\"]) + \"_keypoints_\" + body_part,\n",
     "                \"points\": [],\n",
-    "                \"type\": \"marker\",\n",
+    "                \"type\": \"pose\",\n",
     "            }\n",
     "            for x, y, visibility, point_type in zip(\n",
     "                keypoints[::3],\n",
@@ -1009,12 +1009,12 @@
     "                    continue\n",
     "                kili_keypoint_ann[\"points\"].append(\n",
     "                    {\n",
-    "                        \"categories\": [{\"name\": point_type}],\n",
     "                        \"children\": {},\n",
     "                        \"code\": point_type,\n",
     "                        \"jobName\": \"POSE_ESTIMATION_JOB\",\n",
     "                        \"mid\": str(coco_ann[\"id\"]) + \"_keypoints_\" + point_type,\n",
     "                        \"name\": point_type,\n",
+    "                        \"type\": \"marker\",\n",
     "                        \"point\": point_to_normalized_point(\n",
     "                            point={\"x\": x, \"y\": y},\n",
     "                            img_height=img_height,\n",