feat: Update getPage and getPageCount methods to use similarityScore instead of isSemantic flag

Author: Paulanerus

api/src/main/kotlin/dev/paulee/api/data/IDataService.kt

@@ -34,12 +34,12 @@ interface IDataService : Closeable {
 
     suspend fun getPage(
         query: String,
-        isSemantic: Boolean,
+        similarityScore: Float,
         order: QueryOrder?,
         pageCount: Int,
     ): Pair<List<Map<String, String>>, Map<String, List<Map<String, String>>>>
 
-    suspend fun getPageCount(query: String, isSemantic: Boolean): Triple<Long, Long, Set<String>>
+    suspend fun getPageCount(query: String, similarityScore: Float): Triple<Long, Long, Set<String>>
 
     fun createStorageProvider(infoName: String, path: Path): IStorageProvider?
 

core/src/main/kotlin/dev/paulee/core/data/DataServiceImpl.kt

@@ -537,11 +537,16 @@ object DataServiceImpl : IDataService {
         return result
     }
 
-    override suspend fun getPage(query: String, isSemantic: Boolean, order: QueryOrder?, pageCount: Int): PageResult {
+    override suspend fun getPage(
+        query: String,
+        similarityScore: Float,
+        order: QueryOrder?,
+        pageCount: Int,
+    ): PageResult {
 
         if (this.currentPool == null || this.currentField == null) return Pair(emptyList(), emptyMap())
 
-        logger.info("Query (${order ?: "None"} | Semantic: $isSemantic): $query")
+        logger.info("Query (${order ?: "None"} | Similarity: $similarityScore): $query")
 
         val key = Triple(pageCount, query, order)
 
@@ -554,7 +559,7 @@ object DataServiceImpl : IDataService {
         val (filterQuery, filter) = this.getPreFilter(query)
 
         val indexResult =
-            dataPool.search(this.handleReplacements(dataPool.metadata, filterQuery), if (isSemantic) 0.8f else 0f)
+            dataPool.search(this.handleReplacements(dataPool.metadata, filterQuery), similarityScore)
 
         if (filter.isEmpty() && indexResult.isEmpty()) return Pair(emptyList(), emptyMap())
 
@@ -590,7 +595,7 @@ object DataServiceImpl : IDataService {
         return result
     }
 
-    override suspend fun getPageCount(query: String, isSemantic: Boolean): Triple<Long, Long, Set<String>> {
+    override suspend fun getPageCount(query: String, similarityScore: Float): Triple<Long, Long, Set<String>> {
         if (this.currentPool == null || this.currentField == null) return Triple(-1, -1, emptySet())
 
         val dataPool = this.dataPools[this.currentPool] ?: return Triple(-1, -1, emptySet())
@@ -600,7 +605,7 @@ object DataServiceImpl : IDataService {
         val (filterQuery, filter) = this.getPreFilter(query)
 
         val indexResult =
-            dataPool.search(handleReplacements(dataPool.metadata, filterQuery), if (isSemantic) 0.8f else 0f)
+            dataPool.search(handleReplacements(dataPool.metadata, filterQuery), similarityScore)
 
         if (filter.isEmpty() && indexResult.isEmpty()) return Triple(0, 0, emptySet())
 

gradle.properties

@@ -14,7 +14,7 @@ onnx.version=1.22.0
 duckdb.version=1.4.1.0
 caffeine.version=3.2.2
 
-api.version=1.16.3
-core.version=1.18.9
-ui.version=1.19.3
+api.version=1.16.4
+core.version=1.18.10
+ui.version=1.19.4
 app.version=1.6.4

ui/src/main/kotlin/dev/paulee/ui/TextExplorerUI.kt

@@ -171,7 +171,7 @@ class TextExplorerUI(
 
             launchQuery {
                 val (count, pages, indexed) = withContext(Dispatchers.IO) {
-                    dataService.getPageCount(queryText, semanticSearch)
+                    dataService.getPageCount(queryText, if (semanticSearch) Config.queryEmbSimilarity else 0f)
                 }
 
                 amount = count
@@ -180,7 +180,12 @@ class TextExplorerUI(
 
                 if (totalPages > 0) {
                     val (pageEntries, pageLinks) = withContext(Dispatchers.IO) {
-                        dataService.getPage(queryText, semanticSearch, order, pageIndex)
+                        dataService.getPage(
+                            queryText,
+                            if (semanticSearch) Config.queryEmbSimilarity else 0f,
+                            order,
+                            pageIndex
+                        )
                     }
 
                     header = pageEntries.firstOrNull()?.keys?.toList() ?: emptyList()
@@ -213,7 +218,12 @@ class TextExplorerUI(
 
             launchQuery {
                 val (entries, pageLinks) = withContext(Dispatchers.IO) {
-                    dataService.getPage(queryText, semanticSearch, order, pageIndex)
+                    dataService.getPage(
+                        queryText,
+                        if (semanticSearch) Config.queryEmbSimilarity else 0f,
+                        order,
+                        pageIndex
+                    )
                 }
 
                 data = entries.map { it.values.toList() }