highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-03-26 17:51:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2632 from danswer-ai/hotfix/v0.6-default-assistant

Browse Source 
Hotfix/v0.6 default assistant
This commit is contained in:
rkuo-danswer 2024-09-30 12:25:37 -07:00 committed by GitHub
commit f548164464
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,
availableAssistants
);
const finalAssistants = user
? orderAssistantsForUser(visibleAssistants, user)
: visibleAssistants;
const existingChatSessionAssistantId = selectedChatSession?.persona_id;
const [selectedAssistant, setSelectedAssistant] = useState<
@ -216,7 +219,7 @@ export function ChatPage({
const liveAssistant =
alternativeAssistant ||
selectedAssistant ||
visibleAssistants[0] ||
finalAssistants[0] ||
availableAssistants[0];
useEffect(() => {
@ -686,7 +689,7 @@ export function ChatPage({
useEffect(() => {
if (messageHistory.length === 0 && chatSessionIdRef.current === null) {
setSelectedAssistant(
visibleAssistants.find((persona) => persona.id === defaultAssistantId)
finalAssistants.find((persona) => persona.id === defaultAssistantId)
);
}
}, [defaultAssistantId]);
@ -2390,10 +2393,7 @@ export function ChatPage({
showDocs={() => setDocumentSelection(true)}
selectedDocuments={selectedDocuments}
// assistant stuff
assistantOptions={orderAssistantsForUser(
visibleAssistants,
user
)}
assistantOptions={finalAssistants}
selectedAssistant={liveAssistant}
setSelectedAssistant={onAssistantChange}
setAlternativeAssistant={setAlternativeAssistant}

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

@ -188,14 +188,6 @@ export async function fetchChatData(searchParams: {
!hasAnyConnectors &&
(!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
// passthrough and don't do any retrieval
if (!hasAnyConnectors) {