stac-fastapi.core 7.0.0__tar.gz → 7.2.0__tar.gz

{stac_fastapi_core-7.0.0 → stac_fastapi_core-7.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: stac_fastapi_core
-Version: 7.0.0
+Version: 7.2.0
 Summary: Core library for the Elasticsearch and Opensearch stac-fastapi backends.
 Project-URL: Homepage, https://github.com/stac-utils/stac-fastapi-elasticsearch-opensearch
 License: MIT
@@ -22,19 +22,19 @@ Requires-Dist: overrides<7.8,>=7.4
 Requires-Dist: pydantic<3.0.0,>=2.4.1
 Requires-Dist: pygeofilter<0.5.0,>=0.3.1
 Requires-Dist: slowapi~=0.1.9
-Requires-Dist: stac-fastapi-api==6.5.0
-Requires-Dist: stac-fastapi-extensions==6.5.0
-Requires-Dist: stac-fastapi-types==6.5.0
+Requires-Dist: stac-fastapi-api==7.0.0
+Requires-Dist: stac-fastapi-extensions==7.0.0
+Requires-Dist: stac-fastapi-types==7.0.0
 Requires-Dist: stac-pydantic<3.7,>=3.3
 Requires-Dist: starlette<1.7.0,>=0.35.0
 Requires-Dist: uvicorn<0.53,>=0.23
 Provides-Extra: catalogs
-Requires-Dist: stac-fastapi-catalogs-extension==0.5.0; extra == 'catalogs'
+Requires-Dist: stac-fastapi-catalogs-extension==1.0.0; extra == 'catalogs'
 Provides-Extra: redis
 Requires-Dist: redis<8.2,>=6.4; extra == 'redis'
 Requires-Dist: retry~=0.9.2; extra == 'redis'
 Provides-Extra: sentry
-Requires-Dist: sentry-sdk<2.69,>=2.49; extra == 'sentry'
+Requires-Dist: sentry-sdk<2.70,>=2.49; extra == 'sentry'
 Provides-Extra: validator
 Requires-Dist: jsonpatch; extra == 'validator'
 Requires-Dist: stac-valid<4.6.0,>=4.2.2; extra == 'validator'

{stac_fastapi_core-7.0.0 → stac_fastapi_core-7.2.0}/pyproject.toml

@@ -33,9 +33,9 @@ dependencies = [
     "attrs>=23.2.0",
     "pydantic>=2.4.1,<3.0.0",
     "stac_pydantic>=3.3,<3.7",
-    "stac-fastapi.types==6.5.0",
-    "stac-fastapi.api==6.5.0",
-    "stac-fastapi.extensions==6.5.0",
+    "stac-fastapi.types==7.0.0",
+    "stac-fastapi.api==7.0.0",
+    "stac-fastapi.extensions==7.0.0",
     "orjson>=3.11,<3.13",
     "overrides>=7.4,<7.8",
     "pygeofilter>=0.3.1,<0.5.0",
@@ -51,10 +51,10 @@ redis = [
     "retry~=0.9.2",
 ]
 sentry = [
-    "sentry-sdk>=2.49,<2.69",
+    "sentry-sdk>=2.49,<2.70",
 ]
 catalogs = [
-    "stac-fastapi-catalogs-extension==0.5.0",
+    "stac-fastapi-catalogs-extension==1.0.0",
 ]
 validator = [
     "stac-valid>=4.2.2,<4.6.0",

{stac_fastapi_core-7.0.0 → stac_fastapi_core-7.2.0}/stac_fastapi/core/base_database_logic.py

@@ -201,7 +201,12 @@ class BaseDatabaseLogic(abc.ABC):
 
     @abc.abstractmethod
     async def delete_catalog(self, catalog_id: str, refresh: bool = False) -> None:
-        """Delete a catalog from the database."""
+        """Delete a catalog from the database.
+
+        Implementations MUST verify the document exists and is a Catalog
+        before deleting, raising NotFoundError otherwise; deleting a catalog
+        must never remove Collection or Item data.
+        """
         pass
 
     @abc.abstractmethod

{stac_fastapi_core-7.0.0 → stac_fastapi_core-7.2.0}/stac_fastapi/core/catalogs_client.py

@@ -730,9 +730,18 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
         **kwargs,
     ) -> Catalog | Response:
         """Create a new catalog or link an existing catalog as a sub-catalog."""
+        # Verify the parent catalog exists
+        await self.database.find_catalog(catalog_id)
+
         # Check if it's an existing catalog or a new one
         cat_id = catalog.id if hasattr(catalog, "id") else catalog.get("id")
 
+        # Detect an ObjectUri payload ({"id": ...} only) vs a full Catalog body
+        if isinstance(catalog, dict):
+            is_object_uri = len(catalog) == 1 and "id" in catalog
+        else:
+            is_object_uri = isinstance(catalog, ObjectUri)
+
         try:
             existing = await self.database.find_catalog(cat_id)
             # Link existing catalog
@@ -752,8 +761,25 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
             existing_dict["links"] = [
                 self._link_to_dict(link) for link in existing_dict.get("links", [])
             ]
-            return JSONResponse(content=existing_dict, status_code=201)
+            # Linking an existing catalog returns 200 OK (Mode B);
+            # 201 Created is reserved for newly created catalogs
+            headers = (
+                {
+                    "Warning": (
+                        f'299 - "Catalog {cat_id} already exists and was linked '
+                        f"to catalog {catalog_id}; posted content was not "
+                        f'applied. Use PUT /catalogs/{cat_id} to update."'
+                    )
+                }
+                if not is_object_uri
+                else None
+            )
+            return JSONResponse(content=existing_dict, status_code=200, headers=headers)
         except NotFoundError:
+            # An ObjectUri payload must reference an existing catalog
+            if is_object_uri:
+                raise NotFoundError(f"Catalog {cat_id} not found")
+
             # Create new catalog
             db_catalog_dict = self._to_dict(catalog)
             db_catalog_dict["type"] = "Catalog"
@@ -805,10 +831,7 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
         else:
             col_id = collection.id
             # Check if this is an ObjectUri (only has id field)
-            is_object_uri = (
-                hasattr(collection, "__class__")
-                and collection.__class__.__name__ == "ObjectUri"
-            )
+            is_object_uri = isinstance(collection, ObjectUri)
 
         # If only an ID was provided (ObjectUri), the collection must already exist
         if is_object_uri:
@@ -833,9 +856,10 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
                 catalog_id=catalog_id,
                 extensions=["CatalogsExtension"],
             )
-            # Return 201 Created for all collection operations
+            # Linking an existing collection returns 200 OK (Mode B);
+            # 201 Created is reserved for newly created collections
             content = self._to_dict(collection_obj)
-            return JSONResponse(content=content, status_code=201)
+            return JSONResponse(content=content, status_code=200)
 
         # Full collection data provided - try to link existing or create new
         try:
@@ -845,7 +869,9 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
             # Collection doesn't exist, will create new one below
             pass
         else:
-            # Collection exists, link it
+            # Collection exists, link it. POST does not replace the stored
+            # document, so return 200 to signal the collection already existed
+            # (201 is reserved for a newly created collection document).
             try:
                 await self.database.update_collection(col_id, existing, refresh=True)
             except Exception as e:
@@ -861,9 +887,19 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
                 catalog_id=catalog_id,
                 extensions=["CatalogsExtension"],
             )
-            # Return 201 Created for full collection data (even if linking existing)
             content = self._to_dict(collection_obj)
-            return JSONResponse(content=content, status_code=201)
+            return JSONResponse(
+                content=content,
+                status_code=200,
+                headers={
+                    "Warning": (
+                        f'299 - "Collection {col_id} already exists and was '
+                        f"linked to catalog {catalog_id}; posted content was "
+                        f"not applied. Use PUT /catalogs/{catalog_id}/"
+                        f'collections/{col_id} to update."'
+                    )
+                },
+            )
 
         # Create new collection
         col_dict = self._to_dict(collection)
@@ -1410,6 +1446,44 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
         filtered_links = [self._link_to_dict(link) for link in links]
         children_dicts = [self._to_dict(child) for child in children]
 
+        # Per STAC API - Children v1.0.0, every child entity MUST include
+        # self, root, and parent link relations
+        for child_dict, raw_child in zip(children_dicts, children_list):
+            child_id = raw_child.get("id")
+            if raw_child.get("type") == "Catalog":
+                self_href = f"{base_url}/catalogs/{child_id}"
+            else:
+                self_href = f"{base_url}/catalogs/{catalog_id}/collections/{child_id}"
+
+            child_links = [
+                link
+                for link in child_dict.get("links", [])
+                if link.get("rel") not in ("self", "root", "parent")
+            ]
+            child_dict["links"] = [
+                self._link_to_dict(link)
+                for link in [
+                    {
+                        "rel": "self",
+                        "type": "application/json",
+                        "href": self_href,
+                    },
+                    {
+                        "rel": "parent",
+                        "type": "application/json",
+                        "href": f"{base_url}/catalogs/{catalog_id}",
+                        "title": "Parent Catalog",
+                    },
+                    {
+                        "rel": "root",
+                        "type": "application/json",
+                        "href": base_url,
+                        "title": "Root Catalog",
+                    },
+                    *child_links,
+                ]
+            ]
+
         return JSONResponse(
             content={
                 "children": children_dicts,
@@ -1422,14 +1496,23 @@ class CatalogsClient(AsyncBaseCatalogsClient, AsyncCatalogsSearchClient):
     async def get_catalog_conformance(
         self, catalog_id: str, request: Request | None = None, **kwargs
     ) -> dict | Response:
-        """Get conformance classes specific to this sub-catalog."""
-        # Return standard conformance classes for now
+        """Get conformance classes specific to this sub-catalog.
+
+        SFEOS always enables the transaction and scoped search extensions
+        alongside the catalogs extension, so their conformance classes are
+        advertised here. The extension also merges in the conformance classes
+        of registered catalog extensions via
+        ``app.state.catalogs_conformance_classes``.
+        """
         return {
             "conformsTo": [
                 "https://api.stacspec.org/v1.0.0/core",
-                "https://api.stacspec.org/v1.0.0-rc.1/multi-tenant-catalogs",
-                "https://api.stacspec.org/v1.0.0-rc.1/multi-tenant-catalogs/transaction",
-                "https://api.stacspec.org/v1.0.0-rc.2/children",
+                "https://api.stacspec.org/v1.0.0/multi-tenant-catalogs",
+                "https://api.stacspec.org/v1.0.0/multi-tenant-catalogs/transaction",
+                "https://api.stacspec.org/v1.0.0/multi-tenant-catalogs/search",
+                "https://api.stacspec.org/v1.0.0/children",
+                "https://api.stacspec.org/v1.0.0/children#type-filter",
+                "https://api.stacspec.org/v1.0.0/item-search",
             ]
         }
 

{stac_fastapi_core-7.0.0 → stac_fastapi_core-7.2.0}/stac_fastapi/core/core.py

@@ -6,7 +6,7 @@ import os
 from datetime import datetime as datetime_type
 from datetime import timezone
 from enum import Enum
-from typing import Type
+from typing import Type, cast
 from urllib.parse import unquote_plus, urljoin
 
 import attr
@@ -54,6 +54,7 @@ from stac_fastapi.core.validate import (
 )
 from stac_fastapi.extensions.bulk_transactions import (
     BaseBulkTransactionsClient,
+    BulkTransaction,
     BulkTransactionMethod,
     Items,
 )
@@ -2030,7 +2031,7 @@ class BulkTransactionsClient(BaseBulkTransactionsClient):
     @overrides
     def bulk_item_insert(
         self, items: Items, chunk_size: int | None = None, **kwargs
-    ) -> str:
+    ) -> BulkTransaction | Response:
         """Perform a bulk insertion of items into the database using Elasticsearch.
 
         Args:
@@ -2075,7 +2076,15 @@ class BulkTransactionsClient(BaseBulkTransactionsClient):
         skipped_batch_duplicates = len(raw_items) - len(unique_items)
 
         if not unique_items:
-            return f"No items to insert. {skipped_batch_duplicates} items were skipped (duplicates)."
+            return cast(
+                BulkTransaction,
+                {
+                    "received": len(raw_items),
+                    "success": 0,
+                    "skipped": skipped_batch_duplicates,
+                    "errors": [],
+                },
+            )
 
         # 2. VALIDATION LAYER (Use batch validator for efficiency)
         if get_bool_env("ENABLE_STAC_VALIDATOR"):
@@ -2115,7 +2124,15 @@ class BulkTransactionsClient(BaseBulkTransactionsClient):
                 processed_items.append(prepped)
 
         if not processed_items:
-            return f"No items to insert after preprocessing. Skipped {skipped_batch_duplicates} duplicates."
+            return cast(
+                BulkTransaction,
+                {
+                    "received": len(raw_items),
+                    "success": 0,
+                    "skipped": skipped_batch_duplicates + len(valid_items),
+                    "errors": [],
+                },
+            )
 
         # 4. DATABASE INSERTION LAYER
         collection_id = processed_items[0]["collection"]
@@ -2141,4 +2158,16 @@ class BulkTransactionsClient(BaseBulkTransactionsClient):
             logger.info(f"Bulk sync operation succeeded with {success} actions.")
 
         total_skipped = skipped_batch_duplicates + len(conflict_errors)
-        return f"Successfully added/updated {success} Items. {total_skipped} skipped (duplicates). {len(other_errors)} errors occurred."
+
+        # Combine all errors (conflicts + other errors)
+        all_errors = conflict_errors + other_errors if other_errors else conflict_errors
+
+        return cast(
+            BulkTransaction,
+            {
+                "received": len(raw_items),
+                "success": success,
+                "skipped": total_skipped,
+                "errors": all_errors if all_errors else [],
+            },
+        )

{stac_fastapi_core-7.0.0 → stac_fastapi_core-7.2.0}/stac_fastapi/core/version.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "7.0.0"
+__version__ = "7.2.0"