stac-fastapi-core 6.8.1__py3-none-any.whl → 6.9.0__py3-none-any.whl

stac_fastapi/core/core.py

@@ -315,7 +315,7 @@ class CoreClient(AsyncBaseCoreClient):
 
         body_limit = None
         try:
-            if request.method == "POST" and request.body():
+            if request.method == "POST" and await request.body():
                 body_data = await request.json()
                 body_limit = body_data.get("limit")
         except Exception:

stac_fastapi/core/extensions/catalogs.py

@@ -56,6 +56,7 @@ class CatalogsExtension(ApiExtension):
             settings: extension settings (unused for now).
         """
         self.settings = settings or {}
+        self.router = APIRouter()
 
         self.router.add_api_route(
             path="/catalogs",
@@ -364,9 +365,9 @@ class CatalogsExtension(ApiExtension):
             await self.client.database.find_catalog(catalog_id)
 
             # Find all collections with this catalog in parent_ids
-            query_body = {"query": {"term": {"parent_ids": catalog_id}}}
+            query_body = {"query": {"term": {"parent_ids": catalog_id}}, "size": 10000}
             search_result = await self.client.database.client.search(
-                index=COLLECTIONS_INDEX, body=query_body, size=10000
+                index=COLLECTIONS_INDEX, body=query_body
             )
             children = [hit["_source"] for hit in search_result["hits"]["hits"]]
 

stac_fastapi/core/extensions/collections_search.py

@@ -38,7 +38,7 @@ def build_get_collections_search_doc(original_endpoint):
         query: Optional[str] = Query(
             None,
             description="Additional filtering expressed as a string (legacy support)",
-            example="platform=landsat AND collection_category=level2",
+            examples=["platform=landsat AND collection_category=level2"],
         ),
         limit: int = Query(
             10,
@@ -83,14 +83,16 @@ def build_get_collections_search_doc(original_endpoint):
             description=(
                 "Structured filter expression in CQL2 JSON or CQL2-text format"
             ),
-            example='{"op": "=", "args": [{"property": "properties.category"}, "level2"]}',
+            examples=[
+                '{"op": "=", "args": [{"property": "properties.category"}, "level2"]}'
+            ],
         ),
         filter_lang: Optional[str] = Query(
             None,
             description=(
                 "Filter language. Must be 'cql2-json' or 'cql2-text' if specified"
             ),
-            example="cql2-json",
+            examples=["cql2-json"],
         ),
     ):
         # Delegate to original endpoint with parameters
@@ -160,24 +162,26 @@ def build_post_collections_search_doc(original_post_endpoint):
                 "- `sortby`: List of sort criteria objects with 'field' and 'direction' (asc/desc)\n"
                 "- `fields`: Object with 'include' and 'exclude' arrays for field selection"
             ),
-            example={
-                "q": "landsat",
-                "query": "platform=landsat AND collection_category=level2",
-                "filter": {
-                    "op": "=",
-                    "args": [{"property": "properties.category"}, "level2"],
-                },
-                "filter_lang": "cql2-json",
-                "limit": 10,
-                "token": "next-page-token",
-                "bbox": [-180, -90, 180, 90],
-                "datetime": "2020-01-01T00:00:00Z/2021-01-01T12:31:12Z",
-                "sortby": [{"field": "id", "direction": "asc"}],
-                "fields": {
-                    "include": ["id", "title", "description"],
-                    "exclude": ["properties"],
-                },
-            },
+            examples=[
+                {
+                    "q": "landsat",
+                    "query": "platform=landsat AND collection_category=level2",
+                    "filter": {
+                        "op": "=",
+                        "args": [{"property": "properties.category"}, "level2"],
+                    },
+                    "filter_lang": "cql2-json",
+                    "limit": 10,
+                    "token": "next-page-token",
+                    "bbox": [-180, -90, 180, 90],
+                    "datetime": "2020-01-01T00:00:00Z/2021-01-01T12:31:12Z",
+                    "sortby": [{"field": "id", "direction": "asc"}],
+                    "fields": {
+                        "include": ["id", "title", "description"],
+                        "exclude": ["properties"],
+                    },
+                }
+            ],
         ),
     ) -> Union[Collections, Response]:
         return await original_post_endpoint(request, body)

stac_fastapi/core/redis_utils.py

@@ -292,4 +292,4 @@ async def redis_pagination_links(
     except Exception as e:
         logger.warning(f"Redis pagination operation failed: {e}")
     finally:
-        await redis.close()
+        await redis.aclose()  # type: ignore

stac_fastapi/core/utilities.py

@@ -6,6 +6,7 @@ such as converting bounding boxes to polygon representations.
 
 import logging
 import os
+import re
 from typing import Any, Dict, List, Optional, Set, Union
 
 from stac_fastapi.types.stac import Item
@@ -70,8 +71,6 @@ def bbox2polygon(b0: float, b1: float, b2: float, b3: float) -> List[List[List[f
     return [[[b0, b1], [b2, b1], [b2, b3], [b0, b3], [b0, b1]]]
 
 
-# copied from stac-fastapi-pgstac
-# https://github.com/stac-utils/stac-fastapi-pgstac/blob/26f6d918eb933a90833f30e69e21ba3b4e8a7151/stac_fastapi/pgstac/utils.py#L10-L116
 def filter_fields(  # noqa: C901
     item: Union[Item, Dict[str, Any]],
     include: Optional[Set[str]] = None,
@@ -87,15 +86,60 @@ def filter_fields(  # noqa: C901
     if not include and not exclude:
         return item
 
-    # Build a shallow copy of included fields on an item, or a sub-tree of an item
+    def match_pattern(pattern: str, key: str) -> bool:
+        """Check if a key matches a wildcard pattern."""
+        regex_pattern = "^" + re.escape(pattern).replace(r"\*", ".*") + "$"
+        return bool(re.match(regex_pattern, key))
+
+    def get_matching_keys(source: Dict[str, Any], pattern: str) -> List[str]:
+        """Get all keys that match the pattern."""
+        if not isinstance(source, dict):
+            return []
+        return [key for key in source.keys() if match_pattern(pattern, key)]
+
     def include_fields(
         source: Dict[str, Any], fields: Optional[Set[str]]
     ) -> Dict[str, Any]:
+        """Include only the specified fields from the source dictionary."""
         if not fields:
             return source
 
+        def recursive_include(
+            source: Dict[str, Any], path_parts: List[str]
+        ) -> Dict[str, Any]:
+            """Recursively include fields matching the pattern path."""
+            if not path_parts:
+                return source
+
+            if not isinstance(source, dict):
+                return {}
+
+            current_pattern = path_parts[0]
+            remaining_parts = path_parts[1:]
+
+            matching_keys = get_matching_keys(source, current_pattern)
+
+            if not matching_keys:
+                return {}
+
+            result: Dict[str, Any] = {}
+            for key in matching_keys:
+                if remaining_parts:
+                    if isinstance(source[key], dict):
+                        value = recursive_include(source[key], remaining_parts)
+                        if value:
+                            result[key] = value
+                else:
+                    result[key] = source[key]
+
+            return result
+
         clean_item: Dict[str, Any] = {}
         for key_path in fields or []:
+            if "*" in key_path:
+                value = recursive_include(source, key_path.split("."))
+                dict_deep_update(clean_item, value)
+                continue
             key_path_parts = key_path.split(".")
             key_root = key_path_parts[0]
             if key_root in source:
@@ -125,12 +169,46 @@ def filter_fields(  # noqa: C901
                 # The key, or root key of a multi-part key, is not present in the item,
                 # so it is ignored
                 pass
+
         return clean_item
 
-    # For an item built up for included fields, remove excluded fields. This
-    # modifies `source` in place.
-    def exclude_fields(source: Dict[str, Any], fields: Optional[Set[str]]) -> None:
+    def exclude_fields(
+        source: Dict[str, Any],
+        fields: Optional[Set[str]],
+    ) -> None:
+        """Exclude fields from source."""
+
+        def recursive_exclude(
+            source: Dict[str, Any], path_parts: List[str], current_path: str = ""
+        ) -> None:
+            """Recursively exclude fields matching the pattern path."""
+            if not path_parts or not isinstance(source, dict):
+                return
+
+            current_pattern = path_parts[0]
+            remaining_parts = path_parts[1:]
+
+            matching_keys = get_matching_keys(source, current_pattern)
+
+            for key in list(matching_keys):
+                if key not in source:
+                    continue
+
+                # Build the full path for this key
+                full_path = f"{current_path}.{key}" if current_path else key
+
+                if remaining_parts:
+                    if isinstance(source[key], dict):
+                        recursive_exclude(source[key], remaining_parts, full_path)
+                        if not source[key]:
+                            del source[key]
+                else:
+                    source.pop(key, None)
+
         for key_path in fields or []:
+            if "*" in key_path:
+                recursive_exclude(source, key_path.split("."))
+                continue
             key_path_part = key_path.split(".")
             key_root = key_path_part[0]
             if key_root in source:

stac_fastapi/core/version.py

@@ -1,2 +1,2 @@
 """library version."""
-__version__ = "6.8.1"
+__version__ = "6.9.0"

{stac_fastapi_core-6.8.1.dist-info → stac_fastapi_core-6.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stac_fastapi_core
-Version: 6.8.1
+Version: 6.9.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

{stac_fastapi_core-6.8.1.dist-info → stac_fastapi_core-6.9.0.dist-info}/RECORD

@@ -2,26 +2,26 @@ stac_fastapi/core/__init__.py,sha256=8izV3IWRGdXmDOK1hIPQAanbWs9EI04PJCGgqG1ZGIs
 stac_fastapi/core/base_database_logic.py,sha256=JL7DRcDdqeaLbSPPGcIUMs7q6I3Gm_E5XCOwFG458Io,6053
 stac_fastapi/core/base_settings.py,sha256=R3_Sx7n5XpGMs3zAwFJD7y008WvGU_uI2xkaabm82Kg,239
 stac_fastapi/core/basic_auth.py,sha256=RhFv3RVSHF6OaqnaaU2DO4ncJ_S5nB1q8UNpnVJJsrk,2155
-stac_fastapi/core/core.py,sha256=QvwZbXi5PssZXBXxyggLsYHfvzj57NidloI4uVXenzM,52238
+stac_fastapi/core/core.py,sha256=LTUF1253Bq-E9G9oaK3cPgou7Mk4iemHkS7hDVgwSow,52244
 stac_fastapi/core/datetime_utils.py,sha256=QygF2mJFfI_zqCwmSIec3HYqrsVsn3nUcaRQx3CD7Zw,4683
 stac_fastapi/core/queryables.py,sha256=0gKdxlmCVaIj3ODpmyIfzLChEB1nNKXPZhA3K9ApfL0,3755
 stac_fastapi/core/rate_limit.py,sha256=Gu8dAaJReGsj1L91U6m2tflU6RahpXDRs2-AYSKoybA,1318
-stac_fastapi/core/redis_utils.py,sha256=6_lrXfZBi6vCCCibLDdwwHC3lLaXYTEmqQpxOMaCUH4,9689
+stac_fastapi/core/redis_utils.py,sha256=xqZfXwrZ0Wei6EDereOygW_Aq6DBDykhQYD86Ws9P28,9706
 stac_fastapi/core/route_dependencies.py,sha256=hdtuMkv-zY1vg0YxiCz1aKP0SbBcORqDGEKDGgEazW8,5482
 stac_fastapi/core/serializers.py,sha256=l5EWZvlGjlfsZ3S4wHjWKD8sJBf83zd2dkursu18fV4,13345
 stac_fastapi/core/session.py,sha256=aXqu4LXfVbAAsChMVXd9gAhczA2bZPne6HqPeklAwMY,474
-stac_fastapi/core/utilities.py,sha256=XR_9afK_j8wCydgoXj-CMtRyI8KqgIL3d4HZOE779dU,7807
-stac_fastapi/core/version.py,sha256=mmv17WIhpgYJwiq4ovHUKIHbPTRN4ViHSjE63rArov0,45
+stac_fastapi/core/utilities.py,sha256=B-tLc_H_v92q8ZNpzk-9nKQMKe-bVHUk64HpybGqYX0,10398
+stac_fastapi/core/version.py,sha256=Zec8murh7xqMR7l6fB74XJcq2QdyNqRgOdhLMwBYPAI,45
 stac_fastapi/core/extensions/__init__.py,sha256=oaK-UJDQSEISdQ8VtM0ESxpsv7Hx1HbAdmMnh6MTFD4,356
 stac_fastapi/core/extensions/aggregation.py,sha256=v1hUHqlYuMqfQ554g3cTp16pUyRYucQxPERbHPAFtf8,1878
-stac_fastapi/core/extensions/catalogs.py,sha256=WwUI4Q20zbD5uN2le12uGnGPmQsoQnpD7bcJ__bi02Y,37963
-stac_fastapi/core/extensions/collections_search.py,sha256=xpv51nffMq5a8grNSaLbv2IzeI5JH_pqcoWRbWhzn6Y,14406
+stac_fastapi/core/extensions/catalogs.py,sha256=iOMmPdY0vhGx9QkIMEaLbEaCLvGY2iyg6U07Gdpjejc,38000
+stac_fastapi/core/extensions/collections_search.py,sha256=ZxCRQ5jyhrg6zDs037qLDzCz0T3tq3a9_lXfYQ9GweQ,14546
 stac_fastapi/core/extensions/fields.py,sha256=NCT5XHvfaf297eDPNaIFsIzvJnbbUTpScqF0otdx0NA,1066
 stac_fastapi/core/extensions/filter.py,sha256=-NQGME7rR_ereuDx-LAa1M5JhEXFaKiTtkH2asraYHE,2998
 stac_fastapi/core/extensions/query.py,sha256=Xmo8pfZEZKPudZEjjozv3R0wLOP0ayjC9E67sBOXqWY,1803
 stac_fastapi/core/models/__init__.py,sha256=sUsEB7umGZVYXjT4EHqLwm8p2wevtRBdig2Ioj2ZdVQ,631
 stac_fastapi/core/models/links.py,sha256=5KEZKisFN34U4UuOzSQnDy0QdsUOT2VRuuY36vs-FGw,7074
 stac_fastapi/core/models/search.py,sha256=7SgAUyzHGXBXSqB4G6cwq9FMwoAS00momb7jvBkjyow,27
-stac_fastapi_core-6.8.1.dist-info/METADATA,sha256=GB6GOulxa_ja31Bf1iRvzhCsGDPOVz44zBun5xuL_RE,3480
-stac_fastapi_core-6.8.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-stac_fastapi_core-6.8.1.dist-info/RECORD,,
+stac_fastapi_core-6.9.0.dist-info/METADATA,sha256=4ot6ylGlLz67tpQZ5VPxAbw2kOC1O_VCAzGXZ2dQ39U,3480
+stac_fastapi_core-6.9.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+stac_fastapi_core-6.9.0.dist-info/RECORD,,