fix import

Author: GomezCF

stac_fastapi/core/stac_fastapi/core/core.py

@@ -37,7 +37,6 @@
     BulkTransactionMethod,
     Items,
 )
-from stac_fastapi.sfeos_helpers.database import return_date
 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
@@ -326,9 +325,8 @@ async def item_collection(
         )
 
         try:
-            datetime_search = return_date(datetime)
             search = self.database.apply_datetime_filter(
-                search=search, datetime_search=datetime_search
+                search=search, datetime=datetime
             )
         except (ValueError, TypeError) as e:
             # Handle invalid interval formats if return_date fails
@@ -509,9 +507,8 @@ async def post_search(
             )
 
         try:
-            datetime_search = return_date(search_request.datetime)
             search = self.database.apply_datetime_filter(
-                search=search, datetime_search=datetime_search
+                search=search, datetime=search_request.datetime
             )
         except (ValueError, TypeError) as e:
             # Handle invalid interval formats if return_date fails

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -39,6 +39,7 @@
     mk_actions,
     mk_item_id,
     populate_sort_shared,
+    return_date,
     validate_refresh,
 )
 from stac_fastapi.sfeos_helpers.database.query import (
@@ -277,17 +278,19 @@ def apply_collections_filter(search: Search, collection_ids: List[str]):
 
     @staticmethod
     def apply_datetime_filter(
-        search: Search, datetime_search: Dict[str, Optional[str]]
+        search: Search, datetime: str | None
     ) -> Search:
         """Apply a filter to search on datetime, start_datetime, and end_datetime fields.
 
         Args:
             search: The search object to filter.
-            datetime_search: Dict[str, Optional[str]]
+            datetime: str | None
 
         Returns:
             The filtered search object.
         """
+        datetime_search = return_date(datetime)
+
         if not datetime_search:
             return search
 

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -37,6 +37,7 @@
     mk_actions,
     mk_item_id,
     populate_sort_shared,
+    return_date,
     validate_refresh,
 )
 from stac_fastapi.sfeos_helpers.database.query import (
@@ -66,6 +67,7 @@
 from stac_fastapi.types.links import resolve_links
 from stac_fastapi.types.stac import Collection, Item
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -284,17 +286,19 @@ def apply_free_text_filter(search: Search, free_text_queries: Optional[List[str]
 
     @staticmethod
     def apply_datetime_filter(
-        search: Search, datetime_search: Dict[str, Optional[str]]
+        search: Search, datetime: str | None
     ) -> Search:
         """Apply a filter to search on datetime, start_datetime, and end_datetime fields.
 
         Args:
             search: The search object to filter.
-            datetime_search: Dict[str, Optional[str]]
+            datetime: str | None
 
         Returns:
             The filtered search object.
         """
+        datetime_search = return_date(datetime)
+
         if not datetime_search:
             return search
 

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/aggregation/client.py

@@ -313,10 +313,9 @@ async def aggregate(
                 search=search, item_ids=aggregate_request.ids
             )
 
-        datetime_search = return_date(aggregate_request.datetime)
         if aggregate_request.datetime:
             search = self.database.apply_datetime_filter(
-                search=search, datetime_search=datetime_search
+                search=search, datetime=aggregate_request.datetime
             )
 
         if aggregate_request.bbox: