adjusting colors

Author: khoroshevskyi

bedhost/routers/bed_api.py

@@ -356,7 +356,11 @@ def get_regions_for_bedfile(
 )
 @count_requests(usage_data, event="bed_search")
 async def text_to_bed_search(
-    query: str, genome: Optional[str] = "hg38", limit: int = 10, offset: int = 0
+    query: str,
+    genome: Optional[Union[str, None]] = None,
+    assay: Optional[Union[str, None]] = None,
+    limit: int = 10,
+    offset: int = 0,
 ):
     """
     Search for a BedFile by a text query.
@@ -368,65 +372,90 @@ async def text_to_bed_search(
     _LOGGER.info(
         f"Searching for: '{query}' with limit='{limit}' and offset='{offset}' and genome='{genome}'"
     )
-
-    # results_sql = bbagent.bed.sql_search(
-    #     query, limit=round(limit / 2, 0), offset=round(offset / 2, 0)
-    # )
     #
-    # if results_sql.count > results_sql.offset:
-    #     qdrant_offset = offset - results_sql.offset
-    # else:
-    #     qdrant_offset = offset - results_sql.count
+    # # results_sql = bbagent.bed.sql_search(
+    # #     query, limit=round(limit / 2, 0), offset=round(offset / 2, 0)
+    # # )
+    # #
+    # # if results_sql.count > results_sql.offset:
+    # #     qdrant_offset = offset - results_sql.offset
+    # # else:
+    # #     qdrant_offset = offset - results_sql.count
+    # #
+    # # results_qdr = bbagent.bed.text_to_bed_search(
+    # #     query, limit=limit, offset=qdrant_offset - 1 if qdrant_offset > 0 else 0
+    # # )
+    # #
+    # # results = BedListSearchResult(
+    # #     count=results_qdr.count,
+    # #     limit=limit,
+    # #     offset=offset,
+    # #     results=(results_sql.results + results_qdr.results)[0:limit],
+    # # )
+    # query = query.strip()
     #
-    # results_qdr = bbagent.bed.text_to_bed_search(
-    #     query, limit=limit, offset=qdrant_offset - 1 if qdrant_offset > 0 else 0
-    # )
+    # if not genome or genome == "hg38":
+    #     spaceless_query = query.replace(" ", "")
+    #     if len(spaceless_query) == 32 and spaceless_query == query:
+    #         try:
+    #             similar_results = bbagent.bed.get_neighbours(
+    #                 query, limit=limit, offset=offset
+    #             )
     #
-    # results = BedListSearchResult(
-    #     count=results_qdr.count,
-    #     limit=limit,
-    #     offset=offset,
-    #     results=(results_sql.results + results_qdr.results)[0:limit],
-    # )
-    query = query.strip()
-
-    if not genome or genome == "hg38":
-        spaceless_query = query.replace(" ", "")
-        if len(spaceless_query) == 32 and spaceless_query == query:
-            try:
-                similar_results = bbagent.bed.get_neighbours(
-                    query, limit=limit, offset=offset
-                )
-
-                if similar_results.results and offset == 0:
-
-                    result = QdrantSearchResult(
-                        id=query,
-                        payload={},
-                        score=1.0,
-                        metadata=bbagent.bed.get(query),
-                    )
-
-                    similar_results.results.insert(0, result)
-                return similar_results
-            except Exception as _:
-                pass
-
-        results = bbagent.bed.text_to_bed_search(
-            query,
-            limit=limit,
-            offset=offset,
-        )
-    else:
-        results = bbagent.bed.sql_search(
-            query, limit=limit, offset=offset, genome=genome
-        )
+    #             if similar_results.results and offset == 0:
+    #
+    #                 result = QdrantSearchResult(
+    #                     id=query,
+    #                     payload={},
+    #                     score=1.0,
+    #                     metadata=bbagent.bed.get(query),
+    #                 )
+    #
+    #                 similar_results.results.insert(0, result)
+    #             return similar_results
+    #         except Exception as _:
+    #             pass
+
+    results = bbagent.bed.comp_search(
+        query,
+        genome_alias=genome,
+        assay=assay,
+        limit=limit,
+        offset=offset,
+    )
+    # else:
+    #     results = bbagent.bed.sql_search(
+    #         query, limit=limit, offset=offset, genome=genome
+    #     )
 
     if results:
         return results
     raise HTTPException(status_code=404, detail="No records found")
 
 
+@router.post(
+    "/search/exact",
+    summary="Search for exact match of metadata in bed files",
+    tags=["search"],
+    response_model=BedListSearchResult,
+    response_model_by_alias=False,
+)
+async def text_to_bed_search(
+    query: str,
+    genome: Optional[Union[str, None]] = None,
+    assay: Optional[Union[str, None]] = None,
+    limit: int = 10,
+    offset: int = 0,
+):
+    bbagent.bed.sql_search(
+        query=query,
+        genome=genome,
+        assay=assay,
+        limit=limit,
+        offset=offset,
+    )
+
+
 @router.post(
     "/search/bed",
     summary="Search for similar bed files",

deployment/config/api-dev.bedbase.org.yaml

@@ -9,7 +9,7 @@ database:
   port: 5432
   password: $POSTGRES_PASSWORD
   user: $POSTGRES_USER
-  database: bedbase2
+  database: bedbase
 qdrant:
   host: $QDRANT_HOST
   port: 6333

requirements/requirements-all.txt

@@ -1,5 +1,5 @@
-# bbconf @ git+https://github.com/databio/bbconf.git@dev#egg=bbconf
-bbconf>=0.11.4
+bbconf @ git+https://github.com/databio/bbconf.git@comp_search#egg=bbconf
+# bbconf>=0.11.4
 fastapi>=0.103.0
 logmuse>=0.2.7
 markdown