Merge pull request #1939 from kili-technology/feature/lab-3861-support-multipoint-multilinestring-geometrycollection

feat(LAB-3861): support GeoJSON `MultiPoint` & `MultiLineString`

Author: RuellePaul

pyproject.toml

@@ -44,7 +44,7 @@ dependencies = [
   "filelock >= 3.0.0, < 4.0.0",
   "pip-system-certs >= 4.0.0, < 5.0.0; platform_system=='Windows'",
   "pyrate-limiter >= 3, < 4",
-  "kili-formats == 0.2.8"
+  "kili-formats == 0.2.9"
 ]
 urls = { homepage = "https://github.com/kili-technology/kili-python-sdk" }
 
@@ -84,7 +84,7 @@ dev = [
   "vulture==2.11",
   "dead==1.5.2",
   # optional dependencies
-  "kili-formats[all] == 0.2.8",
+  "kili-formats[all] == 0.2.9",
   "opencv-python >= 4.0.0, < 5.0.0",
   "azure-storage-blob >= 12.0.0, < 13.0.0",
   # optional dependencies gis
@@ -101,7 +101,7 @@ dev = [
 all = [
   # aggregate all optional deps without dev
   "azure-storage-blob >= 12.0.0, < 13.0.0",
-  "kili-formats[all] == 0.2.8",
+  "kili-formats[all] == 0.2.9",
   "opencv-python >= 4.0.0, < 5.0.0",
   "Pillow >=9.0.0, <11.0.0",
   "pyproj == 3.6.1; python_version >= '3.9'",
@@ -115,7 +115,7 @@ cli = [
   "tabulate >= 0.9.0, < 0.10.0"
 ]
 coco = [
-  "kili-formats[coco] == 0.2.8"
+  "kili-formats[coco] == 0.2.9"
 ]
 gis = [
   "pyproj >= 2.6.1, < 3; python_version < '3.9'",
@@ -124,12 +124,12 @@ gis = [
 ]
 image = [
   "Pillow >=9.0.0, <11.0.0",
-  "kili-formats[image] == 0.2.8"
+  "kili-formats[image] == 0.2.9"
 ]
 image-utils = ["opencv-python >= 4.0.0, < 5.0.0"]
 
 video = [
-  "kili-formats[video] == 0.2.8"
+  "kili-formats[video] == 0.2.9"
 ]
 yolo = [
   "pyyaml >= 6.0, < 7.0"

src/kili/presentation/client/label.py

@@ -1365,6 +1365,9 @@ def append_labels_from_shapefiles(
         job_names: List[str],
         category_names: List[str],
         from_epsgs: Optional[List[int]] = None,
+        label_type: LabelType = "DEFAULT",
+        step_name: Optional[str] = None,
+        model_name: Optional[str] = None,
     ):
         """Import and convert shapefiles into annotations for a specific asset in a Kili project.
 
@@ -1383,6 +1386,11 @@ def append_labels_from_shapefiles(
             from_epsgs: Optional list of EPSG codes specifying the coordinate reference systems
                        of the shapefiles. If not provided, EPSG:4326 (WGS84) is assumed for all files.
                        All geometries will be transformed to EPSG:4326 before being added to Kili.
+            label_type: Can be one of `AUTOSAVE`, `DEFAULT`, `PREDICTION`, `REVIEW` or `INFERENCE`.
+            step_name: Name of the step to which the labels belong.
+                The label_type must match accordingly.
+            model_name: Name of the model that generated the labels.
+                Only useful when uploading PREDICTION or INFERENCE labels.
 
         Note:
             This function requires the 'gis' extra dependencies.
@@ -1404,6 +1412,9 @@ def append_labels_from_shapefiles(
             project_id=project_id,
             json_response_array=[json_response],
             asset_external_id_array=[asset_external_id],
+            label_type=label_type,
+            step_name=step_name,
+            model_name=model_name,
         )
 
     # pylint: disable=too-many-branches
@@ -1415,6 +1426,9 @@ def append_labels_from_geojson_files(
         geojson_file_paths: List[str],
         job_names: Optional[List[str]] = None,
         category_names: Optional[List[str]] = None,
+        label_type: LabelType = "DEFAULT",
+        step_name: Optional[str] = None,
+        model_name: Optional[str] = None,
     ):
         """Import and convert GeoJSON files into annotations for a specific asset in a Kili project.
 
@@ -1444,6 +1458,12 @@ def append_labels_from_geojson_files(
                 When provided, all geometries from the corresponding file will be assigned
                 to this category. Must have the same length as `geojson_file_paths`.
                 Each category must exist in the corresponding job's ontology.
+            label_type: Can be one of `AUTOSAVE`, `DEFAULT`, `PREDICTION`, `REVIEW` or `INFERENCE`.
+            step_name: Name of the step to which the labels belong.
+                The label_type must match accordingly.
+            model_name: Name of the model that generated the labels.
+                Only useful when uploading PREDICTION or INFERENCE labels.
+
 
         Note:
             **Geometry-to-job compatibility:**
@@ -1549,4 +1569,7 @@ def append_labels_from_geojson_files(
             project_id=project_id,
             json_response_array=[merged_json_response],
             asset_external_id_array=[asset_external_id],
+            label_type=label_type,
+            step_name=step_name,
+            model_name=model_name,
         )

src/kili/utils/labels/geojson.py

@@ -71,11 +71,11 @@ def create_kili_property(job_name, job_config, annotation_type):
         geometry_type = feature.get("geometry", {}).get("type")
         kili_property = None
 
-        if geometry_type == "Point" and marker_job:
+        if geometry_type in ["Point", "MultiPoint"] and marker_job:
             job_name, job_config = marker_job
             kili_property = create_kili_property(job_name, job_config, "marker")
 
-        elif geometry_type == "LineString" and polyline_job:
+        elif geometry_type in ["LineString", "MultiLineString"] and polyline_job:
             job_name, job_config = polyline_job
             kili_property = create_kili_property(job_name, job_config, "polyline")
 
@@ -156,9 +156,9 @@ def create_kili_property(annotation_type: str):
         kili_property = None
 
         # Map geometry types to annotation types based on available tools
-        if geometry_type == "Point" and "marker" in tools:
+        if geometry_type in ["Point", "MultiPoint"] and "marker" in tools:
             kili_property = create_kili_property("marker")
-        elif geometry_type == "LineString" and "polyline" in tools:
+        elif geometry_type in ["LineString", "MultiLineString"] and "polyline" in tools:
             kili_property = create_kili_property("polyline")
         elif geometry_type == "Polygon":
             if "polygon" in tools: