From 9a4e51a18ecaa5074bdf2edc63d986cfe3f55f8c Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Tue, 1 Oct 2024 10:43:43 -0700
Subject: [PATCH] add default model + minor fixes (#2638)

* add default model + minor fixes

* fix build

* minor additional fix

* build fix
---
 .../slack/handlers/handle_regular_answer.py        |  2 +-
 web/src/app/admin/assistants/PersonaTable.tsx      |  2 +-
 web/src/app/chat/ChatPage.tsx                      |  3 ++-
 web/src/app/chat/modal/SetDefaultModelModal.tsx    |  6 +++---
 web/src/lib/hooks.ts                               | 14 +++++++++++++-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/backend/danswer/danswerbot/slack/handlers/handle_regular_answer.py b/backend/danswer/danswerbot/slack/handlers/handle_regular_answer.py
index f1c9bd077cf0..5bd920c4b6cb 100644
--- a/backend/danswer/danswerbot/slack/handlers/handle_regular_answer.py
+++ b/backend/danswer/danswerbot/slack/handlers/handle_regular_answer.py
@@ -160,7 +160,7 @@ def handle_regular_answer(
                         detail="Slack bot does not support persona config",
                     )
 
-                elif new_message_request.persona_id:
+                elif new_message_request.persona_id is not None:
                     persona = cast(
                         Persona,
                         fetch_persona_by_id(
diff --git a/web/src/app/admin/assistants/PersonaTable.tsx b/web/src/app/admin/assistants/PersonaTable.tsx
index e30e858f13c1..e1e871372852 100644
--- a/web/src/app/admin/assistants/PersonaTable.tsx
+++ b/web/src/app/admin/assistants/PersonaTable.tsx
@@ -119,7 +119,7 @@ export function PersonasTable({
             id: persona.id.toString(),
             cells: [
               <div key="name" className="flex">
-                {!persona.is_default_persona && (
+                {!persona.builtin_persona && (
                   <FiEdit2
                     className="mr-1 my-auto cursor-pointer"
                     onClick={() =>
diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx
index 0d13b8607d28..e9676d282469 100644
--- a/web/src/app/chat/ChatPage.tsx
+++ b/web/src/app/chat/ChatPage.tsx
@@ -208,7 +208,7 @@ export function ChatPage({
   };
 
   const llmOverrideManager = useLlmOverride(
-    user?.preferences.default_model,
+    user?.preferences.default_model ?? null,
     selectedChatSession,
     defaultTemperature
   );
@@ -1779,6 +1779,7 @@ export function ChatPage({
 
       {settingsToggled && (
         <SetDefaultModelModal
+          setPopup={setPopup}
           setLlmOverride={llmOverrideManager.setGlobalDefault}
           defaultModel={user?.preferences.default_model!}
           refreshUser={refreshUser}
diff --git a/web/src/app/chat/modal/SetDefaultModelModal.tsx b/web/src/app/chat/modal/SetDefaultModelModal.tsx
index e5536f19c613..97e05cf59b0e 100644
--- a/web/src/app/chat/modal/SetDefaultModelModal.tsx
+++ b/web/src/app/chat/modal/SetDefaultModelModal.tsx
@@ -7,22 +7,23 @@ import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces"
 import { destructureValue, structureValue } from "@/lib/llm/utils";
 import { setUserDefaultModel } from "@/lib/users/UserSettings";
 import { useRouter } from "next/navigation";
-import { usePopup } from "@/components/admin/connectors/Popup";
+import { PopupSpec } from "@/components/admin/connectors/Popup";
 
 export function SetDefaultModelModal({
+  setPopup,
   llmProviders,
   onClose,
   setLlmOverride,
   defaultModel,
   refreshUser,
 }: {
+  setPopup: (popupSpec: PopupSpec | null) => void;
   llmProviders: LLMProviderDescriptor[];
   setLlmOverride: Dispatch<SetStateAction<LlmOverride>>;
   onClose: () => void;
   defaultModel: string | null;
   refreshUser: () => void;
 }) {
-  const { popup, setPopup } = usePopup();
   const containerRef = useRef<HTMLDivElement>(null);
   const messageRef = useRef<HTMLDivElement>(null);
 
@@ -127,7 +128,6 @@ export function SetDefaultModelModal({
       modalClassName="rounded-lg  bg-white max-w-xl"
     >
       <>
-        {popup}
         <div className="flex mb-4">
           <h2 className="text-2xl text-emphasis font-bold flex my-auto">
             Set Default Model
diff --git a/web/src/lib/hooks.ts b/web/src/lib/hooks.ts
index 39613e388fdf..a760c0824715 100644
--- a/web/src/lib/hooks.ts
+++ b/web/src/lib/hooks.ts
@@ -151,7 +151,7 @@ export function useLlmOverride(
   defaultTemperature?: number
 ): LlmOverrideManager {
   const [globalDefault, setGlobalDefault] = useState<LlmOverride>(
-    globalModel
+    globalModel != null
       ? destructureValue(globalModel)
       : {
           name: "",
@@ -182,6 +182,18 @@ export function useLlmOverride(
     defaultTemperature != undefined ? defaultTemperature : 0
   );
 
+  useEffect(() => {
+    setGlobalDefault(
+      globalModel != null
+        ? destructureValue(globalModel)
+        : {
+            name: "",
+            provider: "",
+            modelName: "",
+          }
+    );
+  }, [globalModel]);
+
   useEffect(() => {
     setTemperature(defaultTemperature !== undefined ? defaultTemperature : 0);
   }, [defaultTemperature]);