From c2447dbb1c9803d7e102792c076ed12281d94dd8 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Thu, 19 Dec 2024 19:13:55 -0800 Subject: [PATCH] cosmetic updates --- backend/onyx/server/documents/connector.py | 3 +- web/src/app/auth/login/page.tsx | 19 ++++++++++++ web/src/app/chat/ChatPage.tsx | 34 +++++++++++++--------- web/src/app/layout.tsx | 1 + 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/backend/onyx/server/documents/connector.py b/backend/onyx/server/documents/connector.py index f7f4633e50e7..c93d52499080 100644 --- a/backend/onyx/server/documents/connector.py +++ b/backend/onyx/server/documents/connector.py @@ -14,6 +14,7 @@ from pydantic import BaseModel from sqlalchemy.orm import Session from onyx.auth.users import current_admin_user +from onyx.auth.users import current_chat_accesssible_user from onyx.auth.users import current_curator_or_admin_user from onyx.auth.users import current_user from onyx.background.celery.celery_utils import get_deletion_attempt_snapshot @@ -1055,7 +1056,7 @@ class BasicCCPairInfo(BaseModel): @router.get("/connector-status") def get_basic_connector_indexing_status( - _: User = Depends(current_user), + _: User = Depends(current_chat_accesssible_user), db_session: Session = Depends(get_session), ) -> list[BasicCCPairInfo]: cc_pairs = get_connector_credential_pairs(db_session, eager_load_connector=True) diff --git a/web/src/app/auth/login/page.tsx b/web/src/app/auth/login/page.tsx index 5bff4ffb9687..5b1c4e80bfbe 100644 --- a/web/src/app/auth/login/page.tsx +++ b/web/src/app/auth/login/page.tsx @@ -17,6 +17,8 @@ import { getSecondsUntilExpiration } from "@/lib/time"; import AuthFlowContainer from "@/components/auth/AuthFlowContainer"; import CardSection from "@/components/admin/CardSection"; import { NEXT_PUBLIC_FORGOT_PASSWORD_ENABLED } from "@/lib/constants"; +import { SettingsContext } from "@/components/settings/SettingsProvider"; +import { useContext } from "react"; const Page = async (props: { searchParams?: Promise<{ [key: string]: string | string[] | undefined }>; @@ -148,6 +150,23 @@ const Page = async (props: { )} + {currentUser?.is_anonymous_user && ( +
+ + You are currently logged in as an anonymous user. You can access + the chat experience{" "} + + here + + . + +
+ )} ); diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx index 0193bd706402..71bf30d20231 100644 --- a/web/src/app/chat/ChatPage.tsx +++ b/web/src/app/chat/ChatPage.tsx @@ -183,7 +183,15 @@ export function ChatPage({ const [userSettingsToggled, setUserSettingsToggled] = useState(false); - const { assistants: availableAssistants, finalAssistants } = useAssistants(); + const { + assistants: availableAssistants, + finalAssistants, + hiddenAssistants, + visibleAssistants, + } = useAssistants(); + console.log("visibleAssistants", visibleAssistants); + console.log("availableAssistants", availableAssistants); + console.log("hiddenAssistants", hiddenAssistants); const [showApiKeyModal, setShowApiKeyModal] = useState( !shouldShowWelcomeModal @@ -243,10 +251,10 @@ export function ChatPage({ (assistant) => assistant.id === existingChatSessionAssistantId ) : defaultAssistantId !== undefined - ? availableAssistants.find( - (assistant) => assistant.id === defaultAssistantId - ) - : undefined + ? availableAssistants.find( + (assistant) => assistant.id === defaultAssistantId + ) + : undefined ); // Gather default temperature settings const search_param_temperature = searchParams.get( @@ -256,12 +264,12 @@ export function ChatPage({ const defaultTemperature = search_param_temperature ? parseFloat(search_param_temperature) : selectedAssistant?.tools.some( - (tool) => - tool.in_code_tool_id === "SearchTool" || - tool.in_code_tool_id === "InternetSearchTool" - ) - ? 0 - : 0.7; + (tool) => + tool.in_code_tool_id === "SearchTool" || + tool.in_code_tool_id === "InternetSearchTool" + ) + ? 0 + : 0.7; const setSelectedAssistantFromId = (assistantId: number) => { // NOTE: also intentionally look through available assistants here, so that @@ -1177,8 +1185,8 @@ export function ChatPage({ const currentAssistantId = alternativeAssistantOverride ? alternativeAssistantOverride.id : alternativeAssistant - ? alternativeAssistant.id - : liveAssistant.id; + ? alternativeAssistant.id + : liveAssistant.id; resetInputBar(); let messageUpdates: Message[] | null = null; diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx index c8d15792fac4..cf7004651976 100644 --- a/web/src/app/layout.tsx +++ b/web/src/app/layout.tsx @@ -63,6 +63,7 @@ export default async function RootLayout({ getCurrentUserSS(), ]); + console.log("assistantsData", assistantsData); const productGating = combinedSettings?.settings.product_gating ?? GatingType.NONE;