chore: merge release/2.162.2 into main (#1817)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Aurelien Lombard <aurelien.lombard@kili-technology.com>
Co-authored-by: @fanny.gaudin <fanny.gaudin@kili-technology.com>
Co-authored-by: @baptiste33 <baptiste@kili-technology.com>

Author: 5 people

.github/workflows/publish.yml

@@ -50,13 +50,10 @@ jobs:
             exit 1
           fi
 
-      - name: Publish to test PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1.10
-        with:
-          repository-url: https://test.pypi.org/legacy/
-
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1.10
+        with:
+          verbose: true
 
       - name: Slack notification
         id: slack

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "kili"
-version = "2.162.1"
+version = "2.162.2"
 description = "Python client for Kili Technology labeling tool"
 readme = "README.md"
 authors = [{ name = "Kili Technology", email = "contact@kili-technology.com" }]

src/kili/__init__.py

@@ -1,3 +1,3 @@
 """Kili Python SDK."""
 
-__version__ = "2.162.1"
+__version__ = "2.162.2"

src/kili/adapters/kili_api_gateway/project/mappers.py

@@ -50,6 +50,7 @@ def project_data_mapper(data: ProjectDataKiliAPIGatewayInput) -> Dict:
         "numberOfRemainingAssets": data.number_of_remaining_assets,
         "numberOfReviewedAssets": data.number_of_reviewed_assets,
         "reviewCoverage": data.review_coverage,
+        "secondsToLabelBeforeAutoAssign": data.seconds_to_label_before_auto_assign,
         "shouldRelaunchKpiComputation": data.should_relaunch_kpi_computation,
         "title": data.title,
         "useHoneyPot": data.use_honeypot,

src/kili/adapters/kili_api_gateway/project/types.py

@@ -32,6 +32,7 @@ class ProjectDataKiliAPIGatewayInput:
     number_of_remaining_assets: Optional[int]
     number_of_reviewed_assets: Optional[int]
     review_coverage: Optional[int]
+    seconds_to_label_before_auto_assign: Optional[int]
     should_relaunch_kpi_computation: Optional[bool]
     title: Optional[str]
     use_honeypot: Optional[bool]

src/kili/llm/presentation/client/llm.py

@@ -11,7 +11,7 @@
 )
 
 from kili.adapters.kili_api_gateway.kili_api_gateway import KiliAPIGateway
-from kili.domain.asset import AssetExternalId, AssetFilters, AssetId
+from kili.domain.asset import AssetExternalId, AssetFilters, AssetId, AssetStatus
 from kili.domain.label import LabelType
 from kili.domain.llm import (
     AzureOpenAICredentials,
@@ -47,6 +47,7 @@ def export(
         external_ids: Optional[List[str]] = None,
         include_sent_back_labels: Optional[bool] = False,
         label_type_in: Optional[List[LabelType]] = None,
+        status_in: Optional[List[AssetStatus]] = None,
     ) -> Optional[List[Dict[str, Union[List[str], str]]]]:
         # pylint: disable=line-too-long
         """Returns an export of llm assets with valid labels.
@@ -58,6 +59,8 @@ def export(
             external_ids: Optional list of the assets external IDs from which to export the labels.
             include_sent_back_labels: Include sent back labels if True.
             label_type_in: Optional types of label to fetch, by default ["DEFAULT", "REVIEW"].
+            status_in: Returned assets should have a status that belongs to that list, if given.
+                Possible choices: `TODO`, `ONGOING`, `LABELED`, `TO_REVIEW` or `REVIEWED`.
         !!! Example
             ```python
             kili.llm.export("your_project_id")
@@ -83,6 +86,7 @@ def export(
             project_id=ProjectId(project_id),
             asset_id_in=resolved_asset_ids,
             label_type_in=label_type_in,
+            status_in=status_in,
         )
 
         try:

src/kili/llm/services/export/__init__.py

@@ -78,7 +78,6 @@ def export(  # pylint: disable=too-many-arguments, too-many-locals
     input_type = project["inputType"]
 
     fields = get_fields_to_fetch(input_type)
-    asset_filter.status_in = ["LABELED", "REVIEWED", "TO_REVIEW", "ONGOING"]
     assets = list(
         kili_api_gateway.list_assets(asset_filter, fields, QueryOptions(disable_tqdm=disable_tqdm))
     )

src/kili/llm/services/export/dynamic.py

@@ -8,7 +8,6 @@
 CHAT_ITEMS_NEEDED_FIELDS = [
     "id",
     "content",
-    "createdAt",
     "modelId",
     "parentId",
     "role",
@@ -123,42 +122,76 @@ def _init_round(self, context):
 
     def _build_rounds(self, chat_items, annotations, json_interface):
         """A round is composed of a prompt with n pre-prompts and n completions."""
-        ordered_chat_items = sorted(chat_items, key=lambda x: x["createdAt"])
+        dict_chat_items = {}
+        for chat_item in chat_items:
+            if dict_chat_items.get(chat_item["parentId"]) is None:
+                dict_chat_items[chat_item["parentId"]] = []
+            dict_chat_items[chat_item["parentId"]].append(chat_item)
         rounds = []
+        parent_target = None
+        has_children = True
         current_round = self._init_round([])
-        for chat_item in ordered_chat_items:
-            role = chat_item["role"].lower() if chat_item["role"] else None
-            if role == "user" or role == "system":
-                if current_round["prompt"] is not None:
-                    rounds.append(current_round)
-                    new_context = (
-                        current_round["context"]
-                        + current_round["pre_prompts"]
-                        + [
-                            current_round["prompt"],
-                            self._get_round_winner(
-                                current_round["completion"],
-                                current_round["annotations"],
-                                json_interface,
-                            ),
-                        ]
-                    )
-                    current_round = self._init_round(new_context)
-
-            if role == "user":
-                current_round["prompt"] = chat_item
-            elif role == "system":
-                current_round["pre_prompts"].append(chat_item)
-            elif role == "assistant":
-                current_round["completion"].append(chat_item)
-            else:
-                raise ValueError(f"Role {chat_item['role']} not supported")
-            current_round["annotations"] += [
-                annotation
-                for annotation in annotations
-                if annotation["chatItemId"] == chat_item["id"]
-            ]
-        rounds.append(current_round)
+
+        while has_children:
+            nodes = dict_chat_items.get(parent_target)
+            if nodes is None or len(nodes) == 0:
+                has_children = False
+                continue
+            node = nodes[0]
+            if node["role"].lower() == "system":
+                current_round["pre_prompts"].append(node)
+                parent_target = node["id"]
+                current_round["annotations"] += [
+                    annotation
+                    for annotation in annotations
+                    if annotation["chatItemId"] == node["id"]
+                ]
+                continue
+
+            if node["role"].lower() == "user":
+                current_round["prompt"] = node
+                parent_target = node["id"]
+                current_round["annotations"] += [
+                    annotation
+                    for annotation in annotations
+                    if annotation["chatItemId"] == node["id"]
+                ]
+                continue
+
+            if node["role"].lower() == "assistant":
+                has_children = False
+                if dict_chat_items.get(parent_target) is None:
+                    continue
+                for chat_item in dict_chat_items[parent_target]:
+                    current_round["completion"].append(chat_item)
+                    current_round["annotations"] += [
+                        annotation
+                        for annotation in annotations
+                        if annotation["chatItemId"] == chat_item["id"]
+                    ]
+                    if not has_children and dict_chat_items.get(chat_item["id"]) is not None:
+                        has_children = True
+                        parent_target = chat_item["id"]
+
+                rounds.append(current_round)
+                new_context = (
+                    current_round["context"]
+                    + current_round["pre_prompts"]
+                    + [
+                        current_round["prompt"],
+                        self._get_round_winner(
+                            current_round["completion"],
+                            current_round["annotations"],
+                            json_interface,
+                        ),
+                    ]
+                )
+                current_round = self._init_round(new_context)
+                continue
+
+            raise ValueError(f"Role {node['role']} not supported")
+        if current_round["prompt"] is not None:
+            rounds.append(current_round)
         return rounds
 
 

src/kili/presentation/client/project.py

@@ -304,6 +304,7 @@ def update_properties_in_project(
         title: Optional[str] = None,
         use_honeypot: Optional[bool] = None,
         metadata_types: Optional[dict] = None,
+        seconds_to_label_before_auto_assign: Optional[int] = None,
     ) -> Dict[str, Any]:
         """Update properties of a project.
 
@@ -340,6 +341,9 @@ def update_properties_in_project(
             metadata_types: Types of the project metadata.
                 Should be a `dict` of metadata fields name as keys and metadata types as values.
                 Currently, possible types are: `string`, `number`
+            seconds_to_label_before_auto_assign: When a user begins to annotate an asset,
+                it automatically gets assigned to them.
+                This ensures the user retains the asset until it is submitted.
 
         Returns:
             A dict with the changed properties which indicates if the mutation was successful,
@@ -388,6 +392,7 @@ def update_properties_in_project(
             use_honeypot=use_honeypot,
             title=title,
             metadata_types=metadata_types,
+            seconds_to_label_before_auto_assign=seconds_to_label_before_auto_assign,
         )
 
     @typechecked

src/kili/services/copy_project/__init__.py

@@ -33,10 +33,12 @@ class ProjectCopier:  # pylint: disable=too-few-public-methods
     )
     FIELDS_JSON_INTERFACE = ("jsonInterface",)
     FIELDS_QUALITY_SETTINGS = (
+        "canSkipAsset",
         "consensusTotCoverage",
         "minConsensusSize",
-        "useHoneyPot",
         "reviewCoverage",
+        "secondsToLabelBeforeAutoAssign",
+        "useHoneyPot",
     )
 
     def __init__(self, kili: "Kili") -> None:
@@ -156,10 +158,12 @@ def _copy_members(self, from_project_id: str, new_project_id: str) -> None:
     def _copy_quality_settings(self, new_project_id: str, src_project: Dict) -> None:
         self.kili.update_properties_in_project(
             project_id=new_project_id,
+            can_skip_asset=src_project["canSkipAsset"],
             consensus_tot_coverage=src_project["consensusTotCoverage"],
             min_consensus_size=src_project["minConsensusSize"],
             use_honeypot=src_project["useHoneyPot"],
             review_coverage=src_project["reviewCoverage"],
+            seconds_to_label_before_auto_assign=src_project["secondsToLabelBeforeAutoAssign"],
         )
 
     def _copy_assets(self, from_project_id: str, new_project_id: str) -> None: