dfs_query_then_fetch

frontends/mit-learn/src/page-components/SearchDisplay/SearchDisplay.tsx

@@ -553,6 +553,7 @@ const SearchDisplay: React.FC<SearchDisplayProps> = ({
       max_incompleteness_penalty: searchParams.get(
         "max_incompleteness_penalty",
       ),
+      use_dfs_query_then_fetch: searchParams.get("use_dfs_query_then_fetch"),
       ...requestParams,
       aggregations: (facetNames || []).concat([
         "resource_category",

learning_resources_search/api.py

@@ -595,7 +595,7 @@ def add_text_query_to_search(search, text, search_params, query_type_query):
     return search
 
 
-def construct_search(search_params):
+def construct_search(search_params):  # noqa: C901
     """
     Construct a learning resources search based on the query
 
@@ -669,6 +669,9 @@ def construct_search(search_params):
     if search_params.get("dev_mode"):
         search = search.extra(explain=True)
 
+    if search_params.get("use_dfs_query_then_fetch"):
+        search = search.params(search_type="dfs_query_then_fetch")
+
     return search
 
 

learning_resources_search/serializers.py

@@ -282,6 +282,15 @@ class SearchRequestSerializer(serializers.Serializer):
         default=False,
         help_text="If true return raw open search results with score explanations",
     )
+    use_dfs_query_then_fetch = serializers.BooleanField(
+        required=False,
+        allow_null=True,
+        default=False,
+        help_text=(
+            "If true sets search_type=dfs_query_then_fetch which makes Opensearch"
+            "make an extra pre-query to calculate term frequencies accross indexes"
+        ),
+    )
 
     def validate(self, attrs):
         unknown = set(self.initial_data) - set(self.fields)

learning_resources_search/serializers_test.py

@@ -879,6 +879,7 @@ def test_learning_resources_search_request_serializer():
         "slop": 2,
         "min_score": 0,
         "max_incompleteness_penalty": 25,
+        "use_dfs_query_then_fetch": False,
     }
 
     cleaned = {
@@ -905,6 +906,7 @@ def test_learning_resources_search_request_serializer():
         "slop": 2,
         "min_score": 0,
         "max_incompleteness_penalty": 25,
+        "use_dfs_query_then_fetch": False,
     }
 
     serialized = LearningResourcesSearchRequestSerializer(data=data)
@@ -942,6 +944,7 @@ def test_content_file_search_request_serializer():
         "offered_by": ["xpro", "ocw"],
         "platform": ["xpro", "edx", "ocw"],
         "dev_mode": False,
+        "use_dfs_query_then_fetch": False,
     }
 
     serialized = ContentFileSearchRequestSerializer(data=data)

openapi/specs/v1.yaml

@@ -303,6 +303,14 @@ paths:
             type: string
             minLength: 1
         description: The topic name. To see a list of options go to api/v1/topics/
+      - in: query
+        name: use_dfs_query_then_fetch
+        schema:
+          type: boolean
+          nullable: true
+          default: false
+        description: If true sets search_type=dfs_query_then_fetch which makes Opensearchmake
+          an extra pre-query to calculate term frequencies accross indexes
       tags:
       - content_file_search
       responses:
@@ -2674,6 +2682,14 @@ paths:
             type: string
             minLength: 1
         description: The topic name. To see a list of options go to api/v1/topics/
+      - in: query
+        name: use_dfs_query_then_fetch
+        schema:
+          type: boolean
+          nullable: true
+          default: false
+        description: If true sets search_type=dfs_query_then_fetch which makes Opensearchmake
+          an extra pre-query to calculate term frequencies accross indexes
       - in: query
         name: yearly_decay_percent
         schema:
@@ -3155,6 +3171,14 @@ paths:
             type: string
             minLength: 1
         description: The topic name. To see a list of options go to api/v1/topics/
+      - in: query
+        name: use_dfs_query_then_fetch
+        schema:
+          type: boolean
+          nullable: true
+          default: false
+        description: If true sets search_type=dfs_query_then_fetch which makes Opensearchmake
+          an extra pre-query to calculate term frequencies accross indexes
       - in: query
         name: yearly_decay_percent
         schema:
@@ -3675,6 +3699,14 @@ paths:
             type: string
             minLength: 1
         description: The topic name. To see a list of options go to api/v1/topics/
+      - in: query
+        name: use_dfs_query_then_fetch
+        schema:
+          type: boolean
+          nullable: true
+          default: false
+        description: If true sets search_type=dfs_query_then_fetch which makes Opensearchmake
+          an extra pre-query to calculate term frequencies accross indexes
       - in: query
         name: yearly_decay_percent
         schema:
@@ -4172,6 +4204,14 @@ paths:
             type: string
             minLength: 1
         description: The topic name. To see a list of options go to api/v1/topics/
+      - in: query
+        name: use_dfs_query_then_fetch
+        schema:
+          type: boolean
+          nullable: true
+          default: false
+        description: If true sets search_type=dfs_query_then_fetch which makes Opensearchmake
+          an extra pre-query to calculate term frequencies accross indexes
       - in: query
         name: yearly_decay_percent
         schema:
@@ -9835,6 +9875,12 @@ components:
           nullable: true
           default: false
           description: If true return raw open search results with score explanations
+        use_dfs_query_then_fetch:
+          type: boolean
+          nullable: true
+          default: false
+          description: If true sets search_type=dfs_query_then_fetch which makes Opensearchmake
+            an extra pre-query to calculate term frequencies accross indexes
         id:
           type: array
           items: