Both options in one branch

Author: Joseph Smith

common-lib/src/main/scala/com/gu/mediaservice/lib/elasticsearch/ElasticSearchExecutions.scala

@@ -1,7 +1,9 @@
 package com.gu.mediaservice.lib.elasticsearch
 
 import com.gu.mediaservice.lib.logging._
+import com.sksamuel.elastic4s.ElasticDsl.RichRequest
 import com.sksamuel.elastic4s._
+
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success}
 

kahuna/public/js/search/query.html

@@ -7,12 +7,15 @@
             Use AI search
         </label>
     </span>
-    <span id="fill-scores-checkbox" class="search__modifier-item search__modifier-checkbox"
+    <span id="fill-scores-select" class="search__modifier-item"
         ng-if="searchQuery.shouldDisplayAISearchOption && searchQuery.useAISearch">
         <label>
-            <input type="checkbox"
-                   ng-model="searchQuery.fillScores"/>
-            Fill scores
+            Fill scores:
+            <select ng-model="searchQuery.fillScoresMode">
+                <option value="off">Off (default hybrid)</option>
+                <option value="option1">Option 1</option>
+                <option value="option2">Option 2</option>
+            </select>
         </label>
     </span>
     <span class="search-query">

kahuna/public/js/search/query.js

@@ -83,11 +83,11 @@ query.controller('SearchQueryCtrl', [
     if (!ctrl.shouldDisplayAISearchOption) {
       ctrl.useAISearch = false;
       ctrl.vecWeight = undefined;
-      ctrl.fillScores = false;
+      ctrl.fillScoresMode = 'off';
     } else {
       ctrl.useAISearch = ($stateParams.useAISearch === 'true' || $stateParams.useAISearch === true) ? true : false;
       ctrl.vecWeight = $stateParams.vecWeight;
-      ctrl.fillScores = ($stateParams.fillScores === 'true' || $stateParams.fillScores === true) ? true : false;
+      ctrl.fillScoresMode = $stateParams.fillScores || 'off';
     }
 
     //--react - angular interop events--
@@ -461,22 +461,22 @@ query.controller('SearchQueryCtrl', [
           ...ctrl.filter,
           useAISearch: true,
           vecWeight: ctrl.vecWeight,
-          fillScores: ctrl.fillScores ? true : null
+          fillScores: (ctrl.fillScoresMode && ctrl.fillScoresMode !== 'off') ? ctrl.fillScoresMode : null
         });
       } else {
           // fillScores is only meaningful with AI search, so clear it when AI search is disabled
-          ctrl.fillScores = false;
+          ctrl.fillScoresMode = 'off';
           $state.go('search.results', {...ctrl.filter,  useAISearch: null, fillScores: null});
       }
     });
-    $scope.$watch(() => ctrl.fillScores, () => {
+    $scope.$watch(() => ctrl.fillScoresMode, () => {
       // fillScores only applies when AI search is enabled
       if (ctrl.useAISearch) {
         $state.go('search.results', {
           ...ctrl.filter,
           useAISearch: true,
           vecWeight: ctrl.vecWeight,
-          fillScores: ctrl.fillScores ? true : null
+          fillScores: (ctrl.fillScoresMode && ctrl.fillScoresMode !== 'off') ? ctrl.fillScoresMode : null
         });
       }
     });

kahuna/public/js/services/api/media-api.js

@@ -67,7 +67,7 @@ mediaApi.factory('mediaApi',
             persisted,
             useAISearch: maybeStringToBoolean(useAISearch),
             vecWeight: vecWeight,
-            fillScores: maybeStringToBoolean(fillScores)
+            fillScores: fillScores
         }).get();
     }
 

media-api/app/controllers/MediaApi.scala

@@ -652,7 +652,7 @@ class MediaApi(
           }
 
           val weight = params.vecWeight.getOrElse(1.0)
-          val fillScores = params.fillScores.getOrElse(false)
+          val fillScoresMode = params.fillScoresMode
 
           // cache.get(key) is atomic: if two requests race on the same key, only one
           // load fires and both callers receive the same Future.
@@ -669,7 +669,7 @@ class MediaApi(
               k = k,
               numCandidates = Math.max(k * 2, 100),
               vecWeight = weight,
-              fillScores = fillScores,
+              fillScoresMode = fillScoresMode,
               filterOpt = filterOpt
             )
           } yield searchResults