Add support for Patch endpoints

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

@@ -10,9 +10,9 @@
     "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-fastapi.types@git+https://github.com/stac-utils/stac-fastapi.git@refs/pull/744/head#subdirectory=stac_fastapi/types",
+    "stac-fastapi.api@git+https://github.com/stac-utils/stac-fastapi.git@refs/pull/744/head#subdirectory=stac_fastapi/api",
+    "stac-fastapi.extensions@git+https://github.com/stac-utils/stac-fastapi.git@refs/pull/744/head#subdirectory=stac_fastapi/extensions",
     "orjson~=3.9.0",
     "overrides~=7.4.0",
     "geojson-pydantic~=1.0.0",

stac_fastapi/core/stac_fastapi/core/base_database_logic.py

@@ -1,7 +1,7 @@
 """Base database logic."""
 
 import abc
-from typing import Any, Dict, Iterable, Optional
+from typing import Any, Dict, Iterable, List, Optional
 
 
 class BaseDatabaseLogic(abc.ABC):
@@ -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
@@ -41,6 +65,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

@@ -12,7 +12,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
@@ -42,6 +42,9 @@
 
 logger = logging.getLogger(__name__)
 
+partialItemValidator = TypeAdapter(stac_types.PartialItem)
+partialCollectionValidator = TypeAdapter(stac_types.PartialCollection)
+
 
 @attr.s
 class CoreClient(AsyncBaseCoreClient):
@@ -376,7 +379,7 @@ async def get_item(
 
     @staticmethod
     def _return_date(
-        interval: Optional[Union[DateTimeType, str]]
+        interval: Optional[Union[DateTimeType, str]],
     ) -> Dict[str, Optional[str]]:
         """
         Convert a date interval.
@@ -503,6 +506,7 @@ async def get_search(
             "token": token,
             "query": orjson.loads(query) if query else query,
             "q": q,
+            "datetime": datetime,
         }
 
         if datetime:
@@ -765,6 +769,59 @@ 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[stac_types.PartialItem, List[stac_types.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[stac_types.PartialItem, List[stac_types.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) and content_type in [
+            "application/merge-patch+json",
+            "application/json",
+        ]:
+            patch = partialItemValidator.validate_python(patch)
+            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("Content-Type and body combination not implemented")
+
     @overrides
     async def delete_item(self, item_id: str, collection_id: str, **kwargs) -> None:
         """Delete an item from a collection.
@@ -846,6 +903,54 @@ async def update_collection(
             extensions=[type(ext).__name__ for ext in self.database.extensions],
         )
 
+    def patch_collection(
+        self,
+        collection_id: str,
+        patch: Union[stac_types.PartialCollection, List[stac_types.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.
+        """
+        content_type = kwargs["request"].headers.get("content-type")
+        base_url = str(kwargs["request"].base_url)
+
+        collection = None
+        if isinstance(patch, list) and content_type == "application/json-patch+json":
+            collection = self.database.json_patch_collection(
+                collection_id=collection_id,
+                operations=patch,
+                base_url=base_url,
+            )
+
+        if isinstance(patch, dict) and content_type in [
+            "application/merge-patch+json",
+            "application/json",
+        ]:
+            patch = partialCollectionValidator.validate_python(patch)
+            collection = 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("Content-Type and body combination not implemented")
+
     @overrides
     async def delete_collection(self, collection_id: str, **kwargs) -> None:
         """

stac_fastapi/core/stac_fastapi/core/extensions/aggregation.py

@@ -369,6 +369,7 @@ async def aggregate(
                 "geometry_geohash_grid_frequency_precision": geometry_geohash_grid_frequency_precision,
                 "geometry_geotile_grid_frequency_precision": geometry_geotile_grid_frequency_precision,
                 "datetime_frequency_interval": datetime_frequency_interval,
+                "datetime": datetime,
             }
 
             if collection_id: