Merge pull request #1894 from kili-technology/feature/lab-3617-aakd-i-have-the-export-logic-in-a-common-library

feat: export logic in a separated library

Author: baptiste-olivier

.github/workflows/ci.yml

@@ -80,7 +80,7 @@ jobs:
           pip install -e ".[dev]"
 
       - name: Unit and integration tests
-        run: pytest -n auto -ra -sv --color yes --code-highlight yes --durations=15 -vv --ignore tests/e2e/ --cov=src/kili --cov-report=term-missing --cov-config=.coveragerc --cov-fail-under=82
+        run: pytest -n auto -ra -sv --color yes --code-highlight yes --durations=15 -vv --ignore tests/e2e/ --cov=src/kili --cov-report=term-missing --cov-config=.coveragerc --cov-fail-under=80
 
   markdown-link-check:
     timeout-minutes: 10

docs/sdk/label_utils.md

@@ -56,24 +56,24 @@ The module `kili.utils.labels` provides a set of helpers to convert point, bound
 
 ### Point
 
-::: kili.utils.labels.geojson.point
+::: kili_formats.format.geojson.point
 
 ### Line
 
-::: kili.utils.labels.geojson.line
+::: kili_formats.format.geojson.line
 
 ### Bounding box
 
-::: kili.utils.labels.geojson.bbox
+::: kili_formats.format.geojson.bbox
 
 ### Polygon
 
-::: kili.utils.labels.geojson.polygon
+::: kili_formats.format.geojson.polygon
 
 ### Segmentation
 
-::: kili.utils.labels.geojson.segmentation
+::: kili_formats.format.geojson.segmentation
 
 ### Collection
 
-::: kili.utils.labels.geojson.collection
+::: kili_formats.format.geojson.collection

docs/sdk/tutorials/geojson.md

@@ -170,7 +170,7 @@ Kili SDK provides a set of label utils to convert Kili labels to GeoJSON:
 
 
 ```python
-from kili.utils.labels.geojson import (
+from kili_formats.format.geojson import (
     features_to_feature_collection,
     kili_bbox_annotation_to_geojson_polygon_feature,
     kili_json_response_to_feature_collection,
@@ -312,7 +312,7 @@ However, since the GeoJSON file we are using does not have the `kili` key in the
 
 
 ```python
-from kili.utils.labels.geojson import (
+from kili_formats.format.geojsonon import (
     geojson_linestring_feature_to_kili_line_annotation,
     geojson_point_feature_to_kili_point_annotation,
     geojson_polygon_feature_to_kili_polygon_annotation,

pyproject.toml

@@ -52,6 +52,7 @@ dependencies = [
   "shapely >= 1.8, < 3",
   "pyproj >= 2.6.1, < 3; python_version < '3.9'",
   "pyproj == 3.6.1; python_version >= '3.9'",
+  "kili-formats < 1"
 ]
 urls = { homepage = "https://github.com/kili-technology/kili-python-sdk" }
 

recipes/geojson.ipynb

@@ -314,7 +314,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from kili.utils.labels.geojson import (\n",
+    "from kili_formats.format.geojson import (\n",
     "    features_to_feature_collection,\n",
     "    kili_bbox_annotation_to_geojson_polygon_feature,\n",
     "    kili_json_response_to_feature_collection,\n",
@@ -588,7 +588,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from kili.utils.labels.geojson import (\n",
+    "from kili_formats.format.geojsonon import (\n",
     "    geojson_linestring_feature_to_kili_line_annotation,\n",
     "    geojson_point_feature_to_kili_point_annotation,\n",
     "    geojson_polygon_feature_to_kili_polygon_annotation,\n",

src/kili/adapters/authentification.py

@@ -20,7 +20,7 @@ def is_api_key_valid(
     """
     response = http_client.post(
         url=api_endpoint,
-        data='{"query":"{ me { id email } }"}',
+        data='{"query":"{ viewer { id email } }"}',
         timeout=30,
         headers={
             "Authorization": f"X-API-Key: {api_key}",

src/kili/adapters/kili_api_gateway/asset/operations_mixin.py

@@ -2,6 +2,10 @@
 
 from typing import Dict, Generator, List
 
+from kili_formats.tool.annotations_to_json_response import (
+    AnnotationsToJsonResponseConverter,
+)
+
 from kili.adapters.kili_api_gateway.asset.formatters import (
     load_asset_json_fields,
 )
@@ -18,9 +22,6 @@
     QueryOptions,
     fragment_builder,
 )
-from kili.adapters.kili_api_gateway.label.annotation_to_json_response import (
-    AnnotationsToJsonResponseConverter,
-)
 from kili.adapters.kili_api_gateway.label.common import get_annotation_fragment
 from kili.adapters.kili_api_gateway.project.common import get_project
 from kili.domain.asset import AssetFilters
@@ -47,6 +48,7 @@ def list_assets(
                 "LLM_RLHF",
                 "LLM_INSTR_FOLLOWING",
                 "LLM_STATIC",
+                "GEOSPATIAL",
             }:
                 yield from self.list_assets_split(filters, fields, options, project_info)
                 return