quick nit

backend/onyx/chat/chat_utils.py

@@ -190,8 +190,7 @@ def create_chat_chain(
             and previous_message.message_type == MessageType.ASSISTANT
             and mainline_messages
         ):
-            if current_message.refined_answer_improvement:
-                mainline_messages[-1] = current_message
+            mainline_messages[-1] = current_message
         else:
             mainline_messages.append(current_message)
 

backend/onyx/chat/models.py

@@ -142,15 +142,6 @@ class MessageResponseIDInfo(BaseModel):
     reserved_assistant_message_id: int
 
 
-class AgentMessageIDInfo(BaseModel):
-    level: int
-    message_id: int
-
-
-class AgenticMessageResponseIDInfo(BaseModel):
-    agentic_message_ids: list[AgentMessageIDInfo]
-
-
 class StreamingError(BaseModel):
     error: str
     stack_trace: str | None = None

backend/onyx/chat/process_message.py

@@ -11,8 +11,6 @@ from onyx.agents.agent_search.orchestration.nodes.call_tool import ToolCallExcep
 from onyx.chat.answer import Answer
 from onyx.chat.chat_utils import create_chat_chain
 from onyx.chat.chat_utils import create_temporary_persona
-from onyx.chat.models import AgenticMessageResponseIDInfo
-from onyx.chat.models import AgentMessageIDInfo
 from onyx.chat.models import AgentSearchPacket
 from onyx.chat.models import AllCitations
 from onyx.chat.models import AnswerPostInfo
@@ -310,7 +308,6 @@ ChatPacket = (
     | CustomToolResponse
     | MessageSpecificCitations
     | MessageResponseIDInfo
-    | AgenticMessageResponseIDInfo
     | StreamStopInfo
     | AgentSearchPacket
 )
@@ -1038,7 +1035,6 @@ def stream_chat_message_objects(
         next_level = 1
         prev_message = gen_ai_response_message
         agent_answers = answer.llm_answer_by_level()
-        agentic_message_ids = []
         while next_level in agent_answers:
             next_answer = agent_answers[next_level]
             info = info_by_subq[
@@ -1063,18 +1059,17 @@ def stream_chat_message_objects(
                 refined_answer_improvement=refined_answer_improvement,
                 is_agentic=True,
             )
-            agentic_message_ids.append(
-                AgentMessageIDInfo(level=next_level, message_id=next_answer_message.id)
-            )
             next_level += 1
             prev_message = next_answer_message
 
         logger.debug("Committing messages")
         db_session.commit()  # actually save user / assistant message
 
-        yield AgenticMessageResponseIDInfo(agentic_message_ids=agentic_message_ids)
+        msg_detail_response = translate_db_message_to_chat_message_detail(
+            gen_ai_response_message
+        )
 
-        yield translate_db_message_to_chat_message_detail(gen_ai_response_message)
+        yield msg_detail_response
     except Exception as e:
         error_msg = str(e)
         logger.exception(error_msg)

backend/onyx/connectors/factory.py

@@ -195,15 +195,10 @@ def validate_ccpair_for_user(
         db_session,
         get_editable=False,
     )
-
-    if not connector:
-        raise ValueError("Connector not found")
-
-    if connector.source == DocumentSource.INGESTION_API:
-        return
-
     if not credential:
         raise ValueError("Credential not found")
+    if not connector:
+        raise ValueError("Connector not found")
 
     try:
         runnable_connector = instantiate_connector(

backend/onyx/llm/models.py

@@ -23,7 +23,6 @@ class PreviousMessage(BaseModel):
     message_type: MessageType
     files: list[InMemoryChatFile]
     tool_call: ToolCallFinalResult | None
-    refined_answer_improvement: bool | None
 
     @classmethod
     def from_chat_message(
@@ -48,7 +47,6 @@ class PreviousMessage(BaseModel):
             )
             if chat_message.tool_call
             else None,
-            refined_answer_improvement=chat_message.refined_answer_improvement,
         )
 
     def to_langchain_msg(self) -> BaseMessage:

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_enabled: bool | None = None
+    pro_search_disabled: bool | None = None
 
     temperature_override_enabled: bool = False
     auto_scroll: bool = False

backend/requirements/ee.txt

@@ -1,4 +1,3 @@
 cohere==5.6.1
 posthog==3.7.4
 python3-saml==1.15.0
-xmlsec==1.3.14

deployment/data/nginx/app.conf.template

@@ -4,24 +4,6 @@ log_format custom_main '$remote_addr - $remote_user [$time_local] "$request" '
                 '"$http_user_agent" "$http_x_forwarded_for" '
                 'rt=$request_time';
 
-# Map X-Forwarded-Proto or fallback to $scheme
-map $http_x_forwarded_proto $forwarded_proto {
-    default $http_x_forwarded_proto;
-    ""      $scheme;
-}
-
-# Map X-Forwarded-Host or fallback to $host
-map $http_x_forwarded_host $forwarded_host {
-    default $http_x_forwarded_host;
-    ""      $host;
-}
-
-# Map X-Forwarded-Port or fallback to server port
-map $http_x_forwarded_port $forwarded_port {
-    default $http_x_forwarded_port;
-    ""      $server_port;
-}
-
 upstream api_server {
     # fail_timeout=0 means we always retry an upstream even if it failed
     # to return a good HTTP response
@@ -39,7 +21,8 @@ upstream web_server {
 }
 
 server {
-    listen 80 default_server;
+    listen 80;
+    server_name ${DOMAIN};
 
     client_max_body_size 5G;    # Maximum upload size
 
@@ -53,9 +36,8 @@ server {
         # misc headers
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $forwarded_proto;
-        proxy_set_header X-Forwarded-Host $forwarded_host; 
-        proxy_set_header X-Forwarded-Port $forwarded_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host; 
         proxy_set_header Host $host;
 
         # need to use 1.1 to support chunked transfers
@@ -72,9 +54,8 @@ server {
         # misc headers
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $forwarded_proto;
-        proxy_set_header X-Forwarded-Host $forwarded_host; 
-        proxy_set_header X-Forwarded-Port $forwarded_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host; 
         proxy_set_header Host $host;
 
         proxy_http_version 1.1;
@@ -91,25 +72,14 @@ server {
 }
 
 server {
-    listen 443 ssl default_server;
+    listen 443 ssl;
+    server_name ${DOMAIN};
 
     client_max_body_size 5G;    # Maximum upload size
     
     location / {
-        # misc headers
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        # don't use forwarded schema, host, or port here - this is the entry point
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host; 
-        proxy_set_header X-Forwarded-Port $server_port;
-        proxy_set_header Host $host;
-
         proxy_http_version 1.1;
         proxy_buffering off;
-        # we don't want nginx trying to do something clever with
-        # redirects, we set the Host: header above already.
-        proxy_redirect off;
         proxy_pass http://localhost:80;
     }
 

deployment/data/nginx/app.conf.template.dev

@@ -21,7 +21,8 @@ upstream web_server {
 }
 
 server {
-    listen 80 default_server;
+    listen 80;
+    server_name ${DOMAIN};
 
     client_max_body_size 5G;    # Maximum upload size    
 
@@ -36,8 +37,7 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Port $server_port;
+        proxy_set_header X-Forwarded-Host $host; 
         proxy_set_header Host $host;
 
         # need to use 1.1 to support chunked transfers
@@ -55,8 +55,7 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Port $server_port;
+        proxy_set_header X-Forwarded-Host $host; 
         proxy_set_header Host $host;
 
         proxy_http_version 1.1;

deployment/data/nginx/app.conf.template.no-letsencrypt

@@ -4,24 +4,6 @@ log_format custom_main '$remote_addr - $remote_user [$time_local] "$request" '
                 '"$http_user_agent" "$http_x_forwarded_for" '
                 'rt=$request_time';
 
-# Map X-Forwarded-Proto or fallback to $scheme
-map $http_x_forwarded_proto $forwarded_proto {
-    default $http_x_forwarded_proto;
-    ""      $scheme;
-}
-
-# Map X-Forwarded-Host or fallback to $host
-map $http_x_forwarded_host $forwarded_host {
-    default $http_x_forwarded_host;
-    ""      $host;
-}
-
-# Map X-Forwarded-Port or fallback to server port
-map $http_x_forwarded_port $forwarded_port {
-    default $http_x_forwarded_port;
-    ""      $server_port;
-}
-
 upstream api_server {
     # fail_timeout=0 means we always retry an upstream even if it failed
     # to return a good HTTP response
@@ -39,7 +21,8 @@ upstream web_server {
 }
 
 server {
-    listen 80 default_server;
+    listen 80;
+    server_name ${DOMAIN};
 
     client_max_body_size 5G;    # Maximum upload size
 
@@ -53,9 +36,8 @@ server {
         # misc headers
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $forwarded_proto;
-        proxy_set_header X-Forwarded-Host $forwarded_host; 
-        proxy_set_header X-Forwarded-Port $forwarded_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host; 
         proxy_set_header Host $host;
 
         # need to use 1.1 to support chunked transfers
@@ -72,9 +54,8 @@ server {
         # misc headers
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $forwarded_proto;
-        proxy_set_header X-Forwarded-Host $forwarded_host; 
-        proxy_set_header X-Forwarded-Port $forwarded_port;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host; 
         proxy_set_header Host $host;
 
         proxy_http_version 1.1;
@@ -87,25 +68,14 @@ server {
 }
 
 server {
-    listen 443 ssl default_server;
+    listen 443 ssl;
+    server_name ${DOMAIN};
 
     client_max_body_size 5G;    # Maximum upload size
     
     location / {
-        # misc headers
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        # don't use forwarded schema, host, or port here - this is the entry point
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host; 
-        proxy_set_header X-Forwarded-Port $server_port;
-        proxy_set_header Host $host;
-
         proxy_http_version 1.1;
         proxy_buffering off;
-        # we don't want nginx trying to do something clever with
-        # redirects, we set the Host: header above already.
-        proxy_redirect off;
         proxy_pass http://localhost:80;
     }
 

deployment/data/nginx/run-nginx.sh

@@ -1,5 +1,5 @@
 # fill in the template
-envsubst '$SSL_CERT_FILE_NAME $SSL_CERT_KEY_FILE_NAME' < "/etc/nginx/conf.d/$1" > /etc/nginx/conf.d/app.conf
+envsubst '$DOMAIN $SSL_CERT_FILE_NAME $SSL_CERT_KEY_FILE_NAME' < "/etc/nginx/conf.d/$1" > /etc/nginx/conf.d/app.conf
 
 # wait for the api_server to be ready
 echo "Waiting for API server to boot up; this may take a minute or two..."

web/src/app/admin/settings/SettingsForm.tsx

@@ -221,7 +221,7 @@ export function SettingsForm() {
       />
       <Checkbox
         label="Override default temperature"
-        sublabel="If set, users will be able to override the default temperature for each assistant. This can be overridden by individual user settings."
+        sublabel="If set, users will be able to override the default temperature for each assistant."
         checked={settings.temperature_override_enabled}
         onChange={(e) =>
           handleToggleSettingsField(
@@ -240,11 +240,11 @@ export function SettingsForm() {
       />
 
       <Checkbox
-        label="Agent Search"
-        sublabel="If set, users will be able to use Agent Search."
-        checked={settings.pro_search_enabled ?? true}
+        label="Pro Search Disabled"
+        sublabel="If set, users will not be able to use Pro Search."
+        checked={settings.pro_search_disabled ?? false}
         onChange={(e) =>
-          handleToggleSettingsField("pro_search_enabled", e.target.checked)
+          handleToggleSettingsField("pro_search_disabled", e.target.checked)
         }
       />
 

web/src/app/admin/settings/interfaces.ts

@@ -10,7 +10,7 @@ export interface Settings {
   notifications: Notification[];
   needs_reindexing: boolean;
   gpu_enabled: boolean;
-  pro_search_enabled: boolean | null;
+  pro_search_disabled: boolean | null;
   application_status: ApplicationStatus;
   auto_scroll: boolean;
   temperature_override_enabled: boolean;

web/src/app/chat/ChatPage.tsx

@@ -23,7 +23,6 @@ import {
   SubQuestionDetail,
   constructSubQuestions,
   DocumentsResponse,
-  AgenticMessageResponseIDInfo,
 } from "./interfaces";
 
 import Prism from "prismjs";
@@ -1281,8 +1280,6 @@ export function ChatPage({
     let toolCall: ToolCallMetadata | null = null;
     let isImprovement: boolean | undefined = undefined;
     let isStreamingQuestions = true;
-    let includeAgentic = false;
-    let secondLevelMessageId: number | null = null;
 
     let initialFetchDetails: null | {
       user_message_id: number;
@@ -1339,7 +1336,7 @@ export function ChatPage({
           searchParams.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined,
         useExistingUserMessage: isSeededChat,
         useLanggraph:
-          settings?.settings.pro_search_enabled &&
+          !settings?.settings.pro_search_disabled &&
           proSearchEnabled &&
           retrievalEnabled,
       });
@@ -1420,17 +1417,6 @@ export function ChatPage({
             resetRegenerationState();
           } else {
             const { user_message_id, frozenMessageMap } = initialFetchDetails;
-            if (Object.hasOwn(packet, "agentic_message_ids")) {
-              const agenticMessageIds = (packet as AgenticMessageResponseIDInfo)
-                .agentic_message_ids;
-              const level1MessageId = agenticMessageIds.find(
-                (item) => item.level === 1
-              )?.message_id;
-              if (level1MessageId) {
-                secondLevelMessageId = level1MessageId;
-                includeAgentic = true;
-              }
-            }
 
             setChatState((prevState) => {
               if (prevState.get(chatSessionIdRef.current!) === "loading") {
@@ -1582,10 +1568,7 @@ export function ChatPage({
                   };
                 }
               );
-            } else if (
-              Object.hasOwn(packet, "error") &&
-              (packet as any).error != null
-            ) {
+            } else if (Object.hasOwn(packet, "error")) {
               if (
                 sub_questions.length > 0 &&
                 sub_questions
@@ -1597,8 +1580,8 @@ export function ChatPage({
                 setAgenticGenerating(false);
                 setAlternativeGeneratingAssistant(null);
                 setSubmittedMessage("");
-
-                throw new Error((packet as StreamingError).error);
+                return;
+                // throw new Error((packet as StreamingError).error);
               } else {
                 error = (packet as StreamingError).error;
                 stackTrace = (packet as StreamingError).stack_trace;
@@ -1681,19 +1664,6 @@ export function ChatPage({
                 second_level_generating: second_level_generating,
                 agentic_docs: agenticDocs,
               },
-              ...(includeAgentic
-                ? [
-                    {
-                      messageId: secondLevelMessageId!,
-                      message: second_level_answer,
-                      type: "assistant" as const,
-                      files: [],
-                      toolCall: null,
-                      parentMessageId:
-                        initialFetchDetails.assistant_message_id!,
-                    },
-                  ]
-                : []),
             ]);
           }
         }
@@ -2722,11 +2692,6 @@ export function ChatPage({
                                     ? messageHistory[i + 1]?.documents
                                     : undefined;
 
-                                const nextMessage =
-                                  messageHistory[i + 1]?.type === "assistant"
-                                    ? messageHistory[i + 1]
-                                    : undefined;
-
                                 return (
                                   <div
                                     className="text-text"
@@ -2755,10 +2720,7 @@ export function ChatPage({
                                             selectedMessageForDocDisplay ==
                                               secondLevelMessage?.messageId)
                                         }
-                                        isImprovement={
-                                          message.isImprovement ||
-                                          nextMessage?.isImprovement
-                                        }
+                                        isImprovement={message.isImprovement}
                                         secondLevelGenerating={
                                           (message.second_level_generating &&
                                             currentSessionChatState !==

web/src/app/chat/input/ChatInputBar.tsx

@@ -805,12 +805,13 @@ export function ChatInputBar({
                 )}
               </div>
               <div className="flex items-center my-auto">
-                {retrievalEnabled && settings?.settings.pro_search_enabled && (
-                  <AgenticToggle
-                    proSearchEnabled={proSearchEnabled}
-                    setProSearchEnabled={setProSearchEnabled}
-                  />
-                )}
+                {retrievalEnabled &&
+                  !settings?.settings.pro_search_disabled && (
+                    <AgenticToggle
+                      proSearchEnabled={proSearchEnabled}
+                      setProSearchEnabled={setProSearchEnabled}
+                    />
+                  )}
                 <button
                   id="onyx-chat-input-send-button"
                   className={`cursor-pointer ${

web/src/app/chat/interfaces.ts

@@ -155,15 +155,6 @@ export interface MessageResponseIDInfo {
   reserved_assistant_message_id: number;
 }
 
-export interface AgentMessageIDInfo {
-  level: number;
-  message_id: number;
-}
-
-export interface AgenticMessageResponseIDInfo {
-  agentic_message_ids: AgentMessageIDInfo[];
-}
-
 export interface DocumentsResponse {
   top_documents: OnyxDocument[];
   rephrased_query: string | null;

web/src/app/chat/lib.tsx

@@ -25,7 +25,6 @@ import {
   RetrievalType,
   StreamingError,
   ToolCallMetadata,
-  AgenticMessageResponseIDInfo,
 } from "./interfaces";
 import { Persona } from "../admin/assistants/interfaces";
 import { ReadonlyURLSearchParams } from "next/navigation";
@@ -65,7 +64,7 @@ export function getChatRetentionInfo(
   };
 }
 
-export async function updateLLMOverrideForChatSession(
+export async function updateModelOverrideForChatSession(
   chatSessionId: string,
   newAlternateModel: string
 ) {
@@ -155,8 +154,7 @@ export type PacketType =
   | AgentAnswerPiece
   | SubQuestionPiece
   | ExtendedToolResponse
-  | RefinedAnswerImprovement
-  | AgenticMessageResponseIDInfo;
+  | RefinedAnswerImprovement;
 
 export async function* sendMessage({
   regenerate,

web/src/app/layout.tsx

@@ -21,9 +21,11 @@ import { fetchAssistantData } from "@/lib/chat/fetchAssistantdata";
 import { AppProvider } from "@/components/context/AppProvider";
 import { PHProvider } from "./providers";
 import { getCurrentUserSS } from "@/lib/userSS";
+import CardSection from "@/components/admin/CardSection";
 import { Suspense } from "react";
 import PostHogPageView from "./PostHogPageView";
 import Script from "next/script";
+import { LogoType } from "@/components/logo/Logo";
 import { Hanken_Grotesk } from "next/font/google";
 import { WebVitals } from "./web-vitals";
 import { ThemeProvider } from "next-themes";

web/src/components/settings/lib.ts

@@ -51,7 +51,7 @@ export async function fetchSettingsSS(): Promise<CombinedSettings | null> {
           notifications: [],
           needs_reindexing: false,
           anonymous_user_enabled: false,
-          pro_search_enabled: true,
+          pro_search_disabled: false,
           temperature_override_enabled: true,
         };
       } else {
@@ -95,8 +95,8 @@ export async function fetchSettingsSS(): Promise<CombinedSettings | null> {
       }
     }
 
-    if (enterpriseSettings && settings.pro_search_enabled == null) {
-      settings.pro_search_enabled = true;
+    if (enterpriseSettings && settings.pro_search_disabled == null) {
+      settings.pro_search_disabled = true;
     }
 
     const webVersion = getWebVersion();

web/src/lib/hooks.ts

@@ -32,10 +32,7 @@ import { getSourceMetadata } from "./sources";
 import { AuthType, NEXT_PUBLIC_CLOUD_ENABLED } from "./constants";
 import { useUser } from "@/components/user/UserProvider";
 import { SEARCH_TOOL_ID } from "@/app/chat/tools/constants";
-import {
-  updateLLMOverrideForChatSession,
-  updateTemperatureOverrideForChatSession,
-} from "@/app/chat/lib";
+import { updateTemperatureOverrideForChatSession } from "@/app/chat/lib";
 
 const CREDENTIAL_URL = "/api/manage/admin/credential";
 
@@ -394,8 +391,7 @@ LLM Override is as follows (i.e. this order)
 - User preference (defaults to system wide default if no preference set)
 
 On switching to an existing or new chat session or a different assistant:
-- If we have a chat session default- use that
-- Otherwise if we have a live assistant after any switch with a model override, use that- otherwise use the above hierarchy
+- If we have a live assistant after any switch with a model override, use that- otherwise use the above hierarchy
 
 Thus, the input should be
 - User preference
@@ -506,16 +502,12 @@ export function useLlmOverride(
     const provider =
       newOverride.provider ||
       findProviderForModel(llmProviders, newOverride.modelName);
-
     const structuredValue = structureValue(
       newOverride.name,
       provider,
       newOverride.modelName
     );
     setLlmOverride(getValidLlmOverride(structuredValue));
-    if (currentChatSession) {
-      updateLLMOverrideForChatSession(currentChatSession.id, structuredValue);
-    }
   };
 
   const updateModelOverrideForChatSession = (chatSession?: ChatSession) => {