add min confidence score filter

Author: ckouder

app/db/queries.py

@@ -60,11 +60,17 @@ async def build_conditions(
         if column_conditions:
             conditions.append(f"pua.predictions_uniprot_annot_id IN (SELECT predictions_uniprot_annot_id FROM cleandb.predictions_uniprot_annot_clean_ec WHERE " + " OR ".join(column_conditions) + ")")
 
-    if params.clean_ec_confidence is not None:
+    if params.clean_ec_confidence_min is not None:
         param_idx += 1
         param_name = f"param_{param_idx}"
         conditions.append(f"max_clean_ec_confidence > ${param_idx}")
-        query_params[param_name] = params.clean_ec_confidence
+        query_params[param_name] = params.clean_ec_confidence_min
+
+    if params.clean_ec_confidence_max is not None:
+        param_idx += 1
+        param_name = f"param_{param_idx}"
+        conditions.append(f"max_clean_ec_confidence < ${param_idx}")
+        query_params[param_name] = params.clean_ec_confidence_max
 
     if params.sequence_length is not None:
         param_idx += 1

app/models/query_params.py

@@ -42,9 +42,12 @@ class CLEANSearchQueryParams(BaseModel):
     clean_ec_number: Optional[List[str]] = Field(
         None, description="CLEAN predicted EC number, exact match or wildcard match using terminal dash (multiple values allowed, OR logic)"
     )
-    clean_ec_confidence: Optional[float] = Field(
+    clean_ec_confidence_min: Optional[float] = Field(
         None, description="Minimum confidence for CLEAN predicted EC number"
     )
+    clean_ec_confidence_max: Optional[float] = Field(
+        None, description="Maximum confidence for CLEAN predicted EC number"
+    )
     sequence_length: Optional[str] = Field(
         None, description="Minimum sequence length"
     )

app/routers/search.py

@@ -43,9 +43,12 @@ def parse_query_params(
         description="Uniprot ID"
     ),
     # Additional filters
-    clean_ec_confidence: Optional[float] = Query(
+    clean_ec_confidence_min: Optional[float] = Query(
         None, description="Minimum confidence for CLEAN predicted EC number"
     ),
+    clean_ec_confidence_max: Optional[float] = Query(
+        None, description="Maximum confidence for CLEAN predicted EC number"
+    ),
     sequence_length: Optional[str] = Query(
         None, description="Minimum sequence length"
     ),
@@ -70,7 +73,8 @@ def parse_query_params(
             organism=organism,
             gene_name=gene_name,
             clean_ec_number=ec_number,
-            clean_ec_confidence = clean_ec_confidence,
+            clean_ec_confidence_min = clean_ec_confidence_min,
+            clean_ec_confidence_max = clean_ec_confidence_max,
             sequence_length = sequence_length,
             uniprot_id = uniprot,
             format=format,