Merge branch 'stac-fastapi-6' into more-stac-extensions

Author: fmigneault

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.1
+  rev: v0.12.2
   hooks:
     # Run the linter.
     - id: ruff-check

CHANGES.md

@@ -21,11 +21,10 @@
   _**NOTE**_: <br>
   The `CollectionSearchPostExtension` is purposely omitted as it would conflict with the `Transaction` extension
   that both uses the same `POST /collections` enpodint for search and collection creation respectively.
-  
 
 # Fixed
 
-- n/a
+- Fix breaking PG connection setting when using ``stac-fastapi>=6``.
 
 [1.1.0](https://github.com/crim-ca/stac-app/tree/1.1.0)
 ------------------------------------------------------------------------------------------------------------------

src/stac_app.py

@@ -10,12 +10,14 @@
 from buildpg import render
 from fastapi import APIRouter, HTTPException, Request, Response
 from fastapi.responses import ORJSONResponse
+from packaging.version import Version
 from stac_fastapi.api.app import StacApi
 from stac_fastapi.api.models import (
     ItemCollectionUri,
     create_get_request_model,
     create_post_request_model,
 )
+from stac_fastapi.api.version import __version__ as stac_fastapi_version
 from stac_fastapi.extensions.core import (
     CollectionSearchFilterExtension,
     FieldsExtension,
@@ -167,9 +169,15 @@ async def _load_script(script_basename: str, conn: asyncpg.Connection) -> None:
 async def startup_event() -> None:
     """Connect to database on startup and load custom functions."""
     max_retries = 60
+
+    # forward-compatibility setting
+    connect_to_db_kwargs = {}
+    if Version(stac_fastapi_version) >= Version("6.0"):
+        connect_to_db_kwargs["add_write_connection_pool"] = True
+
     for retry in range(max_retries):
         try:
-            await connect_to_db(app)
+            await connect_to_db(app, **connect_to_db_kwargs)
             break
         except Exception as err:
             logger.warning(