Cx/update typeahead

app/db/queries.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Tuple
 
 import rich
-
+import re
 from app.db.database import Database
 from app.models.clean_data import CLEANColumn
 from app.models.query_params import CLEANECLookupQueryParams, CLEANSearchQueryParams, CLEANTypeaheadQueryParams
@@ -53,7 +53,7 @@ async def build_conditions(
             # for EC numbers, we allow a terminal dash as a wildcard, which is the convention used in the ec_class_names table
             if value.endswith("-"):
                 column_conditions.append(f"clean_ec_number LIKE ${param_idx}")
-                query_params[param_name] = value.replace("-", "%")
+                query_params[param_name] = re.sub(r'-.*$', '%', value)
             else:
                 column_conditions.append(f"clean_ec_number = ${param_idx}")
                 query_params[param_name] = value
@@ -169,6 +169,9 @@ async def get_typeahead_suggestions(db: Database, params: CLEANTypeaheadQueryPar
         # match any part of the string (note we have gene names that start with an apostrophe, for example, which the user might not expect)
         search = '%' + search + '%'
         query = f"""SELECT DISTINCT gene_name FROM cleandb.predictions_uniprot_annot WHERE LOWER(gene_name) LIKE LOWER($1) ORDER BY 1 ASC"""
+    elif params.field_name == 'uniprot_id':
+        search = '%' + search + '%'
+        query = f"""SELECT DISTINCT uniprot_id FROM cleandb.predictions_uniprot_annot WHERE LOWER(uniprot_id) LIKE LOWER($1) ORDER BY 1 ASC"""
     else:
         raise ValueError(f"Invalid field name: {params.field_name}")
 

app/models/clean_data.py

@@ -112,7 +112,7 @@ class CLEANSearchResponse(BaseModel):
 
 class CLEANTypeaheadResponse(BaseModel):
     """Model for the response of a CLEAN typeahead query."""
-    field_name: Literal['accession', 'organism', 'protein_name', 'gene_name'] = Field(
+    field_name: Literal['accession', 'organism', 'protein_name', 'gene_name', 'uniprot_id'] = Field(
         'organism',
         description="Which field to search in",
     ),

app/models/query_params.py

@@ -65,7 +65,7 @@ class CLEANSearchQueryParams(BaseModel):
 class CLEANTypeaheadQueryParams(BaseModel):
     """Query parameters for CLEAN typeahead suggestions."""
 
-    field_name: Literal['accession', 'organism', 'protein_name', 'gene_name'] = Field(
+    field_name: Literal['accession', 'organism', 'protein_name', 'gene_name', 'uniprot_id'] = Field(
         'organism',
         description="Which field to search in",
     )

app/routers/search.py

@@ -224,7 +224,7 @@ async def get_data(
         raise HTTPException(status_code=500, detail=f"Error retrieving data: {str(e)}")
 
 def parse_typeahead_params(
-    field_name: Literal['accession', 'organism', 'protein_name', 'gene_name'] = Query(
+    field_name: Literal['accession', 'organism', 'protein_name', 'gene_name', 'uniprot_id'] = Query(
         'organism',
         description="Which field to search in",
     ),