Skip to content

Commit 5792261

Browse files
authored
Minor doc set fix (#4480)
* update * update * update * k
1 parent 71839e7 commit 5792261

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

Diff for: backend/onyx/db/persona.py

+1
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ def upsert_persona(
564564
if is_default_persona is not None
565565
else existing_persona.is_default_persona
566566
)
567+
567568
# Do not delete any associations manually added unless
568569
# a new updated list is provided
569570
if document_sets is not None:

Diff for: backend/onyx/server/features/persona/models.py

+4
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@ def from_model(
194194
if persona.user
195195
else None
196196
),
197+
document_sets=[
198+
DocumentSet.from_model(document_set_model)
199+
for document_set_model in persona.document_sets
200+
],
197201
search_start_date=persona.search_start_date,
198202
prompts=[PromptSnapshot.from_model(prompt) for prompt in persona.prompts],
199203
llm_relevance_filter=persona.llm_relevance_filter,

Diff for: web/src/app/admin/assistants/AssistantEditor.tsx

+15-9
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,11 @@ export function AssistantEditor({
281281
selectedGroups: existingPersona?.groups ?? [],
282282
user_file_ids: existingPersona?.user_file_ids ?? [],
283283
user_folder_ids: existingPersona?.user_folder_ids ?? [],
284-
knowledge_source: "user_files",
284+
knowledge_source:
285+
(existingPersona?.user_file_ids?.length ?? 0) > 0 ||
286+
(existingPersona?.user_folder_ids?.length ?? 0) > 0
287+
? "user_files"
288+
: "team_knowledge",
285289
is_default_persona: existingPersona?.is_default_persona ?? false,
286290
};
287291

@@ -375,6 +379,7 @@ export function AssistantEditor({
375379
}
376380
}
377381
};
382+
378383
const canShowKnowledgeSource =
379384
ccPairs.length > 0 &&
380385
searchTool &&
@@ -891,6 +896,7 @@ export function AssistantEditor({
891896
</div>
892897
</>
893898
)}
899+
894900
{searchTool && values.enabled_tools_map[searchTool.id] && (
895901
<div>
896902
{canShowKnowledgeSource && (
@@ -899,43 +905,43 @@ export function AssistantEditor({
899905
<div className="flex gap-2.5">
900906
<div
901907
className={`w-[150px] h-[110px] rounded-lg border flex flex-col items-center justify-center cursor-pointer transition-all ${
902-
values.knowledge_source === "user_files"
908+
values.knowledge_source === "team_knowledge"
903909
? "border-2 border-blue-500 bg-blue-50 dark:bg-blue-950/20"
904910
: "border-gray-200 hover:border-gray-300 dark:border-gray-700 dark:hover:border-gray-600"
905911
}`}
906912
onClick={() =>
907913
setFieldValue(
908914
"knowledge_source",
909-
"user_files"
915+
"team_knowledge"
910916
)
911917
}
912918
>
913919
<div className="text-blue-500 mb-2">
914-
<FileIcon size={24} />
920+
<BookIcon size={24} />
915921
</div>
916922
<p className="font-medium text-xs">
917-
User Knowledge
923+
Team Knowledge
918924
</p>
919925
</div>
920926

921927
<div
922928
className={`w-[150px] h-[110px] rounded-lg border flex flex-col items-center justify-center cursor-pointer transition-all ${
923-
values.knowledge_source === "team_knowledge"
929+
values.knowledge_source === "user_files"
924930
? "border-2 border-blue-500 bg-blue-50 dark:bg-blue-950/20"
925931
: "border-gray-200 hover:border-gray-300 dark:border-gray-700 dark:hover:border-gray-600"
926932
}`}
927933
onClick={() =>
928934
setFieldValue(
929935
"knowledge_source",
930-
"team_knowledge"
936+
"user_files"
931937
)
932938
}
933939
>
934940
<div className="text-blue-500 mb-2">
935-
<BookIcon size={24} />
941+
<FileIcon size={24} />
936942
</div>
937943
<p className="font-medium text-xs">
938-
Team Knowledge
944+
User Knowledge
939945
</p>
940946
</div>
941947
</div>

0 commit comments

Comments
 (0)