+
{connectors.length > 0 && (
= ({
existingSources={connectors.map((connector) => connector.source)}
/>
)}
+
+
+
+ setDefaultOverrides((prevState) => ({
+ ...(prevState || SEARCH_DEFAULT_OVERRIDES_START),
+ forceDisplayQA: true,
+ }))
+ }
+ setOffset={(offset) => {
+ setDefaultOverrides((prevState) => ({
+ ...(prevState || SEARCH_DEFAULT_OVERRIDES_START),
+ offset,
+ }));
+ }}
+ />
+
= ({
/>
{
- setIsFetching(true);
- setSearchResponse({
- answer: null,
- quotes: null,
- documents: null,
- searchType: selectedSearchType,
- });
-
- await aiSearchRequestStreamed({
- query,
- sources,
- updateCurrentAnswer,
- updateQuotes,
- updateDocs,
- searchType: selectedSearchType,
- });
-
- setIsFetching(false);
+ query={query}
+ setQuery={setQuery}
+ onSearch={async () => {
+ setDefaultOverrides(SEARCH_DEFAULT_OVERRIDES_START);
+ await onSearch({ offset: 0 });
}}
/>
@@ -107,6 +166,7 @@ export const SearchSection: React.FC = ({
diff --git a/web/src/components/search/SearchTypeSelector.tsx b/web/src/components/search/SearchTypeSelector.tsx
index 593e0b2d5dc0..cae254f2eb15 100644
--- a/web/src/components/search/SearchTypeSelector.tsx
+++ b/web/src/components/search/SearchTypeSelector.tsx
@@ -1,11 +1,8 @@
+import { SearchType } from "@/lib/search/interfaces";
+
const defaultStyle =
"py-1 px-2 border rounded border-gray-700 cursor-pointer font-bold ";
-export enum SearchType {
- SEMANTIC = "SEMANTIC",
- KEYWORD = "KEYWORD",
-}
-
interface Props {
selectedSearchType: SearchType;
setSelectedSearchType: (searchType: SearchType) => void;
@@ -20,6 +17,19 @@ export const SearchTypeSelector: React.FC
= ({
setSelectedSearchType(SearchType.AUTOMATIC)}
+ >
+ Auto
+
+
+ | null;
documents: DanswerDocument[] | null;
@@ -29,11 +41,24 @@ export interface Source {
internalName: ValidSources;
}
+export interface SearchDefaultOverrides {
+ forceDisplayQA: boolean;
+ offset: number;
+}
+
export interface SearchRequestArgs {
query: string;
sources: Source[];
updateCurrentAnswer: (val: string) => void;
updateQuotes: (quotes: Record) => void;
updateDocs: (documents: DanswerDocument[]) => void;
- searchType: SearchType;
+ updateSuggestedSearchType: (searchType: SearchType) => void;
+ updateSuggestedFlowType: (flowType: FlowType) => void;
+ selectedSearchType: SearchType | null;
+ offset: number | null;
+}
+
+export interface SearchRequestOverrides {
+ searchType?: SearchType;
+ offset?: number;
}
diff --git a/web/src/lib/search/ai.ts b/web/src/lib/search/streaming.ts
similarity index 84%
rename from web/src/lib/search/ai.ts
rename to web/src/lib/search/streaming.ts
index d3d592fd74c5..efb4a4acddfe 100644
--- a/web/src/lib/search/ai.ts
+++ b/web/src/lib/search/streaming.ts
@@ -1,5 +1,9 @@
-import { SearchType } from "@/components/search/SearchTypeSelector";
-import { DanswerDocument, Quote, SearchRequestArgs } from "./interfaces";
+import {
+ DanswerDocument,
+ Quote,
+ SearchRequestArgs,
+ SearchType,
+} from "./interfaces";
const processSingleChunk = (
chunk: string,
@@ -45,14 +49,22 @@ const processRawChunkString = (
return [parsedChunkSections, currPartialChunk];
};
-export const aiSearchRequestStreamed = async ({
+export const searchRequestStreamed = async ({
query,
sources,
updateCurrentAnswer,
updateQuotes,
updateDocs,
- searchType,
+ updateSuggestedSearchType,
+ updateSuggestedFlowType,
+ selectedSearchType,
+ offset,
}: SearchRequestArgs) => {
+ let useKeyword = null;
+ if (selectedSearchType !== SearchType.AUTOMATIC) {
+ useKeyword = selectedSearchType === SearchType.KEYWORD ? true : false;
+ }
+
let answer = "";
let quotes: Record | null = null;
let relevantDocuments: DanswerDocument[] | null = null;
@@ -62,7 +74,7 @@ export const aiSearchRequestStreamed = async ({
body: JSON.stringify({
query,
collection: "danswer_index",
- use_keyword: searchType === SearchType.KEYWORD,
+ use_keyword: useKeyword,
...(sources.length > 0
? {
filters: [
@@ -72,6 +84,7 @@ export const aiSearchRequestStreamed = async ({
],
}
: {}),
+ offset: offset,
}),
headers: {
"Content-Type": "application/json",
@@ -113,12 +126,15 @@ export const aiSearchRequestStreamed = async ({
// we're now looking for quotes
updateQuotes({});
if (
+ answer &&
!answer.endsWith(".") &&
!answer.endsWith("?") &&
!answer.endsWith("!")
) {
answer += ".";
updateCurrentAnswer(answer);
+ } else {
+ updateCurrentAnswer("");
}
} else {
if (Object.hasOwn(chunk, "top_documents")) {
@@ -129,6 +145,13 @@ export const aiSearchRequestStreamed = async ({
);
updateDocs(relevantDocuments);
}
+
+ if (chunk.predicted_flow) {
+ updateSuggestedFlowType(chunk.predicted_flow);
+ }
+ if (chunk.predicted_search) {
+ updateSuggestedSearchType(chunk.predicted_search);
+ }
} else {
quotes = chunk as Record;
updateQuotes(quotes);