Skip to content

Enable HybridSearch for design research testing #6501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cooltey wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −6
Open

Enable HybridSearch for design research testing #6501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/src/main/java/org/wikipedia/search/HybridSearchAbCTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.wikipedia.search

import org.wikipedia.analytics.ABTest
import org.wikipedia.settings.Prefs
import org.wikipedia.settings.RemoteConfig

class HybridSearchAbCTest : ABTest("apps_hybridsearch", GROUP_SIZE_3) {

Expand All @@ -15,7 +14,7 @@ class HybridSearchAbCTest : ABTest("apps_hybridsearch", GROUP_SIZE_3) {
}

fun isTestActive(): Boolean {
return RemoteConfig.config.androidv1?.hybridSearchEnabled ?: true
return true
}

fun isTestGroupUser(): Boolean {
Expand All @@ -31,7 +30,7 @@ class HybridSearchAbCTest : ABTest("apps_hybridsearch", GROUP_SIZE_3) {
}

private val supportedLanguages = listOf(
"en", "pt", "fr", "el"
"en"
)

fun isHybridSearchEnabled(languageCode: String?): Boolean {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/wikipedia/search/SearchResultsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class SearchResultsFragment : Fragment() {
viewModel.updateSearchTerm(if (term.isNullOrBlank()) "" else term)

// If user changes the language, make sure to turn off hybrid search screen.
showHybridSearch = !resetHybridSearch && showHybridSearch && viewModel.isHybridSearchExperimentOn
showHybridSearch = viewModel.isHybridSearchExperimentOn
if (showHybridSearch) {
viewModel.resetHybridSearchState()
viewModel.loadHybridSearchResults()
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/java/org/wikipedia/search/SearchResultsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.Job
import kotlinx.coroutines.async
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asSharedFlow
Expand Down Expand Up @@ -54,6 +56,7 @@ class SearchResultsViewModel : ViewModel() {
val hybridSearchResultState = _hybridSearchResultState.asStateFlow()

private var _refreshSearchResults = MutableStateFlow(0)
private var hybridSearchJob: Job? = null

val getTestGroup get() = HybridSearchAbCTest().getGroupName()

Expand Down Expand Up @@ -94,10 +97,12 @@ class SearchResultsViewModel : ViewModel() {

@OptIn(FlowPreview::class)
fun loadHybridSearchResults() {
viewModelScope.launch(CoroutineExceptionHandler { _, throwable ->
hybridSearchJob?.cancel()
hybridSearchJob = viewModelScope.launch(CoroutineExceptionHandler { _, throwable ->
_hybridSearchResultState.value = UiState.Error(throwable)
}) {
}) {
_hybridSearchResultState.value = UiState.Loading
delay(delayMillis)
val lexicalBatchSize = 3
val semanticBatchSize = 3

Expand Down
Loading