post fields

Author: jonhealy1

stac_fastapi/core/stac_fastapi/core/core.py

@@ -255,6 +255,8 @@ async def all_collections(
         request = kwargs["request"]
         base_url = str(request.base_url)
 
+        print("fields get: ", fields)
+
         limit = int(request.query_params.get("limit", os.getenv("STAC_ITEM_LIMIT", 10)))
 
         token = request.query_params.get("token")
@@ -263,10 +265,18 @@ async def all_collections(
         includes, excludes = set(), set()
         if fields:
             for field in fields:
+                print("Processing field:", field)
                 if field[0] == "-":
                     excludes.add(field[1:])
+                    print("Added to excludes:", field[1:])
                 else:
                     includes.add(field[1:] if field[0] in "+ " else field)
+                    print(
+                        "Added to includes:", field[1:] if field[0] in "+ " else field
+                    )
+            print("Final includes:", includes)
+            print("Final excludes:", excludes)
+        print("fields get: ", fields)
 
         sort = None
         if sortby:
@@ -391,6 +401,71 @@ async def all_collections(
             numberReturned=len(filtered_collections),
         )
 
+    async def post_all_collections(
+        self, search_request: BaseSearchPostRequest, request: Request, **kwargs
+    ) -> stac_types.Collections:
+        """Search collections with POST request.
+
+        Args:
+            search_request (BaseSearchPostRequest): The search request.
+            request (Request): The request.
+
+        Returns:
+            A Collections object containing all the collections in the database and links to various resources.
+        """
+        # Convert fields parameter from POST format to all_collections format
+        fields = None
+
+        if hasattr(search_request, "fields") and search_request.fields:
+            fields = []
+
+            # Handle include fields
+            if (
+                hasattr(search_request.fields, "include")
+                and search_request.fields.include
+            ):
+                for field in search_request.fields.include:
+                    fields.append(f"+{field}")
+
+            # Handle exclude fields
+            if (
+                hasattr(search_request.fields, "exclude")
+                and search_request.fields.exclude
+            ):
+                for field in search_request.fields.exclude:
+                    fields.append(f"-{field}")
+
+        # Convert sortby parameter from POST format to all_collections format
+        sortby = None
+        if hasattr(search_request, "sortby") and search_request.sortby:
+            sort_strings = []
+            for sort_item in search_request.sortby:
+                direction = sort_item.get("direction", "asc")
+                field = sort_item.get("field")
+                if field:
+                    prefix = "-" if direction.lower() == "desc" else "+"
+                    sort_strings.append(f"{prefix}{field}")
+            # Join the sort strings into a single string
+            if sort_strings:
+                sortby = ",".join(sort_strings)
+
+        # Pass all parameters from search_request to all_collections
+        return await self.all_collections(
+            limit=search_request.limit if hasattr(search_request, "limit") else None,
+            fields=fields,
+            sortby=sortby,
+            filter_expr=search_request.filter
+            if hasattr(search_request, "filter")
+            else None,
+            filter_lang=search_request.filter_lang
+            if hasattr(search_request, "filter_lang")
+            else None,
+            query=search_request.query if hasattr(search_request, "query") else None,
+            q=search_request.q if hasattr(search_request, "q") else None,
+            request=request,
+            **kwargs,
+        )
+
     async def get_collection(
         self, collection_id: str, **kwargs
     ) -> stac_types.Collection:

stac_fastapi/core/stac_fastapi/core/utilities.py

@@ -92,7 +92,13 @@ def filter_fields(  # noqa: C901
     This will not perform a deep copy; values of the original item will be referenced
     in the return item.
     """
+    print("filter_fields called with:")
+    print("  item:", item.keys() if hasattr(item, "keys") else item)
+    print("  include:", include)
+    print("  exclude:", exclude)
+
     if not include and not exclude:
+        print("  No include or exclude, returning original item")
         return item
 
     # Build a shallow copy of included fields on an item, or a sub-tree of an item

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -38,6 +38,7 @@
     AggregationExtension,
     CollectionSearchExtension,
     CollectionSearchFilterExtension,
+    CollectionSearchPostExtension,
     FilterExtension,
     FreeTextExtension,
     SortExtension,
@@ -136,7 +137,34 @@
     )
     collections_get_request_model = collection_search_ext.GET
 
-    extensions.append(collection_search_ext)
+# Create a post request model for collection search
+collection_search_post_request_model = create_post_request_model(
+    collection_search_extensions
+)
+
+# Initialize collection search POST extension
+collection_search_post_ext = CollectionSearchPostExtension(
+    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,
+    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)
 
 database_logic.extensions = [type(ext).__name__ for ext in extensions]
 

stac_fastapi/opensearch/stac_fastapi/opensearch/app.py

@@ -32,6 +32,7 @@
     AggregationExtension,
     CollectionSearchExtension,
     CollectionSearchFilterExtension,
+    CollectionSearchPostExtension,
     FilterExtension,
     FreeTextExtension,
     SortExtension,
@@ -136,7 +137,34 @@
     )
     collections_get_request_model = collection_search_ext.GET
 
-    extensions.append(collection_search_ext)
+# Create a post request model for collection search
+collection_search_post_request_model = create_post_request_model(
+    collection_search_extensions
+)
+
+# Initialize collection search POST extension
+collection_search_post_ext = CollectionSearchPostExtension(
+    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,
+    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)
 
 database_logic.extensions = [type(ext).__name__ for ext in extensions]
 

stac_fastapi/tests/api/test_api_search_collections.py

@@ -598,3 +598,68 @@ async def test_collections_number_matched_returned(app_client, txn_client, ctx):
     # Check that numberMatched matches the number of collections that match the query
     # (should be 1 in this case)
     assert resp_json["numberMatched"] >= 1
+
+
+@pytest.mark.asyncio
+async def test_collections_search_post(app_client, txn_client, ctx):
+    """Verify POST /collections-search endpoint works."""
+    # Create multiple collections with different ids
+    base_collection = ctx.collection
+
+    # Create collections with ids in a specific order to test search
+    # Use unique prefixes to avoid conflicts between tests
+    test_prefix = f"post-{uuid.uuid4().hex[:8]}"
+    collection_ids = [f"{test_prefix}-{i}" for i in range(10)]
+
+    for i, coll_id in enumerate(collection_ids):
+        test_collection = base_collection.copy()
+        test_collection["id"] = coll_id
+        test_collection["title"] = f"Test Collection {i}"
+        await create_collection(txn_client, test_collection)
+
+    await refresh_indices(txn_client)
+
+    # Test basic POST search
+    resp = await app_client.post(
+        "/collections",
+        json={"limit": 5},
+    )
+    assert resp.status_code == 200
+    resp_json = resp.json()
+
+    # Filter collections to only include the ones we created for this test
+    test_collections = [
+        c for c in resp_json["collections"] if c["id"].startswith(test_prefix)
+    ]
+
+    # Should return 5 collections
+    assert len(test_collections) == 5
+
+    # Check that numberReturned matches the number of collections returned
+    assert resp_json["numberReturned"] == len(resp_json["collections"])
+
+    # Check that numberMatched is greater than or equal to numberReturned
+    assert resp_json["numberMatched"] >= resp_json["numberReturned"]
+
+    # Test POST search with query
+    resp = await app_client.post(
+        "/collections",
+        json={"query": {"id": {"eq": f"{test_prefix}-1"}}},
+    )
+    assert resp.status_code == 200
+    resp_json = resp.json()
+
+    # Filter collections to only include the ones we created for this test
+    test_collections = [
+        c for c in resp_json["collections"] if c["id"].startswith(test_prefix)
+    ]
+
+    # Should return only 1 collection
+    assert len(test_collections) == 1
+    assert test_collections[0]["id"] == f"{test_prefix}-1"
+
+    # Check that numberReturned matches the number of collections returned
+    assert resp_json["numberReturned"] == len(resp_json["collections"])
+
+    # Check that numberMatched matches the number of collections that match the query
+    assert resp_json["numberMatched"] >= 1