update for v2.5.3

Author: jonhealy1

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed 
 
-- Upgraded stac-fastapi libraries to v2.5.2 from v2.4.9 [#172](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/172)
+- Upgraded stac-fastapi libraries to v2.5.3 from v2.4.9 [#172](https://github.com/stac-utils/stac-fastapi-elasticsearch/pull/172)
 
 ## [v2.2.0]
 

stac_fastapi/core/setup.py

@@ -10,9 +10,9 @@
     "attrs",
     "pydantic[dotenv]<2",
     "stac_pydantic==2.0.*",
-    "stac-fastapi.types==2.5.2",
-    "stac-fastapi.api==2.5.2",
-    "stac-fastapi.extensions==2.5.2",
+    "stac-fastapi.types==2.5.3",
+    "stac-fastapi.api==2.5.3",
+    "stac-fastapi.extensions==2.5.3",
     "pystac[validation]",
     "orjson",
     "overrides",

stac_fastapi/core/stac_fastapi/core/core.py

@@ -1,5 +1,4 @@
-"""Item crud client."""
-import json
+"""Core client."""
 import logging
 import re
 from datetime import datetime as datetime_type
@@ -16,7 +15,7 @@
 from pygeofilter.backends.cql2_json import to_cql2
 from pygeofilter.parsers.cql2_text import parse as parse_cql2_text
 from stac_pydantic.links import Relations
-from stac_pydantic.shared import MimeTypes
+from stac_pydantic.shared import BBox, MimeTypes
 from stac_pydantic.version import STAC_VERSION
 
 from stac_fastapi.core.base_database_logic import BaseDatabaseLogic
@@ -246,8 +245,8 @@ async def get_collection(self, collection_id: str, **kwargs) -> Collection:
     async def item_collection(
         self,
         collection_id: str,
-        bbox: Optional[List[NumType]] = None,
-        datetime: Union[str, datetime_type, None] = None,
+        bbox: Optional[BBox] = None,
+        datetime: Optional[DateTimeType] = None,
         limit: int = 10,
         token: str = None,
         **kwargs,
@@ -256,8 +255,8 @@ async def item_collection(
 
         Args:
             collection_id (str): The identifier of the collection to read items from.
-            bbox (Optional[List[NumType]]): The bounding box to filter items by.
-            datetime (Union[str, datetime_type, None]): The datetime range to filter items by.
+            bbox (OOptional[BBox]): The bounding box to filter items by.
+            datetime (Optional[DateTimeType]): The datetime range to filter items by.
             limit (int): The maximum number of items to return. The default value is 10.
             token (str): A token used for pagination.
             request (Request): The incoming request.
@@ -413,8 +412,8 @@ async def get_search(
         request: Request,
         collections: Optional[List[str]] = None,
         ids: Optional[List[str]] = None,
-        bbox: Optional[List[NumType]] = None,
-        datetime: Optional[Union[str, datetime_type]] = None,
+        bbox: Optional[BBox] = None,
+        datetime: Optional[DateTimeType] = None,
         limit: Optional[int] = 10,
         query: Optional[str] = None,
         token: Optional[str] = None,
@@ -430,8 +429,8 @@ async def get_search(
         Args:
             collections (Optional[List[str]]): List of collection IDs to search in.
             ids (Optional[List[str]]): List of item IDs to search for.
-            bbox (Optional[List[NumType]]): Bounding box to search in.
-            datetime (Optional[Union[str, datetime_type]]): Filter items based on the datetime field.
+            bbox (Optional[BBox]): Bounding box to search in.
+            datetime (Optional[DateTimeType]): Filter items based on the datetime field.
             limit (Optional[int]): Maximum number of results to return.
             query (Optional[str]): Query string to filter the results.
             token (Optional[str]): Access token to use when searching the catalog.
@@ -466,27 +465,8 @@ async def get_search(
         if datetime:
             base_args["datetime"] = datetime
 
-        # As of stac-fastapi 2.5.x, the intersects GET request parameter is being sent as a list
         if intersects:
-            intersects_dict = {"type": None, "coordinates": None}
-
-            combined_json_string = intersects[0]
-
-            # Iterate over the remaining fragments and add each with a preceding comma
-            for fragment in intersects[1:]:
-                combined_json_string += "," + fragment
-
-            combined_json_string = combined_json_string.replace("'", "")
-            combined_json_string = "".join(
-                char for char in combined_json_string if char.isprintable()
-            )
-
-            try:
-                intersects_dict = json.loads(combined_json_string)
-            except json.JSONDecodeError as error:
-                print("Failed to parse JSON:", error)
-
-            base_args["intersects"] = intersects_dict
+            base_args["intersects"] = orjson.loads(unquote_plus(intersects))
 
         if sortby:
             sort_param = []