Prep for Hybrid Search (#648)

This commit is contained in:
Yuhong Sun
2023-10-29 00:13:21 -07:00
committed by GitHub
parent bfa338e142
commit 26b491fb0c
19 changed files with 199 additions and 442 deletions

View File

@@ -52,44 +52,6 @@ const getAssistantMessage = ({
);
}
if (
selectedSearchType !== SearchType.AUTOMATIC &&
searchResponse.suggestedSearchType !== selectedSearchType
) {
if (searchResponse.suggestedSearchType === SearchType.SEMANTIC) {
return (
<div>
Your query looks more like natural language, Semantic Search may yield
better results. Would you like to{" "}
<span
className={CLICKABLE_CLASS_NAME}
onClick={() => {
setSelectedSearchType(SearchType.SEMANTIC);
restartSearch({ searchType: SearchType.SEMANTIC });
}}
>
try AI search?
</span>
</div>
);
}
return (
<div>
Your query seems to be a better fit for keyword search. Would you like
to{" "}
<span
className={CLICKABLE_CLASS_NAME}
onClick={() => {
setSelectedSearchType(SearchType.KEYWORD);
restartSearch({ searchType: SearchType.KEYWORD });
}}
>
try Keyword search?
</span>
</div>
);
}
if (
(searchResponse.suggestedFlowType === FlowType.QUESTION_ANSWER ||
defaultOverrides.forceDisplayQA) &&

View File

@@ -228,14 +228,6 @@ export const SearchSection: React.FC<SearchSectionProps> = ({
</div>
</div>
<div className="w-[800px] mx-auto">
<SearchTypeSelector
selectedSearchType={selectedSearchType}
setSelectedSearchType={(searchType) => {
Cookies.set("searchType", searchType);
setSelectedSearchType(searchType);
}}
/>
<SearchBar
query={query}
setQuery={setQuery}

View File

@@ -21,11 +21,6 @@ export const searchRequest = async ({
selectedSearchType,
offset,
}: SearchRequestArgs) => {
let useKeyword = null;
if (selectedSearchType !== SearchType.AUTOMATIC) {
useKeyword = selectedSearchType === SearchType.KEYWORD ? true : false;
}
let answer = "";
let quotes: Quote[] | null = null;
let relevantDocuments: DanswerDocument[] | null = null;
@@ -36,7 +31,6 @@ export const searchRequest = async ({
body: JSON.stringify({
query,
collection: "danswer_index",
use_keyword: useKeyword,
filters,
enable_auto_detect_filters: false,
offset: offset,

View File

@@ -64,14 +64,8 @@ export const searchRequestStreamed = async ({
updateSuggestedFlowType,
updateError,
updateQueryEventId,
selectedSearchType,
offset,
}: SearchRequestArgs) => {
let useKeyword = null;
if (selectedSearchType !== SearchType.AUTOMATIC) {
useKeyword = selectedSearchType === SearchType.KEYWORD ? true : false;
}
let answer = "";
let quotes: Quote[] | null = null;
let relevantDocuments: DanswerDocument[] | null = null;
@@ -82,7 +76,6 @@ export const searchRequestStreamed = async ({
body: JSON.stringify({
query,
collection: "danswer_index",
use_keyword: useKeyword,
filters,
enable_auto_detect_filters: false,
offset: offset,

View File

@@ -21,7 +21,6 @@ export const questionValidationStreamed = async <T>({
body: JSON.stringify({
query,
collection: "danswer_index",
use_keyword: null,
filters: emptyFilters,
enable_auto_detect_filters: false,
offset: null,