Merge branch 'main' into merge/lts-to-main

Author: baptiste-olivier

.github/workflows/ci.yml

@@ -6,22 +6,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: "3.10"
           cache: "pip"
       - uses: pre-commit/action@v3.0.1
 
   pylint:
     runs-on: ubuntu-latest
     name: Pylint test
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ["3.9", "3.12"]
+        python-version: ["3.10", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -36,11 +37,12 @@ jobs:
   pyright:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        version: ["3.9", "3.12"]
+        version: ["3.10", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.version }}
           cache: "pip"
@@ -49,27 +51,30 @@ jobs:
           python -m pip install --upgrade pip
           pip install -e ".[dev]"
       - name: Run pyright
-        run: pyright .
+        run: pyright src/kili
 
   unit-integration-test:
     timeout-minutes: 15
     name: Unit and integration tests
     strategy:
+      fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
-            python-version: 3.9
+            python-version: "3.10"
           - os: windows-latest
-            python-version: 3.9
+            python-version: "3.10"
           - os: ubuntu-latest
-            python-version: 3.12
+            python-version: "3.12"
+          - os: ubuntu-latest
+            python-version: "3.13"
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -86,22 +91,29 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: lycheeverse/lychee-action@v1.9.3
+      - uses: actions/checkout@v5
+      - name: Convert ipynb to markdown
+        shell: bash
+        run: |
+          pip install --quiet nbconvert
+          # Find all .ipynb files under recipes/ and subfolders and convert them to .md
+          find recipes -type f -name '*.ipynb' -print0 | while IFS= read -r -d '' file; do
+            echo "Converting $file"
+            jupyter nbconvert --to markdown "$file"
+          done
+      - uses: lycheeverse/lychee-action@v2
         with:
-          fail: true
-          debug: false
-          args: "-qq --no-progress --insecure './**/*.md' './src/kili/**/*.py'"
+          args: "-qq --no-progress --insecure --accept 200,201,202,203,204,206,207,208,226,301,302,307,308 --max-redirects 5 './**/*.md'"
 
   build-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: "3.10"
           cache: "pip"
 
       - name: Install dependencies
@@ -129,9 +141,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: "3.10"
           cache: "pip"
 
       - name: Install dependencies

.github/workflows/deploy_doc.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.10"
           cache: "pip"
 
       - name: Install dependencies

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.10"
           cache: "pip"
 
       - name: Install dependencies
@@ -48,7 +48,7 @@ jobs:
           fi
 
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.12.4
+        uses: pypa/gh-action-pypi-publish@v1.13.0
         with:
           verbose: true
 

.lycheeignore

@@ -1,9 +1,11 @@
-^(http|https)://cloud.kili-technology.com/api/label/v2/graphql$
-https://my-custom-url-publicly-accessible/
-https://to/second/asset.png
-jane.doe@test.com
-john@doe.com
-john.doe@test.com
-https://tagtog.com/JaqenNLP/ApartmentReview
-https://tagtog.com/JaqenNLP/ApartmentReviews/-settings
-https://platform.openai.com/docs/models/overview
+# Ignore localhost and local network addresses
+http://localhost:*
+http://127.0.0.1:*
+
+# Ignore GraphQL endpoints (they return 400 for GET requests)
+http://localhost:4001/api/label/v2/graphql*
+https://cloud.kili-technology.com/api/label/v2/graphql*
+
+# Ignore OpenAI documentation (403 errors due to bot protection)
+https://help.openai.com/*
+https://platform.openai.com/*

.pylintrc

@@ -88,7 +88,7 @@ persistent=yes
 
 # Minimum Python version to use for version dependent checks. Will default to
 # the version used to run pylint.
-py-version=3.9
+py-version=3.10
 
 # Discover python modules and packages in the file system subtree.
 recursive=no
@@ -99,10 +99,6 @@ recursive=no
 # source root.
 source-roots=
 
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
-
 # Allow loading of arbitrary C extensions. Extensions are imported into the
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no
@@ -437,6 +433,7 @@ disable=raw-checker-failed,
         too-few-public-methods,
         too-many-ancestors,
         too-many-arguments,
+        too-many-positional-arguments,
         too-many-instance-attributes,
         too-many-locals,
         fixme,

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Set up the Development environment
 
-To install the development environment, please follow these steps, preferably in a Python 3.9 virtual environment.
+To install the development environment, please follow these steps, preferably in a Python 3.10 virtual environment.
 
 ```bash
 pip install -e ".[dev]"

README.md

@@ -1,6 +1,6 @@
 # Kili Python SDK
 
-[![Python 3.9](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)](https://www.python.org/)
+[![Python 3.10](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue)](https://www.python.org/)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/kili-technology/kili-python-sdk?label=pypi%20package)
 
@@ -36,7 +36,7 @@ It comes with several [tutorials](https://python-sdk-docs.kili-technology.com/la
 
 ## Requirements
 
-- Python >= 3.9
+- Python >= 3.10
 - Create and copy a [Kili API key](https://docs.kili-technology.com/docs/creating-an-api-key)
 - Add the `KILI_API_KEY` variable in your bash environment (or in the settings of your favorite IDE) by pasting the API key value you copied above:
 

docs/index.md

@@ -14,7 +14,7 @@ Kili Python SDK has been designed to perform complex project-related tasks by us
 
 ## Requirements
 
-You only need Python 3.9 or higher.
+You only need Python 3.10 or higher.
 
 ## Installation
 

docs/sdk/tutorials/finetuning_dinov2.md

@@ -188,7 +188,7 @@ We can then prepare the assets to be uploaded to Kili:
 # sort the assets by alternating between classes so that both
 # classes show up in the first page of the labeling interface
 content_array = []
-iterator = zip((data_dir / "def_front").iterdir(), (data_dir / "ok_front").iterdir())
+iterator = zip((data_dir / "def_front").iterdir(), (data_dir / "ok_front").iterdir(), strict=False)
 for filepath_def, filepath_ok in iterator:
     content_array.append(filepath_def)
     content_array.append(filepath_ok)

docs/sdk/tutorials/importing_coco.md

@@ -548,17 +548,15 @@ Below, we import some useful functions to convert annotations to Kili label form
 
 
 ```python
-from typing import Dict, List
-
 from kili.utils.labels.bbox import bbox_points_to_normalized_vertices, point_to_normalized_point
 from kili.utils.labels.image import mask_to_normalized_vertices
 ```
 
 
 ```python
 def coco_bbox_annotation_to_normalized_vertices(
-    coco_ann: Dict, *, img_width: int, img_height: int
-) -> List[Dict]:
+    coco_ann: dict, *, img_width: int, img_height: int
+) -> list[dict]:
     x, y, width, height = coco_ann["bbox"]
     ret = bbox_points_to_normalized_vertices(
         bottom_left={"x": x, "y": y + height},
@@ -575,8 +573,8 @@ def coco_bbox_annotation_to_normalized_vertices(
 
 ```python
 def coco_segm_annotation_to_normalized_vertices(
-    coco_ann: Dict, *, img_width: int, img_height: int
-) -> List[List[Dict]]:
+    coco_ann: dict, *, img_width: int, img_height: int
+) -> list[list[dict]]:
     coco_segmentations = coco_ann["segmentation"]
 
     ret = []
@@ -590,7 +588,7 @@ def coco_segm_annotation_to_normalized_vertices(
                     img_width=img_width,
                     origin_location="top_left",
                 )
-                for x, y in zip(coco_segm[::2], coco_segm[1::2])
+                for x, y in zip(coco_segm[::2], coco_segm[1::2], strict=False)
             ]
             ret.append(vertices)
 
@@ -706,6 +704,7 @@ for image_id in external_id_array:
                 keypoints[1::3],
                 keypoints[2::3],
                 person_keypoints_val2017["categories"][0]["keypoints"],
+                strict=False,
             ):
                 if x == y == visibility == 0:
                     continue