fix search error with staleness and incompleteness (#2688)

Author: abeglova

learning_resources_search/api.py

@@ -592,38 +592,37 @@ def add_text_query_to_search(search, text, search_params, query_type_query):
 
     if yearly_decay_percent or max_incompleteness_penalty:
         script_query = {
-            "script_score": {
+            "function_score": {
                 "query": {"bool": {"must": [text_query], "filter": query_type_query}}
             }
         }
 
-        completeness_term = (
-            "(doc['completeness'].value * params.max_incompleteness_penalty + "
-            "(1-params.max_incompleteness_penalty))"
-        )
-
-        staleness_term = (
-            "(doc['resource_age_date'].size() == 0 ? 1 : "
-            "decayDateLinear(params.origin, params.scale, params.offset, params.decay, "
-            "doc['resource_age_date'].value))"
-        )
-
-        source = "_score"
+        source = []
         params = {}
 
         if max_incompleteness_penalty:
-            source = f"{source} * {completeness_term}"
+            completeness_term = (
+                "(doc['completeness'].value * params.max_incompleteness_penalty + "
+                "(1-params.max_incompleteness_penalty))"
+            )
+            source.append(completeness_term)
             params["max_incompleteness_penalty"] = max_incompleteness_penalty
 
         if yearly_decay_percent:
-            source = f"{source} * {staleness_term}"
+            staleness_term = (
+                "(doc['resource_age_date'].size() == 0 ? 1 : "
+                "decayDateLinear(params.origin, params.scale, params.offset, "
+                "params.decay, doc['resource_age_date'].value))"
+            )
+            source.append(staleness_term)
             params["decay"] = 1 - (yearly_decay_percent / 100)
             params["offset"] = "0"
             params["scale"] = "365d"
             params["origin"] = datetime.now(tz=UTC).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
 
-        script_query["script_score"]["script"] = {
-            "source": source,
+        script_query["function_score"]["script_score"] = {}
+        script_query["function_score"]["script_score"]["script"] = {
+            "source": "*".join(source),
             "params": params,
         }
 

learning_resources_search/api_test.py

@@ -2000,8 +2000,8 @@ def test_execute_learn_search_with_script_score(
 
     if yearly_decay_percent > 0 and max_incompleteness_penalty > 0:
         source = (
-            "_score * (doc['completeness'].value * params.max_incompleteness_penalty + "
-            "(1-params.max_incompleteness_penalty)) * (doc['resource_age_date'].size() == 0 ? "
+            "(doc['completeness'].value * params.max_incompleteness_penalty + "
+            "(1-params.max_incompleteness_penalty))*(doc['resource_age_date'].size() == 0 ? "
             "1 : decayDateLinear(params.origin, params.scale, params.offset, params.decay, "
             "doc['resource_age_date'].value))"
         )
@@ -2014,7 +2014,7 @@ def test_execute_learn_search_with_script_score(
         }
     elif yearly_decay_percent > 0:
         source = (
-            "_score * (doc['resource_age_date'].size() == 0 ? "
+            "(doc['resource_age_date'].size() == 0 ? "
             "1 : decayDateLinear(params.origin, params.scale, params.offset, params.decay, "
             "doc['resource_age_date'].value))"
         )
@@ -2027,7 +2027,7 @@ def test_execute_learn_search_with_script_score(
         }
     else:
         source = (
-            "_score * (doc['completeness'].value * params.max_incompleteness_penalty +"
+            "(doc['completeness'].value * params.max_incompleteness_penalty +"
             " (1-params.max_incompleteness_penalty))"
         )
         params = {"max_incompleteness_penalty": 0.25}
@@ -2047,7 +2047,17 @@ def test_execute_learn_search_with_script_score(
 
     query = {
         "query": {
-            "script_score": {
+            "function_score": {
+                "functions": [
+                    {
+                        "script_score": {
+                            "script": {
+                                "params": params,
+                                "source": source,
+                            },
+                        },
+                    },
+                ],
                 "query": {
                     "bool": {
                         "must": [
@@ -2301,10 +2311,6 @@ def test_execute_learn_search_with_script_score(
                         "filter": [{"exists": {"field": "resource_type"}}],
                     }
                 },
-                "script": {
-                    "source": source,
-                    "params": params,
-                },
             }
         },
         "post_filter": {