test1

test
Additional logging to salesforce perm sync
2026-02-19 00:35:46 +00:00 · 2025-04-01 16:24:57 -07:00 · 2025-04-01 16:24:11 -07:00 · 2025-04-01 16:19:50 -07:00 · 2025-04-01 16:19:50 -07:00 · 2025-04-01 16:19:50 -07:00
20 changed files with 290 additions and 306 deletions
--- a/backend/ee/onyx/external_permissions/salesforce/postprocessing.py
+++ b/backend/ee/onyx/external_permissions/salesforce/postprocessing.py
@@ -58,6 +58,7 @@ def _get_objects_access_for_user_email_from_salesforce(
        f"Time taken to get Salesforce user ID: {end_time - start_time} seconds"
    )
    if user_id is None:
+        logger.warning(f"User '{user_email}' not found in Salesforce")
        return None

    # This is the only query that is not cached in the function
@@ -65,6 +66,7 @@ def _get_objects_access_for_user_email_from_salesforce(
    object_id_to_access = get_objects_access_for_user_id(
        salesforce_client, user_id, list(object_ids)
    )
+    logger.debug(f"Object ID to access: {object_id_to_access}")
    return object_id_to_access


--- a/backend/onyx/auth/email_utils.py
+++ b/backend/onyx/auth/email_utils.py
@@ -23,6 +23,7 @@ from onyx.utils.url import add_url_params
 from onyx.utils.variable_functionality import fetch_versioned_implementation
 from shared_configs.configs import MULTI_TENANT

+
 HTML_EMAIL_TEMPLATE = """\
 <!DOCTYPE html>
 <html lang="en">
--- a/backend/onyx/auth/users.py
+++ b/backend/onyx/auth/users.py
@@ -56,6 +56,7 @@ from httpx_oauth.oauth2 import OAuth2Token
 from pydantic import BaseModel
 from sqlalchemy.ext.asyncio import AsyncSession

+from ee.onyx.configs.app_configs import ANONYMOUS_USER_COOKIE_NAME
 from onyx.auth.api_key import get_hashed_api_key_from_request
 from onyx.auth.email_utils import send_forgot_password_email
 from onyx.auth.email_utils import send_user_verification_email
@@ -513,6 +514,25 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):

            return user

+    async def on_after_login(
+        self,
+        user: User,
+        request: Optional[Request] = None,
+        response: Optional[Response] = None,
+    ) -> None:
+        try:
+            if response and request and ANONYMOUS_USER_COOKIE_NAME in request.cookies:
+                response.delete_cookie(
+                    ANONYMOUS_USER_COOKIE_NAME,
+                    # Ensure cookie deletion doesn't override other cookies by setting the same path/domain
+                    path="/",
+                    domain=None,
+                    secure=WEB_DOMAIN.startswith("https"),
+                )
+                logger.debug(f"Deleted anonymous user cookie for user {user.email}")
+        except Exception:
+            logger.exception("Error deleting anonymous user cookie")
+
    async def on_after_register(
        self, user: User, request: Optional[Request] = None
    ) -> None:
@@ -1302,6 +1322,7 @@ def get_oauth_router(
        # Login user
        response = await backend.login(strategy, user)
        await user_manager.on_after_login(user, request, response)
+
        # Prepare redirect response
        if tenant_id is None:
            # Use URL utility to add parameters
@@ -1311,9 +1332,14 @@ def get_oauth_router(
            # No parameters to add
            redirect_response = RedirectResponse(next_url, status_code=302)

-        # Copy headers and other attributes from 'response' to 'redirect_response'
+        # Copy headers from auth response to redirect response, with special handling for Set-Cookie
        for header_name, header_value in response.headers.items():
-            redirect_response.headers[header_name] = header_value
+            # FastAPI can have multiple Set-Cookie headers as a list
+            if header_name.lower() == "set-cookie" and isinstance(header_value, list):
+                for cookie_value in header_value:
+                    redirect_response.headers.append(header_name, cookie_value)
+            else:
+                redirect_response.headers[header_name] = header_value

        if hasattr(response, "body"):
            redirect_response.body = response.body
--- a/backend/onyx/background/celery/tasks/doc_permission_syncing/tasks.py
+++ b/backend/onyx/background/celery/tasks/doc_permission_syncing/tasks.py
@@ -886,11 +886,8 @@ def monitor_ccpair_permissions_taskset(
        record_type=RecordType.PERMISSION_SYNC_PROGRESS,
        data={
            "cc_pair_id": cc_pair_id,
-            "id": payload.id if payload else None,
-            "total_docs": initial if initial is not None else 0,
-            "remaining_docs": remaining,
-            "synced_docs": (initial - remaining) if initial is not None else 0,
-            "is_complete": remaining == 0,
+            "total_docs_synced": initial if initial is not None else 0,
+            "remaining_docs_to_sync": remaining,
        },
        tenant_id=tenant_id,
    )
@@ -906,6 +903,13 @@ def monitor_ccpair_permissions_taskset(
        f"num_synced={initial}"
    )

+    # Add telemetry for permission syncing complete
+    optional_telemetry(
+        record_type=RecordType.PERMISSION_SYNC_COMPLETE,
+        data={"cc_pair_id": cc_pair_id},
+        tenant_id=tenant_id,
+    )
+
    update_sync_record_status(
        db_session=db_session,
        entity_id=cc_pair_id,
--- a/backend/onyx/background/indexing/run_indexing.py
+++ b/backend/onyx/background/indexing/run_indexing.py
@@ -56,7 +56,6 @@ from onyx.indexing.indexing_pipeline import build_indexing_pipeline
 from onyx.natural_language_processing.search_nlp_models import (
    InformationContentClassificationModel,
 )
-from onyx.redis.redis_connector import RedisConnector
 from onyx.utils.logger import setup_logger
 from onyx.utils.logger import TaskAttemptSingleton
 from onyx.utils.telemetry import create_milestone_and_report
@@ -578,11 +577,8 @@ def _run_indexing(
                    data={
                        "index_attempt_id": index_attempt_id,
                        "cc_pair_id": ctx.cc_pair_id,
-                        "connector_id": ctx.connector_id,
-                        "credential_id": ctx.credential_id,
-                        "total_docs_indexed": document_count,
-                        "total_chunks": chunk_count,
-                        "batch_num": batch_num,
+                        "current_docs_indexed": document_count,
+                        "current_chunks_indexed": chunk_count,
                        "source": ctx.source.value,
                    },
                    tenant_id=tenant_id,
@@ -603,26 +599,15 @@ def _run_indexing(
                    checkpoint=checkpoint,
                )

-        # Add telemetry for completed indexing
-        redis_connector = RedisConnector(tenant_id, ctx.cc_pair_id)
-        redis_connector_index = redis_connector.new_index(
-            index_attempt_start.search_settings_id
-        )
-        final_progress = redis_connector_index.get_progress() or 0
-
        optional_telemetry(
            record_type=RecordType.INDEXING_COMPLETE,
            data={
                "index_attempt_id": index_attempt_id,
                "cc_pair_id": ctx.cc_pair_id,
-                "connector_id": ctx.connector_id,
-                "credential_id": ctx.credential_id,
                "total_docs_indexed": document_count,
                "total_chunks": chunk_count,
-                "batch_count": batch_num,
                "time_elapsed_seconds": time.monotonic() - start_time,
                "source": ctx.source.value,
-                "redis_progress": final_progress,
            },
            tenant_id=tenant_id,
        )
--- a/backend/onyx/connectors/salesforce/utils.py
+++ b/backend/onyx/connectors/salesforce/utils.py
@@ -25,6 +25,8 @@ class SalesforceObject:
        )


+# te
+
 # This defines the base path for all data files relative to this file
 # AKA BE CAREFUL WHEN MOVING THIS FILE
 BASE_DATA_PATH = os.path.join(os.path.dirname(__file__), "data")
--- a/backend/onyx/db/index_attempt.py
+++ b/backend/onyx/db/index_attempt.py
@@ -217,7 +217,6 @@ def mark_attempt_in_progress(
                "index_attempt_id": index_attempt.id,
                "status": IndexingStatus.IN_PROGRESS.value,
                "cc_pair_id": index_attempt.connector_credential_pair_id,
-                "search_settings_id": index_attempt.search_settings_id,
            },
        )
    except Exception:
@@ -246,9 +245,6 @@ def mark_attempt_succeeded(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.SUCCESS.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
@@ -277,9 +273,6 @@ def mark_attempt_partially_succeeded(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.COMPLETED_WITH_ERRORS.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
@@ -312,10 +305,6 @@ def mark_attempt_canceled(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.CANCELED.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "reason": reason,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
@@ -350,10 +339,6 @@ def mark_attempt_failed(
                "index_attempt_id": index_attempt_id,
                "status": IndexingStatus.FAILED.value,
                "cc_pair_id": attempt.connector_credential_pair_id,
-                "search_settings_id": attempt.search_settings_id,
-                "reason": failure_reason,
-                "total_docs_indexed": attempt.total_docs_indexed,
-                "new_docs_indexed": attempt.new_docs_indexed,
            },
        )
    except Exception:
--- a/backend/onyx/document_index/vespa/shared_utils/vespa_request_builders.py
+++ b/backend/onyx/document_index/vespa/shared_utils/vespa_request_builders.py
@@ -5,6 +5,7 @@ from datetime import timezone
 from onyx.configs.constants import INDEX_SEPARATOR
 from onyx.context.search.models import IndexFilters
 from onyx.document_index.interfaces import VespaChunkRequest
+from onyx.document_index.vespa_constants import ACCESS_CONTROL_LIST
 from onyx.document_index.vespa_constants import CHUNK_ID
 from onyx.document_index.vespa_constants import DOC_UPDATED_AT
 from onyx.document_index.vespa_constants import DOCUMENT_ID
@@ -74,8 +75,10 @@ def build_vespa_filters(
        filter_str += f'({TENANT_ID} contains "{filters.tenant_id}") and '

    # ACL filters
-    # if filters.access_control_list is not None:
-    #     filter_str += _build_or_filters(ACCESS_CONTROL_LIST, filters.access_control_list)
+    if filters.access_control_list is not None:
+        filter_str += _build_or_filters(
+            ACCESS_CONTROL_LIST, filters.access_control_list
+        )

    # Source type filters
    source_strs = (
--- a/backend/onyx/utils/telemetry.py
+++ b/backend/onyx/utils/telemetry.py
@@ -39,6 +39,7 @@ class RecordType(str, Enum):
    INDEXING_PROGRESS = "indexing_progress"
    INDEXING_COMPLETE = "indexing_complete"
    PERMISSION_SYNC_PROGRESS = "permission_sync_progress"
+    PERMISSION_SYNC_COMPLETE = "permission_sync_complete"
    INDEX_ATTEMPT_STATUS = "index_attempt_status"


--- a/backend/scripts/debugging/onyx_vespa.py
+++ b/backend/scripts/debugging/onyx_vespa.py
@@ -887,6 +887,7 @@ def main() -> None:
        type=int,
        help="Maximum number of documents to delete (for delete-all-documents)",
    )
+    parser.add_argument("--link", help="Document link (for get_acls filter)")

    args = parser.parse_args()
    vespa_debug = VespaDebugging(args.tenant_id)
@@ -924,7 +925,11 @@ def main() -> None:
    elif args.action == "get_acls":
        if args.cc_pair_id is None:
            parser.error("--cc-pair-id is required for get_acls action")
-        vespa_debug.acls(args.cc_pair_id, args.n)
+
+        if args.link is None:
+            vespa_debug.acls(args.cc_pair_id, args.n)
+        else:
+            vespa_debug.acls_by_link(args.cc_pair_id, args.link)


 if __name__ == "__main__":
--- a/backend/tests/integration/common_utils/managers/user.py
+++ b/backend/tests/integration/common_utils/managers/user.py
@@ -313,3 +313,29 @@ class UserManager:
        )
        response.raise_for_status()
        return UserInfo(**response.json())
+
+    @staticmethod
+    def invite_users(
+        user_performing_action: DATestUser,
+        emails: list[str],
+    ) -> int:
+        response = requests.put(
+            url=f"{API_SERVER_URL}/manage/admin/users",
+            json={"emails": emails},
+            headers=user_performing_action.headers,
+        )
+        response.raise_for_status()
+        return response.json()
+
+    @staticmethod
+    def remove_invited_user(
+        user_performing_action: DATestUser,
+        user_email: str,
+    ) -> int:
+        response = requests.patch(
+            url=f"{API_SERVER_URL}/manage/admin/remove-invited-user",
+            json={"user_email": user_email},
+            headers=user_performing_action.headers,
+        )
+        response.raise_for_status()
+        return response.json()
--- a/backend/tests/integration/common_utils/reset.py
+++ b/backend/tests/integration/common_utils/reset.py
@@ -22,6 +22,7 @@ from onyx.document_index.document_index_utils import get_multipass_config
 from onyx.document_index.vespa.index import DOCUMENT_ID_ENDPOINT
 from onyx.document_index.vespa.index import VespaIndex
 from onyx.indexing.models import IndexingSetting
+from onyx.redis.redis_pool import get_redis_client
 from onyx.setup import setup_postgres
 from onyx.setup import setup_vespa
 from onyx.utils.logger import setup_logger
@@ -237,6 +238,12 @@ def reset_vespa() -> None:
            time.sleep(5)


+def reset_redis() -> None:
+    """Reset the Redis database."""
+    redis_client = get_redis_client()
+    redis_client.flushall()
+
+
 def reset_postgres_multitenant() -> None:
    """Reset the Postgres database for all tenants in a multitenant setup."""

@@ -341,6 +348,8 @@ def reset_all() -> None:
    reset_postgres()
    logger.info("Resetting Vespa...")
    reset_vespa()
+    logger.info("Resetting Redis...")
+    reset_redis()


 def reset_all_multitenant() -> None:
--- a/backend/tests/integration/tests/auth/test_user_invitation.py
+++ b/backend/tests/integration/tests/auth/test_user_invitation.py
@@ -0,0 +1,38 @@
+import pytest
+from requests import HTTPError
+
+from onyx.auth.schemas import UserRole
+from tests.integration.common_utils.managers.user import UserManager
+from tests.integration.common_utils.test_models import DATestUser
+
+
+def test_inviting_users_flow(reset: None) -> None:
+    """
+    Test that verifies the functionality around inviting users:
+      1. Creating an admin user
+      2. Admin inviting a new user
+      3. Invited user successfully signing in
+      4. Non-invited user attempting to sign in (should result in an error)
+    """
+    # 1) Create an admin user (the first user created is automatically admin)
+    admin_user: DATestUser = UserManager.create(name="admin_user")
+    assert admin_user is not None
+    assert UserManager.is_role(admin_user, UserRole.ADMIN)
+
+    # 2) Admin invites a new user
+    invited_email = "invited_user@test.com"
+    invite_response = UserManager.invite_users(admin_user, [invited_email])
+
+    assert invite_response == 1
+
+    # 3) The invited user successfully registers/logs in
+    invited_user: DATestUser = UserManager.create(
+        name="invited_user", email=invited_email
+    )
+    assert invited_user is not None
+    assert invited_user.email == invited_email
+    assert UserManager.is_role(invited_user, UserRole.BASIC)
+
+    # 4) A non-invited user attempts to sign in/register (should fail)
+    with pytest.raises(HTTPError):
+        UserManager.create(name="uninvited_user", email="uninvited_user@test.com")
--- a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
+++ b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx
@@ -302,11 +302,17 @@ export default function AddConnector({
          ...connector_specific_config
        } = values;

-        // Apply transforms from connectors.ts configuration
+        // Apply special transforms according to application logic
        const transformedConnectorSpecificConfig = Object.entries(
          connector_specific_config
        ).reduce(
          (acc, [key, value]) => {
+            // Filter out empty strings from arrays
+            if (Array.isArray(value)) {
+              value = (value as any[]).filter(
+                (item) => typeof item !== "string" || item.trim() !== ""
+              );
+            }
            const matchingConfigValue = configuration.values.find(
              (configValue) => configValue.name === key
            );
--- a/web/src/app/chat/RegenerateOption.tsx
+++ b/web/src/app/chat/RegenerateOption.tsx
@@ -4,177 +4,62 @@ import {
  LlmDescriptor,
  useLlmManager,
 } from "@/lib/hooks";
-import { StringOrNumberOption } from "@/components/Dropdown";

 import { Persona } from "@/app/admin/assistants/interfaces";
-import { destructureValue, getFinalLLM, structureValue } from "@/lib/llm/utils";
+import { destructureValue } from "@/lib/llm/utils";
 import { useState } from "react";
 import { Hoverable } from "@/components/Hoverable";
-import { Popover } from "@/components/popover/Popover";
 import { IconType } from "react-icons";
-import { FiRefreshCw, FiCheck } from "react-icons/fi";
-
-export function RegenerateDropdown({
-  options,
-  selected,
-  onSelect,
-  side,
-  maxHeight,
-  alternate,
-  onDropdownVisibleChange,
-}: {
-  alternate?: string;
-  options: StringOrNumberOption[];
-  selected: string | null;
-  onSelect: (value: string | number | null) => void;
-  includeDefault?: boolean;
-  side?: "top" | "right" | "bottom" | "left";
-  maxHeight?: string;
-  onDropdownVisibleChange: (isVisible: boolean) => void;
-}) {
-  const [isOpen, setIsOpen] = useState(false);
-
-  const toggleDropdownVisible = (isVisible: boolean) => {
-    setIsOpen(isVisible);
-    onDropdownVisibleChange(isVisible);
-  };
-
-  const Dropdown = (
-    <div className="overflow-y-auto border border-neutral-800  py-2 min-w-fit bg-neutral-50 dark:bg-neutral-900 rounded-md shadow-lg">
-      <div className="mb-1 flex items-center justify-between px-4 pt-2">
-        <span className="text-sm text-neutral-600 dark:text-neutral-400">
-          Regenerate with
-        </span>
-      </div>
-      {options.map((option) => (
-        <div
-          key={option.value}
-          role="menuitem"
-          className={`flex items-center m-1.5 p-1.5 text-sm cursor-pointer focus-visible:outline-0 group relative hover:bg-neutral-200 dark:hover:bg-neutral-800 rounded-md my-0 px-3 mx-2 gap-2.5 py-3 !pr-3 ${
-            option.value === selected
-              ? "bg-neutral-200 dark:bg-neutral-800"
-              : ""
-          }`}
-          onClick={() => onSelect(option.value)}
-        >
-          <div className="flex grow items-center justify-between gap-2">
-            <div>
-              <div className="flex items-center gap-3">
-                <div>{getDisplayNameForModel(option.name)}</div>
-              </div>
-            </div>
-          </div>
-          {option.value === selected && (
-            <FiCheck className="text-neutral-700 dark:text-neutral-300" />
-          )}
-        </div>
-      ))}
-    </div>
-  );
-
-  return (
-    <Popover
-      open={isOpen}
-      onOpenChange={toggleDropdownVisible}
-      content={
-        <div onClick={() => toggleDropdownVisible(!isOpen)}>
-          {!alternate ? (
-            <Hoverable size={16} icon={FiRefreshCw as IconType} />
-          ) : (
-            <Hoverable
-              size={16}
-              icon={FiRefreshCw as IconType}
-              hoverText={getDisplayNameForModel(alternate)}
-            />
-          )}
-        </div>
-      }
-      popover={Dropdown}
-      align="start"
-      side={side}
-      sideOffset={5}
-      triggerMaxWidth
-    />
-  );
-}
+import { FiRefreshCw } from "react-icons/fi";
+import LLMPopover from "./input/LLMPopover";

 export default function RegenerateOption({
  selectedAssistant,
  regenerate,
  overriddenModel,
-  onHoverChange,
  onDropdownVisibleChange,
 }: {
  selectedAssistant: Persona;
  regenerate: (modelOverRide: LlmDescriptor) => Promise<void>;
  overriddenModel?: string;
-  onHoverChange: (isHovered: boolean) => void;
  onDropdownVisibleChange: (isVisible: boolean) => void;
 }) {
  const { llmProviders } = useChatContext();
  const llmManager = useLlmManager(llmProviders);
-
-  const [_, llmName] = getFinalLLM(llmProviders, selectedAssistant, null);
-
-  const llmOptionsByProvider: {
-    [provider: string]: { name: string; value: string }[];
-  } = {};
-  const uniqueModelNames = new Set<string>();
-
-  llmProviders.forEach((llmProvider) => {
-    if (!llmOptionsByProvider[llmProvider.provider]) {
-      llmOptionsByProvider[llmProvider.provider] = [];
-    }
-
-    (llmProvider.display_model_names || llmProvider.model_names).forEach(
-      (modelName) => {
-        if (!uniqueModelNames.has(modelName)) {
-          uniqueModelNames.add(modelName);
-          llmOptionsByProvider[llmProvider.provider].push({
-            name: modelName,
-            value: structureValue(
-              llmProvider.name,
-              llmProvider.provider,
-              modelName
-            ),
-          });
-        }
-      }
-    );
-  });
-
-  const llmOptions = Object.entries(llmOptionsByProvider).flatMap(
-    ([provider, options]) => [...options]
-  );
-
-  const currentModelName =
-    llmManager?.currentLlm.modelName ||
-    (selectedAssistant
-      ? selectedAssistant.llm_model_version_override || llmName
-      : llmName);
+  const [isOpen, setIsOpen] = useState(false);
+  const toggleDropdownVisible = (isVisible: boolean) => {
+    setIsOpen(isVisible);
+    onDropdownVisibleChange(isVisible);
+  };

  return (
-    <div
-      className="group flex items-center relative"
-      onMouseEnter={() => onHoverChange(true)}
-      onMouseLeave={() => onHoverChange(false)}
-    >
-      <RegenerateDropdown
-        onDropdownVisibleChange={onDropdownVisibleChange}
-        alternate={overriddenModel}
-        options={llmOptions}
-        selected={currentModelName}
-        onSelect={(value) => {
-          const { name, provider, modelName } = destructureValue(
-            value as string
-          );
-          regenerate({
-            name: name,
-            provider: provider,
-            modelName: modelName,
-          });
-        }}
-      />
-    </div>
+    <LLMPopover
+      llmManager={llmManager}
+      llmProviders={llmProviders}
+      requiresImageGeneration={false}
+      currentAssistant={selectedAssistant}
+      currentModelName={overriddenModel}
+      trigger={
+        <div onClick={() => toggleDropdownVisible(!isOpen)}>
+          {!overriddenModel ? (
+            <Hoverable size={16} icon={FiRefreshCw as IconType} />
+          ) : (
+            <Hoverable
+              size={16}
+              icon={FiRefreshCw as IconType}
+              hoverText={getDisplayNameForModel(overriddenModel)}
+            />
+          )}
+        </div>
+      }
+      onSelect={(value) => {
+        const { name, provider, modelName } = destructureValue(value as string);
+        regenerate({
+          name: name,
+          provider: provider,
+          modelName: modelName,
+        });
+      }}
+    />
  );
 }
--- a/web/src/app/chat/input/ChatInputBar.tsx
+++ b/web/src/app/chat/input/ChatInputBar.tsx
@@ -6,7 +6,7 @@ import { Persona } from "@/app/admin/assistants/interfaces";
 import LLMPopover from "./LLMPopover";
 import { InputPrompt } from "@/app/chat/interfaces";

-import { FilterManager, LlmManager } from "@/lib/hooks";
+import { FilterManager, getDisplayNameForModel, LlmManager } from "@/lib/hooks";
 import { useChatContext } from "@/components/context/ChatContext";
 import { ChatFileType, FileDescriptor } from "../interfaces";
 import {
@@ -38,6 +38,7 @@ import { useUser } from "@/components/user/UserProvider";
 import { useDocumentSelection } from "../useDocumentSelection";
 import { AgenticToggle } from "./AgenticToggle";
 import { SettingsContext } from "@/components/settings/SettingsProvider";
+import { getProviderIcon } from "@/app/admin/configuration/llm/interfaces";
 import { LoadingIndicator } from "react-select/dist/declarations/src/components/indicators";
 import { FidgetSpinner } from "react-loader-spinner";
 import { LoadingAnimation } from "@/components/Loading";
@@ -799,6 +800,27 @@ export function ChatInputBar({
                  llmManager={llmManager}
                  requiresImageGeneration={false}
                  currentAssistant={selectedAssistant}
+                  trigger={
+                    <button
+                      className="dark:text-white text-black focus:outline-none"
+                      data-testid="llm-popover-trigger"
+                    >
+                      <ChatInputOption
+                        minimize
+                        toggle
+                        flexPriority="stiff"
+                        name={getDisplayNameForModel(
+                          llmManager?.currentLlm.modelName || "Models"
+                        )}
+                        Icon={getProviderIcon(
+                          llmManager?.currentLlm.provider || "anthropic",
+                          llmManager?.currentLlm.modelName ||
+                            "claude-3-5-sonnet-20240620"
+                        )}
+                        tooltipContent="Switch models"
+                      />
+                    </button>
+                  }
                />

                {retrievalEnabled && (
--- a/web/src/app/chat/input/LLMPopover.tsx
+++ b/web/src/app/chat/input/LLMPopover.tsx
@@ -1,16 +1,9 @@
-import React, {
-  useState,
-  useEffect,
-  useCallback,
-  useLayoutEffect,
-  useMemo,
-} from "react";
+import React, { useState, useEffect, useCallback, useMemo } from "react";
 import {
  Popover,
  PopoverContent,
  PopoverTrigger,
 } from "@/components/ui/popover";
-import { ChatInputOption } from "./ChatInputOption";
 import { getDisplayNameForModel } from "@/lib/hooks";
 import {
  checkLLMSupportsImageInput,
@@ -35,12 +28,16 @@ import { FiAlertTriangle } from "react-icons/fi";
 import { Slider } from "@/components/ui/slider";
 import { useUser } from "@/components/user/UserProvider";
 import { TruncatedText } from "@/components/ui/truncatedText";
+import { ChatInputOption } from "./ChatInputOption";

 interface LLMPopoverProps {
  llmProviders: LLMProviderDescriptor[];
  llmManager: LlmManager;
  requiresImageGeneration?: boolean;
  currentAssistant?: Persona;
+  trigger?: React.ReactElement;
+  onSelect?: (value: string) => void;
+  currentModelName?: string;
 }

 export default function LLMPopover({
@@ -48,70 +45,69 @@ export default function LLMPopover({
  llmManager,
  requiresImageGeneration,
  currentAssistant,
+  trigger,
+  onSelect,
+  currentModelName,
 }: LLMPopoverProps) {
  const [isOpen, setIsOpen] = useState(false);
  const { user } = useUser();

  // Memoize the options to prevent unnecessary recalculations
-  const {
-    llmOptionsByProvider,
-    llmOptions,
-    defaultProvider,
-    defaultModelDisplayName,
-  } = useMemo(() => {
-    const llmOptionsByProvider: {
-      [provider: string]: {
-        name: string;
-        value: string;
-        icon: React.FC<{ size?: number; className?: string }>;
-      }[];
-    } = {};
+  const { llmOptions, defaultProvider, defaultModelDisplayName } =
+    useMemo(() => {
+      const llmOptionsByProvider: {
+        [provider: string]: {
+          name: string;
+          value: string;
+          icon: React.FC<{ size?: number; className?: string }>;
+        }[];
+      } = {};

-    const uniqueModelNames = new Set<string>();
+      const uniqueModelNames = new Set<string>();

-    llmProviders.forEach((llmProvider) => {
-      if (!llmOptionsByProvider[llmProvider.provider]) {
-        llmOptionsByProvider[llmProvider.provider] = [];
-      }
-
-      (llmProvider.display_model_names || llmProvider.model_names).forEach(
-        (modelName) => {
-          if (!uniqueModelNames.has(modelName)) {
-            uniqueModelNames.add(modelName);
-            llmOptionsByProvider[llmProvider.provider].push({
-              name: modelName,
-              value: structureValue(
-                llmProvider.name,
-                llmProvider.provider,
-                modelName
-              ),
-              icon: getProviderIcon(llmProvider.provider, modelName),
-            });
-          }
+      llmProviders.forEach((llmProvider) => {
+        if (!llmOptionsByProvider[llmProvider.provider]) {
+          llmOptionsByProvider[llmProvider.provider] = [];
        }
+
+        (llmProvider.display_model_names || llmProvider.model_names).forEach(
+          (modelName) => {
+            if (!uniqueModelNames.has(modelName)) {
+              uniqueModelNames.add(modelName);
+              llmOptionsByProvider[llmProvider.provider].push({
+                name: modelName,
+                value: structureValue(
+                  llmProvider.name,
+                  llmProvider.provider,
+                  modelName
+                ),
+                icon: getProviderIcon(llmProvider.provider, modelName),
+              });
+            }
+          }
+        );
+      });
+
+      const llmOptions = Object.entries(llmOptionsByProvider).flatMap(
+        ([provider, options]) => [...options]
      );
-    });

-    const llmOptions = Object.entries(llmOptionsByProvider).flatMap(
-      ([provider, options]) => [...options]
-    );
+      const defaultProvider = llmProviders.find(
+        (llmProvider) => llmProvider.is_default_provider
+      );

-    const defaultProvider = llmProviders.find(
-      (llmProvider) => llmProvider.is_default_provider
-    );
+      const defaultModelName = defaultProvider?.default_model_name;
+      const defaultModelDisplayName = defaultModelName
+        ? getDisplayNameForModel(defaultModelName)
+        : null;

-    const defaultModelName = defaultProvider?.default_model_name;
-    const defaultModelDisplayName = defaultModelName
-      ? getDisplayNameForModel(defaultModelName)
-      : null;
-
-    return {
-      llmOptionsByProvider,
-      llmOptions,
-      defaultProvider,
-      defaultModelDisplayName,
-    };
-  }, [llmProviders]);
+      return {
+        llmOptionsByProvider,
+        llmOptions,
+        defaultProvider,
+        defaultModelDisplayName,
+      };
+    }, [llmProviders]);

  const [localTemperature, setLocalTemperature] = useState(
    llmManager.temperature ?? 0.5
@@ -135,32 +131,34 @@ export default function LLMPopover({

  // Memoize trigger content to prevent rerendering
  const triggerContent = useMemo(
-    () => (
-      <button
-        className="dark:text-[#fff] text-[#000] focus:outline-none"
-        data-testid="llm-popover-trigger"
-      >
-        <ChatInputOption
-          minimize
-          toggle
-          flexPriority="stiff"
-          name={getDisplayNameForModel(
-            llmManager?.currentLlm.modelName ||
-              defaultModelDisplayName ||
-              "Models"
-          )}
-          Icon={getProviderIcon(
-            llmManager?.currentLlm.provider ||
-              defaultProvider?.provider ||
-              "anthropic",
-            llmManager?.currentLlm.modelName ||
-              defaultProvider?.default_model_name ||
-              "claude-3-5-sonnet-20240620"
-          )}
-          tooltipContent="Switch models"
-        />
-      </button>
-    ),
+    trigger
+      ? () => trigger
+      : () => (
+          <button
+            className="dark:text-[#fff] text-[#000] focus:outline-none"
+            data-testid="llm-popover-trigger"
+          >
+            <ChatInputOption
+              minimize
+              toggle
+              flexPriority="stiff"
+              name={getDisplayNameForModel(
+                llmManager?.currentLlm.modelName ||
+                  defaultModelDisplayName ||
+                  "Models"
+              )}
+              Icon={getProviderIcon(
+                llmManager?.currentLlm.provider ||
+                  defaultProvider?.provider ||
+                  "anthropic",
+                llmManager?.currentLlm.modelName ||
+                  defaultProvider?.default_model_name ||
+                  "claude-3-5-sonnet-20240620"
+              )}
+              tooltipContent="Switch models"
+            />
+          </button>
+        ),
    [defaultModelDisplayName, defaultProvider, llmManager?.currentLlm]
  );

@@ -178,12 +176,14 @@ export default function LLMPopover({
                <button
                  key={index}
                  className={`w-full flex items-center gap-x-2 px-3 py-2 text-sm text-left hover:bg-background-100 dark:hover:bg-neutral-800 transition-colors duration-150 ${
-                    llmManager.currentLlm.modelName === name
+                    (currentModelName || llmManager.currentLlm.modelName) ===
+                    name
                      ? "bg-background-100 dark:bg-neutral-900 text-text"
                      : "text-text-darker"
                  }`}
                  onClick={() => {
                    llmManager.updateCurrentLlm(destructureValue(value));
+                    onSelect?.(value);
                    setIsOpen(false);
                  }}
                >
--- a/web/src/app/chat/message/AgenticMessage.tsx
+++ b/web/src/app/chat/message/AgenticMessage.tsx
@@ -178,7 +178,6 @@ export const AgenticMessage = ({
  const [isViewingInitialAnswer, setIsViewingInitialAnswer] = useState(true);

  const [canShowResponse, setCanShowResponse] = useState(isComplete);
-  const [isRegenerateHovered, setIsRegenerateHovered] = useState(false);
  const [isRegenerateDropdownVisible, setIsRegenerateDropdownVisible] =
    useState(false);

@@ -597,7 +596,6 @@ export const AgenticMessage = ({
                                onDropdownVisibleChange={
                                  setIsRegenerateDropdownVisible
                                }
-                                onHoverChange={setIsRegenerateHovered}
                                selectedAssistant={currentPersona!}
                                regenerate={regenerate}
                                overriddenModel={overriddenModel}
@@ -613,16 +611,10 @@ export const AgenticMessage = ({
                          absolute -bottom-5
                          z-10
                          invisible ${
-                            (isHovering ||
-                              isRegenerateHovered ||
-                              settings?.isMobile) &&
-                            "!visible"
+                            (isHovering || settings?.isMobile) && "!visible"
                          }
                          opacity-0 ${
-                            (isHovering ||
-                              isRegenerateHovered ||
-                              settings?.isMobile) &&
-                            "!opacity-100"
+                            (isHovering || settings?.isMobile) && "!opacity-100"
                          }
                          translate-y-2 ${
                            (isHovering || settings?.isMobile) &&
@@ -697,7 +689,6 @@ export const AgenticMessage = ({
                                }
                                regenerate={regenerate}
                                overriddenModel={overriddenModel}
-                                onHoverChange={setIsRegenerateHovered}
                              />
                            </CustomTooltip>
                          )}
--- a/web/src/app/chat/message/Messages.tsx
+++ b/web/src/app/chat/message/Messages.tsx
@@ -301,7 +301,6 @@ export const AIMessage = ({

  const finalContent = processContent(content as string);

-  const [isRegenerateHovered, setIsRegenerateHovered] = useState(false);
  const [isRegenerateDropdownVisible, setIsRegenerateDropdownVisible] =
    useState(false);
  const { isHovering, trackedElementRef, hoverElementRef } = useMouseTracking();
@@ -728,7 +727,6 @@ export const AIMessage = ({
                                onDropdownVisibleChange={
                                  setIsRegenerateDropdownVisible
                                }
-                                onHoverChange={setIsRegenerateHovered}
                                selectedAssistant={currentPersona!}
                                regenerate={regenerate}
                                overriddenModel={overriddenModel}
@@ -744,16 +742,10 @@ export const AIMessage = ({
                        absolute -bottom-5
                        z-10
                        invisible ${
-                          (isHovering ||
-                            isRegenerateHovered ||
-                            settings?.isMobile) &&
-                          "!visible"
+                          (isHovering || settings?.isMobile) && "!visible"
                        }
                        opacity-0 ${
-                          (isHovering ||
-                            isRegenerateHovered ||
-                            settings?.isMobile) &&
-                          "!opacity-100"
+                          (isHovering || settings?.isMobile) && "!opacity-100"
                        }
                        flex md:flex-row gap-x-0.5 bg-background-125/40 -mx-1.5 p-1.5 rounded-lg
                        `}
@@ -818,7 +810,6 @@ export const AIMessage = ({
                                }
                                regenerate={regenerate}
                                overriddenModel={overriddenModel}
-                                onHoverChange={setIsRegenerateHovered}
                              />
                            </CustomTooltip>
                          )}
--- a/web/src/lib/connectors/connectors.tsx
+++ b/web/src/lib/connectors/connectors.tsx
@@ -1333,10 +1333,10 @@ export function createConnectorValidationSchema(
 ): Yup.ObjectSchema<Record<string, any>> {
  const configuration = connectorConfigs[connector];

-  return Yup.object().shape({
+  const object = Yup.object().shape({
    access_type: Yup.string().required("Access Type is required"),
    name: Yup.string().required("Connector Name is required"),
-    ...configuration.values.reduce(
+    ...[...configuration.values, ...configuration.advanced_values].reduce(
      (acc, field) => {
        let schema: any =
          field.type === "select"
@@ -1363,6 +1363,8 @@ export function createConnectorValidationSchema(
    pruneFreq: Yup.number().min(0, "Prune frequency must be non-negative"),
    refreshFreq: Yup.number().min(0, "Refresh frequency must be non-negative"),
  });
+
+  return object;
 }

 export const defaultPruneFreqDays = 30; // 30 days
Author	SHA1	Message	Date
Weves	d38e8cf595	test1	2025-04-01 16:24:57 -07:00
Weves	1f1ab566ec	test	2025-04-01 16:24:11 -07:00
Weves	b7ece296e0	Additional logging to salesforce perm sync	2025-04-01 16:19:50 -07:00
Richard Kuo (Onyx)	d7063e0a1d	expose acl link feature in onyx_vespa	2025-04-01 16:19:50 -07:00
pablonyx	ee073f6d30	Tracking things (#4352 )	2025-04-01 16:19:50 -07:00
Raunak Bhagat	2e524816a0	Regen (#4409 ) * Edit styling of regeneration dropdown * Finish regeneration style changes * Remove invalid props * Update web/src/app/chat/input/ChatInputBar.tsx Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * Remove unused variables --------- Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>	2025-04-01 16:19:50 -07:00
pablonyx	47ef0c8658	Still delete cookies (#4404 )	2025-04-01 16:19:50 -07:00
pablonyx	806de92feb	Add user invitation test (#4161 )	2025-04-01 16:19:50 -07:00
pablonyx	da39f32fea	Validate advanced fields + proper yup assurances for lists (#4399 )	2025-04-01 16:19:50 -07:00
pablonyx	2a87837ce1	Very minor auth standardization (#4400 )	2025-04-01 16:19:50 -07:00
pablonyx	7491cdd0f0	Update migration (#4410 )	2025-04-01 16:19:50 -07:00
SubashMohan	aabd698295	refactor tests for Highspot connector to use mocking for API key retrieval (#4346 )	2025-04-01 16:19:50 -07:00
Weves	4b725e4d1a	Init engine in slackbot	2025-04-01 16:19:50 -07:00
rkuo-danswer	34d2d92fa8	also set permission upsert to medium priority (#4405 ) Co-authored-by: Richard Kuo (Onyx) <rkuo@onyx.app>	2025-04-01 16:19:50 -07:00
pablonyx	3a3b2a2f8d	add user files (#4152 )	2025-04-01 16:19:44 -07:00