es filter methods to sfeos helpers

Author: jonhealy1

stac_fastapi/core/stac_fastapi/core/extensions/filter.py

@@ -1,4 +1,4 @@
-"""Filter extension logic for es conversion."""
+"""Filter extension logic for conversion."""
 
 # """
 # Implements Filter Extension.
@@ -62,8 +62,8 @@
     },
 }
 
-_cql2_like_patterns = re.compile(r"\\.|[%_]|\\$")
-_valid_like_substitutions = {
+cql2_like_patterns = re.compile(r"\\.|[%_]|\\$")
+valid_like_substitutions = {
     "\\\\": "\\",
     "\\%": "%",
     "\\_": "_",
@@ -72,33 +72,6 @@
 }
 
 
-def _replace_like_patterns(match: re.Match) -> str:
-    pattern = match.group()
-    try:
-        return _valid_like_substitutions[pattern]
-    except KeyError:
-        raise ValueError(f"'{pattern}' is not a valid escape sequence")
-
-
-def cql2_like_to_es(string: str) -> str:
-    """
-    Convert CQL2 "LIKE" characters to Elasticsearch "wildcard" characters.
-
-    Args:
-        string (str): The string containing CQL2 wildcard characters.
-
-    Returns:
-        str: The converted string with Elasticsearch compatible wildcards.
-
-    Raises:
-        ValueError: If an invalid escape sequence is encountered.
-    """
-    return _cql2_like_patterns.sub(
-        repl=_replace_like_patterns,
-        string=string,
-    )
-
-
 class LogicalOp(str, Enum):
     """Enumeration for logical operators used in constructing Elasticsearch queries."""
 
@@ -134,16 +107,3 @@ class SpatialOp(str, Enum):
     S_CONTAINS = "s_contains"
     S_WITHIN = "s_within"
     S_DISJOINT = "s_disjoint"
-
-
-def to_es_field(queryables_mapping: Dict[str, Any], field: str) -> str:
-    """
-    Map a given field to its corresponding Elasticsearch field according to a predefined mapping.
-
-    Args:
-        field (str): The field name from a user query or filter.
-
-    Returns:
-        str: The mapped field name suitable for Elasticsearch queries.
-    """
-    return queryables_mapping.get(field, field)

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/filter.py

@@ -1,5 +1,6 @@
 """Shared filter extension methods for stac-fastapi elasticsearch and opensearch backends."""
 
+import re
 from collections import deque
 from typing import Any, Dict, Optional
 
@@ -12,14 +13,54 @@
     ComparisonOp,
     LogicalOp,
     SpatialOp,
-    cql2_like_to_es,
-    to_es_field,
+    cql2_like_patterns,
+    valid_like_substitutions,
 )
 from stac_fastapi.extensions.core.filter.client import AsyncBaseFiltersClient
 
 from .mappings import ES_MAPPING_TYPE_TO_JSON
 
 
+def _replace_like_patterns(match: re.Match) -> str:
+    pattern = match.group()
+    try:
+        return valid_like_substitutions[pattern]
+    except KeyError:
+        raise ValueError(f"'{pattern}' is not a valid escape sequence")
+
+
+def cql2_like_to_es(string: str) -> str:
+    """
+    Convert CQL2 "LIKE" characters to Elasticsearch "wildcard" characters.
+
+    Args:
+        string (str): The string containing CQL2 wildcard characters.
+
+    Returns:
+        str: The converted string with Elasticsearch compatible wildcards.
+
+    Raises:
+        ValueError: If an invalid escape sequence is encountered.
+    """
+    return cql2_like_patterns.sub(
+        repl=_replace_like_patterns,
+        string=string,
+    )
+
+
+def to_es_field(queryables_mapping: Dict[str, Any], field: str) -> str:
+    """
+    Map a given field to its corresponding Elasticsearch field according to a predefined mapping.
+
+    Args:
+        field (str): The field name from a user query or filter.
+
+    Returns:
+        str: The mapped field name suitable for Elasticsearch queries.
+    """
+    return queryables_mapping.get(field, field)
+
+
 def to_es(queryables_mapping: Dict[str, Any], query: Dict[str, Any]) -> Dict[str, Any]:
     """
     Transform a simplified CQL2 query structure to an Elasticsearch compatible query DSL.

stac_fastapi/tests/extensions/test_cql2_like_to_es.py

@@ -1,6 +1,6 @@
 import pytest
 
-from stac_fastapi.core.extensions.filter import cql2_like_to_es
+from stac_fastapi.sfeos_helpers.filter import cql2_like_to_es
 
 
 @pytest.mark.parametrize(