Merge branch 'main' of github.com:stac-utils/stac-fastapi-elasticsearch into extend_datetime_search

Author: rhysrevans3

CHANGELOG.md

@@ -7,8 +7,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v3.0.0a1]
+
+### Changed
+
+- Unskip temporal open window test [#254](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/254)
+- Removed deprecated context extension [#255](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/255)
+- Remove duplicated code from stac_fastapi.types [#257](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/257)
+
+## [v3.0.0a0]
+
 ### Added
 
+- Symlinks from project-specific readme files to main readme [#250](https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch/pull/250)
 - Support for Python 3.12 [#234](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/234)
 - Extended Datetime Search to search on start_datetime and end_datetime as well as datetime fields. [#182](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/182)
 
@@ -194,7 +205,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added db_to_stac serializer to item_collection method in core.py.
 
 
-[Unreleased]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.4.1...main>
+[Unreleased]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v3.0.0a1...main>
+[v3.0.0a1]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v3.0.0a0...v3.0.0a1>
+[v3.0.0a0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.4.1...v3.0.0a0>
 [v2.4.1]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.4.0...v2.4.1>
 [v2.4.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.3.0...v2.4.0>
 [v2.3.0]: <https://github.com/stac-utils/stac-fastapi-elasticsearch/tree/v2.2.0...v2.3.0>

README.md

@@ -5,6 +5,7 @@
 <p align="left">
   <img src="https://github.com/radiantearth/stac-site/raw/master/images/logo/stac-030-long.png" width=600>
   <p align="left"><b>Elasticsearch and Opensearch backends for the stac-fastapi project.</b></p>
+  <p align="left"><b>Featuring stac-fastapi.core for simplifying the creation and maintenance of custom STAC api backends.</b></p>
 </p>
 
 

docker-compose.basic_auth_protected.yml

@@ -11,7 +11,7 @@ services:
     environment:
       - STAC_FASTAPI_TITLE=stac-fastapi-elasticsearch
       - STAC_FASTAPI_DESCRIPTION=A STAC FastAPI with an Elasticsearch backend
-      - STAC_FASTAPI_VERSION=2.1
+      - STAC_FASTAPI_VERSION=3.0.0a1
       - APP_HOST=0.0.0.0
       - APP_PORT=8080
       - RELOAD=true

docker-compose.basic_auth_public.yml

@@ -11,7 +11,7 @@ services:
     environment:
       - STAC_FASTAPI_TITLE=stac-fastapi-elasticsearch
       - STAC_FASTAPI_DESCRIPTION=A STAC FastAPI with an Elasticsearch backend
-      - STAC_FASTAPI_VERSION=2.1
+      - STAC_FASTAPI_VERSION=3.0.0a1
       - APP_HOST=0.0.0.0
       - APP_PORT=8080
       - RELOAD=true

docker-compose.yml

@@ -43,7 +43,7 @@ services:
     environment:
       - STAC_FASTAPI_TITLE=stac-fastapi-opensearch
       - STAC_FASTAPI_DESCRIPTION=A STAC FastAPI with an Opensearch backend
-      - STAC_FASTAPI_VERSION=2.1
+      - STAC_FASTAPI_VERSION=3.0.0a1
       - APP_HOST=0.0.0.0
       - APP_PORT=8082
       - RELOAD=true

stac_fastapi/core/README.md

@@ -0,0 +1 @@
+../../README.md

stac_fastapi/core/README.md

@@ -26,10 +26,6 @@
 from stac_fastapi.core.models.links import PagingLinks
 from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.core.session import Session
-from stac_fastapi.core.types.core import (
-    AsyncBaseCoreClient,
-    AsyncBaseTransactionsClient,
-)
 from stac_fastapi.extensions.third_party.bulk_transactions import (
     BaseBulkTransactionsClient,
     BulkTransactionMethod,
@@ -38,7 +34,11 @@
 from stac_fastapi.types import stac as stac_types
 from stac_fastapi.types.config import Settings
 from stac_fastapi.types.conformance import BASE_CONFORMANCE_CLASSES
-from stac_fastapi.types.core import AsyncBaseFiltersClient
+from stac_fastapi.types.core import (
+    AsyncBaseCoreClient,
+    AsyncBaseFiltersClient,
+    AsyncBaseTransactionsClient,
+)
 from stac_fastapi.types.extension import ApiExtension
 from stac_fastapi.types.requests import get_base_url
 from stac_fastapi.types.rfc3339 import DateTimeType
@@ -313,22 +313,14 @@ async def item_collection(
             self.item_serializer.db_to_stac(item, base_url=base_url) for item in items
         ]
 
-        context_obj = None
-        if self.extension_is_enabled("ContextExtension"):
-            context_obj = {
-                "returned": len(items),
-                "limit": limit,
-            }
-            if maybe_count is not None:
-                context_obj["matched"] = maybe_count
-
         links = await PagingLinks(request=request, next=next_token).get_links()
 
         return stac_types.ItemCollection(
             type="FeatureCollection",
             features=items,
             links=links,
-            context=context_obj,
+            numReturned=len(items),
+            numMatched=maybe_count,
         )
 
     async def get_item(
@@ -634,22 +626,14 @@ async def post_search(
                 for feat in items
             ]
 
-        context_obj = None
-        if self.extension_is_enabled("ContextExtension"):
-            context_obj = {
-                "returned": len(items),
-                "limit": limit,
-            }
-            if maybe_count is not None:
-                context_obj["matched"] = maybe_count
-
         links = await PagingLinks(request=request, next=next_token).get_links()
 
         return stac_types.ItemCollection(
             type="FeatureCollection",
             features=items,
             links=links,
-            context=context_obj,
+            numReturned=len(items),
+            numMatched=maybe_count,
         )
 
 
@@ -774,7 +758,7 @@ async def create_collection(
 
     @overrides
     async def update_collection(
-        self, collection: Collection, **kwargs
+        self, collection_id: str, collection: Collection, **kwargs
     ) -> stac_types.Collection:
         """
         Update a collection.
@@ -787,6 +771,7 @@ async def update_collection(
         The updated collection is then returned.
 
         Args:
+            collection_id: id of the existing collection to be updated
             collection: A STAC collection that needs to be updated.
             kwargs: Additional keyword arguments.
 
@@ -798,10 +783,6 @@ async def update_collection(
 
         base_url = str(kwargs["request"].base_url)
 
-        collection_id = kwargs["request"].query_params.get(
-            "collection_id", collection["id"]
-        )
-
         collection = self.database.collection_serializer.stac_to_db(
             collection, base_url
         )