core,database_logic

Author: Gomez324

stac_fastapi/core/stac_fastapi/core/core.py

@@ -822,7 +822,7 @@ async def post_search(
 
         datetime_parsed = format_datetime_range(date_str=search_request.datetime)
         try:
-            search = self.database.apply_datetime_filter(
+            search, _ = self.database.apply_datetime_filter(
                 search=search, datetime=datetime_parsed
             )
         except (ValueError, TypeError) as e:

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -439,7 +439,9 @@ def apply_collections_filter(search: Search, collection_ids: List[str]):
         return search.filter("terms", collection=collection_ids)
 
     @staticmethod
-    def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
+    def apply_datetime_filter(
+        search: Search, datetime: Optional[str]
+    ) -> Tuple[Search, Dict[str, Optional[str]]]:
         """Apply a filter to search on datetime, start_datetime, and end_datetime fields.
 
         Args:
@@ -449,15 +451,15 @@ def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
         Returns:
             The filtered search object.
         """
-        datetime_search = return_date(datetime)
-
         # USE_DATETIME env var
         # True: Search by datetime, if null search by start/end datetime
         # False: Always search only by start/end datetime
         USE_DATETIME = get_bool_env("USE_DATETIME", default=True)
 
+        datetime_search = return_date(datetime)
+
         if not datetime_search:
-            return search
+            return search, datetime_search
 
         if USE_DATETIME:
             if "eq" in datetime_search:
@@ -534,7 +536,10 @@ def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
                     ),
                 ]
 
-            return search.query(Q("bool", should=should, minimum_should_match=1))
+            return (
+                search.query(Q("bool", should=should, minimum_should_match=1)),
+                datetime_search,
+            )
         else:
             if "eq" in datetime_search:
                 filter_query = Q(
@@ -568,7 +573,7 @@ def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
                         ),
                     ],
                 )
-        return search.query(filter_query)
+            return search.query(filter_query), datetime_search
 
     @staticmethod
     def apply_bbox_filter(search: Search, bbox: List):

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -457,7 +457,9 @@ def apply_free_text_filter(search: Search, free_text_queries: Optional[List[str]
         )
 
     @staticmethod
-    def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
+    def apply_datetime_filter(
+        search: Search, datetime: Optional[str]
+    ) -> Tuple[Search, Dict[str, Optional[str]]]:
         """Apply a filter to search on datetime, start_datetime, and end_datetime fields.
 
         Args:
@@ -469,14 +471,14 @@ def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
         """
         datetime_search = return_date(datetime)
 
+        if not datetime_search:
+            return search, datetime_search
+
         # USE_DATETIME env var
         # True: Search by datetime, if null search by start/end datetime
         # False: Always search only by start/end datetime
         USE_DATETIME = get_bool_env("USE_DATETIME", default=True)
 
-        if not datetime_search:
-            return search
-
         if USE_DATETIME:
             if "eq" in datetime_search:
                 # For exact matches, include:
@@ -552,7 +554,10 @@ def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
                     ),
                 ]
 
-            return search.query(Q("bool", should=should, minimum_should_match=1))
+            return (
+                search.query(Q("bool", should=should, minimum_should_match=1)),
+                datetime_search,
+            )
         else:
             if "eq" in datetime_search:
                 filter_query = Q(
@@ -586,7 +591,7 @@ def apply_datetime_filter(search: Search, datetime: Optional[str]) -> Search:
                         ),
                     ],
                 )
-        return search.query(filter_query)
+        return search.query(filter_query), datetime_search
 
     @staticmethod
     def apply_bbox_filter(search: Search, bbox: List):

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

@@ -313,7 +313,7 @@ async def aggregate(
             )
 
         if aggregate_request.datetime:
-            search = self.database.apply_datetime_filter(
+            search, _ = self.database.apply_datetime_filter(
                 search=search, datetime=aggregate_request.datetime
             )
 

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/search_engine/selection/cache_manager.py

@@ -96,8 +96,11 @@ async def load_aliases(self) -> Dict[str, List[Tuple[Dict[str, str]]]]:
                 main_alias = self._find_main_alias(items_aliases)
                 aliases_dict = self._organize_aliases(items_aliases, main_alias)
 
-                if aliases_dict and main_alias not in result:
-                    result[main_alias] = [(aliases_dict,)]
+                if aliases_dict:
+                    if main_alias not in result:
+                        result[main_alias] = []
+
+                    result[main_alias].append((aliases_dict,))
 
         self.cache_manager.set_cache(result)
         return result