Onboarding nits (#2907)

* temporary stash * welcome flow * minor update * k * minor updates to welcome flow
onyx-dot-app · Oct 27, 2024 · 179dc41 · 179dc41
1 parent a1bfa78
commit 179dc41
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 100 deletions.
diff --git a/backend/danswer/one_shot_answer/answer_question.py b/backend/danswer/one_shot_answer/answer_question.py
@@ -129,7 +129,19 @@ def stream_answer_objects(
 
     persona = temporary_persona if temporary_persona else chat_session.persona
 
-    llm, fast_llm = get_llms_for_persona(persona=persona)
+    try:
+        llm, fast_llm = get_llms_for_persona(persona=persona)
+    except ValueError as e:
+        logger.error(
+            f"Failed to initialize LLMs for persona '{persona.name}': {str(e)}"
+        )
+        if "No LLM provider" in str(e):
+            raise ValueError(
+                "Please configure a Generative AI model to use this feature."
+            ) from e
+        raise ValueError(
+            "Failed to initialize the AI model. Please check your configuration and try again."
+        ) from e
 
     llm_tokenizer = get_tokenizer(
         model_name=llm.config.model_name,

diff --git a/web/src/app/assistants/gallery/page.tsx b/web/src/app/assistants/gallery/page.tsx
@@ -24,8 +24,8 @@ export default async function GalleryPage({
     chatSessions,
     folders,
     openedFolders,
-    shouldShowWelcomeModal,
     toggleSidebar,
+    shouldShowWelcomeModal,
   } = data;
 
   return (

diff --git a/web/src/app/assistants/mine/page.tsx b/web/src/app/assistants/mine/page.tsx
@@ -1,10 +1,10 @@
 import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
-import { WelcomeModal } from "@/components/initialSetup/welcome/WelcomeModalWrapper";
+
 import { fetchChatData } from "@/lib/chat/fetchChatData";
 import { unstable_noStore as noStore } from "next/cache";
 import { redirect } from "next/navigation";
 import WrappedAssistantsMine from "./WrappedAssistantsMine";
-import { AssistantsProvider } from "@/components/context/AssistantsContext";
+import { WelcomeModal } from "@/components/initialSetup/welcome/WelcomeModalWrapper";
 
 export default async function GalleryPage({
   searchParams,
@@ -24,8 +24,8 @@ export default async function GalleryPage({
     chatSessions,
     folders,
     openedFolders,
-    shouldShowWelcomeModal,
     toggleSidebar,
+    shouldShowWelcomeModal,
   } = data;
 
   return (

diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx
@@ -135,7 +135,9 @@ export function ChatPage({
 
   const { assistants: availableAssistants, finalAssistants } = useAssistants();
 
-  const [showApiKeyModal, setShowApiKeyModal] = useState(true);
+  const [showApiKeyModal, setShowApiKeyModal] = useState(
+    !shouldShowWelcomeModal
+  );
 
   const { user, isAdmin, isLoadingUser } = useUser();
 

diff --git a/web/src/app/search/page.tsx b/web/src/app/search/page.tsx
@@ -10,16 +10,10 @@ import { CCPairBasicInfo, DocumentSet, Tag, User } from "@/lib/types";
 import { cookies } from "next/headers";
 import { SearchType } from "@/lib/search/interfaces";
 import { Persona } from "../admin/assistants/interfaces";
-import {
-  WelcomeModal,
-  hasCompletedWelcomeFlowSS,
-} from "@/components/initialSetup/welcome/WelcomeModalWrapper";
 import { unstable_noStore as noStore } from "next/cache";
 import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
 import { personaComparator } from "../admin/assistants/lib";
 import { FullEmbeddingModelResponse } from "@/components/embedding/interfaces";
-import { NoSourcesModal } from "@/components/initialSetup/search/NoSourcesModal";
-import { NoCompleteSourcesModal } from "@/components/initialSetup/search/NoCompleteSourceModal";
 import { ChatPopup } from "../chat/ChatPopup";
 import {
   FetchAssistantsResponse,
@@ -38,6 +32,10 @@ import { fetchLLMProvidersSS } from "@/lib/llm/fetchLLMs";
 import { LLMProviderDescriptor } from "../admin/configuration/llm/interfaces";
 import { AssistantsProvider } from "@/components/context/AssistantsContext";
 import { headers } from "next/headers";
+import {
+  hasCompletedWelcomeFlowSS,
+  WelcomeModal,
+} from "@/components/initialSetup/welcome/WelcomeModalWrapper";
 
 export default async function Home({
   searchParams,
@@ -170,14 +168,6 @@ export default async function Home({
     ccPairs.length === 0 &&
     !shouldShowWelcomeModal;
 
-  const shouldDisplaySourcesIncompleteModal =
-    !ccPairs.some(
-      (ccPair) => ccPair.has_successful_run && ccPair.docs_indexed > 0
-    ) &&
-    !shouldDisplayNoSourcesModal &&
-    !shouldShowWelcomeModal &&
-    (!user || user.role == "admin");
-
   const sidebarToggled = cookies().get(SIDEBAR_TOGGLED_COOKIE_NAME);
   const agenticSearchToggle = cookies().get(AGENTIC_SEARCH_TYPE_COOKIE_NAME);
 
@@ -192,12 +182,8 @@ export default async function Home({
   return (
     <>
       <HealthCheckBanner />
-      {shouldShowWelcomeModal && <WelcomeModal user={user} />}
       <InstantSSRAutoRefresh />
-      {shouldDisplayNoSourcesModal && <NoSourcesModal />}
-      {shouldDisplaySourcesIncompleteModal && (
-        <NoCompleteSourcesModal ccPairs={ccPairs} />
-      )}
+      {shouldShowWelcomeModal && <WelcomeModal user={user} />}
       {/* ChatPopup is a custom popup that displays a admin-specified message on initial user visit. 
       Only used in the EE version of the app. */}
       <ChatPopup />

diff --git a/web/src/components/chat_search/UnconfiguredProviderText.tsx b/web/src/components/chat_search/UnconfiguredProviderText.tsx
@@ -2,26 +2,41 @@ import { useProviderStatus } from "./ProviderContext";
 
 export default function CredentialNotConfigured({
   showConfigureAPIKey,
+  noSources,
 }: {
   showConfigureAPIKey: () => void;
+  noSources?: boolean;
 }) {
   const { shouldShowConfigurationNeeded } = useProviderStatus();
 
-  if (!shouldShowConfigurationNeeded) {
-    return null;
-  }
-
   return (
-    <p className="text-base text-center w-full text-subtle">
-      Please note that you have not yet configured an LLM provider. You can
-      configure one{" "}
-      <button
-        onClick={showConfigureAPIKey}
-        className="text-link hover:underline cursor-pointer"
-      >
-        here
-      </button>
-      .
-    </p>
+    <>
+      {noSources ? (
+        <p className="text-base text-center w-full text-subtle">
+          You have not yet added any sources. Please add{" "}
+          <a
+            href="/admin/add-connector"
+            className="text-link hover:underline cursor-pointer"
+          >
+            a source
+          </a>{" "}
+          to continue.
+        </p>
+      ) : (
+        shouldShowConfigurationNeeded && (
+          <p className="text-base text-center w-full text-subtle">
+            Please note that you have not yet configured an LLM provider. You
+            can configure one{" "}
+            <button
+              onClick={showConfigureAPIKey}
+              className="text-link hover:underline cursor-pointer"
+            >
+              here
+            </button>
+            .
+          </p>
+        )
+      )}
+    </>
   );
 }
diff --git a/web/src/components/initialSetup/search/NoSourcesModal.tsx b/web/src/components/initialSetup/search/NoSourcesModal.tsx
diff --git a/web/src/components/initialSetup/welcome/WelcomeModal.tsx b/web/src/components/initialSetup/welcome/WelcomeModal.tsx
@@ -58,6 +58,10 @@ export function _WelcomeModal({ user }: { user: User | null }) {
       {popup}
 
       <Modal
+        onOutsideClick={() => {
+          setWelcomeFlowComplete();
+          router.refresh();
+        }}
         title={"Welcome to Danswer!"}
         width="w-full max-h-[900px] overflow-y-scroll max-w-3xl"
       >

diff --git a/web/src/components/llm/ApiKeyModal.tsx b/web/src/components/llm/ApiKeyModal.tsx
@@ -26,18 +26,17 @@ export const ApiKeyModal = ({
   }
   return (
     <Modal
-      title="Set an API Key!"
+      title="Configure a Generative AI Model"
       width="max-w-3xl w-full"
       onOutsideClick={() => hide()}
     >
       <>
         <div className="mb-5 text-sm text-gray-700">
-          Please provide an API Key below in order to start using Danswer – you
-          can always change this later.
+          Please provide an API Key – you can always change this or switch
+          models later.
           <br />
-          If you&apos;d rather look around first, you can
+          If you would rather look around first, you can{" "}
           <strong onClick={() => hide()} className="text-link cursor-pointer">
-            {" "}
             skip this step
           </strong>
           .

diff --git a/web/src/components/search/SearchSection.tsx b/web/src/components/search/SearchSection.tsx
@@ -44,6 +44,7 @@ import UnconfiguredProviderText from "../chat_search/UnconfiguredProviderText";
 import { DateRangePickerValue } from "@tremor/react";
 import { Tag } from "@/lib/types";
 import { isEqual } from "lodash";
+import { WelcomeModal } from "../initialSetup/welcome/WelcomeModalWrapper";
 
 export type searchState =
   | "input"
@@ -783,6 +784,7 @@ export const SearchSection = ({
                     </div>
 
                     <UnconfiguredProviderText
+                      noSources={shouldDisplayNoSources}
                       showConfigureAPIKey={() => setShowApiKeyModal(true)}
                     />