formatting fixes

Author: jamesfisher-geo

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -19,14 +19,15 @@
     TokenPaginationExtension,
     TransactionExtension,
 )
-
 from stac_fastapi.extensions.third_party import BulkTransactionExtension
 
 settings = ElasticsearchSettings()
 session = Session.create_from_settings(settings)
 
 filter_extension = FilterExtension(client=EsAsyncBaseFiltersClient())
-filter_extension.conformance_classes.append("http://www.opengis.net/spec/cql2/1.0/req/advanced-comparison-operators")
+filter_extension.conformance_classes.append(
+    "http://www.opengis.net/spec/cql2/1.0/req/advanced-comparison-operators"
+)
 
 extensions = [
     TransactionExtension(client=TransactionsClient(session=session), settings=settings),
@@ -36,7 +37,7 @@
     SortExtension(),
     TokenPaginationExtension(),
     ContextExtension(),
-    filter_extension
+    filter_extension,
 ]
 
 post_request_model = create_post_request_model(extensions)

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/filter.py

@@ -184,12 +184,12 @@ def to_es(self):
                 }
             }
         elif self.op == AdvancedComparisonOp.like:
-           return {
-               "wildcard": {
-                   to_es(self.args[0]): {
-                       "value": cql2_like_to_es(str(to_es(self.args[1]))),
+            return {
+                "wildcard": {
+                    to_es(self.args[0]): {
+                        "value": cql2_like_to_es(str(to_es(self.args[1]))),
                         "boost": 1.0,
-                        "case_insensitive": "true"
+                        "case_insensitive": "true",
                     }
                 }
             }
@@ -232,23 +232,20 @@ def to_es(arg: Arg):
         return arg
     else:
         raise RuntimeError(f"unknown arg {repr(arg)}")
-    
+
 
 def cql2_like_to_es(input_string):
-    """
-    Convert arugument in CQL2 ('_' and '%') to Elasticsearch wildcard operators ('?' and '*', respectively). Handle escape characters and 
-    handle Elasticsearch wildcards directly.
-    """
+    """Convert arugument in CQL2 ('_' and '%') to Elasticsearch wildcard operators ('?' and '*', respectively). Handle escape characters and handle Elasticsearch wildcards directly."""
     es_string = ""
     escape = False
 
     for char in input_string:
         if char == "\\":
             escape = True
-        elif char == '_' and not escape:
-            es_string += '?'
-        elif char == '%' and not escape:
-            es_string += '*'
+        elif char == "_" and not escape:
+            es_string += "?"
+        elif char == "%" and not escape:
+            es_string += "*"
         else:
             es_string += char
             escape = False

stac_fastapi/elasticsearch/tests/extensions/test_filter.py

@@ -285,7 +285,9 @@ async def test_search_filter_extension_wildcard_es(app_client, ctx):
 
 @pytest.mark.asyncio
 async def test_search_filter_extension_escape_chars(app_client, ctx):
-    esc_chars = ctx.item["properties"]["landsat:product_id"].replace("_", "\_")[:-1] + "_"
+    esc_chars = (
+        ctx.item["properties"]["landsat:product_id"].replace("_", "\\_")[:-1] + "_"
+    )
 
     params = {
         "filter": {
@@ -298,7 +300,7 @@ async def test_search_filter_extension_escape_chars(app_client, ctx):
                         {"property": "properties.landsat:product_id"},
                         esc_chars,
                     ],
-                }
+                },
             ],
         }
     }