linting

Author: jamesfisher-geo

stac_fastapi/core/stac_fastapi/core/extensions/query.py

@@ -9,7 +9,6 @@
 from enum import auto
 from types import DynamicClassAttribute
 from typing import Any, Callable, Dict, Optional
-import re
 
 from pydantic import BaseModel, model_validator
 from stac_pydantic.utils import AutoValueEnum

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/query.py

@@ -4,15 +4,16 @@
 """
 
 from typing import Any, Dict, List, Optional
-from stac_fastapi.types.rfc3339 import rfc3339_str_to_datetime
-from stac_fastapi.core.datetime_utils import datetime_to_str
 
+from stac_fastapi.core.datetime_utils import datetime_to_str
 from stac_fastapi.sfeos_helpers.mappings import Geometry
+from stac_fastapi.types.rfc3339 import rfc3339_str_to_datetime
 
 ES_MAX_URL_LENGTH = 4096
 
 
 def is_numeric(val: str) -> bool:
+    """Check if an input string value is numeric."""
     try:
         float(val)
         return True
@@ -21,7 +22,7 @@ def is_numeric(val: str) -> bool:
 
 
 def process_ftq(q: str):
-    """Process a date, numeric, or text free-text query"""
+    """Process a date, numeric, or text free-text query."""
     q = q.strip()
     if not q:
         return
@@ -37,16 +38,13 @@ def process_ftq(q: str):
 
 
 def apply_free_text_filter_shared(
-    search: Any,
-    free_text_queries: Optional[List[str]],
-    fields: Optional[List[str]] = [],
+    search: Any, free_text_queries: Optional[List[str]]
 ) -> Any:
     """Create a free text query for Elasticsearch/OpenSearch.
 
     Args:
         search (Any): The search object to apply the query to.
         free_text_queries (Optional[List[str]]): A list of text strings to search for in the properties.
-        fields: Optional[List[str]]: A list of fields to return
 
     Returns:
         Any: The search object with the free text query applied, or the original search
@@ -56,7 +54,6 @@ def apply_free_text_filter_shared(
         This function creates a query_string query that searches for the specified text strings
         in the entire document. The query strings are joined with OR operators.
     """
-
     if free_text_queries:
         processed_queries = [
             process_ftq(q.strip()) for q in free_text_queries if q.strip()
@@ -65,35 +62,7 @@ def apply_free_text_filter_shared(
         if processed_queries:
             free_text_query_string = " AND ".join(processed_queries)
 
-            search = search.query(
-                "query_string", query=free_text_query_string, fields=fields
-            )
-
-    return search
-
-
-def apply_free_text_filter_shared(
-    search: Any, free_text_queries: Optional[List[str]]
-) -> Any:
-    """Create a free text query for Elasticsearch/OpenSearch.
-
-    Args:
-        search (Any): The search object to apply the query to.
-        free_text_queries (Optional[List[str]]): A list of text strings to search for in the properties.
-
-    Returns:
-        Any: The search object with the free text query applied, or the original search
-            object if no free_text_queries were provided.
-
-    Notes:
-        This function creates a query_string query that searches for the specified text strings
-        in all properties of the documents. The query strings are joined with OR operators.
-    """
-    if free_text_queries is not None:
-        free_text_query_string = '" OR properties.\\*:"'.join(free_text_queries)
-        search = search.query(
-            "query_string", query=f'properties.\\*:"{free_text_query_string}"'
-        )
+            search = search.query("query_string", query=free_text_query_string)
 
     return search