Fix conflicts

Author: Chiara Rasi

CHANGELOG.md

@@ -11,7 +11,9 @@ About changelog [here](https://keepachangelog.com/en/1.0.0/)
 - Export genotype with gene variantS search (#6088)
 - igv.js version to 3.7.3 (#6096)
 - Rework rank model file loading, allowing full URI (#6090)
-- Refactored `scout delete` commands and relative tests into separate modules (#6102)
+- Refactored scout delete commands and relative tests into separate modules (#6102)
+- Refactor, speedup and add a progress bar to `scout delete variants` cmd (#6094)
+- `scout delete variants` command now accepts an optional `--out-file` where to print a detailed report of the deletion process (#6094)
 ### Fixed
 - Comments' text wrapping in ACMG classifications exported as PDF (#6086)
 - Individual breakpoint gDNA IGV links should not trigger split locus view (#6103)

scout/adapter/mongo/query.py

@@ -1,7 +1,7 @@
 import logging
 import re
 from datetime import datetime, timedelta
-from typing import List, Optional, Union
+from typing import List, Optional, Set, Union
 
 from scout.constants import (
     CLINSIG_MAP,
@@ -52,31 +52,29 @@ def build_case_query(
     def delete_variants_query(
         self,
         case_id: str,
-        variants_to_keep: List[str] = [],
+        variants_to_keep: Set[str] | None = None,
         min_rank_threshold: Optional[int] = None,
-        keep_ctg: List[str] = [],
+        remove_ctg: List[str] | None = None,
     ) -> dict:
-        """Build a query to delete variants from a case (variant collection).
+        """Build a query to delete variants from a case.
 
         Removes variants with rank lower than `min_rank_threshold`.
-        Retains variants in categories `keep_ctg` by excluding them from deletion - eg `["cancer", "cancer_sv"]`.
+        Retains variants in categories `keep_ctg` and specific variant IDs in
+        `variants_to_keep` by excluding them from deletion.
         """
-        variants_query = {}
-        case_subquery = {"case_id": case_id}
-
-        # Create query to delete all variants that shouldn't be kept or with rank higher than min_rank_threshold
-        if variants_to_keep or min_rank_threshold or keep_ctg:
-            variants_query["$and"] = [case_subquery]
-            if variants_to_keep:
-                variants_query["$and"].append({"_id": {"$nin": variants_to_keep}})
-            if keep_ctg:
-                variants_query["$and"].append({"category": {"$nin": keep_ctg}})
-            if min_rank_threshold:
-                variants_query["$and"].append({"rank_score": {"$lt": min_rank_threshold}})
-        else:
-            variants_query = case_subquery
-
-        return variants_query
+
+        query: dict = {"case_id": case_id}
+
+        if variants_to_keep:
+            query["_id"] = {"$nin": variants_to_keep}
+
+        if remove_ctg:
+            query["category"] = {"$in": remove_ctg}
+
+        if min_rank_threshold is not None:
+            query["rank_score"] = {"$lt": min_rank_threshold}
+
+        return query
 
     def build_variant_query(
         self,