Add support for Patch endpoints (#291)

**Description:**
Adds PATCH endpoints to transaction extension. Adds support for [RFC
6902](https://tools.ietf.org/html/rfc6902) and [RFC
7396](https://tools.ietf.org/html/rfc7396). Pivots on header
Content-Type value.

Related pull requests:
- stac-utils/stac-fastapi#744
- stac-api-extensions/transaction#14

**PR Checklist:**

- [x] Code is formatted and linted (run `pre-commit run --all-files`)
- [x] Tests pass (run `make test`)
- [ ] Documentation has been updated to reflect changes, if applicable
- [x] Changes are added to the changelog

Author: rhysrevans3

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- Added support for PATCH update through  [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902) and [RFC 7396](https://datatracker.ietf.org/doc/html/rfc7396) [#291](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/291)
+
 ## [v5.0.0] - 2025-06-11
 
 ### Added

dockerfiles/Dockerfile.deploy.es

@@ -3,9 +3,12 @@ FROM python:3.10-slim
 RUN apt-get update && \
     apt-get -y upgrade && \
     apt-get -y install gcc && \
+    apt-get -y install build-essential git && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+
+
 ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
 WORKDIR /app

dockerfiles/Dockerfile.dev.es

@@ -4,7 +4,7 @@ FROM python:3.10-slim
 # update apt pkgs, and install build-essential for ciso8601
 RUN apt-get update && \
     apt-get -y upgrade && \
-    apt-get install -y build-essential git && \
+    apt-get -y install build-essential git && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

dockerfiles/Dockerfile.dev.os

@@ -4,10 +4,11 @@ FROM python:3.10-slim
 # update apt pkgs, and install build-essential for ciso8601
 RUN apt-get update && \
     apt-get -y upgrade && \
-    apt-get install -y build-essential && \
+    apt-get -y install build-essential && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+RUN apt-get -y install git
 # update certs used by Requests
 ENV CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 

dockerfiles/Dockerfile.docs

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

stac_fastapi/core/setup.py

@@ -9,10 +9,10 @@
     "fastapi~=0.109.0",
     "attrs>=23.2.0",
     "pydantic>=2.4.1,<3.0.0",
-    "stac_pydantic~=3.1.0",
-    "stac-fastapi.api==5.2.0",
-    "stac-fastapi.extensions==5.2.0",
-    "stac-fastapi.types==5.2.0",
+    "stac_pydantic~=3.3.0",
+    "stac-fastapi.types==6.0.0",
+    "stac-fastapi.api==6.0.0",
+    "stac-fastapi.extensions==6.0.0",
     "orjson~=3.9.0",
     "overrides~=7.4.0",
     "geojson-pydantic~=1.0.0",

stac_fastapi/core/stac_fastapi/core/base_database_logic.py

@@ -29,6 +29,30 @@ async def create_item(self, item: Dict, refresh: bool = False) -> None:
         """Create an item in the database."""
         pass
 
+    @abc.abstractmethod
+    async def merge_patch_item(
+        self,
+        collection_id: str,
+        item_id: str,
+        item: Dict,
+        base_url: str,
+        refresh: bool = True,
+    ) -> Dict:
+        """Patch a item in the database follows RF7396."""
+        pass
+
+    @abc.abstractmethod
+    async def json_patch_item(
+        self,
+        collection_id: str,
+        item_id: str,
+        operations: List,
+        base_url: str,
+        refresh: bool = True,
+    ) -> Dict:
+        """Patch a item in the database follows RF6902."""
+        pass
+
     @abc.abstractmethod
     async def delete_item(
         self, item_id: str, collection_id: str, refresh: bool = False
@@ -53,6 +77,28 @@ async def create_collection(self, collection: Dict, refresh: bool = False) -> No
         """Create a collection in the database."""
         pass
 
+    @abc.abstractmethod
+    async def merge_patch_collection(
+        self,
+        collection_id: str,
+        collection: Dict,
+        base_url: str,
+        refresh: bool = True,
+    ) -> Dict:
+        """Patch a collection in the database follows RF7396."""
+        pass
+
+    @abc.abstractmethod
+    async def json_patch_collection(
+        self,
+        collection_id: str,
+        operations: List,
+        base_url: str,
+        refresh: bool = True,
+    ) -> Dict:
+        """Patch a collection in the database follows RF6902."""
+        pass
+
     @abc.abstractmethod
     async def find_collection(self, collection_id: str) -> Dict:
         """Find a collection in the database."""

stac_fastapi/core/stac_fastapi/core/core.py

@@ -11,7 +11,7 @@
 import orjson
 from fastapi import HTTPException, Request
 from overrides import overrides
-from pydantic import ValidationError
+from pydantic import TypeAdapter, ValidationError
 from pygeofilter.backends.cql2_json import to_cql2
 from pygeofilter.parsers.cql2_text import parse as parse_cql2_text
 from stac_pydantic import Collection, Item, ItemCollection
@@ -26,20 +26,29 @@
 from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.core.session import Session
 from stac_fastapi.core.utilities import filter_fields
+from stac_fastapi.extensions.core.transaction import AsyncBaseTransactionsClient
+from stac_fastapi.extensions.core.transaction.request import (
+    PartialCollection,
+    PartialItem,
+    PatchOperation,
+)
 from stac_fastapi.extensions.third_party.bulk_transactions import (
     BaseBulkTransactionsClient,
     BulkTransactionMethod,
     Items,
 )
 from stac_fastapi.types import stac as stac_types
 from stac_fastapi.types.conformance import BASE_CONFORMANCE_CLASSES
-from stac_fastapi.types.core import AsyncBaseCoreClient, AsyncBaseTransactionsClient
+from stac_fastapi.types.core import AsyncBaseCoreClient
 from stac_fastapi.types.extension import ApiExtension
 from stac_fastapi.types.requests import get_base_url
 from stac_fastapi.types.search import BaseSearchPostRequest
 
 logger = logging.getLogger(__name__)
 
+partialItemValidator = TypeAdapter(PartialItem)
+partialCollectionValidator = TypeAdapter(PartialCollection)
+
 
 @attr.s
 class CoreClient(AsyncBaseCoreClient):
@@ -680,6 +689,63 @@ async def update_item(
 
         return ItemSerializer.db_to_stac(item, base_url)
 
+    @overrides
+    async def patch_item(
+        self,
+        collection_id: str,
+        item_id: str,
+        patch: Union[PartialItem, List[PatchOperation]],
+        **kwargs,
+    ):
+        """Patch an item in the collection.
+
+        Args:
+            collection_id (str): The ID of the collection the item belongs to.
+            item_id (str): The ID of the item to be updated.
+            patch (Union[PartialItem, List[PatchOperation]]): The item data or operations.
+            kwargs: Other optional arguments, including the request object.
+
+        Returns:
+            stac_types.Item: The updated item object.
+
+        Raises:
+            NotFound: If the specified collection is not found in the database.
+
+        """
+        base_url = str(kwargs["request"].base_url)
+
+        content_type = kwargs["request"].headers.get("content-type")
+
+        item = None
+        if isinstance(patch, list) and content_type == "application/json-patch+json":
+            item = await self.database.json_patch_item(
+                collection_id=collection_id,
+                item_id=item_id,
+                operations=patch,
+                base_url=base_url,
+            )
+
+        if isinstance(patch, dict):
+            patch = partialItemValidator.validate_python(patch)
+
+        if isinstance(patch, PartialItem) and content_type in [
+            "application/merge-patch+json",
+            "application/json",
+        ]:
+            item = await self.database.merge_patch_item(
+                collection_id=collection_id,
+                item_id=item_id,
+                item=patch,
+                base_url=base_url,
+            )
+
+        if item:
+            return ItemSerializer.db_to_stac(item, base_url=base_url)
+
+        raise NotImplementedError(
+            f"Content-Type: {content_type} and body: {patch} combination not implemented"
+        )
+
     @overrides
     async def delete_item(self, item_id: str, collection_id: str, **kwargs) -> None:
         """Delete an item from a collection.
@@ -761,6 +827,59 @@ async def update_collection(
             extensions=[type(ext).__name__ for ext in self.database.extensions],
         )
 
+    @overrides
+    async def patch_collection(
+        self,
+        collection_id: str,
+        patch: Union[PartialCollection, List[PatchOperation]],
+        **kwargs,
+    ):
+        """Update a collection.
+
+        Called with `PATCH /collections/{collection_id}`
+
+        Args:
+            collection_id: id of the collection.
+            patch: either the partial collection or list of patch operations.
+
+        Returns:
+            The patched collection.
+        """
+        base_url = str(kwargs["request"].base_url)
+        content_type = kwargs["request"].headers.get("content-type")
+
+        collection = None
+        if isinstance(patch, list) and content_type == "application/json-patch+json":
+            collection = await self.database.json_patch_collection(
+                collection_id=collection_id,
+                operations=patch,
+                base_url=base_url,
+            )
+
+        if isinstance(patch, dict):
+            patch = partialCollectionValidator.validate_python(patch)
+
+        if isinstance(patch, PartialCollection) and content_type in [
+            "application/merge-patch+json",
+            "application/json",
+        ]:
+            collection = await self.database.merge_patch_collection(
+                collection_id=collection_id,
+                collection=patch,
+                base_url=base_url,
+            )
+
+        if collection:
+            return CollectionSerializer.db_to_stac(
+                collection,
+                kwargs["request"],
+                extensions=[type(ext).__name__ for ext in self.database.extensions],
+            )
+
+        raise NotImplementedError(
+            f"Content-Type: {content_type} and body: {patch} combination not implemented"
+        )
+
     @overrides
     async def delete_collection(self, collection_id: str, **kwargs) -> None:
         """

stac_fastapi/core/stac_fastapi/core/utilities.py

@@ -3,6 +3,7 @@
 This module contains functions for transforming geospatial coordinates,
 such as converting bounding boxes to polygon representations.
 """
+
 import logging
 import os
 from typing import Any, Dict, List, Optional, Set, Union