Add support for Patch endpoints

.github/workflows/cicd.yml

@@ -65,7 +65,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13"]
         backend: [ "elasticsearch7", "elasticsearch8", "opensearch"]
 
     name: Python ${{ matrix.python-version }} testing with ${{ matrix.backend }}

.github/workflows/deploy_mkdocs.yml

@@ -20,10 +20,10 @@ jobs:
       - name: Checkout main
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Install dependencies
         run: |

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",
     "stac_pydantic>=3",
-    "stac-fastapi.types==3.0.0",
-    "stac-fastapi.api==3.0.0",
-    "stac-fastapi.extensions==3.0.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",
     "overrides",
     "geojson-pydantic",
@@ -26,12 +26,11 @@
     description="Core library for the Elasticsearch and Opensearch stac-fastapi backends.",
     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",

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

@@ -377,7 +377,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.
@@ -459,7 +459,7 @@ async def get_search(
         sortby: Optional[str] = None,
         q: Optional[List[str]] = None,
         intersects: Optional[str] = None,
-        filter: Optional[str] = None,
+        filter_expr: Optional[str] = None,
         filter_lang: Optional[str] = None,
         **kwargs,
     ) -> stac_types.ItemCollection:
@@ -493,11 +493,9 @@ async def get_search(
             "token": token,
             "query": orjson.loads(query) if query else query,
             "q": q,
+            "datetime": datetime,
         }
 
-        if datetime:
-            base_args["datetime"] = self._format_datetime_range(datetime)
-
         if intersects:
             base_args["intersects"] = orjson.loads(unquote_plus(intersects))
 
@@ -507,12 +505,12 @@ async def get_search(
                 for sort in sortby
             ]
 
-        if filter:
+        if filter_expr:
             base_args["filter-lang"] = "cql2-json"
             base_args["filter"] = orjson.loads(
-                unquote_plus(filter)
+                unquote_plus(filter_expr)
                 if filter_lang == "cql2-json"
-                else to_cql2(parse_cql2_text(filter))
+                else to_cql2(parse_cql2_text(filter_expr))
             )
 
         if fields:
@@ -594,10 +592,11 @@ async def post_search(
                     )
 
         # only cql2_json is supported here
-        if hasattr(search_request, "filter"):
-            cql2_filter = getattr(search_request, "filter", None)
+        if search_request.filter_expr:
             try:
-                search = self.database.apply_cql2_filter(search, cql2_filter)
+                search = self.database.apply_cql2_filter(
+                    search, search_request.filter_expr
+                )
             except Exception as e:
                 raise HTTPException(
                     status_code=400, detail=f"Error with cql2_json filter: {e}"
@@ -734,6 +733,62 @@ async def update_item(
 
         return ItemSerializer.db_to_stac(item, base_url)
 
+    @overrides
+    async def merge_patch_item(
+        self, collection_id: str, item_id: str, item: stac_types.PartialItem, **kwargs
+    ) -> Optional[stac_types.Item]:
+        """Patch an item in the collection following RF7396..
+
+        Args:
+            collection_id (str): The ID of the collection the item belongs to.
+            item_id (str): The ID of the item to be updated.
+            item (stac_types.PartialItem): The partial item data.
+            kwargs: Other optional arguments, including the request object.
+
+        Returns:
+            stac_types.Item: The patched item object.
+
+        """
+        base_url = str(kwargs["request"].base_url)
+
+        item = await self.database.merge_patch_item(
+            collection_id=collection_id,
+            item_id=item_id,
+            item=item,
+            base_url=base_url,
+        )
+        return ItemSerializer.db_to_stac(item, base_url=base_url)
+
+    @overrides
+    async def json_patch_item(
+        self,
+        collection_id: str,
+        item_id: str,
+        operations: List[stac_types.PatchOperation],
+        **kwargs,
+    ) -> Optional[stac_types.Item]:
+        """Patch an item in the collection following RF6902.
+
+        Args:
+            collection_id (str): The ID of the collection the item belongs to.
+            item_id (str): The ID of the item to be updated.
+            operations (List): List of operations to run on item.
+            kwargs: Other optional arguments, including the request object.
+
+        Returns:
+            stac_types.Item: The patched item object.
+
+        """
+        base_url = str(kwargs["request"].base_url)
+
+        item = await self.database.json_patch_item(
+            collection_id=collection_id,
+            item_id=item_id,
+            base_url=base_url,
+            operations=operations,
+        )
+        return ItemSerializer.db_to_stac(item, base_url=base_url)
+
     @overrides
     async def delete_item(
         self, item_id: str, collection_id: str, **kwargs
@@ -814,6 +869,60 @@ async def update_collection(
             extensions=[type(ext).__name__ for ext in self.database.extensions],
         )
 
+    @overrides
+    async def merge_patch_collection(
+        self, collection_id: str, collection: stac_types.PartialCollection, **kwargs
+    ) -> Optional[stac_types.Collection]:
+        """Patch a collection following RF7396..
+
+        Args:
+            collection_id (str): The ID of the collection  to patch.
+            collection (stac_types.Collection): The partial collection data.
+            kwargs: Other optional arguments, including the request object.
+
+        Returns:
+            stac_types.Collection: The patched collection object.
+
+        """
+        collection = await self.database.merge_patch_collection(
+            collection_id=collection_id,
+            base_url=str(kwargs["request"].base_url),
+            collection=collection,
+        )
+
+        return CollectionSerializer.db_to_stac(
+            collection,
+            kwargs["request"],
+            extensions=[type(ext).__name__ for ext in self.database.extensions],
+        )
+
+    @overrides
+    async def json_patch_collection(
+        self, collection_id: str, operations: List[stac_types.PatchOperation], **kwargs
+    ) -> Optional[stac_types.Collection]:
+        """Patch a collection following RF6902.
+
+        Args:
+            collection_id (str): The ID of the collection to patch.
+            operations (List): List of operations to run on collection.
+            kwargs: Other optional arguments, including the request object.
+
+        Returns:
+            stac_types.Collection: The patched collection object.
+
+        """
+        collection = await self.database.json_patch_collection(
+            collection_id=collection_id,
+            operations=operations,
+            base_url=str(kwargs["request"].base_url),
+        )
+
+        return CollectionSerializer.db_to_stac(
+            collection,
+            kwargs["request"],
+            extensions=[type(ext).__name__ for ext in self.database.extensions],
+        )
+
     @overrides
     async def delete_collection(
         self, collection_id: str, **kwargs