Semantic search: update API, and enable for FR.

Author: dbrant

app/src/main/java/org/wikipedia/dataclient/Service.kt

@@ -55,13 +55,14 @@ interface Service {
                 "&prop=description|pageimages|pageprops|coordinates|info&ppprop=mainpage|disambiguation" +
                 "&generator=search&gsrnamespace=0&gsrwhat=text" +
                 "&inprop=varianttitles|displaytitle" +
-                "&gsrinfo=&gsrprop=redirecttitle&piprop=thumbnail&pilicense=any&pithumbsize=" +
+                "&gsrinfo=&gsrprop=redirecttitle|snippet|sectiontitle&piprop=thumbnail&pilicense=any&pithumbsize=" +
                 PREFERRED_THUMB_SIZE
     )
     suspend fun fullTextSearch(
         @Query("gsrsearch") searchTerm: String?,
         @Query("gsrlimit") gsrLimit: Int,
-        @Query("gsroffset") gsrOffset: Int?
+        @Query("gsroffset") gsrOffset: Int?,
+        @Query("cirrusSemanticSearch") isSemantic: Boolean? = null
     ): MwQueryResponse
 
     @GET(MW_API_PREFIX + "action=query&list=allusers&auwitheditsonly=1")

app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.kt

@@ -40,6 +40,7 @@ class MwQueryPage {
     val protection: List<Protection> = emptyList()
     val extract: String? = null
     val snippet: String? = null
+    @SerialName("sectiontitle") val sectionTitle: String? = null
     val description: String? = null
     private val imagerepository: String? = null
     var redirectFrom: String? = null

app/src/main/java/org/wikipedia/search/HybridSearchAbCTest.kt

@@ -4,6 +4,7 @@ import org.wikipedia.WikipediaApp
 import org.wikipedia.analytics.ABTest
 import org.wikipedia.settings.Prefs
 import org.wikipedia.settings.RemoteConfig
+import org.wikipedia.util.ReleaseUtil
 
 class HybridSearchAbCTest : ABTest("apps_hybridsearch", GROUP_SIZE_3) {
 
@@ -28,15 +29,15 @@ class HybridSearchAbCTest : ABTest("apps_hybridsearch", GROUP_SIZE_3) {
     }
 
     private fun isLanguageSupported(languageCode: String?): Boolean {
-        return (RemoteConfig.config.androidv1?.hybridSearchLanguages ?: supportedLanguages).any { it.equals(languageCode, true) }
+        return ((if (ReleaseUtil.isPreBetaRelease) null else RemoteConfig.config.androidv1?.hybridSearchLanguages) ?: supportedLanguages).any { it.equals(languageCode, true) }
     }
 
     fun shouldShowOnboarding(languageCode: String?): Boolean {
         return isTestActive() && isTestGroupUser() && isLanguageSupported(languageCode) && !Prefs.isHybridSearchOnboardingShown
     }
 
     private val supportedLanguages = listOf(
-        "el"
+        "el", "fr"
     )
 
     fun isHybridSearchEnabled(languageCode: String?): Boolean {

app/src/main/java/org/wikipedia/search/SearchResult.kt

@@ -5,6 +5,7 @@ import kotlinx.serialization.Serializable
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.mwapi.MwQueryPage
 import org.wikipedia.page.PageTitle
+import org.wikipedia.util.StringUtil
 
 @Serializable
 data class SearchResult(val pageTitle: PageTitle,
@@ -30,7 +31,7 @@ data class SearchResult(val pageTitle: PageTitle,
             thumbUrl = page.thumbUrl(),
             description = page.description,
             displayText = page.displayTitle(wiki.languageCode),
-        ),
+        ).also { if (!page.sectionTitle.isNullOrEmpty()) it.fragment = StringUtil.addUnderscores(page.sectionTitle) },
         redirectFrom = page.redirectFrom,
         type = type,
         coordinates = coordinates,

app/src/main/java/org/wikipedia/search/SearchResultsViewModel.kt

@@ -119,18 +119,19 @@ class SearchResultsViewModel : ViewModel() {
 
             val semanticDeferred = async {
                 runCatching {
-                    val tableName = when (lang) {
-                        "el" -> "elwiki_sections"
-                        else -> ""
-                    }
-                    val response = semanticSearchService.search(query = term, count = semanticBatchSize, table = tableName, includeText = true)
-                    val infoResponse = ServiceFactory.get(wikiSite).getInfoByPageIdsOrTitles(titles = response.results.joinToString("|") { it.title })
-                    buildList(response, wikiSite, SearchResult.SearchResultType.SEMANTIC).also { list ->
-                        for (result in list) {
-                            val page = infoResponse.query?.pages?.find { StringUtil.addUnderscores(it.title) == result.pageTitle.prefixedText }
-                            result.pageTitle.thumbUrl = page?.thumbUrl()
-                            result.pageTitle.description = page?.description
+                    if (lang == "el") {
+                        val response = semanticSearchService.search(query = term, count = semanticBatchSize, table = "elwiki_sections", includeText = true)
+                        val infoResponse = ServiceFactory.get(wikiSite).getInfoByPageIdsOrTitles(titles = response.results.joinToString("|") { it.title })
+                        buildList(response, wikiSite, SearchResult.SearchResultType.SEMANTIC).also { list ->
+                            for (result in list) {
+                                val page = infoResponse.query?.pages?.find { StringUtil.addUnderscores(it.title) == result.pageTitle.prefixedText }
+                                result.pageTitle.thumbUrl = page?.thumbUrl()
+                                result.pageTitle.description = page?.description
+                            }
                         }
+                    } else {
+                        val response = ServiceFactory.get(wikiSite).fullTextSearch(term, lexicalBatchSize, 0, isSemantic = true)
+                        buildList(response, invokeSource, wikiSite, type = SearchResult.SearchResultType.SEMANTIC)
                     }
                 }
             }