Switching to query_string.

stac_fastapi/core/stac_fastapi/core/core.py

@@ -457,6 +457,7 @@ async def get_search(
         token: Optional[str] = None,
         fields: Optional[List[str]] = None,
         sortby: Optional[str] = None,
+        q: Optional[List[str]] = None,
         intersects: Optional[str] = None,
         filter: Optional[str] = None,
         filter_lang: Optional[str] = None,
@@ -474,6 +475,7 @@ async def get_search(
             token (Optional[str]): Access token to use when searching the catalog.
             fields (Optional[List[str]]): Fields to include or exclude from the results.
             sortby (Optional[str]): Sorting options for the results.
+            q (Optional[List[str]]): Free text query to filter the results.
             intersects (Optional[str]): GeoJSON geometry to search in.
             kwargs: Additional parameters to be passed to the API.
 
@@ -490,6 +492,7 @@ async def get_search(
             "limit": limit,
             "token": token,
             "query": orjson.loads(query) if query else query,
+            "q": q,
         }
 
         if datetime:
@@ -601,10 +604,7 @@ async def post_search(
                 )
 
         if hasattr(search_request, "q"):
-            q_param = getattr(search_request, "q", None)
-            free_text_queries = (
-                q_param.split(",") if isinstance(q_param, str) else q_param
-            )
+            free_text_queries = getattr(search_request, "q", None)
             try:
                 search = self.database.apply_free_text_filter(search, free_text_queries)
             except Exception as e:

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -514,13 +514,11 @@ def apply_stacql_filter(search: Search, op: str, field: str, value: float):
     def apply_free_text_filter(search: Search, free_text_queries: Optional[List[str]]):
         """Database logic to perform query for search endpoint."""
         if free_text_queries is not None:
-            # the colon is a reserved character
-            for free_text_query in free_text_queries:
-                search = search.query(
-                    "multi_match",
-                    query=free_text_query,
-                    fields=["collection", "properties.*"],
-                )
+            free_text_query_string = '" OR properties.\\*:"'.join(free_text_queries)
+            search = search.query(
+                "query_string", query=f'properties.\\*:"{free_text_query_string}"'
+            )
+
         return search
 
     @staticmethod

stac_fastapi/opensearch/stac_fastapi/opensearch/app.py

@@ -22,6 +22,7 @@
 from stac_fastapi.extensions.core import (
     AggregationExtension,
     FilterExtension,
+    FreeTextExtension,
     SortExtension,
     TokenPaginationExtension,
     TransactionExtension,
@@ -71,6 +72,7 @@
     SortExtension(),
     TokenPaginationExtension(),
     filter_extension,
+    FreeTextExtension(),
 ]
 
 extensions = [aggregation_extension] + search_extensions

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -431,13 +431,11 @@ def apply_collections_filter(search: Search, collection_ids: List[str]):
     def apply_free_text_filter(search: Search, free_text_queries: Optional[List[str]]):
         """Database logic to perform query for search endpoint."""
         if free_text_queries is not None:
-            # the colon is a reserved character
-            for free_text_query in free_text_queries:
-                search = search.query(
-                    "multi_match",
-                    query=free_text_query,
-                    fields=["collection", "properties.*"],
-                )
+            free_text_query_string = '" OR properties.\\*:"'.join(free_text_queries)
+            search = search.query(
+                "query_string", query=f'properties.\\*:"{free_text_query_string}"'
+            )
+
         return search
 
     @staticmethod

stac_fastapi/tests/conftest.py

@@ -49,6 +49,7 @@
     AggregationExtension,
     FieldsExtension,
     FilterExtension,
+    FreeTextExtension,
     SortExtension,
     TokenPaginationExtension,
     TransactionExtension,
@@ -215,6 +216,7 @@ async def app():
         QueryExtension(),
         TokenPaginationExtension(),
         FilterExtension(),
+        FreeTextExtension(),
     ]
 
     extensions = [aggregation_extension] + search_extensions
@@ -301,6 +303,7 @@ async def app_basic_auth():
         QueryExtension(),
         TokenPaginationExtension(),
         FilterExtension(),
+        FreeTextExtension(),
     ]
 
     extensions = [aggregation_extension] + search_extensions
@@ -380,6 +383,7 @@ async def route_dependencies_app():
         QueryExtension(),
         TokenPaginationExtension(),
         FilterExtension(),
+        FreeTextExtension(),
     ]
 
     post_request_model = create_post_request_model(extensions)

stac_fastapi/tests/resources/test_item.py

@@ -544,7 +544,7 @@ async def test_item_search_free_text_extension(app_client, txn_client, ctx):
 
     await create_item(txn_client, second_item)
 
-    params = {"q": "hello"}
+    params = {"q": ["hello"]}
     resp = await app_client.post("/search", json=params)
     assert resp.status_code == 200
     resp_json = resp.json()