add collection search extension

.dockerignore

@@ -9,5 +9,7 @@ coverage.xml
 *.log
 .git
 .envrc
+*egg-info
 
-venv
+venv
+env

.github/workflows/cicd.yaml

@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       pgstac:
-        image: ghcr.io/stac-utils/pgstac:v0.7.10
+        image: ghcr.io/stac-utils/pgstac:v0.8.6
         env:
           POSTGRES_USER: username
           POSTGRES_PASSWORD: password

CHANGES.md

@@ -2,7 +2,8 @@
 
 ## [Unreleased]
 
-- Fix Docker compose file, so example data can be loaded into database (author @zstatmanweil, https://github.com/stac-utils/stac-fastapi-pgstac/pull/142)
+- Fix Docker compose file, so example data can be loaded into database (author @zstatmanweil, <https://github.com/stac-utils/stac-fastapi-pgstac/pull/142>)
+- Add collection search extension
 
 - Fix `filter` extension implementation in `CoreCrudClient`
 

setup.py

@@ -10,9 +10,9 @@
     "orjson",
     "pydantic",
     "stac_pydantic==3.1.*",
-    "stac-fastapi.api~=3.0",
-    "stac-fastapi.extensions~=3.0",
-    "stac-fastapi.types~=3.0",
+    "stac-fastapi.api~=3.0.2",
+    "stac-fastapi.extensions~=3.0.2",
+    "stac-fastapi.types~=3.0.2",
     "asyncpg",
     "buildpg",
     "brotli_asgi",

stac_fastapi/pgstac/app.py

@@ -10,6 +10,7 @@
 from fastapi.responses import ORJSONResponse
 from stac_fastapi.api.app import StacApi
 from stac_fastapi.api.models import (
+    EmptyRequest,
     ItemCollectionUri,
     create_get_request_model,
     create_post_request_model,
@@ -22,6 +23,7 @@
     TokenPaginationExtension,
     TransactionExtension,
 )
+from stac_fastapi.extensions.core.collection_search import CollectionSearchExtension
 from stac_fastapi.extensions.third_party import BulkTransactionExtension
 
 from stac_fastapi.pgstac.config import Settings
@@ -48,12 +50,17 @@
 }
 
 if enabled_extensions := os.getenv("ENABLED_EXTENSIONS"):
+    _enabled_extensions = enabled_extensions.split(",")
     extensions = [
-        extensions_map[extension_name] for extension_name in enabled_extensions.split(",")
+        extension
+        for key, extension in extensions_map.items()
+        if key in _enabled_extensions
     ]
 else:
+    _enabled_extensions = list(extensions_map.keys()) + ["collection_search"]
     extensions = list(extensions_map.values())
 
+
 if any(isinstance(ext, TokenPaginationExtension) for ext in extensions):
     items_get_request_model = create_request_model(
         model_name="ItemCollectionUri",
@@ -64,17 +71,33 @@
 else:
     items_get_request_model = ItemCollectionUri
 
+if "collection_search" in _enabled_extensions:
+    collection_search_extension = CollectionSearchExtension.from_extensions(
+        extensions=extensions
+    )
+    collections_get_request_model = collection_search_extension.GET
+else:
+    collection_search_extension = None
+    collections_get_request_model = EmptyRequest
+
 post_request_model = create_post_request_model(extensions, base_model=PgstacSearch)
 get_request_model = create_get_request_model(extensions)
 
+# will only use parameters defined in collections_get_request_model
+collection_search_model = create_post_request_model(extensions, base_model=PgstacSearch)
+
 api = StacApi(
     settings=settings,
-    extensions=extensions,
-    client=CoreCrudClient(post_request_model=post_request_model),  # type: ignore
+    extensions=extensions + [collection_search_extension],
+    client=CoreCrudClient(
+        post_request_model=post_request_model,  # type: ignore
+        collection_request_model=collection_search_model,  # type: ignore
+    ),
     response_class=ORJSONResponse,
     items_get_request_model=items_get_request_model,
     search_get_request_model=get_request_model,
     search_post_request_model=post_request_model,
+    collections_get_request_model=collections_get_request_model,
 )
 app = api.app