feat(LAB-3105): add param for exclude sent back labels

And fix export for llm

Author: FannyGaudin

src/kili/presentation/client/label.py

@@ -1138,6 +1138,7 @@ def export_labels(
         asset_filter_kwargs: Optional[Dict[str, object]] = None,
         normalized_coordinates: Optional[bool] = None,
         label_type_in: Optional[List[str]] = None,
+        include_sent_back_labels: Optional[bool] = True,
     ) -> Optional[List[Dict[str, Union[List[str], str]]]]:
         # pylint: disable=line-too-long
         """Export the project labels with the requested format into the requested output path.
@@ -1192,6 +1193,7 @@ def export_labels(
                 If False, the json response will contain additional fields with coordinates in absolute values, that is, in pixels.
             label_type_in: Optional list of label type. Exported assets should have a label whose type belongs to that list.
                 By default, only `DEFAULT` and `REVIEW` labels are exported.
+            include_sent_back_labels: If True, the export will include the labels that have been sent back.
 
         !!! Info
             The supported formats are:
@@ -1249,6 +1251,7 @@ def is_rectangle(coco_annotation, coco_image, kili_annotation):
                 asset_filter_kwargs=asset_filter_kwargs,
                 normalized_coordinates=normalized_coordinates,
                 label_type_in=label_type_in,
+                include_sent_back_labels=include_sent_back_labels,
             )
         except NoCompatibleJobError as excp:
             warnings.warn(str(excp), stacklevel=2)

src/kili/services/export/__init__.py

@@ -39,6 +39,7 @@ def export_labels(  # pylint: disable=too-many-arguments, too-many-locals
     asset_filter_kwargs: Optional[Dict[str, object]],
     normalized_coordinates: Optional[bool],
     label_type_in: Optional[List[str]],
+    include_sent_back_labels: Optional[bool] = True,
 ) -> Optional[List[Dict[str, Union[List[str], str]]]]:
     """Export the selected assets into the required format, and save it into a file archive."""
     kili.kili_api_gateway.get_project(project_id, ["id"])
@@ -56,6 +57,7 @@ def export_labels(  # pylint: disable=too-many-arguments, too-many-locals
         asset_filter_kwargs=asset_filter_kwargs,
         normalized_coordinates=normalized_coordinates,
         label_type_in=label_type_in,
+        include_sent_back_labels=include_sent_back_labels,
     )
 
     logger = get_logger(log_level)

src/kili/services/export/format/base.py

@@ -47,6 +47,7 @@ class ExportParams(NamedTuple):
     asset_filter_kwargs: Optional[Dict[str, object]]
     normalized_coordinates: Optional[bool]
     label_type_in: Optional[List[str]]
+    include_sent_back_labels: Optional[bool]
 
 
 class AbstractExporter(ABC):  # pylint: disable=too-many-instance-attributes
@@ -79,6 +80,7 @@ def __init__(
         self.asset_filter_kwargs = export_params.asset_filter_kwargs
         self.normalized_coordinates = export_params.normalized_coordinates
         self.label_type_in = export_params.label_type_in or ["DEFAULT", "REVIEW"]
+        self.include_sent_back_labels = export_params.include_sent_back_labels
 
         self.project = kili.kili_api_gateway.get_project(
             self.project_id, ["jsonInterface", "inputType", "title", "description", "id"]
@@ -273,19 +275,28 @@ def _format_json_response(label: Dict) -> Dict:
 
     def preprocess_assets(self, assets: List[Dict]) -> List[Dict]:
         """Format labels in the requested format, and filter out autosave labels."""
+        include_sent_back_labels = self.include_sent_back_labels
         assets_in_format = []
         for asset in assets:
             if "labels" in asset:
                 labels_of_asset = []
                 for label in asset["labels"]:
                     clean_label = AbstractExporter._format_json_response(label)
                     labels_of_asset.append(clean_label)
+                    if not include_sent_back_labels:
+                        labels_of_asset = list(
+                            filter(
+                                lambda label: label["isSentBackToQueue"] is False, labels_of_asset
+                            )
+                        )
                 asset["labels"] = labels_of_asset
+                assets_in_format.append(asset)
             if "latestLabel" in asset:
                 label = asset["latestLabel"]
                 if label is not None:
                     clean_label = AbstractExporter._format_json_response(label)
                     asset["latestLabel"] = clean_label
-            assets_in_format.append(asset)
+                if include_sent_back_labels or asset["latestLabel"]["isSentBackToQueue"] is False:
+                    assets_in_format.append(asset)
 
         return AbstractExporter._filter_out_autosave_labels(assets_in_format)

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

@@ -58,9 +58,10 @@ def process(self, assets: List[Dict]) -> List[Dict[str, Union[List[str], str]]]:
             DeprecationWarning,
             stacklevel=2,
         )
+        clean_assets = self.preprocess_assets(assets)
         if self.label_format == "llm_v1":
-            return self._process_llm_v1(assets)
-        return self._process_llm_dynamic_v1(assets)
+            return self._process_llm_v1(clean_assets)
+        return self._process_llm_dynamic_v1(clean_assets)
 
     def _process_llm_dynamic_v1(self, assets: List[Dict]) -> List[Dict[str, Union[List[str], str]]]:
         result = []
@@ -262,7 +263,10 @@ def _format_raw_data(
                         "id": _safe_pop(chat_items_ids),
                         "chat_id": chat_id,
                         "model": models[index_completion]
-                        if (index == len(prompts) - 1 or all_model_keys)
+                        if (
+                            (index == len(prompts) - 1 or all_model_keys)
+                            and len(models) > index_completion
+                        )
                         else None,
                     }
                 )

src/kili/services/export/tools.py

@@ -41,6 +41,7 @@
     "labels.author.lastname",
     "labels.createdAt",
     "labels.isLatestLabelForUser",
+    "labels.isSentBackToQueue",
     "labels.labelType",
     "labels.modelName",
 ]
@@ -53,6 +54,7 @@
     "latestLabel.author.lastname",
     "latestLabel.createdAt",
     "latestLabel.isLatestLabelForUser",
+    "latestLabel.isSentBackToQueue",
     "latestLabel.labelType",
     "latestLabel.modelName",
 ]