fix: stac search query dependency [GDD-3825]

Author: jverrydt

titiler/stacapi/dependencies.py

@@ -152,13 +152,7 @@ def ItemIdParams(
     )
 
 
-def STACSearchParams(
-    request: Request,
-    collection_id: Annotated[
-        str,
-        Path(description="STAC Collection Identifier"),
-    ],
-    ids: Annotated[Optional[str], Query(description="Filter by Ids.")] = None,
+def STACQueryParams(
     bbox: Annotated[
         Optional[str],
         Query(description="Spatial Filter."),
@@ -191,8 +185,6 @@ def STACSearchParams(
 ) -> Dict:
     """Dependency to construct STAC API Search Query."""
     return {
-        "collections": [collection_id],
-        "ids": ids.split(",") if ids else None,
         "bbox": list(map(float, bbox.split(","))) if bbox else None,
         "datetime": datetime,
         "sortby": sortby,
@@ -201,3 +193,20 @@ def STACSearchParams(
         "limit": limit or 10,
         "max_items": max_items or 100,
     }
+
+
+def STACSearchParams(
+    request: Request,
+    collection_id: Annotated[
+        str,
+        Path(description="STAC Collection Identifier"),
+    ],
+    ids: Annotated[Optional[str], Query(description="Filter by Ids.")] = None,
+    query_params=Depends(STACQueryParams),
+) -> Dict:
+    """Dependency to construct STAC API Search Query."""
+    return {
+        "collections": [collection_id],
+        "ids": ids.split(",") if ids else None,
+        **query_params,
+    }

titiler/stacapi/factory.py

@@ -45,7 +45,12 @@
 from titiler.core.utils import render_image
 from titiler.mosaic.factory import PixelSelectionParams
 from titiler.stacapi.backend import STACAPIBackend
-from titiler.stacapi.dependencies import APIParams, STACApiParams, STACSearchParams
+from titiler.stacapi.dependencies import (
+    APIParams,
+    STACApiParams,
+    STACQueryParams,
+    STACSearchParams,
+)
 from titiler.stacapi.models import FeatureInfo, LayerDict
 from titiler.stacapi.pystac import Client
 from titiler.stacapi.settings import CacheSettings, RetrySettings
@@ -723,12 +728,12 @@ class OGCWMTSFactory(BaseTilerFactory):
 
     path_dependency: Callable[..., APIParams] = STACApiParams
 
-    search_dependency: Callable[..., Dict] = STACSearchParams
-
     # In this factory, `reader` should be a Mosaic Backend
     # https://developmentseed.org/cogeo-mosaic/advanced/backends/
     reader: Type[BaseBackend] = STACAPIBackend
 
+    query_dependency: Callable[..., Any] = STACQueryParams
+
     # Because the endpoints should work with STAC Items,
     # the `layer_dependency` define which query parameters are mandatory/optional to `display` images
     # Defaults to `titiler.core.dependencies.AssetsBidxExprParams`, `assets=` or `expression=` is required
@@ -806,7 +811,6 @@ def get_tile(  # noqa: C901
             # STAC Query parameter provided by the the render extension and QueryParameters
             ###########################################################
             query_params = copy(layer.get("render")) or {}
-            query_params["collections"] = [layer["collection"]]
 
             if req_time:
                 start_datetime = python_datetime.datetime.strptime(
@@ -825,9 +829,10 @@ def get_tile(  # noqa: C901
                 query_params["expression"] = req["expression"]
 
             search_query = get_dependency_params(
-                dependency=self.search_dependency,
+                dependency=self.query_dependency,
                 query_params=query_params,
             )
+            search_query["collections"] = [layer["collection"]]
 
             layer_params = get_dependency_params(
                 dependency=self.layer_dependency,