From 5792261a4fc2272267c3c439930542d2a04f3c64 Mon Sep 17 00:00:00 2001
From: pablonyx <pablo@danswer.ai>
Date: Tue, 8 Apr 2025 12:14:56 -0700
Subject: [PATCH] Minor doc set fix (#4480)

* update

* update

* update

* k
---
 backend/onyx/db/persona.py                    |  1 +
 .../onyx/server/features/persona/models.py    |  4 ++
 .../app/admin/assistants/AssistantEditor.tsx  | 50 +++++++++++--------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/backend/onyx/db/persona.py b/backend/onyx/db/persona.py
index ab6c96cc9..8e113539e 100644
--- a/backend/onyx/db/persona.py
+++ b/backend/onyx/db/persona.py
@@ -564,6 +564,7 @@ def upsert_persona(
             if is_default_persona is not None
             else existing_persona.is_default_persona
         )
+
         # Do not delete any associations manually added unless
         # a new updated list is provided
         if document_sets is not None:
diff --git a/backend/onyx/server/features/persona/models.py b/backend/onyx/server/features/persona/models.py
index 5bd9a70cf..0986c42fc 100644
--- a/backend/onyx/server/features/persona/models.py
+++ b/backend/onyx/server/features/persona/models.py
@@ -194,6 +194,10 @@ class FullPersonaSnapshot(PersonaSnapshot):
                 if persona.user
                 else None
             ),
+            document_sets=[
+                DocumentSet.from_model(document_set_model)
+                for document_set_model in persona.document_sets
+            ],
             search_start_date=persona.search_start_date,
             prompts=[PromptSnapshot.from_model(prompt) for prompt in persona.prompts],
             llm_relevance_filter=persona.llm_relevance_filter,
diff --git a/web/src/app/admin/assistants/AssistantEditor.tsx b/web/src/app/admin/assistants/AssistantEditor.tsx
index fa8ddca26..8347ca4f0 100644
--- a/web/src/app/admin/assistants/AssistantEditor.tsx
+++ b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -281,7 +281,11 @@ export function AssistantEditor({
     selectedGroups: existingPersona?.groups ?? [],
     user_file_ids: existingPersona?.user_file_ids ?? [],
     user_folder_ids: existingPersona?.user_folder_ids ?? [],
-    knowledge_source: "user_files",
+    knowledge_source:
+      (existingPersona?.user_file_ids?.length ?? 0) > 0 ||
+      (existingPersona?.user_folder_ids?.length ?? 0) > 0
+        ? "user_files"
+        : "team_knowledge",
     is_default_persona: existingPersona?.is_default_persona ?? false,
   };
 
@@ -375,6 +379,7 @@ export function AssistantEditor({
       }
     }
   };
+
   const canShowKnowledgeSource =
     ccPairs.length > 0 &&
     searchTool &&
@@ -891,33 +896,13 @@ export function AssistantEditor({
                       </div>
                     </>
                   )}
+
                   {searchTool && values.enabled_tools_map[searchTool.id] && (
                     <div>
                       {canShowKnowledgeSource && (
                         <>
                           <div className="mt-1.5 mb-2.5">
                             <div className="flex gap-2.5">
-                              <div
-                                className={`w-[150px] h-[110px] rounded-lg border flex flex-col items-center justify-center cursor-pointer transition-all ${
-                                  values.knowledge_source === "user_files"
-                                    ? "border-2 border-blue-500 bg-blue-50 dark:bg-blue-950/20"
-                                    : "border-gray-200 hover:border-gray-300 dark:border-gray-700 dark:hover:border-gray-600"
-                                }`}
-                                onClick={() =>
-                                  setFieldValue(
-                                    "knowledge_source",
-                                    "user_files"
-                                  )
-                                }
-                              >
-                                <div className="text-blue-500 mb-2">
-                                  <FileIcon size={24} />
-                                </div>
-                                <p className="font-medium text-xs">
-                                  User Knowledge
-                                </p>
-                              </div>
-
                               <div
                                 className={`w-[150px] h-[110px] rounded-lg border flex flex-col items-center justify-center cursor-pointer transition-all ${
                                   values.knowledge_source === "team_knowledge"
@@ -938,6 +923,27 @@ export function AssistantEditor({
                                   Team Knowledge
                                 </p>
                               </div>
+
+                              <div
+                                className={`w-[150px] h-[110px] rounded-lg border flex flex-col items-center justify-center cursor-pointer transition-all ${
+                                  values.knowledge_source === "user_files"
+                                    ? "border-2 border-blue-500 bg-blue-50 dark:bg-blue-950/20"
+                                    : "border-gray-200 hover:border-gray-300 dark:border-gray-700 dark:hover:border-gray-600"
+                                }`}
+                                onClick={() =>
+                                  setFieldValue(
+                                    "knowledge_source",
+                                    "user_files"
+                                  )
+                                }
+                              >
+                                <div className="text-blue-500 mb-2">
+                                  <FileIcon size={24} />
+                                </div>
+                                <p className="font-medium text-xs">
+                                  User Knowledge
+                                </p>
+                              </div>
                             </div>
                           </div>
                         </>