From 57cf7d9fac5c5a17b840ddd00563ee84c920ca04 Mon Sep 17 00:00:00 2001 From: pablonyx Date: Wed, 19 Feb 2025 17:20:18 -0800 Subject: [PATCH] default agent search `on` --- backend/onyx/connectors/factory.py | 9 +++++++-- backend/onyx/server/settings/models.py | 2 +- web/src/app/admin/settings/SettingsForm.tsx | 8 ++++---- web/src/app/admin/settings/interfaces.ts | 2 +- web/src/app/chat/ChatPage.tsx | 2 +- web/src/app/chat/input/ChatInputBar.tsx | 13 ++++++------- web/src/app/layout.tsx | 2 -- web/src/components/settings/lib.ts | 6 +++--- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/backend/onyx/connectors/factory.py b/backend/onyx/connectors/factory.py index 2bb143e79..b4f497f65 100644 --- a/backend/onyx/connectors/factory.py +++ b/backend/onyx/connectors/factory.py @@ -195,11 +195,16 @@ def validate_ccpair_for_user( db_session, get_editable=False, ) - if not credential: - raise ValueError("Credential not found") + if not connector: raise ValueError("Connector not found") + if connector.source == DocumentSource.INGESTION_API: + return + + if not credential: + raise ValueError("Credential not found") + try: runnable_connector = instantiate_connector( db_session=db_session, diff --git a/backend/onyx/server/settings/models.py b/backend/onyx/server/settings/models.py index 515551dbc..2511e1ed2 100644 --- a/backend/onyx/server/settings/models.py +++ b/backend/onyx/server/settings/models.py @@ -45,7 +45,7 @@ class Settings(BaseModel): gpu_enabled: bool | None = None application_status: ApplicationStatus = ApplicationStatus.ACTIVE anonymous_user_enabled: bool | None = None - pro_search_disabled: bool | None = None + pro_search_enabled: bool | None = None temperature_override_enabled: bool = False auto_scroll: bool = False diff --git a/web/src/app/admin/settings/SettingsForm.tsx b/web/src/app/admin/settings/SettingsForm.tsx index 021474e70..38b687797 100644 --- a/web/src/app/admin/settings/SettingsForm.tsx +++ b/web/src/app/admin/settings/SettingsForm.tsx @@ -240,11 +240,11 @@ export function SettingsForm() { /> - handleToggleSettingsField("pro_search_disabled", e.target.checked) + handleToggleSettingsField("pro_search_enabled", e.target.checked) } /> diff --git a/web/src/app/admin/settings/interfaces.ts b/web/src/app/admin/settings/interfaces.ts index 94c58bb7a..c56875c1d 100644 --- a/web/src/app/admin/settings/interfaces.ts +++ b/web/src/app/admin/settings/interfaces.ts @@ -10,7 +10,7 @@ export interface Settings { notifications: Notification[]; needs_reindexing: boolean; gpu_enabled: boolean; - pro_search_disabled: boolean | null; + pro_search_enabled: boolean | null; application_status: ApplicationStatus; auto_scroll: boolean; temperature_override_enabled: boolean; diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx index d55f33d3d..a1e5fd2b7 100644 --- a/web/src/app/chat/ChatPage.tsx +++ b/web/src/app/chat/ChatPage.tsx @@ -1339,7 +1339,7 @@ export function ChatPage({ searchParams.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined, useExistingUserMessage: isSeededChat, useLanggraph: - !settings?.settings.pro_search_disabled && + settings?.settings.pro_search_enabled && proSearchEnabled && retrievalEnabled, }); diff --git a/web/src/app/chat/input/ChatInputBar.tsx b/web/src/app/chat/input/ChatInputBar.tsx index f8b922bd4..4010be443 100644 --- a/web/src/app/chat/input/ChatInputBar.tsx +++ b/web/src/app/chat/input/ChatInputBar.tsx @@ -805,13 +805,12 @@ export function ChatInputBar({ )}
- {retrievalEnabled && - !settings?.settings.pro_search_disabled && ( - - )} + {retrievalEnabled && settings?.settings.pro_search_enabled && ( + + )}