feature: added option to frontend

devflowinc · Sep 3, 2024 · a96bd22 · a96bd22
1 parent d7cf581
commit a96bd22
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 12 deletions.
diff --git a/frontends/search/src/components/ResultsPage.tsx b/frontends/search/src/components/ResultsPage.tsx
@@ -294,6 +294,8 @@ const ResultsPage = (props: ResultsPageProps) => {
             max: props.search.debounced.twoTypoWordRangeMax,
           },
           disable_on_word: props.search.debounced.disableOnWords,
+          prioritize_domain_specifc_words:
+            props.search.debounced.prioritize_domain_specifc_words,
         },
         highlight_options: {
           highlight_results: props.search.debounced.highlightResults ?? true,

diff --git a/frontends/search/src/components/SearchForm.tsx b/frontends/search/src/components/SearchForm.tsx
@@ -1058,6 +1058,7 @@ const SearchForm = (props: {
                                   twoTypoWordRangeMax: null,
                                   disableOnWords: [],
                                   typoTolerance: false,
+                                  prioritize_domain_specifc_words: true,
                                   highlightResults: true,
                                   highlightDelimiters: ["?", ".", "!"],
                                   highlightMaxLength: 8,
@@ -1219,6 +1220,26 @@ const SearchForm = (props: {
                             }}
                           />
                         </div>
+                        <div class="flex items-center justify-between space-x-2 p-1">
+                          <label>Auto-require Domain Keywords</label>
+                          <input
+                            class="h-4 w-4"
+                            type="checkbox"
+                            checked={
+                              tempSearchValues()
+                                .prioritize_domain_specifc_words ?? false
+                            }
+                            onChange={(e) => {
+                              setTempSearchValues((prev) => {
+                                return {
+                                  ...prev,
+                                  prioritize_domain_specifc_words:
+                                    e.target.checked,
+                                };
+                              });
+                            }}
+                          />
+                        </div>
                         <div class="items flex justify-between space-x-2 p-1">
                           <label>One typo min word length:</label>
                           <input

diff --git a/frontends/search/src/hooks/useSearch.ts b/frontends/search/src/hooks/useSearch.ts
@@ -65,6 +65,7 @@ export interface SearchOptions {
   oneTypoWordRangeMax: number | null;
   twoTypoWordRangeMin: number;
   twoTypoWordRangeMax: number | null;
+  prioritize_domain_specifc_words: boolean | null;
   disableOnWords: string[];
   sort_by: SortByField | SortBySearchType;
   pageSize: number;
@@ -102,6 +103,7 @@ const initalState: SearchOptions = {
   oneTypoWordRangeMax: 8,
   twoTypoWordRangeMin: 8,
   twoTypoWordRangeMax: null,
+  prioritize_domain_specifc_words: true,
   disableOnWords: [],
   highlightResults: true,
   highlightStrategy: "exactmatch",
@@ -140,6 +142,8 @@ const fromStateToParams = (state: SearchOptions): Params => {
     oneTypoWordRangeMax: state.oneTypoWordRangeMax?.toString() ?? "8",
     twoTypoWordRangeMin: state.twoTypoWordRangeMin.toString(),
     twoTypoWordRangeMax: state.twoTypoWordRangeMax?.toString() ?? "",
+    prioritize_domain_specifc_words:
+      state.prioritize_domain_specifc_words?.toString() ?? "",
     disableOnWords: state.disableOnWords.join(","),
     highlightStrategy: state.highlightStrategy,
     highlightResults: state.highlightResults.toString(),
@@ -184,6 +188,8 @@ const fromParamsToState = (
     oneTypoWordRangeMax: parseIntOrNull(params.oneTypoWordRangeMax),
     twoTypoWordRangeMin: parseInt(params.oneTypoWordRangeMin ?? "8"),
     twoTypoWordRangeMax: parseIntOrNull(params.twoTypoWordRangeMax),
+    prioritize_domain_specifc_words:
+      (params.prioritize_domain_specifc_words ?? "true") === "true",
     disableOnWords: params.disableOnWords?.split(",") ?? [],
     highlightResults: (params.highlightResults ?? "true") === "true",
     highlightStrategy: isHighlightStrategy(params.highlightStrategy)

diff --git a/server/src/data/models.rs b/server/src/data/models.rs
@@ -5297,7 +5297,7 @@ pub struct TypoOptions {
     /// Words that should not be corrected. If not specified, this defaults to an empty list.
     pub disable_on_word: Option<Vec<String>>,
     /// Auto-require non-english words present in the dataset to exist in each results chunk_html text. If not specified, this defaults to true.
-    pub auto_require_non_english_words: Option<bool>,
+    pub prioritize_domain_specifc_words: Option<bool>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, ToSchema, Default)]

diff --git a/server/src/operators/typo_operator.rs b/server/src/operators/typo_operator.rs
@@ -610,17 +610,17 @@ fn correct_query_helper(
             continue;
         }
 
-        if options.auto_require_non_english_words.unwrap_or(true)
-            && !tree.find(word.to_string(), 0).is_empty()
-        {
-            new_quote_words.push(word);
-            query.quote_words = match query.quote_words {
-                Some(mut existing_words) => {
-                    existing_words.push(word.to_string());
-                    Some(existing_words)
-                }
-                None => Some(vec![word.to_string()]),
-            };
+        if !tree.find(word.to_string(), 0).is_empty() {
+            if options.prioritize_domain_specifc_words.unwrap_or(true) {
+                new_quote_words.push(word);
+                query.quote_words = match query.quote_words {
+                    Some(mut existing_words) => {
+                        existing_words.push(word.to_string());
+                        Some(existing_words)
+                    }
+                    None => Some(vec![word.to_string()]),
+                };
+            }
             continue;
         }