new route scratch

jonhealy1 · jonhealy1 · commit 6e8322785d14 · 2025-09-28T01:24:17.000+08:00
diff --git a/stac_fastapi/core/stac_fastapi/core/core.py b/stac_fastapi/core/stac_fastapi/core/core.py
@@ -283,7 +283,7 @@ async def all_collections(
             if parsed_sort:
                 sort = parsed_sort
 
-        print("sort: ", sort)
+        # sort is now ready for use
         # Convert q to a list if it's a string
         q_list = None
         if q is not None:
@@ -404,11 +404,13 @@ async def post_all_collections(
         Returns:
             A Collections object containing all the collections in the database and links to various resources.
         """
+        # Debug print
+        print("search_request: ", search_request)
         # Set the postbody attribute on the request object for PagingLinks
         request.postbody = search_request.model_dump(exclude_unset=True)
-        # Convert fields parameter from POST format to all_collections format
-        fields = None
 
+        fields = None
+        # Check for fields attribute (legacy format)
         if hasattr(search_request, "fields") and search_request.fields:
             fields = []
 
@@ -428,8 +430,29 @@ async def post_all_collections(
                 for field in search_request.fields.exclude:
                     fields.append(f"-{field}")
 
+        # Check for field attribute (ExtendedSearch format)
+        if hasattr(search_request, "field") and search_request.field:
+            fields = []
+
+            # Handle include fields
+            if (
+                hasattr(search_request.field, "includes")
+                and search_request.field.includes
+            ):
+                for field in search_request.field.includes:
+                    fields.append(f"+{field}")
+
+            # Handle exclude fields
+            if (
+                hasattr(search_request.field, "excludes")
+                and search_request.field.excludes
+            ):
+                for field in search_request.field.excludes:
+                    fields.append(f"-{field}")
+
         # Convert sortby parameter from POST format to all_collections format
         sortby = None
+        # Check for sortby attribute
         if hasattr(search_request, "sortby") and search_request.sortby:
             # Create a list of sort strings in the format expected by all_collections
             sortby = []
diff --git a/stac_fastapi/core/stac_fastapi/core/extensions/__init__.py b/stac_fastapi/core/stac_fastapi/core/extensions/__init__.py
@@ -1,5 +1,11 @@
 """elasticsearch extensions modifications."""
 
+from .collections_search import CollectionsSearchEndpointExtension
 from .query import Operator, QueryableTypes, QueryExtension
 
-__all__ = ["Operator", "QueryableTypes", "QueryExtension"]
+__all__ = [
+    "Operator",
+    "QueryableTypes",
+    "QueryExtension",
+    "CollectionsSearchEndpointExtension",
+]
diff --git a/stac_fastapi/core/stac_fastapi/core/extensions/collections_search.py b/stac_fastapi/core/stac_fastapi/core/extensions/collections_search.py
@@ -0,0 +1,184 @@
+"""Collections search extension."""
+
+from typing import List, Optional, Type, Union
+
+from fastapi import APIRouter, FastAPI, Request
+from fastapi.responses import JSONResponse
+from pydantic import BaseModel
+from starlette.responses import Response
+
+from stac_fastapi.api.models import APIRequest
+from stac_fastapi.types.core import BaseCoreClient
+from stac_fastapi.types.extension import ApiExtension
+from stac_fastapi.types.stac import Collections
+
+
+class CollectionsSearchEndpointExtension(ApiExtension):
+    """Collections search endpoint extension.
+
+    This extension adds a dedicated /collections-search endpoint for collection search operations.
+    """
+
+    def __init__(
+        self,
+        client: Optional[BaseCoreClient] = None,
+        settings: dict = None,
+        GET: Optional[Type[Union[BaseModel, APIRequest]]] = None,
+        POST: Optional[Type[Union[BaseModel, APIRequest]]] = None,
+        conformance_classes: Optional[List[str]] = None,
+    ):
+        """Initialize the extension.
+
+        Args:
+            client: Optional BaseCoreClient instance to use for this extension.
+            settings: Dictionary of settings to pass to the extension.
+            GET: Optional GET request model.
+            POST: Optional POST request model.
+            conformance_classes: Optional list of conformance classes to add to the API.
+        """
+        super().__init__()
+        self.client = client
+        self.settings = settings or {}
+        self.GET = GET
+        self.POST = POST
+        self.conformance_classes = conformance_classes or []
+        self.router = APIRouter()
+        self.create_endpoints()
+
+    def register(self, app: FastAPI) -> None:
+        """Register the extension with a FastAPI application.
+
+        Args:
+            app: target FastAPI application.
+
+        Returns:
+            None
+        """
+        app.include_router(self.router)
+
+    def create_endpoints(self) -> None:
+        """Create endpoints for the extension."""
+        if self.GET:
+            self.router.add_api_route(
+                name="Get Collections Search",
+                path="/collections-search",
+                response_model=None,
+                response_class=JSONResponse,
+                methods=["GET"],
+                endpoint=self.collections_search_get_endpoint,
+                **(self.settings if isinstance(self.settings, dict) else {}),
+            )
+
+        if self.POST:
+            self.router.add_api_route(
+                name="Post Collections Search",
+                path="/collections-search",
+                response_model=None,
+                response_class=JSONResponse,
+                methods=["POST"],
+                endpoint=self.collections_search_post_endpoint,
+                **(self.settings if isinstance(self.settings, dict) else {}),
+            )
+
+    async def collections_search_get_endpoint(
+        self, request: Request
+    ) -> Union[Collections, Response]:
+        """GET /collections-search endpoint.
+
+        Args:
+            request: Request object.
+
+        Returns:
+            Collections: Collections object.
+        """
+        # Extract query parameters from the request
+        params = dict(request.query_params)
+
+        # Convert query parameters to appropriate types
+        if "limit" in params:
+            try:
+                params["limit"] = int(params["limit"])
+            except ValueError:
+                pass
+
+        # Handle fields parameter
+        if "fields" in params:
+            fields_str = params.pop("fields")
+            fields = fields_str.split(",")
+            params["fields"] = fields
+
+        # Handle sortby parameter
+        if "sortby" in params:
+            sortby_str = params.pop("sortby")
+            sortby = sortby_str.split(",")
+            params["sortby"] = sortby
+
+        collections = await self.client.all_collections(request=request, **params)
+        return collections
+
+    async def collections_search_post_endpoint(
+        self, request: Request, body: dict
+    ) -> Union[Collections, Response]:
+        """POST /collections-search endpoint.
+
+        Args:
+            request: Request object.
+            body: Search request body.
+
+        Returns:
+            Collections: Collections object.
+        """
+        from stac_pydantic.api.search import ExtendedSearch
+
+        # Convert the dict to an ExtendedSearch model
+        search_request = ExtendedSearch.model_validate(body)
+
+        # Check if fields are present in the body
+        if "fields" in body:
+            # Extract fields from body and add them to search_request
+            if hasattr(search_request, "field"):
+                from stac_pydantic.api.extensions.fields import FieldsExtension
+
+                fields_data = body["fields"]
+                search_request.field = FieldsExtension(
+                    includes=fields_data.get("include"),
+                    excludes=fields_data.get("exclude"),
+                )
+
+        # Set the postbody on the request for pagination links
+        request.postbody = body
+
+        collections = await self.client.post_all_collections(
+            search_request=search_request, request=request
+        )
+        return collections
+
+    @classmethod
+    def from_extensions(
+        cls, extensions: List[ApiExtension]
+    ) -> "CollectionsSearchEndpointExtension":
+        """Create a CollectionsSearchEndpointExtension from a list of extensions.
+
+        Args:
+            extensions: List of extensions to include in the CollectionsSearchEndpointExtension.
+
+        Returns:
+            CollectionsSearchEndpointExtension: A new CollectionsSearchEndpointExtension instance.
+        """
+        from stac_fastapi.api.models import (
+            create_get_request_model,
+            create_post_request_model,
+        )
+
+        get_model = create_get_request_model(extensions)
+        post_model = create_post_request_model(extensions)
+
+        return cls(
+            GET=get_model,
+            POST=post_model,
+            conformance_classes=[
+                ext.conformance_classes
+                for ext in extensions
+                if hasattr(ext, "conformance_classes")
+            ],
+        )
diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py
@@ -23,6 +23,9 @@
     EsAggregationExtensionGetRequest,
     EsAggregationExtensionPostRequest,
 )
+from stac_fastapi.core.extensions.collections_search import (
+    CollectionsSearchEndpointExtension,
+)
 from stac_fastapi.core.extensions.fields import FieldsExtension
 from stac_fastapi.core.rate_limit import setup_rate_limit
 from stac_fastapi.core.route_dependencies import get_route_dependencies
@@ -163,8 +166,31 @@
     ],
 )
 
+# Initialize collections-search endpoint extension
+collections_search_endpoint_ext = CollectionsSearchEndpointExtension(
+    client=CoreClient(
+        database=database_logic,
+        session=session,
+        post_request_model=collection_search_post_request_model,
+        landing_page_id=os.getenv("STAC_FASTAPI_LANDING_PAGE_ID", "stac-fastapi"),
+    ),
+    settings=settings,
+    GET=collections_get_request_model,
+    POST=collection_search_post_request_model,
+    conformance_classes=[
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search",
+        "http://www.opengis.net/spec/ogcapi-common-2/1.0/conf/simple-query",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#filter",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#free-text",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#query",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#sort",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#fields",
+    ],
+)
+
 extensions.append(collection_search_ext)
 extensions.append(collection_search_post_ext)
+extensions.append(collections_search_endpoint_ext)
 
 database_logic.extensions = [type(ext).__name__ for ext in extensions]
 
diff --git a/stac_fastapi/opensearch/stac_fastapi/opensearch/app.py b/stac_fastapi/opensearch/stac_fastapi/opensearch/app.py
@@ -23,6 +23,9 @@
     EsAggregationExtensionGetRequest,
     EsAggregationExtensionPostRequest,
 )
+from stac_fastapi.core.extensions.collections_search import (
+    CollectionsSearchEndpointExtension,
+)
 from stac_fastapi.core.extensions.fields import FieldsExtension
 from stac_fastapi.core.rate_limit import setup_rate_limit
 from stac_fastapi.core.route_dependencies import get_route_dependencies
@@ -163,8 +166,31 @@
     ],
 )
 
+# Initialize collections-search endpoint extension
+collections_search_endpoint_ext = CollectionsSearchEndpointExtension(
+    client=CoreClient(
+        database=database_logic,
+        session=session,
+        post_request_model=collection_search_post_request_model,
+        landing_page_id=os.getenv("STAC_FASTAPI_LANDING_PAGE_ID", "stac-fastapi"),
+    ),
+    settings=settings,
+    GET=collections_get_request_model,
+    POST=collection_search_post_request_model,
+    conformance_classes=[
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search",
+        "http://www.opengis.net/spec/ogcapi-common-2/1.0/conf/simple-query",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#filter",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#free-text",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#query",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#sort",
+        "https://api.stacspec.org/v1.0.0-rc.1/collection-search#fields",
+    ],
+)
+
 extensions.append(collection_search_ext)
 extensions.append(collection_search_post_ext)
+extensions.append(collections_search_endpoint_ext)
 
 database_logic.extensions = [type(ext).__name__ for ext in extensions]
 
diff --git a/stac_fastapi/tests/api/test_api_search_collections.py b/stac_fastapi/tests/api/test_api_search_collections.py
@@ -601,13 +601,8 @@ async def test_collections_number_matched_returned(app_client, txn_client, ctx):
 
 
 @pytest.mark.asyncio
-async def test_collections_post(app_client, txn_client, ctx, monkeypatch):
-    """Verify POST /collections endpoint works."""
-    # Turn off the transaction extension to avoid conflict with collections POST endpoint
-    import os
-
-    original_value = os.environ.get("ENABLE_TRANSACTIONS_EXTENSIONS")
-    monkeypatch.setenv("ENABLE_TRANSACTIONS_EXTENSIONS", "False")
+async def test_collections_post(app_client, txn_client, ctx):
+    """Verify POST /collections-search endpoint works."""
 
     # Create multiple collections with different ids
     base_collection = ctx.collection
@@ -627,7 +622,7 @@ async def test_collections_post(app_client, txn_client, ctx, monkeypatch):
 
     # Test basic POST search
     resp = await app_client.post(
-        "/collections",
+        "/collections-search",
         json={"limit": 5},
     )
     assert resp.status_code == 200
@@ -649,7 +644,7 @@ async def test_collections_post(app_client, txn_client, ctx, monkeypatch):
 
     # Test POST search with sortby
     resp = await app_client.post(
-        "/collections",
+        "/collections-search",
         json={"sortby": [{"field": "id", "direction": "desc"}]},
     )
     assert resp.status_code == 200
@@ -669,7 +664,7 @@ async def test_collections_post(app_client, txn_client, ctx, monkeypatch):
 
     # Test POST search with fields
     resp = await app_client.post(
-        "/collections",
+        "/collections-search",
         json={"fields": {"exclude": ["stac_version"]}},
     )
     assert resp.status_code == 200
@@ -683,9 +678,3 @@ async def test_collections_post(app_client, txn_client, ctx, monkeypatch):
     # Check that stac_version is excluded from the collections
     for collection in test_collections:
         assert "stac_version" not in collection
-
-    # Restore the original environment variable value
-    if original_value is not None:
-        monkeypatch.setenv("ENABLE_TRANSACTIONS_EXTENSIONS", original_value)
-    else:
-        monkeypatch.delenv("ENABLE_TRANSACTIONS_EXTENSIONS", raising=False)
