highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-05-14 05:40:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix default assistant (#2600)

Browse Source 
* Fix default assistant

* Remove log

* Add newline
This commit is contained in:
Chris Weaver 2024-09-29 15:47:14 -07:00 committed by GitHub
parent 9155800fab
commit e159b2e947
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/app/chat/ChatPage.tsx
View File

@ -162,6 +162,9 @@ export function ChatPage({
user, user,
availableAssistants availableAssistants
); );
const finalAssistants = user
? orderAssistantsForUser(visibleAssistants, user)
: visibleAssistants;
const existingChatSessionAssistantId = selectedChatSession?.persona_id; const existingChatSessionAssistantId = selectedChatSession?.persona_id;
const [selectedAssistant, setSelectedAssistant] = useState< const [selectedAssistant, setSelectedAssistant] = useState<
@ -216,7 +219,7 @@ export function ChatPage({
const liveAssistant = const liveAssistant =
alternativeAssistant || alternativeAssistant ||
selectedAssistant || selectedAssistant ||
visibleAssistants[0] || finalAssistants[0] ||
availableAssistants[0]; availableAssistants[0];
useEffect(() => { useEffect(() => {
@ -686,7 +689,7 @@ export function ChatPage({
useEffect(() => { useEffect(() => {
if (messageHistory.length === 0 && chatSessionIdRef.current === null) { if (messageHistory.length === 0 && chatSessionIdRef.current === null) {
setSelectedAssistant( setSelectedAssistant(
visibleAssistants.find((persona) => persona.id === defaultAssistantId) finalAssistants.find((persona) => persona.id === defaultAssistantId)
); );
} }
}, [defaultAssistantId]); }, [defaultAssistantId]);
@ -2390,10 +2393,7 @@ export function ChatPage({
showDocs={() => setDocumentSelection(true)} showDocs={() => setDocumentSelection(true)}
selectedDocuments={selectedDocuments} selectedDocuments={selectedDocuments}
// assistant stuff // assistant stuff
assistantOptions={orderAssistantsForUser( assistantOptions={finalAssistants}
visibleAssistants,
user
)}
selectedAssistant={liveAssistant} selectedAssistant={liveAssistant}
setSelectedAssistant={onAssistantChange} setSelectedAssistant={onAssistantChange}
setAlternativeAssistant={setAlternativeAssistant} setAlternativeAssistant={setAlternativeAssistant}

8
web/src/lib/chat/fetchChatData.ts
View File

@ -188,14 +188,6 @@ export async function fetchChatData(searchParams: {
!hasAnyConnectors && !hasAnyConnectors &&
(!user || user.role === "admin"); (!user || user.role === "admin");
const shouldDisplaySourcesIncompleteModal =
hasAnyConnectors &&
!shouldShowWelcomeModal &&
!ccPairs.some(
(ccPair) => ccPair.has_successful_run && ccPair.docs_indexed > 0
) &&
(!user || user.role == "admin");
// if no connectors are setup, only show personas that are pure // if no connectors are setup, only show personas that are pure
// passthrough and don't do any retrieval // passthrough and don't do any retrieval
if (!hasAnyConnectors) { if (!hasAnyConnectors) {