Just a few updates to the query box

navapbc · May 16, 2024 · db51054 · db51054
1 parent f3f4526
commit db51054
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/api/src/adapters/opensearch/populate_search_index.py b/api/src/adapters/opensearch/populate_search_index.py
@@ -46,7 +46,6 @@ def insert(opensearch_client: OpenSearch, db_session: db.Session) -> None:
             continue
 
         body = OpportunitySchema().dump(opp)
-        print(body)
 
         # TODO - use the bulk endpoint instead
         # however that requires making raw JSON text - which I'll do later

diff --git a/api/src/services/opportunities_v0_1/search_opportunities.py b/api/src/services/opportunities_v0_1/search_opportunities.py
@@ -214,11 +214,10 @@ def opensearch_approach(search_params: SearchOpportunityParams) -> Tuple[Sequenc
 
     if search_params.query:
         must_filters.append({
-                "multi_match": {
+                "simple_query_string": {
                     "query": search_params.query,
-                    "fields": ["agency^16", "opportunity_title^2", "opportunity_number^12", "summary.summary_description", "opportunity_assistance_listings.assistance_listing_number^10", "opportunity_assistance_listings.program_title^4"],
-                    "type": "best_fields",
-                    "tie_breaker": 0.3
+                    "default_operator": "AND",
+                    "fields": ["agency.keyword^16", "opportunity_title^2", "opportunity_number^12", "summary.summary_description", "opportunity_assistance_listings.assistance_listing_number^10", "opportunity_assistance_listings.program_title^4"],
                 }
             }
         )
@@ -254,8 +253,8 @@ def opensearch_approach(search_params: SearchOpportunityParams) -> Tuple[Sequenc
     if non_scoring_filters:
         body["query"]["bool"]["filter"] = non_scoring_filters
 
+    print(body)
     result = client.search(body=body, index="test-opportunity-index")
-    print(result)
 
     raw_opps = [opp for opp in result["hits"]["hits"]]