stac-fastapi v6.0.0

Author: rhysrevans3

stac_fastapi/core/setup.py

@@ -10,9 +10,9 @@
     "attrs>=23.2.0",
     "pydantic>=2.4.1,<3.0.0",
     "stac_pydantic~=3.3.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",
+    "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/core.py

@@ -26,22 +26,28 @@
 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(stac_types.PartialItem)
-partialCollectionValidator = TypeAdapter(stac_types.PartialCollection)
+partialItemValidator = TypeAdapter(PartialItem)
+partialCollectionValidator = TypeAdapter(PartialCollection)
 
 
 @attr.s
@@ -688,15 +694,15 @@ async def patch_item(
         self,
         collection_id: str,
         item_id: str,
-        patch: Union[stac_types.PartialItem, List[stac_types.PatchOperation]],
+        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[stac_types.PartialItem, List[stac_types.PatchOperation]]): The item data or operations.
+            patch (Union[PartialItem, List[PatchOperation]]): The item data or operations.
             kwargs: Other optional arguments, including the request object.
 
         Returns:
@@ -722,7 +728,7 @@ async def patch_item(
         if isinstance(patch, dict):
             patch = partialItemValidator.validate_python(patch)
 
-        if isinstance(patch, stac_types.PartialItem) and content_type in [
+        if isinstance(patch, PartialItem) and content_type in [
             "application/merge-patch+json",
             "application/json",
         ]:
@@ -825,7 +831,7 @@ async def update_collection(
     async def patch_collection(
         self,
         collection_id: str,
-        patch: Union[stac_types.PartialCollection, List[stac_types.PatchOperation]],
+        patch: Union[PartialCollection, List[PatchOperation]],
         **kwargs,
     ):
         """Update a collection.
@@ -853,7 +859,7 @@ async def patch_collection(
         if isinstance(patch, dict):
             patch = partialCollectionValidator.validate_python(patch)
 
-        if isinstance(patch, stac_types.PartialCollection) and content_type in [
+        if isinstance(patch, PartialCollection) and content_type in [
             "application/merge-patch+json",
             "application/json",
         ]:

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -22,6 +22,11 @@
 from stac_fastapi.elasticsearch.config import (
     ElasticsearchSettings as SyncElasticsearchSettings,
 )
+from stac_fastapi.extensions.core.transaction.request import (
+    PartialCollection,
+    PartialItem,
+    PatchOperation,
+)
 from stac_fastapi.sfeos_helpers import filter
 from stac_fastapi.sfeos_helpers.database import (
     apply_free_text_filter_shared,
@@ -53,13 +58,7 @@
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 from stac_fastapi.types.links import resolve_links
 from stac_fastapi.types.rfc3339 import DateTimeType
-from stac_fastapi.types.stac import (
-    Collection,
-    Item,
-    PartialCollection,
-    PartialItem,
-    PatchOperation,
-)
+from stac_fastapi.types.stac import Collection, Item
 
 logger = logging.getLogger(__name__)
 

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -17,6 +17,11 @@
 from stac_fastapi.core.base_database_logic import BaseDatabaseLogic
 from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.core.utilities import MAX_LIMIT, bbox2polygon
+from stac_fastapi.extensions.core.transaction.request import (
+    PartialCollection,
+    PartialItem,
+    PatchOperation,
+)
 from stac_fastapi.opensearch.config import (
     AsyncOpensearchSettings as AsyncSearchSettings,
 )
@@ -55,13 +60,7 @@
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 from stac_fastapi.types.links import resolve_links
 from stac_fastapi.types.rfc3339 import DateTimeType
-from stac_fastapi.types.stac import (
-    Collection,
-    Item,
-    PartialCollection,
-    PartialItem,
-    PatchOperation,
-)
+from stac_fastapi.types.stac import Collection, Item
 
 logger = logging.getLogger(__name__)
 

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/utils.py

@@ -8,8 +8,12 @@
 from typing import Dict, List, Union
 
 from stac_fastapi.core.utilities import get_bool_env
+from stac_fastapi.extensions.core.transaction.request import (
+    PatchAddReplaceTest,
+    PatchOperation,
+    PatchRemove,
+)
 from stac_fastapi.sfeos_helpers.models.patch import ElasticPath, ESCommandSet
-from stac_fastapi.types.stac import PatchAddReplaceTest, PatchOperation, PatchRemove
 
 
 def validate_refresh(value: Union[str, bool]) -> str:

stac_fastapi/tests/clients/test_es_os.py

@@ -6,8 +6,12 @@
 from fastapi import HTTPException
 from stac_pydantic import Item, api
 
+from stac_fastapi.extensions.core.transaction.request import (
+    PatchAddReplaceTest,
+    PatchMoveCopy,
+    PatchRemove,
+)
 from stac_fastapi.types.errors import ConflictError, NotFoundError
-from stac_fastapi.types.stac import PatchAddReplaceTest, PatchMoveCopy, PatchRemove
 
 from ..conftest import MockRequest