update from main

Author: vincentsarago

.github/workflows/cicd.yaml

@@ -15,8 +15,8 @@ jobs:
           - {python: '3.12', pypgstac: '0.9.*'}
           - {python: '3.12', pypgstac: '0.8.*'}
           - {python: '3.11', pypgstac: '0.8.*'}
+          - {python: '3.10', pypgstac: '0.8.*'}
           - {python: '3.9', pypgstac: '0.8.*'}
-          - {python: '3.8', pypgstac: '0.8.*'}
 
     timeout-minutes: 20
 

.github/workflows/packages.yml

@@ -24,11 +24,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5.5.1
+        uses: docker/metadata-action@v5.6.1
         with:
           images: ghcr.io/stac-utils/stac-fastapi-pgstac
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6.12.0
         with:
           context: .
           file: Dockerfile

CHANGES.md

@@ -2,15 +2,27 @@
 
 ## [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>)
+### Changed
+
 - Handle `next` and `dev` tokens now returned as links from pgstac>=0.9.0 (author @zstatmanweil, https://github.com/stac-utils/stac-fastapi-pgstac/pull/140)
 - Add collection search extension ([#139](https://github.com/stac-utils/stac-fastapi-pgstac/pull/139))
 - keep `/search` and `/collections` extensions separate ([#158](https://github.com/stac-utils/stac-fastapi-pgstac/pull/158))
-- Fix `filter` extension implementation in `CoreCrudClient`
 - update `pypgstac` requirement to `>=0.8,<0.10`
 - set `pypgstac==0.9.*` for test requirements
+- update `stac-fastapi-*` requirement to `~=4.0`
+- remove `python 3.8` support
+- renamed `post_request_model` attribute to `pgstac_search_model` in `CoreCrudClient` class
+- changed `datetime` input type to `string` in GET endpoint methods
+- renamed `filter` to `filter_expr` input attributes in GET endpoint methods
+- delete `utils.format_datetime_range` function
+
+### Fixed
+
+- 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 `filter` extension implementation in `CoreCrudClient`
 
 ## [3.0.1] - 2024-11-14
+
 - Enable runtime `CORS` configuration using environment variables (`CORS_ORIGIN="https://...,https://..."`, `CORS_METHODS="PUT,OPTIONS"`) (https://github.com/stac-utils/stac-fastapi-pgstac/pull/168)
 
 ## [3.0.0] - 2024-08-02

Dockerfile

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.12
 
 FROM python:${PYTHON_VERSION}-slim as base
 

Dockerfile.docs

@@ -1,4 +1,4 @@
-FROM python:3.8-slim
+FROM python:3.10-slim
 
 # build-essential is required to build a wheel for ciso8601
 RUN apt update && apt install -y build-essential

Dockerfile.tests

@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.12
 
 FROM python:${PYTHON_VERSION}-slim as base
 

README.md

@@ -27,6 +27,7 @@ PgSTAC stores all collection and item records as jsonb fields exactly as they co
 |                            --|          --|
 |                          2.5 | >=0.7,<0.8 |
 |                          3.0 | >=0.8,<0.9 |
+|                          4.0 | >=0.8,<0.10 |
 
 ## Usage
 

docker-compose.yml

@@ -35,6 +35,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.tests
+    volumes:
+      - .:/app
     environment:
       - ENVIRONMENT=local
       - DB_MIN_CONN_SIZE=1
@@ -44,7 +46,7 @@ services:
 
   database:
     container_name: stac-db
-    image: ghcr.io/stac-utils/pgstac:v0.9.1
+    image: ghcr.io/stac-utils/pgstac:v0.9.2
     environment:
       - POSTGRES_USER=username
       - POSTGRES_PASSWORD=password

setup.py

@@ -10,9 +10,9 @@
     "orjson",
     "pydantic",
     "stac_pydantic==3.1.*",
-    "stac-fastapi.api~=3.0.2",
-    "stac-fastapi.extensions~=3.0.2",
-    "stac-fastapi.types~=3.0.2",
+    "stac-fastapi.api~=4.0",
+    "stac-fastapi.extensions~=4.0",
+    "stac-fastapi.types~=4.0",
     "asyncpg",
     "buildpg",
     "brotli_asgi",
@@ -27,7 +27,7 @@
         "pytest-postgresql",
         "pytest",
         "pytest-cov",
-        "pytest-asyncio>=0.17,<0.25.0",
+        "pytest-asyncio>=0.17,<0.26.0",
         "pre-commit",
         "requests",
         "shapely",
@@ -36,7 +36,7 @@
         "wheel",
     ],
     "docs": ["mkdocs", "mkdocs-material", "pdocs"],
-    "server": ["uvicorn[standard]==0.32.0"],
+    "server": ["uvicorn[standard]==0.34.0"],
     "awslambda": ["mangum"],
 }
 
@@ -46,12 +46,15 @@
     description="An implementation of STAC API based on the FastAPI framework and using the pgstac backend.",
     long_description=desc,
     long_description_content_type="text/markdown",
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     classifiers=[
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",
         "Intended Audience :: Science/Research",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "License :: OSI Approved :: MIT License",
     ],
     keywords="STAC FastAPI COG",

stac_fastapi/pgstac/app.py

@@ -6,8 +6,10 @@
 """
 
 import os
+from contextlib import asynccontextmanager
 
 from brotli_asgi import BrotliMiddleware
+from fastapi import FastAPI
 from fastapi.responses import ORJSONResponse
 from stac_fastapi.api.app import StacApi
 from stac_fastapi.api.middleware import CORSMiddleware, ProxyHeaderMiddleware
@@ -18,10 +20,12 @@
     create_post_request_model,
     create_request_model,
 )
+from stac_fastapi.api.openapi import update_openapi
 from stac_fastapi.extensions.core import (
     FieldsExtension,
     FilterExtension,
     FreeTextExtension,
+    OffsetPaginationExtension,
     SortExtension,
     TokenPaginationExtension,
     TransactionExtension,
@@ -61,6 +65,7 @@
     "fields": FieldsExtension(),
     "filter": FilterExtension(client=FiltersClient()),
     "free_text": FreeTextExtension(),
+    "pagination": OffsetPaginationExtension(),
 }
 
 enabled_extensions = (
@@ -102,12 +107,31 @@
 post_request_model = create_post_request_model(extensions, base_model=PgstacSearch)
 get_request_model = create_get_request_model(extensions)
 
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    """FastAPI Lifespan."""
+    await connect_to_db(app)
+    yield
+    await close_db_connection(app)
+
+
+fastapp = FastAPI(
+    openapi_url=settings.openapi_url,
+    docs_url=settings.docs_url,
+    redoc_url=None,
+    root_path=settings.root_path,
+    lifespan=lifespan,
+)
+
+
 api = StacApi(
+    app=update_openapi(fastapp),
     settings=settings,
     extensions=extensions + [collection_search_extension]
     if collection_search_extension
     else extensions,
-    client=CoreCrudClient(post_request_model=post_request_model),  # type: ignore
+    client=CoreCrudClient(pgstac_search_model=post_request_model),
     response_class=ORJSONResponse,
     items_get_request_model=items_get_request_model,
     search_get_request_model=get_request_model,
@@ -126,18 +150,6 @@
 app = api.app
 
 
-@app.on_event("startup")
-async def startup_event():
-    """Connect to database on startup."""
-    await connect_to_db(app)
-
-
-@app.on_event("shutdown")
-async def shutdown_event():
-    """Close database connection."""
-    await close_db_connection(app)
-
-
 def run():
     """Run app from command line using uvicorn if available."""
     try: