PI-2526 Fix semantic sorting + switch to minScore instead of knn (#785)

marcus-bcl · web-flow · commit c1f2415c9eef · 2025-01-20T18:00:54.000Z
diff --git a/src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/ContactSearchService.kt b/src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/ContactSearchService.kt
@@ -100,7 +100,7 @@ class ContactSearchService(
           query.neural {
             it.field("textEmbedding.knn")
               .queryText(request.query)
-              .k(10)
+              .minScore(0.01F)
           }
         }
     }.toQuery()
@@ -255,7 +255,7 @@ private fun Sort.fieldSorts() = SortType.entries.flatMap { type ->
       SortBuilders.fieldSort(type.searchField).order(it.direction.toSortOrder())
     }
   }
-}
+}.ifEmpty { listOf(SortBuilders.fieldSort(SCORE.searchField).order(SortOrder.DESC)) }
 
 private fun SearchRequest.Builder.sorted(sorts: List<FieldSortBuilder>): SearchRequest.Builder {
   sorted(sorts) { fieldSorts ->

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class ContactSearchService(`
`100`	`100`	`query.neural {`
`101`	`101`	`it.field("textEmbedding.knn")`
`102`	`102`	`.queryText(request.query)`
`103`		`- .k(10)`
	`103`	`+ .minScore(0.01F)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}.toQuery()`
`@@ -255,7 +255,7 @@ private fun Sort.fieldSorts() = SortType.entries.flatMap { type ->`
`255`	`255`	`SortBuilders.fieldSort(type.searchField).order(it.direction.toSortOrder())`
`256`	`256`	`}`
`257`	`257`	`}`
`258`		`-}`
	`258`	`+}.ifEmpty { listOf(SortBuilders.fieldSort(SCORE.searchField).order(SortOrder.DESC)) }`
`259`	`259`
`260`	`260`	`private fun SearchRequest.Builder.sorted(sorts: List<FieldSortBuilder>): SearchRequest.Builder {`
`261`	`261`	`sorted(sorts) { fieldSorts ->`