k

.github/workflows/multi-tenant-tests.yml

@@ -0,0 +1,111 @@
+name: Run Multi-Tenant Integration Tests
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+      - "release/**"
+
+env:
+  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+  SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+  CONFLUENCE_TEST_SPACE_URL: ${{ secrets.CONFLUENCE_TEST_SPACE_URL }}
+  CONFLUENCE_USER_NAME: ${{ secrets.CONFLUENCE_USER_NAME }}
+  CONFLUENCE_ACCESS_TOKEN: ${{ secrets.CONFLUENCE_ACCESS_TOKEN }}
+
+jobs:
+  multi-tenant-integration-tests:
+    runs-on:
+      [runs-on, runner=8cpu-linux-x64, ram=16, "run-id=${{ github.run_id }}"]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Pull Required Docker Images
+        run: |
+          docker pull danswer/danswer-backend:latest
+          docker tag danswer/danswer-backend:latest danswer/danswer-backend:test
+
+          docker pull danswer/danswer-model-server:latest
+          docker tag danswer/danswer-model-server:latest danswer/danswer-model-server:test
+
+          docker pull danswer/danswer-web-server:latest
+          docker tag danswer/danswer-web-server:latest danswer/danswer-web-server:test
+
+          docker pull danswer/control-tenants-service:latest
+          docker tag danswer/control-tenants-service:latest danswer/control-tenants-service:test
+
+      - name: Build Integration Test Docker Image
+        uses: ./.github/actions/custom-build-and-push
+        with:
+          context: ./backend
+          file: ./backend/tests/integration/Dockerfile
+          platforms: linux/amd64
+          tags: danswer/danswer-integration:test
+          push: false
+          load: true
+
+      - name: Start Docker Containers for Multi-Tenant Tests
+        run: |
+          cd deployment/docker_compose
+          ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=true \
+          MULTI_TENANT=true \
+          INTEGRATION_TEST_MODE=true \  
+          AUTH_TYPE=basic \
+          REQUIRE_EMAIL_VERIFICATION=false \
+          DISABLE_TELEMETRY=true \
+          IMAGE_TAG=test \
+          CONTROL_TENANTS_SERVICE_IMAGE=danswer/control-tenants-service:test \
+          docker compose -f docker-compose.dev.yml -f docker-compose.multi-tenant.yml -p danswer-stack up -d
+
+      - name: Run Multi-Tenant Integration Tests
+        run: |
+          echo "Running multi-tenant integration tests..."
+          docker run --rm --network danswer-stack_default \
+            --name test-runner \
+            -e POSTGRES_HOST=relational_db \
+            -e POSTGRES_USER=postgres \
+            -e POSTGRES_PASSWORD=password \
+            -e POSTGRES_DB=postgres \
+            -e VESPA_HOST=index \
+            -e REDIS_HOST=cache \
+            -e API_SERVER_HOST=api_server \
+            -e OPENAI_API_KEY=${OPENAI_API_KEY} \
+            -e SLACK_BOT_TOKEN=${SLACK_BOT_TOKEN} \
+            -e TEST_WEB_HOSTNAME=test-runner \
+            -e AUTH_TYPE=cloud \
+            -e MULTI_TENANT=true \
+            danswer/danswer-integration:test \
+            /app/tests/integration/multitenant_tests
+        continue-on-error: true
+        id: run_multitenant_tests
+
+      - name: Check Multi-Tenant Test Results
+        run: |
+          if [ ${{ steps.run_multitenant_tests.outcome }} == 'failure' ]; then
+            echo "Integration tests failed. Exiting with error."
+            exit 1
+          else
+            echo "All integration tests passed successfully."
+          fi
+
+      - name: Stop Docker Containers
+        run: |
+          cd deployment/docker_compose
+          docker compose -f docker-compose.dev.yml -p danswer-stack down -v
+
+      - name: Upload Logs
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-logs
+          path: ${{ github.workspace }}/docker-compose.log

.github/workflows/pr-integration-tests.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/**'
+      - "release/**"
 
 env:
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
@@ -16,11 +16,12 @@ env:
   CONFLUENCE_TEST_SPACE_URL: ${{ secrets.CONFLUENCE_TEST_SPACE_URL }}
   CONFLUENCE_USER_NAME: ${{ secrets.CONFLUENCE_USER_NAME }}
   CONFLUENCE_ACCESS_TOKEN: ${{ secrets.CONFLUENCE_ACCESS_TOKEN }}
-  
+
 jobs:
   integration-tests:
     # See https://runs-on.com/runners/linux/
-    runs-on: [runs-on,runner=8cpu-linux-x64,ram=16,"run-id=${{ github.run_id }}"]
+    runs-on:
+      [runs-on, runner=8cpu-linux-x64, ram=16, "run-id=${{ github.run_id }}"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -36,9 +37,9 @@ jobs:
 
       # tag every docker image with "test" so that we can spin up the correct set
       # of images during testing
-      
+
       # We don't need to build the Web Docker image since it's not yet used
-      # in the integration tests. We have a separate action to verify that it builds 
+      # in the integration tests. We have a separate action to verify that it builds
       # successfully.
       - name: Pull Web Docker image
         run: |
@@ -50,7 +51,7 @@ jobs:
       # https://runs-on.com/caching/s3-cache-for-github-actions/
       # https://runs-on.com/caching/docker/
       # https://github.com/moby/buildkit#s3-cache-experimental
-      
+
       # images are built and run locally for testing purposes. Not pushed.
       - name: Build Backend Docker image
         uses: ./.github/actions/custom-build-and-push
@@ -75,7 +76,7 @@ jobs:
           load: true
           cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
           cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
-      
+
       - name: Build integration test Docker image
         uses: ./.github/actions/custom-build-and-push
         with:
@@ -88,58 +89,7 @@ jobs:
           cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
           cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
 
-      # Start containers for multi-tenant tests
-      - name: Start Docker containers for multi-tenant tests
-        run: |
-          cd deployment/docker_compose
-          ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=true \
-          MULTI_TENANT=true \
-          AUTH_TYPE=basic \
-          REQUIRE_EMAIL_VERIFICATION=false \
-          DISABLE_TELEMETRY=true \
-          IMAGE_TAG=test \
-          docker compose -f docker-compose.dev.yml -p danswer-stack up -d
-        id: start_docker_multi_tenant
-
-      # In practice, `cloud` Auth type would require OAUTH credentials to be set.
-      - name: Run Multi-Tenant Integration Tests
-        run: |
-          echo "Running integration tests..."
-          docker run --rm --network danswer-stack_default \
-            --name test-runner \
-            -e POSTGRES_HOST=relational_db \
-            -e POSTGRES_USER=postgres \
-            -e POSTGRES_PASSWORD=password \
-            -e POSTGRES_DB=postgres \
-            -e VESPA_HOST=index \
-            -e REDIS_HOST=cache \
-            -e API_SERVER_HOST=api_server \
-            -e OPENAI_API_KEY=${OPENAI_API_KEY} \
-            -e SLACK_BOT_TOKEN=${SLACK_BOT_TOKEN} \
-            -e TEST_WEB_HOSTNAME=test-runner \
-            -e AUTH_TYPE=cloud \
-            -e MULTI_TENANT=true \
-            danswer/danswer-integration:test \
-            /app/tests/integration/multitenant_tests
-        continue-on-error: true
-        id: run_multitenant_tests
-
-      - name: Check multi-tenant test results
-        run: |
-          if [ ${{ steps.run_tests.outcome }} == 'failure' ]; then
-            echo "Integration tests failed. Exiting with error."
-            exit 1
-          else
-            echo "All integration tests passed successfully."
-          fi 
-
-      - name: Stop multi-tenant Docker containers
-        run: |
-          cd deployment/docker_compose
-          docker compose -f docker-compose.dev.yml -p danswer-stack down -v
-
-
-      - name: Start Docker containers 
+      - name: Start Docker containers
         run: |
           cd deployment/docker_compose
           ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=true \
@@ -153,12 +103,12 @@ jobs:
       - name: Wait for service to be ready
         run: |
           echo "Starting wait-for-service script..."
-          
+
           docker logs -f danswer-stack-api_server-1 &
 
           start_time=$(date +%s)
           timeout=300  # 5 minutes in seconds
-          
+
           while true; do
             current_time=$(date +%s)
             elapsed_time=$((current_time - start_time))
@@ -229,7 +179,7 @@ jobs:
         run: |
           cd deployment/docker_compose
           docker compose -f docker-compose.dev.yml -p danswer-stack down -v
-      
+
       - name: Upload logs
         if: success() || failure()
         uses: actions/upload-artifact@v4

.github/workflows/pr-python-connector-tests.yml

@@ -24,8 +24,6 @@ env:
   GOOGLE_DRIVE_OAUTH_CREDENTIALS_JSON_STR: ${{ secrets.GOOGLE_DRIVE_OAUTH_CREDENTIALS_JSON_STR }}
   GOOGLE_GMAIL_SERVICE_ACCOUNT_JSON_STR: ${{ secrets.GOOGLE_GMAIL_SERVICE_ACCOUNT_JSON_STR }}
   GOOGLE_GMAIL_OAUTH_CREDENTIALS_JSON_STR: ${{ secrets.GOOGLE_GMAIL_OAUTH_CREDENTIALS_JSON_STR }}
-  # Slab
-  SLAB_BOT_TOKEN: ${{ secrets.SLAB_BOT_TOKEN }}
 
 jobs:
   connectors-check:

backend/Dockerfile

@@ -73,7 +73,6 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /usr/local/lib/python3.11/site-packages/tornado/test/test.key
 
-
 # Pre-downloading models for setups with limited egress
 RUN python -c "from tokenizers import Tokenizer; \
 Tokenizer.from_pretrained('nomic-ai/nomic-embed-text-v1')"

backend/alembic/env.py

@@ -1,5 +1,5 @@
 from sqlalchemy.engine.base import Connection
-from typing import Literal
+from typing import Any
 import asyncio
 from logging.config import fileConfig
 import logging
@@ -8,7 +8,6 @@ from alembic import context
 from sqlalchemy import pool
 from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.sql import text
-from sqlalchemy.sql.schema import SchemaItem
 
 from shared_configs.configs import MULTI_TENANT
 from danswer.db.engine import build_connection_string
@@ -36,18 +35,7 @@ logger = logging.getLogger(__name__)
 
 
 def include_object(
-    object: SchemaItem,
-    name: str | None,
-    type_: Literal[
-        "schema",
-        "table",
-        "column",
-        "index",
-        "unique_constraint",
-        "foreign_key_constraint",
-    ],
-    reflected: bool,
-    compare_to: SchemaItem | None,
+    object: Any, name: str, type_: str, reflected: bool, compare_to: Any
 ) -> bool:
     """
     Determines whether a database object should be included in migrations.

backend/alembic/versions/a8c2065484e6_add_auto_scroll_to_user_model.py

@@ -1,27 +0,0 @@
-"""add auto scroll to user model
-
-Revision ID: a8c2065484e6
-Revises: abe7378b8217
-Create Date: 2024-11-22 17:34:09.690295
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = "a8c2065484e6"
-down_revision = "abe7378b8217"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "user",
-        sa.Column("auto_scroll", sa.Boolean(), nullable=True, server_default=None),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("user", "auto_scroll")

backend/alembic_tenants/env.py

@@ -1,6 +1,5 @@
 import asyncio
 from logging.config import fileConfig
-from typing import Literal
 
 from sqlalchemy import pool
 from sqlalchemy.engine import Connection
@@ -38,15 +37,8 @@ EXCLUDE_TABLES = {"kombu_queue", "kombu_message"}
 
 def include_object(
     object: SchemaItem,
-    name: str | None,
-    type_: Literal[
-        "schema",
-        "table",
-        "column",
-        "index",
-        "unique_constraint",
-        "foreign_key_constraint",
-    ],
+    name: str,
+    type_: str,
     reflected: bool,
     compare_to: SchemaItem | None,
 ) -> bool:

backend/danswer/auth/noauth_user.py

@@ -23,9 +23,7 @@ def load_no_auth_user_preferences(store: KeyValueStore) -> UserPreferences:
         )
         return UserPreferences(**preferences_data)
     except KvKeyNotFoundError:
-        return UserPreferences(
-            chosen_assistants=None, default_model=None, auto_scroll=True
-        )
+        return UserPreferences(chosen_assistants=None, default_model=None)
 
 
 def fetch_no_auth_user(store: KeyValueStore) -> UserInfo:

backend/danswer/background/celery/apps/app_base.py

@@ -11,7 +11,6 @@ from celery.exceptions import WorkerShutdown
 from celery.states import READY_STATES
 from celery.utils.log import get_task_logger
 from celery.worker import strategy  # type: ignore
-from redis.lock import Lock as RedisLock
 from sentry_sdk.integrations.celery import CeleryIntegration
 from sqlalchemy import text
 from sqlalchemy.orm import Session
@@ -333,16 +332,16 @@ def on_worker_shutdown(sender: Any, **kwargs: Any) -> None:
         return
 
     logger.info("Releasing primary worker lock.")
-    lock: RedisLock = sender.primary_worker_lock
+    lock = sender.primary_worker_lock
     try:
         if lock.owned():
             try:
                 lock.release()
                 sender.primary_worker_lock = None
-            except Exception:
-                logger.exception("Failed to release primary worker lock")
-    except Exception:
-        logger.exception("Failed to check if primary worker lock is owned")
+            except Exception as e:
+                logger.error(f"Failed to release primary worker lock: {e}")
+    except Exception as e:
+        logger.error(f"Failed to check if primary worker lock is owned: {e}")
 
 
 def on_setup_logging(

backend/danswer/background/celery/apps/primary.py

@@ -11,7 +11,6 @@ from celery.signals import celeryd_init
 from celery.signals import worker_init
 from celery.signals import worker_ready
 from celery.signals import worker_shutdown
-from redis.lock import Lock as RedisLock
 
 import danswer.background.celery.apps.app_base as app_base
 from danswer.background.celery.apps.app_base import task_logger
@@ -117,7 +116,7 @@ def on_worker_init(sender: Any, **kwargs: Any) -> None:
     # it is planned to use this lock to enforce singleton behavior on the primary
     # worker, since the primary worker does redis cleanup on startup, but this isn't
     # implemented yet.
-    lock: RedisLock = r.lock(
+    lock = r.lock(
         DanswerRedisLocks.PRIMARY_WORKER,
         timeout=CELERY_PRIMARY_WORKER_LOCK_TIMEOUT,
     )
@@ -228,7 +227,7 @@ class HubPeriodicTask(bootsteps.StartStopStep):
             if not hasattr(worker, "primary_worker_lock"):
                 return
 
-            lock: RedisLock = worker.primary_worker_lock
+            lock = worker.primary_worker_lock
 
             r = get_redis_client(tenant_id=None)
 

backend/danswer/background/celery/tasks/beat_schedule.py

@@ -2,55 +2,54 @@ from datetime import timedelta
 from typing import Any
 
 from danswer.configs.constants import DanswerCeleryPriority
-from danswer.configs.constants import DanswerCeleryTask
 
 
 tasks_to_schedule = [
     {
         "name": "check-for-vespa-sync",
-        "task": DanswerCeleryTask.CHECK_FOR_VESPA_SYNC_TASK,
+        "task": "check_for_vespa_sync_task",
         "schedule": timedelta(seconds=20),
         "options": {"priority": DanswerCeleryPriority.HIGH},
     },
     {
         "name": "check-for-connector-deletion",
-        "task": DanswerCeleryTask.CHECK_FOR_CONNECTOR_DELETION,
+        "task": "check_for_connector_deletion_task",
         "schedule": timedelta(seconds=20),
         "options": {"priority": DanswerCeleryPriority.HIGH},
     },
     {
         "name": "check-for-indexing",
-        "task": DanswerCeleryTask.CHECK_FOR_INDEXING,
+        "task": "check_for_indexing",
         "schedule": timedelta(seconds=15),
         "options": {"priority": DanswerCeleryPriority.HIGH},
     },
     {
         "name": "check-for-prune",
-        "task": DanswerCeleryTask.CHECK_FOR_PRUNING,
+        "task": "check_for_pruning",
         "schedule": timedelta(seconds=15),
         "options": {"priority": DanswerCeleryPriority.HIGH},
     },
     {
         "name": "kombu-message-cleanup",
-        "task": DanswerCeleryTask.KOMBU_MESSAGE_CLEANUP_TASK,
+        "task": "kombu_message_cleanup_task",
         "schedule": timedelta(seconds=3600),
         "options": {"priority": DanswerCeleryPriority.LOWEST},
     },
     {
         "name": "monitor-vespa-sync",
-        "task": DanswerCeleryTask.MONITOR_VESPA_SYNC,
+        "task": "monitor_vespa_sync",
         "schedule": timedelta(seconds=5),
         "options": {"priority": DanswerCeleryPriority.HIGH},
     },
     {
         "name": "check-for-doc-permissions-sync",
-        "task": DanswerCeleryTask.CHECK_FOR_DOC_PERMISSIONS_SYNC,
+        "task": "check_for_doc_permissions_sync",
         "schedule": timedelta(seconds=30),
         "options": {"priority": DanswerCeleryPriority.HIGH},
     },
     {
         "name": "check-for-external-group-sync",
-        "task": DanswerCeleryTask.CHECK_FOR_EXTERNAL_GROUP_SYNC,
+        "task": "check_for_external_group_sync",
         "schedule": timedelta(seconds=20),
         "options": {"priority": DanswerCeleryPriority.HIGH},
     },

backend/danswer/background/celery/tasks/connector_deletion/tasks.py

@@ -11,7 +11,6 @@ from sqlalchemy.orm import Session
 from danswer.background.celery.apps.app_base import task_logger
 from danswer.configs.app_configs import JOB_TIMEOUT
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DanswerRedisLocks
 from danswer.db.connector_credential_pair import get_connector_credential_pair_from_id
 from danswer.db.connector_credential_pair import get_connector_credential_pairs
@@ -29,7 +28,7 @@ class TaskDependencyError(RuntimeError):
 
 
 @shared_task(
-    name=DanswerCeleryTask.CHECK_FOR_CONNECTOR_DELETION,
+    name="check_for_connector_deletion_task",
     soft_time_limit=JOB_TIMEOUT,
     trail=False,
     bind=True,

backend/danswer/background/celery/tasks/doc_permission_syncing/tasks.py

@@ -18,7 +18,6 @@ from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DANSWER_REDIS_FUNCTION_LOCK_PREFIX
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DanswerRedisLocks
 from danswer.configs.constants import DocumentSource
 from danswer.db.connector_credential_pair import get_connector_credential_pair_from_id
@@ -83,7 +82,7 @@ def _is_external_doc_permissions_sync_due(cc_pair: ConnectorCredentialPair) -> b
 
 
 @shared_task(
-    name=DanswerCeleryTask.CHECK_FOR_DOC_PERMISSIONS_SYNC,
+    name="check_for_doc_permissions_sync",
     soft_time_limit=JOB_TIMEOUT,
     bind=True,
 )
@@ -165,7 +164,7 @@ def try_creating_permissions_sync_task(
         custom_task_id = f"{redis_connector.permissions.generator_task_key}_{uuid4()}"
 
         result = app.send_task(
-            DanswerCeleryTask.CONNECTOR_PERMISSION_SYNC_GENERATOR_TASK,
+            "connector_permission_sync_generator_task",
             kwargs=dict(
                 cc_pair_id=cc_pair_id,
                 tenant_id=tenant_id,
@@ -192,7 +191,7 @@ def try_creating_permissions_sync_task(
 
 
 @shared_task(
-    name=DanswerCeleryTask.CONNECTOR_PERMISSION_SYNC_GENERATOR_TASK,
+    name="connector_permission_sync_generator_task",
     acks_late=False,
     soft_time_limit=JOB_TIMEOUT,
     track_started=True,
@@ -287,7 +286,7 @@ def connector_permission_sync_generator_task(
 
 
 @shared_task(
-    name=DanswerCeleryTask.UPDATE_EXTERNAL_DOCUMENT_PERMISSIONS_TASK,
+    name="update_external_document_permissions_task",
     soft_time_limit=LIGHT_SOFT_TIME_LIMIT,
     time_limit=LIGHT_TIME_LIMIT,
     max_retries=DOCUMENT_PERMISSIONS_UPDATE_MAX_RETRIES,

backend/danswer/background/celery/tasks/external_group_syncing/tasks.py

@@ -17,7 +17,6 @@ from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DANSWER_REDIS_FUNCTION_LOCK_PREFIX
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DanswerRedisLocks
 from danswer.db.connector import mark_cc_pair_as_external_group_synced
 from danswer.db.connector_credential_pair import get_connector_credential_pair_from_id
@@ -86,7 +85,7 @@ def _is_external_group_sync_due(cc_pair: ConnectorCredentialPair) -> bool:
 
 
 @shared_task(
-    name=DanswerCeleryTask.CHECK_FOR_EXTERNAL_GROUP_SYNC,
+    name="check_for_external_group_sync",
     soft_time_limit=JOB_TIMEOUT,
     bind=True,
 )
@@ -162,7 +161,7 @@ def try_creating_external_group_sync_task(
         custom_task_id = f"{redis_connector.external_group_sync.taskset_key}_{uuid4()}"
 
         result = app.send_task(
-            DanswerCeleryTask.CONNECTOR_EXTERNAL_GROUP_SYNC_GENERATOR_TASK,
+            "connector_external_group_sync_generator_task",
             kwargs=dict(
                 cc_pair_id=cc_pair_id,
                 tenant_id=tenant_id,
@@ -192,7 +191,7 @@ def try_creating_external_group_sync_task(
 
 
 @shared_task(
-    name=DanswerCeleryTask.CONNECTOR_EXTERNAL_GROUP_SYNC_GENERATOR_TASK,
+    name="connector_external_group_sync_generator_task",
     acks_late=False,
     soft_time_limit=JOB_TIMEOUT,
     track_started=True,

backend/danswer/background/celery/tasks/indexing/tasks.py

@@ -23,7 +23,6 @@ from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DANSWER_REDIS_FUNCTION_LOCK_PREFIX
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DanswerRedisLocks
 from danswer.configs.constants import DocumentSource
 from danswer.db.connector import mark_ccpair_with_indexing_trigger
@@ -157,7 +156,7 @@ def get_unfenced_index_attempt_ids(db_session: Session, r: redis.Redis) -> list[
 
 
 @shared_task(
-    name=DanswerCeleryTask.CHECK_FOR_INDEXING,
+    name="check_for_indexing",
     soft_time_limit=300,
     bind=True,
 )
@@ -487,7 +486,7 @@ def try_creating_indexing_task(
         # when the task is sent, we have yet to finish setting up the fence
         # therefore, the task must contain code that blocks until the fence is ready
         result = celery_app.send_task(
-            DanswerCeleryTask.CONNECTOR_INDEXING_PROXY_TASK,
+            "connector_indexing_proxy_task",
             kwargs=dict(
                 index_attempt_id=index_attempt_id,
                 cc_pair_id=cc_pair.id,
@@ -525,10 +524,7 @@ def try_creating_indexing_task(
 
 
 @shared_task(
-    name=DanswerCeleryTask.CONNECTOR_INDEXING_PROXY_TASK,
-    bind=True,
-    acks_late=False,
-    track_started=True,
+    name="connector_indexing_proxy_task", bind=True, acks_late=False, track_started=True
 )
 def connector_indexing_proxy_task(
     self: Task,
@@ -584,64 +580,39 @@ def connector_indexing_proxy_task(
 
         if self.request.id and redis_connector_index.terminating(self.request.id):
             task_logger.warning(
-                "Indexing watchdog - termination signal detected: "
+                "Indexing proxy - termination signal detected: "
                 f"attempt={index_attempt_id} "
                 f"tenant={tenant_id} "
                 f"cc_pair={cc_pair_id} "
                 f"search_settings={search_settings_id}"
             )
 
-            try:
-                with get_session_with_tenant(tenant_id) as db_session:
-                    mark_attempt_canceled(
-                        index_attempt_id,
-                        db_session,
-                        "Connector termination signal detected",
-                    )
-            finally:
-                # if the DB exceptions, we'll just get an unfriendly failure message
-                # in the UI instead of the cancellation message
-                logger.exception(
-                    "Indexing watchdog - transient exception marking index attempt as canceled: "
-                    f"attempt={index_attempt_id} "
-                    f"tenant={tenant_id} "
-                    f"cc_pair={cc_pair_id} "
-                    f"search_settings={search_settings_id}"
+            with get_session_with_tenant(tenant_id) as db_session:
+                mark_attempt_canceled(
+                    index_attempt_id,
+                    db_session,
+                    "Connector termination signal detected",
                 )
 
-                job.cancel()
-
+            job.cancel()
             break
 
+        # do nothing for ongoing jobs that haven't been stopped
         if not job.done():
-            # if the spawned task is still running, restart the check once again
-            # if the index attempt is not in a finished status
-            try:
-                with get_session_with_tenant(tenant_id) as db_session:
-                    index_attempt = get_index_attempt(
-                        db_session=db_session, index_attempt_id=index_attempt_id
-                    )
-
-                    if not index_attempt:
-                        continue
-
-                    if not index_attempt.is_finished():
-                        continue
-            except Exception:
-                # if the DB exceptioned, just restart the check.
-                # polling the index attempt status doesn't need to be strongly consistent
-                logger.exception(
-                    "Indexing watchdog - transient exception looking up index attempt: "
-                    f"attempt={index_attempt_id} "
-                    f"tenant={tenant_id} "
-                    f"cc_pair={cc_pair_id} "
-                    f"search_settings={search_settings_id}"
+            with get_session_with_tenant(tenant_id) as db_session:
+                index_attempt = get_index_attempt(
+                    db_session=db_session, index_attempt_id=index_attempt_id
                 )
-                continue
+
+                if not index_attempt:
+                    continue
+
+                if not index_attempt.is_finished():
+                    continue
 
         if job.status == "error":
             task_logger.error(
-                "Indexing watchdog - spawned task exceptioned: "
+                f"Indexing watchdog - spawned task exceptioned: "
                 f"attempt={index_attempt_id} "
                 f"tenant={tenant_id} "
                 f"cc_pair={cc_pair_id} "

backend/danswer/background/celery/tasks/periodic/tasks.py

@@ -13,13 +13,12 @@ from sqlalchemy.orm import Session
 
 from danswer.background.celery.apps.app_base import task_logger
 from danswer.configs.app_configs import JOB_TIMEOUT
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import PostgresAdvisoryLocks
 from danswer.db.engine import get_session_with_tenant
 
 
 @shared_task(
-    name=DanswerCeleryTask.KOMBU_MESSAGE_CLEANUP_TASK,
+    name="kombu_message_cleanup_task",
     soft_time_limit=JOB_TIMEOUT,
     bind=True,
     base=AbortableTask,

backend/danswer/background/celery/tasks/pruning/tasks.py

@@ -20,7 +20,6 @@ from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DANSWER_REDIS_FUNCTION_LOCK_PREFIX
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DanswerRedisLocks
 from danswer.connectors.factory import instantiate_connector
 from danswer.connectors.models import InputType
@@ -76,7 +75,7 @@ def _is_pruning_due(cc_pair: ConnectorCredentialPair) -> bool:
 
 
 @shared_task(
-    name=DanswerCeleryTask.CHECK_FOR_PRUNING,
+    name="check_for_pruning",
     soft_time_limit=JOB_TIMEOUT,
     bind=True,
 )
@@ -185,7 +184,7 @@ def try_creating_prune_generator_task(
         custom_task_id = f"{redis_connector.prune.generator_task_key}_{uuid4()}"
 
         celery_app.send_task(
-            DanswerCeleryTask.CONNECTOR_PRUNING_GENERATOR_TASK,
+            "connector_pruning_generator_task",
             kwargs=dict(
                 cc_pair_id=cc_pair.id,
                 connector_id=cc_pair.connector_id,
@@ -210,7 +209,7 @@ def try_creating_prune_generator_task(
 
 
 @shared_task(
-    name=DanswerCeleryTask.CONNECTOR_PRUNING_GENERATOR_TASK,
+    name="connector_pruning_generator_task",
     acks_late=False,
     soft_time_limit=JOB_TIMEOUT,
     track_started=True,

backend/danswer/background/celery/tasks/shared/tasks.py

@@ -9,7 +9,6 @@ from tenacity import RetryError
 from danswer.access.access import get_access_for_document
 from danswer.background.celery.apps.app_base import task_logger
 from danswer.background.celery.tasks.shared.RetryDocumentIndex import RetryDocumentIndex
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.db.document import delete_document_by_connector_credential_pair__no_commit
 from danswer.db.document import delete_documents_complete__no_commit
 from danswer.db.document import get_document
@@ -32,7 +31,7 @@ LIGHT_TIME_LIMIT = LIGHT_SOFT_TIME_LIMIT + 15
 
 
 @shared_task(
-    name=DanswerCeleryTask.DOCUMENT_BY_CC_PAIR_CLEANUP_TASK,
+    name="document_by_cc_pair_cleanup_task",
     soft_time_limit=LIGHT_SOFT_TIME_LIMIT,
     time_limit=LIGHT_TIME_LIMIT,
     max_retries=DOCUMENT_BY_CC_PAIR_CLEANUP_MAX_RETRIES,

backend/danswer/background/celery/tasks/vespa/tasks.py

@@ -25,7 +25,6 @@ from danswer.background.celery.tasks.shared.tasks import LIGHT_TIME_LIMIT
 from danswer.configs.app_configs import JOB_TIMEOUT
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DanswerRedisLocks
 from danswer.db.connector import fetch_connector_by_id
 from danswer.db.connector import mark_cc_pair_as_permissions_synced
@@ -81,7 +80,7 @@ logger = setup_logger()
 # celery auto associates tasks created inside another task,
 # which bloats the result metadata considerably. trail=False prevents this.
 @shared_task(
-    name=DanswerCeleryTask.CHECK_FOR_VESPA_SYNC_TASK,
+    name="check_for_vespa_sync_task",
     soft_time_limit=JOB_TIMEOUT,
     trail=False,
     bind=True,
@@ -655,28 +654,24 @@ def monitor_ccpair_indexing_taskset(
     # outer = result.state in READY state
     status_int = redis_connector_index.get_completion()
     if status_int is None:  # inner signal not set ... possible error
-        task_state = result.state
+        result_state = result.state
         if (
-            task_state in READY_STATES
+            result_state in READY_STATES
         ):  # outer signal in terminal state ... possible error
             # Now double check!
             if redis_connector_index.get_completion() is None:
                 # inner signal still not set (and cannot change when outer result_state is READY)
                 # Task is finished but generator complete isn't set.
                 # We have a problem! Worker may have crashed.
-                task_result = str(result.result)
-                task_traceback = str(result.traceback)
 
                 msg = (
                     f"Connector indexing aborted or exceptioned: "
                     f"attempt={payload.index_attempt_id} "
                     f"celery_task={payload.celery_task_id} "
+                    f"result_state={result_state} "
                     f"cc_pair={cc_pair_id} "
                     f"search_settings={search_settings_id} "
-                    f"elapsed_submitted={elapsed_submitted.total_seconds():.2f} "
-                    f"result.state={task_state} "
-                    f"result.result={task_result} "
-                    f"result.traceback={task_traceback}"
+                    f"elapsed_submitted={elapsed_submitted.total_seconds():.2f}"
                 )
                 task_logger.warning(msg)
 
@@ -708,7 +703,7 @@ def monitor_ccpair_indexing_taskset(
     redis_connector_index.reset()
 
 
-@shared_task(name=DanswerCeleryTask.MONITOR_VESPA_SYNC, soft_time_limit=300, bind=True)
+@shared_task(name="monitor_vespa_sync", soft_time_limit=300, bind=True)
 def monitor_vespa_sync(self: Task, tenant_id: str | None) -> bool:
     """This is a celery beat task that monitors and finalizes metadata sync tasksets.
     It scans for fence values and then gets the counts of any associated tasksets.
@@ -819,7 +814,7 @@ def monitor_vespa_sync(self: Task, tenant_id: str | None) -> bool:
 
 
 @shared_task(
-    name=DanswerCeleryTask.VESPA_METADATA_SYNC_TASK,
+    name="vespa_metadata_sync_task",
     bind=True,
     soft_time_limit=LIGHT_SOFT_TIME_LIMIT,
     time_limit=LIGHT_TIME_LIMIT,

backend/danswer/chat/chat_utils.py

@@ -31,7 +31,6 @@ def llm_doc_from_inference_section(inference_section: InferenceSection) -> LlmDo
         if inference_section.center_chunk.source_links
         else None,
         source_links=inference_section.center_chunk.source_links,
-        match_highlights=inference_section.center_chunk.match_highlights,
     )
 
 

backend/danswer/chat/models.py

@@ -25,7 +25,6 @@ class LlmDoc(BaseModel):
     updated_at: datetime | None
     link: str | None
     source_links: dict[int, str] | None
-    match_highlights: list[str] | None
 
 
 # First chunk of info for streaming QA

backend/danswer/chat/process_message.py

@@ -605,7 +605,6 @@ def stream_chat_message_objects(
                 additional_headers=custom_tool_additional_headers,
             ),
         )
-
         tools: list[Tool] = []
         for tool_list in tool_dict.values():
             tools.extend(tool_list)

backend/danswer/configs/app_configs.py

@@ -308,22 +308,6 @@ CONFLUENCE_CONNECTOR_ATTACHMENT_CHAR_COUNT_THRESHOLD = int(
     os.environ.get("CONFLUENCE_CONNECTOR_ATTACHMENT_CHAR_COUNT_THRESHOLD", 200_000)
 )
 
-# Due to breakages in the confluence API, the timezone offset must be specified client side
-# to match the user's specified timezone.
-
-# The current state of affairs:
-# CQL queries are parsed in the user's timezone and cannot be specified in UTC
-# no API retrieves the user's timezone
-# All data is returned in UTC, so we can't derive the user's timezone from that
-
-# https://community.developer.atlassian.com/t/confluence-cloud-time-zone-get-via-rest-api/35954/16
-# https://jira.atlassian.com/browse/CONFCLOUD-69670
-
-# enter as a floating point offset from UTC in hours (-24 < val < 24)
-# this will be applied globally, so it probably makes sense to transition this to per
-# connector as some point.
-CONFLUENCE_TIMEZONE_OFFSET = float(os.environ.get("CONFLUENCE_TIMEZONE_OFFSET", 0.0))
-
 JIRA_CONNECTOR_LABELS_TO_SKIP = [
     ignored_tag
     for ignored_tag in os.environ.get("JIRA_CONNECTOR_LABELS_TO_SKIP", "").split(",")
@@ -509,6 +493,10 @@ CONTROL_PLANE_API_BASE_URL = os.environ.get(
 # JWT configuration
 JWT_ALGORITHM = "HS256"
 
+# Super Users
+SUPER_USERS = json.loads(os.environ.get("SUPER_USERS", '["pablo@danswer.ai"]'))
+SUPER_CLOUD_API_KEY = os.environ.get("SUPER_CLOUD_API_KEY", "api_key")
+
 
 #####
 # API Key Configs

backend/danswer/configs/constants.py

@@ -259,32 +259,6 @@ class DanswerCeleryPriority(int, Enum):
     LOWEST = auto()
 
 
-class DanswerCeleryTask:
-    CHECK_FOR_CONNECTOR_DELETION = "check_for_connector_deletion_task"
-    CHECK_FOR_VESPA_SYNC_TASK = "check_for_vespa_sync_task"
-    CHECK_FOR_INDEXING = "check_for_indexing"
-    CHECK_FOR_PRUNING = "check_for_pruning"
-    CHECK_FOR_DOC_PERMISSIONS_SYNC = "check_for_doc_permissions_sync"
-    CHECK_FOR_EXTERNAL_GROUP_SYNC = "check_for_external_group_sync"
-    MONITOR_VESPA_SYNC = "monitor_vespa_sync"
-    KOMBU_MESSAGE_CLEANUP_TASK = "kombu_message_cleanup_task"
-    CONNECTOR_PERMISSION_SYNC_GENERATOR_TASK = (
-        "connector_permission_sync_generator_task"
-    )
-    UPDATE_EXTERNAL_DOCUMENT_PERMISSIONS_TASK = (
-        "update_external_document_permissions_task"
-    )
-    CONNECTOR_EXTERNAL_GROUP_SYNC_GENERATOR_TASK = (
-        "connector_external_group_sync_generator_task"
-    )
-    CONNECTOR_INDEXING_PROXY_TASK = "connector_indexing_proxy_task"
-    CONNECTOR_PRUNING_GENERATOR_TASK = "connector_pruning_generator_task"
-    DOCUMENT_BY_CC_PAIR_CLEANUP_TASK = "document_by_cc_pair_cleanup_task"
-    VESPA_METADATA_SYNC_TASK = "vespa_metadata_sync_task"
-    CHECK_TTL_MANAGEMENT_TASK = "check_ttl_management_task"
-    AUTOGENERATE_USAGE_REPORT_TASK = "autogenerate_usage_report_task"
-
-
 REDIS_SOCKET_KEEPALIVE_OPTIONS = {}
 REDIS_SOCKET_KEEPALIVE_OPTIONS[socket.TCP_KEEPINTVL] = 15
 REDIS_SOCKET_KEEPALIVE_OPTIONS[socket.TCP_KEEPCNT] = 3

backend/danswer/connectors/README.md

@@ -11,16 +11,11 @@ Connectors come in 3 different flows:
 - Load Connector:
   - Bulk indexes documents to reflect a point in time. This type of connector generally works by either pulling all
   documents via a connector's API or loads the documents from some sort of a dump file.
-- Poll Connector:
+- Poll connector:
   - Incrementally updates documents based on a provided time range. It is used by the background job to pull the latest
   changes and additions since the last round of polling. This connector helps keep the document index up to date
   without needing to fetch/embed/index every document which would be too slow to do frequently on large sets of
   documents.
-- Slim Connector:
-  - This connector should be a lighter weight method of checking all documents in the source to see if they still exist.
-  - This connector should be identical to the Poll or Load Connector except that it only fetches the IDs of the documents, not the documents themselves.
-  - This is used by our pruning job which removes old documents from the index.
-  - The optional start and end datetimes can be ignored.
 - Event Based connectors:
   - Connectors that listen to events and update documents accordingly.
   - Currently not used by the background job, this exists for future design purposes.
@@ -31,14 +26,8 @@ Refer to [interfaces.py](https://github.com/danswer-ai/danswer/blob/main/backend
 and this first contributor created Pull Request for a new connector (Shoutout to Dan Brown):
 [Reference Pull Request](https://github.com/danswer-ai/danswer/pull/139)
 
-For implementing a Slim Connector, refer to the comments in this PR:
-[Slim Connector PR](https://github.com/danswer-ai/danswer/pull/3303/files)
-
-All new connectors should have tests added to the `backend/tests/daily/connectors` directory. Refer to the above PR for an example of adding tests for a new connector.
-
-
 #### Implementing the new Connector
-The connector must subclass one or more of LoadConnector, PollConnector, SlimConnector, or EventConnector.
+The connector must subclass one or more of LoadConnector, PollConnector, or EventConnector.
 
 The `__init__` should take arguments for configuring what documents the connector will and where it finds those
 documents. For example, if you have a wiki site, it may include the configuration for the team, topic, folder, etc. of

backend/danswer/connectors/confluence/connector.py

@@ -1,11 +1,9 @@
 from datetime import datetime
-from datetime import timedelta
 from datetime import timezone
 from typing import Any
 from urllib.parse import quote
 
 from danswer.configs.app_configs import CONFLUENCE_CONNECTOR_LABELS_TO_SKIP
-from danswer.configs.app_configs import CONFLUENCE_TIMEZONE_OFFSET
 from danswer.configs.app_configs import CONTINUE_ON_CONNECTOR_FAILURE
 from danswer.configs.app_configs import INDEX_BATCH_SIZE
 from danswer.configs.constants import DocumentSource
@@ -71,7 +69,6 @@ class ConfluenceConnector(LoadConnector, PollConnector, SlimConnector):
         # skip it. This is generally used to avoid indexing extra sensitive
         # pages.
         labels_to_skip: list[str] = CONFLUENCE_CONNECTOR_LABELS_TO_SKIP,
-        timezone_offset: float = CONFLUENCE_TIMEZONE_OFFSET,
     ) -> None:
         self.batch_size = batch_size
         self.continue_on_failure = continue_on_failure
@@ -107,8 +104,6 @@ class ConfluenceConnector(LoadConnector, PollConnector, SlimConnector):
             )
             self.cql_label_filter = f" and label not in ({comma_separated_labels})"
 
-        self.timezone: timezone = timezone(offset=timedelta(hours=timezone_offset))
-
     @property
     def confluence_client(self) -> OnyxConfluence:
         if self._confluence_client is None:
@@ -209,14 +204,12 @@ class ConfluenceConnector(LoadConnector, PollConnector, SlimConnector):
         confluence_page_ids: list[str] = []
 
         page_query = self.cql_page_query + self.cql_label_filter + self.cql_time_filter
-        logger.debug(f"page_query: {page_query}")
         # Fetch pages as Documents
         for page in self.confluence_client.paginated_cql_retrieval(
             cql=page_query,
             expand=",".join(_PAGE_EXPANSION_FIELDS),
             limit=self.batch_size,
         ):
-            logger.debug(f"_fetch_document_batches: {page['id']}")
             confluence_page_ids.append(page["id"])
             doc = self._convert_object_to_document(page)
             if doc is not None:
@@ -249,10 +242,10 @@ class ConfluenceConnector(LoadConnector, PollConnector, SlimConnector):
 
     def poll_source(self, start: float, end: float) -> GenerateDocumentsOutput:
         # Add time filters
-        formatted_start_time = datetime.fromtimestamp(start, tz=self.timezone).strftime(
+        formatted_start_time = datetime.fromtimestamp(start, tz=timezone.utc).strftime(
             "%Y-%m-%d %H:%M"
         )
-        formatted_end_time = datetime.fromtimestamp(end, tz=self.timezone).strftime(
+        formatted_end_time = datetime.fromtimestamp(end, tz=timezone.utc).strftime(
             "%Y-%m-%d %H:%M"
         )
         self.cql_time_filter = f" and lastmodified >= '{formatted_start_time}'"

backend/danswer/connectors/confluence/onyx_confluence.py

@@ -134,32 +134,6 @@ class OnyxConfluence(Confluence):
         super(OnyxConfluence, self).__init__(url, *args, **kwargs)
         self._wrap_methods()
 
-    def get_current_user(self, expand: str | None = None) -> Any:
-        """
-        Implements a method that isn't in the third party client.
-
-        Get information about the current user
-        :param expand: OPTIONAL expand for get status of user.
-                Possible param is "status". Results are "Active, Deactivated"
-        :return: Returns the user details
-        """
-
-        from atlassian.errors import ApiPermissionError  # type:ignore
-
-        url = "rest/api/user/current"
-        params = {}
-        if expand:
-            params["expand"] = expand
-        try:
-            response = self.get(url, params=params)
-        except HTTPError as e:
-            if e.response.status_code == 403:
-                raise ApiPermissionError(
-                    "The calling user does not have permission", reason=e
-                )
-            raise
-        return response
-
     def _wrap_methods(self) -> None:
         """
         For each attribute that is callable (i.e., a method) and doesn't start with an underscore,
@@ -332,13 +306,6 @@ def _validate_connector_configuration(
     )
     spaces = confluence_client_with_minimal_retries.get_all_spaces(limit=1)
 
-    # uncomment the following for testing
-    # the following is an attempt to retrieve the user's timezone
-    # Unfornately, all data is returned in UTC regardless of the user's time zone
-    # even tho CQL parses incoming times based on the user's time zone
-    # space_key = spaces["results"][0]["key"]
-    # space_details = confluence_client_with_minimal_retries.cql(f"space.key={space_key}+AND+type=space")
-
     if not spaces:
         raise RuntimeError(
             f"No spaces found at {wiki_base}! "

backend/danswer/connectors/slab/connector.py

@@ -12,15 +12,12 @@ from dateutil import parser
 from danswer.configs.app_configs import INDEX_BATCH_SIZE
 from danswer.configs.constants import DocumentSource
 from danswer.connectors.interfaces import GenerateDocumentsOutput
-from danswer.connectors.interfaces import GenerateSlimDocumentOutput
 from danswer.connectors.interfaces import LoadConnector
 from danswer.connectors.interfaces import PollConnector
 from danswer.connectors.interfaces import SecondsSinceUnixEpoch
-from danswer.connectors.interfaces import SlimConnector
 from danswer.connectors.models import ConnectorMissingCredentialError
 from danswer.connectors.models import Document
 from danswer.connectors.models import Section
-from danswer.connectors.models import SlimDocument
 from danswer.utils.logger import setup_logger
 
 
@@ -31,8 +28,6 @@ logger = setup_logger()
 SLAB_GRAPHQL_MAX_TRIES = 10
 SLAB_API_URL = "https://api.slab.com/v1/graphql"
 
-_SLIM_BATCH_SIZE = 1000
-
 
 def run_graphql_request(
     graphql_query: dict, bot_token: str, max_tries: int = SLAB_GRAPHQL_MAX_TRIES
@@ -163,26 +158,21 @@ def get_slab_url_from_title_id(base_url: str, title: str, page_id: str) -> str:
     return urljoin(urljoin(base_url, "posts/"), url_id)
 
 
-class SlabConnector(LoadConnector, PollConnector, SlimConnector):
+class SlabConnector(LoadConnector, PollConnector):
     def __init__(
         self,
         base_url: str,
         batch_size: int = INDEX_BATCH_SIZE,
+        slab_bot_token: str | None = None,
     ) -> None:
         self.base_url = base_url
         self.batch_size = batch_size
-        self._slab_bot_token: str | None = None
+        self.slab_bot_token = slab_bot_token
 
     def load_credentials(self, credentials: dict[str, Any]) -> dict[str, Any] | None:
-        self._slab_bot_token = credentials["slab_bot_token"]
+        self.slab_bot_token = credentials["slab_bot_token"]
         return None
 
-    @property
-    def slab_bot_token(self) -> str:
-        if self._slab_bot_token is None:
-            raise ConnectorMissingCredentialError("Slab")
-        return self._slab_bot_token
-
     def _iterate_posts(
         self, time_filter: Callable[[datetime], bool] | None = None
     ) -> GenerateDocumentsOutput:
@@ -237,21 +227,3 @@ class SlabConnector(LoadConnector, PollConnector, SlimConnector):
         yield from self._iterate_posts(
             time_filter=lambda t: start_time <= t <= end_time
         )
-
-    def retrieve_all_slim_documents(
-        self,
-        start: SecondsSinceUnixEpoch | None = None,
-        end: SecondsSinceUnixEpoch | None = None,
-    ) -> GenerateSlimDocumentOutput:
-        slim_doc_batch: list[SlimDocument] = []
-        for post_id in get_all_post_ids(self.slab_bot_token):
-            slim_doc_batch.append(
-                SlimDocument(
-                    id=post_id,
-                )
-            )
-            if len(slim_doc_batch) >= _SLIM_BATCH_SIZE:
-                yield slim_doc_batch
-                slim_doc_batch = []
-        if slim_doc_batch:
-            yield slim_doc_batch

backend/danswer/db/models.py

@@ -126,7 +126,6 @@ class User(SQLAlchemyBaseUserTableUUID, Base):
 
     # if specified, controls the assistants that are shown to the user + their order
     # if not specified, all assistants are shown
-    auto_scroll: Mapped[bool] = mapped_column(Boolean, default=True)
     chosen_assistants: Mapped[list[int] | None] = mapped_column(
         postgresql.JSONB(), nullable=True, default=None
     )

backend/danswer/db/persona.py

@@ -415,6 +415,9 @@ def upsert_prompt(
     return prompt
 
 
+# NOTE: This operation cannot update persona configuration options that
+# are core to the persona, such as its display priority and
+# whether or not the assistant is a built-in / default assistant
 def upsert_persona(
     user: User | None,
     name: str,
@@ -446,12 +449,6 @@ def upsert_persona(
     chunks_above: int = CONTEXT_CHUNKS_ABOVE,
     chunks_below: int = CONTEXT_CHUNKS_BELOW,
 ) -> Persona:
-    """
-    NOTE: This operation cannot update persona configuration options that
-    are core to the persona, such as its display priority and
-    whether or not the assistant is a built-in / default assistant
-    """
-
     if persona_id is not None:
         persona = db_session.query(Persona).filter_by(id=persona_id).first()
     else:
@@ -489,8 +486,6 @@ def upsert_persona(
         validate_persona_tools(tools)
 
     if persona:
-        # Built-in personas can only be updated through YAML configuration.
-        # This ensures that core system personas are not modified unintentionally.
         if persona.builtin_persona and not builtin_persona:
             raise ValueError("Cannot update builtin persona with non-builtin.")
 
@@ -499,9 +494,6 @@ def upsert_persona(
             db_session=db_session, persona_id=persona.id, user=user, get_editable=True
         )
 
-        # The following update excludes `default`, `built-in`, and display priority.
-        # Display priority is handled separately in the `display-priority` endpoint.
-        # `default` and `built-in` properties can only be set when creating a persona.
         persona.name = name
         persona.description = description
         persona.num_chunks = num_chunks

backend/danswer/file_store/file_store.py

@@ -59,12 +59,6 @@ class FileStore(ABC):
             Contents of the file and metadata dict
         """
 
-    @abstractmethod
-    def read_file_record(self, file_name: str) -> PGFileStore:
-        """
-        Read the file record by the name
-        """
-
     @abstractmethod
     def delete_file(self, file_name: str) -> None:
         """

backend/danswer/llm/factory.py

@@ -71,7 +71,6 @@ def get_llms_for_persona(
             api_base=llm_provider.api_base,
             api_version=llm_provider.api_version,
             custom_config=llm_provider.custom_config,
-            temperature=temperature_override,
             additional_headers=additional_headers,
             long_term_logger=long_term_logger,
         )
@@ -129,13 +128,11 @@ def get_llm(
     api_base: str | None = None,
     api_version: str | None = None,
     custom_config: dict[str, str] | None = None,
-    temperature: float | None = None,
+    temperature: float = GEN_AI_TEMPERATURE,
     timeout: int = QA_TIMEOUT,
     additional_headers: dict[str, str] | None = None,
     long_term_logger: LongTermLogger | None = None,
 ) -> LLM:
-    if temperature is None:
-        temperature = GEN_AI_TEMPERATURE
     return DefaultMultiLLM(
         model_provider=provider,
         model_name=model,

backend/danswer/redis/redis_connector_credential_pair.py

@@ -10,7 +10,6 @@ from sqlalchemy.orm import Session
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.db.connector_credential_pair import get_connector_credential_pair_from_id
 from danswer.db.document import (
     construct_document_select_for_connector_credential_pair_by_needs_sync,
@@ -106,7 +105,7 @@ class RedisConnectorCredentialPair(RedisObjectHelper):
 
             # Priority on sync's triggered by new indexing should be medium
             result = celery_app.send_task(
-                DanswerCeleryTask.VESPA_METADATA_SYNC_TASK,
+                "vespa_metadata_sync_task",
                 kwargs=dict(document_id=doc.id, tenant_id=tenant_id),
                 queue=DanswerCeleryQueues.VESPA_METADATA_SYNC,
                 task_id=custom_task_id,

backend/danswer/redis/redis_connector_delete.py

@@ -12,7 +12,6 @@ from sqlalchemy.orm import Session
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.db.connector_credential_pair import get_connector_credential_pair_from_id
 from danswer.db.document import construct_document_select_for_connector_credential_pair
 from danswer.db.models import Document as DbDocument
@@ -115,7 +114,7 @@ class RedisConnectorDelete:
 
             # Priority on sync's triggered by new indexing should be medium
             result = celery_app.send_task(
-                DanswerCeleryTask.DOCUMENT_BY_CC_PAIR_CLEANUP_TASK,
+                "document_by_cc_pair_cleanup_task",
                 kwargs=dict(
                     document_id=doc.id,
                     connector_id=cc_pair.connector_id,

backend/danswer/redis/redis_connector_doc_perm_sync.py

@@ -12,7 +12,6 @@ from danswer.access.models import DocExternalAccess
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 
 
 class RedisConnectorPermissionSyncPayload(BaseModel):
@@ -150,7 +149,7 @@ class RedisConnectorPermissionSync:
             self.redis.sadd(self.taskset_key, custom_task_id)
 
             result = celery_app.send_task(
-                DanswerCeleryTask.UPDATE_EXTERNAL_DOCUMENT_PERMISSIONS_TASK,
+                "update_external_document_permissions_task",
                 kwargs=dict(
                     tenant_id=self.tenant_id,
                     serialized_doc_external_access=doc_perm.to_dict(),

backend/danswer/redis/redis_connector_prune.py

@@ -10,7 +10,6 @@ from sqlalchemy.orm import Session
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.db.connector_credential_pair import get_connector_credential_pair_from_id
 
 
@@ -135,7 +134,7 @@ class RedisConnectorPrune:
 
             # Priority on sync's triggered by new indexing should be medium
             result = celery_app.send_task(
-                DanswerCeleryTask.DOCUMENT_BY_CC_PAIR_CLEANUP_TASK,
+                "document_by_cc_pair_cleanup_task",
                 kwargs=dict(
                     document_id=doc_id,
                     connector_id=cc_pair.connector_id,

backend/danswer/redis/redis_document_set.py

@@ -11,7 +11,6 @@ from sqlalchemy.orm import Session
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.db.document_set import construct_document_select_by_docset
 from danswer.redis.redis_object_helper import RedisObjectHelper
 
@@ -77,7 +76,7 @@ class RedisDocumentSet(RedisObjectHelper):
             redis_client.sadd(self.taskset_key, custom_task_id)
 
             result = celery_app.send_task(
-                DanswerCeleryTask.VESPA_METADATA_SYNC_TASK,
+                "vespa_metadata_sync_task",
                 kwargs=dict(document_id=doc.id, tenant_id=tenant_id),
                 queue=DanswerCeleryQueues.VESPA_METADATA_SYNC,
                 task_id=custom_task_id,

backend/danswer/redis/redis_usergroup.py

@@ -11,7 +11,6 @@ from sqlalchemy.orm import Session
 from danswer.configs.constants import CELERY_VESPA_SYNC_BEAT_LOCK_TIMEOUT
 from danswer.configs.constants import DanswerCeleryPriority
 from danswer.configs.constants import DanswerCeleryQueues
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.redis.redis_object_helper import RedisObjectHelper
 from danswer.utils.variable_functionality import fetch_versioned_implementation
 from danswer.utils.variable_functionality import global_version
@@ -90,7 +89,7 @@ class RedisUserGroup(RedisObjectHelper):
             redis_client.sadd(self.taskset_key, custom_task_id)
 
             result = celery_app.send_task(
-                DanswerCeleryTask.VESPA_METADATA_SYNC_TASK,
+                "vespa_metadata_sync_task",
                 kwargs=dict(document_id=doc.id, tenant_id=tenant_id),
                 queue=DanswerCeleryQueues.VESPA_METADATA_SYNC,
                 task_id=custom_task_id,

backend/danswer/seeding/load_docs.py

@@ -33,6 +33,7 @@ from danswer.server.documents.models import ConnectorBase
 from danswer.utils.logger import setup_logger
 from danswer.utils.retry_wrapper import retry_builder
 from danswer.utils.variable_functionality import fetch_versioned_implementation
+from ee.danswer.configs.app_configs import INTEGRATION_TEST_MODE
 
 logger = setup_logger()
 
@@ -127,6 +128,9 @@ def seed_initial_documents(
     - Indexing the documents into Vespa
     - Create a fake index attempt with fake times
     """
+    if INTEGRATION_TEST_MODE:
+        return
+
     logger.info("Seeding initial documents")
 
     kv_store = get_kv_store()

backend/danswer/seeding/personas.yaml

@@ -5,7 +5,7 @@ personas:
   # this is for DanswerBot to use when tagged in a non-configured channel
   # Careful setting specific IDs, this won't autoincrement the next ID value for postgres
   - id: 0
-    name: "Search"
+    name: "Knowledge"
     description: >
       Assistant with access to documents from your Connected Sources.
     # Default Prompt objects attached to the persona, see prompts.yaml

backend/danswer/server/documents/connector.py

@@ -20,7 +20,6 @@ from danswer.background.celery.celery_utils import get_deletion_attempt_snapshot
 from danswer.background.celery.versioned_apps.primary import app as primary_app
 from danswer.configs.app_configs import ENABLED_CONNECTOR_TYPES
 from danswer.configs.constants import DanswerCeleryPriority
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DocumentSource
 from danswer.configs.constants import FileOrigin
 from danswer.connectors.google_utils.google_auth import (
@@ -868,7 +867,7 @@ def connector_run_once(
 
     # run the beat task to pick up the triggers immediately
     primary_app.send_task(
-        DanswerCeleryTask.CHECK_FOR_INDEXING,
+        "check_for_indexing",
         priority=DanswerCeleryPriority.HIGH,
         kwargs={"tenant_id": tenant_id},
     )

backend/danswer/server/manage/administrative.py

@@ -13,7 +13,6 @@ from danswer.auth.users import current_curator_or_admin_user
 from danswer.background.celery.versioned_apps.primary import app as primary_app
 from danswer.configs.app_configs import GENERATIVE_MODEL_ACCESS_CHECK_FREQ
 from danswer.configs.constants import DanswerCeleryPriority
-from danswer.configs.constants import DanswerCeleryTask
 from danswer.configs.constants import DocumentSource
 from danswer.configs.constants import KV_GEN_AI_KEY_CHECK_TIME
 from danswer.db.connector_credential_pair import get_connector_credential_pair
@@ -200,7 +199,7 @@ def create_deletion_attempt_for_connector_id(
 
     # run the beat task to pick up this deletion from the db immediately
     primary_app.send_task(
-        DanswerCeleryTask.CHECK_FOR_CONNECTOR_DELETION,
+        "check_for_connector_deletion_task",
         priority=DanswerCeleryPriority.HIGH,
         kwargs={"tenant_id": tenant_id},
     )

backend/danswer/server/manage/models.py

@@ -45,7 +45,6 @@ class UserPreferences(BaseModel):
     visible_assistants: list[int] = []
     recent_assistants: list[int] | None = None
     default_model: str | None = None
-    auto_scroll: bool | None = None
 
 
 class UserInfo(BaseModel):
@@ -80,7 +79,6 @@ class UserInfo(BaseModel):
             role=user.role,
             preferences=(
                 UserPreferences(
-                    auto_scroll=user.auto_scroll,
                     chosen_assistants=user.chosen_assistants,
                     default_model=user.default_model,
                     hidden_assistants=user.hidden_assistants,
@@ -130,10 +128,6 @@ class HiddenUpdateRequest(BaseModel):
     hidden: bool
 
 
-class AutoScrollRequest(BaseModel):
-    auto_scroll: bool | None
-
-
 class SlackBotCreationRequest(BaseModel):
     name: str
     enabled: bool

backend/danswer/server/manage/users.py

@@ -34,6 +34,7 @@ from danswer.auth.users import optional_user
 from danswer.configs.app_configs import AUTH_TYPE
 from danswer.configs.app_configs import ENABLE_EMAIL_INVITES
 from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS
+from danswer.configs.app_configs import SUPER_USERS
 from danswer.configs.app_configs import VALID_EMAIL_DOMAINS
 from danswer.configs.constants import AuthType
 from danswer.db.api_key import is_api_key_email_address
@@ -51,7 +52,6 @@ from danswer.db.users import list_users
 from danswer.db.users import validate_user_role_update
 from danswer.key_value_store.factory import get_kv_store
 from danswer.server.manage.models import AllUsersResponse
-from danswer.server.manage.models import AutoScrollRequest
 from danswer.server.manage.models import UserByEmail
 from danswer.server.manage.models import UserInfo
 from danswer.server.manage.models import UserPreferences
@@ -63,7 +63,6 @@ from danswer.server.models import MinimalUserSnapshot
 from danswer.server.utils import send_user_email_invite
 from danswer.utils.logger import setup_logger
 from danswer.utils.variable_functionality import fetch_ee_implementation_or_noop
-from ee.danswer.configs.app_configs import SUPER_USERS
 from shared_configs.configs import MULTI_TENANT
 
 logger = setup_logger()
@@ -498,6 +497,7 @@ def verify_user_logged_in(
             return fetch_no_auth_user(store)
 
         raise BasicAuthenticationError(detail="User Not Authenticated")
+
     if user.oidc_expiry and user.oidc_expiry < datetime.now(timezone.utc):
         raise BasicAuthenticationError(
             detail="Access denied. User's OIDC token has expired.",
@@ -581,30 +581,6 @@ def update_user_recent_assistants(
     db_session.commit()
 
 
-@router.patch("/auto-scroll")
-def update_user_auto_scroll(
-    request: AutoScrollRequest,
-    user: User | None = Depends(current_user),
-    db_session: Session = Depends(get_session),
-) -> None:
-    if user is None:
-        if AUTH_TYPE == AuthType.DISABLED:
-            store = get_kv_store()
-            no_auth_user = fetch_no_auth_user(store)
-            no_auth_user.preferences.auto_scroll = request.auto_scroll
-            set_no_auth_user_preferences(store, no_auth_user.preferences)
-            return
-        else:
-            raise RuntimeError("This should never happen")
-
-    db_session.execute(
-        update(User)
-        .where(User.id == user.id)  # type: ignore
-        .values(auto_scroll=request.auto_scroll)
-    )
-    db_session.commit()
-
-
 @router.patch("/user/default-model")
 def update_user_default_model(
     request: ChosenDefaultModelRequest,

backend/danswer/server/query_and_chat/chat_backend.py

@@ -707,18 +707,14 @@ def upload_files_for_chat(
     }
 
 
-@router.get("/file/{file_id:path}")
+@router.get("/file/{file_id}")
 def fetch_chat_file(
     file_id: str,
     db_session: Session = Depends(get_session),
     _: User | None = Depends(current_user),
 ) -> Response:
     file_store = get_default_file_store(db_session)
-    file_record = file_store.read_file_record(file_id)
-    if not file_record:
-        raise HTTPException(status_code=404, detail="File not found")
-
-    media_type = file_record.file_type
     file_io = file_store.read_file(file_id, mode="b")
-
-    return StreamingResponse(file_io, media_type=media_type)
+    # NOTE: specifying "image/jpeg" here, but it still works for pngs
+    # TODO: do this properly
+    return Response(content=file_io.read(), media_type="image/jpeg")

backend/danswer/server/query_and_chat/models.py

@@ -79,7 +79,6 @@ class CreateChatMessageRequest(ChunkContext):
     message: str
     # Files that we should attach to this message
     file_descriptors: list[FileDescriptor]
-
     # If no prompt provided, uses the largest prompt of the chat session
     # but really this should be explicitly specified, only in the simplified APIs is this inferred
     # Use prompt_id 0 to use the system default prompt which is Answer-Question

backend/danswer/server/settings/api.py

@@ -2,6 +2,7 @@ from typing import cast
 
 from fastapi import APIRouter
 from fastapi import Depends
+from fastapi import HTTPException
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
@@ -37,6 +38,10 @@ basic_router = APIRouter(prefix="/settings")
 def put_settings(
     settings: Settings, _: User | None = Depends(current_admin_user)
 ) -> None:
+    try:
+        settings.check_validity()
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
     store_settings(settings)
 
 

backend/danswer/server/settings/models.py

@@ -41,10 +41,33 @@ class Notification(BaseModel):
 class Settings(BaseModel):
     """General settings"""
 
+    chat_page_enabled: bool = True
+    search_page_enabled: bool = True
+    default_page: PageType = PageType.SEARCH
     maximum_chat_retention_days: int | None = None
     gpu_enabled: bool | None = None
     product_gating: GatingType = GatingType.NONE
 
+    def check_validity(self) -> None:
+        chat_page_enabled = self.chat_page_enabled
+        search_page_enabled = self.search_page_enabled
+        default_page = self.default_page
+
+        if chat_page_enabled is False and search_page_enabled is False:
+            raise ValueError(
+                "One of `search_page_enabled` and `chat_page_enabled` must be True."
+            )
+
+        if default_page == PageType.CHAT and chat_page_enabled is False:
+            raise ValueError(
+                "The default page cannot be 'chat' if the chat page is disabled."
+            )
+
+        if default_page == PageType.SEARCH and search_page_enabled is False:
+            raise ValueError(
+                "The default page cannot be 'search' if the search page is disabled."
+            )
+
 
 class UserSettings(Settings):
     notifications: list[Notification]

backend/danswer/tools/tool_implementations/internet_search/internet_search_tool.py

@@ -77,7 +77,6 @@ def llm_doc_from_internet_search_result(result: InternetSearchResult) -> LlmDoc:
         updated_at=datetime.now(),
         link=result.link,
         source_links={0: result.link},
-        match_highlights=[],
     )
 
 

backend/ee/danswer/auth/users.py

@@ -1,72 +1,23 @@
-from functools import lru_cache
-
-import requests
 from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Request
 from fastapi import status
-from jwt import decode as jwt_decode
-from jwt import InvalidTokenError
-from jwt import PyJWTError
-from sqlalchemy import func
-from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from danswer.auth.users import current_admin_user
 from danswer.configs.app_configs import AUTH_TYPE
+from danswer.configs.app_configs import SUPER_CLOUD_API_KEY
+from danswer.configs.app_configs import SUPER_USERS
 from danswer.configs.constants import AuthType
 from danswer.db.models import User
 from danswer.utils.logger import setup_logger
-from ee.danswer.configs.app_configs import JWT_PUBLIC_KEY_URL
-from ee.danswer.configs.app_configs import SUPER_CLOUD_API_KEY
-from ee.danswer.configs.app_configs import SUPER_USERS
 from ee.danswer.db.saml import get_saml_account
 from ee.danswer.server.seeding import get_seed_config
 from ee.danswer.utils.secrets import extract_hashed_cookie
 
-
 logger = setup_logger()
 
 
-@lru_cache()
-def get_public_key() -> str | None:
-    if JWT_PUBLIC_KEY_URL is None:
-        logger.error("JWT_PUBLIC_KEY_URL is not set")
-        return None
-
-    response = requests.get(JWT_PUBLIC_KEY_URL)
-    response.raise_for_status()
-    return response.text
-
-
-async def verify_jwt_token(token: str, async_db_session: AsyncSession) -> User | None:
-    try:
-        public_key_pem = get_public_key()
-        if public_key_pem is None:
-            logger.error("Failed to retrieve public key")
-            return None
-
-        payload = jwt_decode(
-            token,
-            public_key_pem,
-            algorithms=["RS256"],
-            audience=None,
-        )
-        email = payload.get("email")
-        if email:
-            result = await async_db_session.execute(
-                select(User).where(func.lower(User.email) == func.lower(email))
-            )
-            return result.scalars().first()
-    except InvalidTokenError:
-        logger.error("Invalid JWT token")
-        get_public_key.cache_clear()
-    except PyJWTError as e:
-        logger.error(f"JWT decoding error: {str(e)}")
-        get_public_key.cache_clear()
-    return None
-
-
 def verify_auth_setting() -> None:
     # All the Auth flows are valid for EE version
     logger.notice(f"Using Auth Type: {AUTH_TYPE.value}")
@@ -87,13 +38,6 @@ async def optional_user_(
             )
             user = saml_account.user if saml_account else None
 
-    # If user is still None, check for JWT in Authorization header
-    if user is None and JWT_PUBLIC_KEY_URL is not None:
-        auth_header = request.headers.get("Authorization")
-        if auth_header and auth_header.startswith("Bearer "):
-            token = auth_header[len("Bearer ") :].strip()
-            user = await verify_jwt_token(token, async_db_session)
-
     return user
 
 

backend/ee/danswer/background/celery/tasks/beat_schedule.py

@@ -4,17 +4,16 @@ from typing import Any
 from danswer.background.celery.tasks.beat_schedule import (
     tasks_to_schedule as base_tasks_to_schedule,
 )
-from danswer.configs.constants import DanswerCeleryTask
 
 ee_tasks_to_schedule = [
     {
         "name": "autogenerate_usage_report",
-        "task": DanswerCeleryTask.AUTOGENERATE_USAGE_REPORT_TASK,
+        "task": "autogenerate_usage_report_task",
         "schedule": timedelta(days=30),  # TODO: change this to config flag
     },
     {
         "name": "check-ttl-management",
-        "task": DanswerCeleryTask.CHECK_TTL_MANAGEMENT_TASK,
+        "task": "check_ttl_management_task",
         "schedule": timedelta(hours=1),
     },
 ]

backend/ee/danswer/configs/app_configs.py

@@ -1,4 +1,3 @@
-import json
 import os
 
 # Applicable for OIDC Auth
@@ -21,10 +20,4 @@ OPENAI_DEFAULT_API_KEY = os.environ.get("OPENAI_DEFAULT_API_KEY")
 ANTHROPIC_DEFAULT_API_KEY = os.environ.get("ANTHROPIC_DEFAULT_API_KEY")
 COHERE_DEFAULT_API_KEY = os.environ.get("COHERE_DEFAULT_API_KEY")
 
-# JWT Public Key URL
-JWT_PUBLIC_KEY_URL: str | None = os.getenv("JWT_PUBLIC_KEY_URL", None)
-
-
-# Super Users
-SUPER_USERS = json.loads(os.environ.get("SUPER_USERS", '["pablo@danswer.ai"]'))
-SUPER_CLOUD_API_KEY = os.environ.get("SUPER_CLOUD_API_KEY", "api_key")
+INTEGRATION_TEST_MODE = os.environ.get("INTEGRATION_TEST_MODE")

backend/ee/danswer/server/enterprise_settings/api.py

@@ -113,6 +113,10 @@ async def refresh_access_token(
 def put_settings(
     settings: EnterpriseSettings, _: User | None = Depends(current_admin_user)
 ) -> None:
+    try:
+        settings.check_validity()
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
     store_settings(settings)
 
 

backend/ee/danswer/server/seeding.py

@@ -157,6 +157,7 @@ def _seed_personas(db_session: Session, personas: list[CreatePersonaRequest]) ->
 def _seed_settings(settings: Settings) -> None:
     logger.notice("Seeding Settings")
     try:
+        settings.check_validity()
         store_base_settings(settings)
         logger.notice("Successfully seeded Settings")
     except ValueError as e:

backend/requirements/model_server.txt

@@ -3,7 +3,7 @@ cohere==5.6.1
 fastapi==0.109.2
 google-cloud-aiplatform==1.58.0
 numpy==1.26.4
-openai==1.55.3
+openai==1.52.2
 pydantic==2.8.2
 retry==0.9.2
 safetensors==0.4.2

backend/shared_configs/configs.py

@@ -163,92 +163,47 @@ SUPPORTED_EMBEDDING_MODELS = [
         dim=1024,
         index_name="danswer_chunk_cohere_embed_english_v3_0",
     ),
-    SupportedEmbeddingModel(
-        name="cohere/embed-english-v3.0",
-        dim=1024,
-        index_name="danswer_chunk_embed_english_v3_0",
-    ),
     SupportedEmbeddingModel(
         name="cohere/embed-english-light-v3.0",
         dim=384,
         index_name="danswer_chunk_cohere_embed_english_light_v3_0",
     ),
-    SupportedEmbeddingModel(
-        name="cohere/embed-english-light-v3.0",
-        dim=384,
-        index_name="danswer_chunk_embed_english_light_v3_0",
-    ),
     SupportedEmbeddingModel(
         name="openai/text-embedding-3-large",
         dim=3072,
         index_name="danswer_chunk_openai_text_embedding_3_large",
     ),
-    SupportedEmbeddingModel(
-        name="openai/text-embedding-3-large",
-        dim=3072,
-        index_name="danswer_chunk_text_embedding_3_large",
-    ),
     SupportedEmbeddingModel(
         name="openai/text-embedding-3-small",
         dim=1536,
         index_name="danswer_chunk_openai_text_embedding_3_small",
     ),
-    SupportedEmbeddingModel(
-        name="openai/text-embedding-3-small",
-        dim=1536,
-        index_name="danswer_chunk_text_embedding_3_small",
-    ),
     SupportedEmbeddingModel(
         name="google/text-embedding-004",
         dim=768,
         index_name="danswer_chunk_google_text_embedding_004",
     ),
-    SupportedEmbeddingModel(
-        name="google/text-embedding-004",
-        dim=768,
-        index_name="danswer_chunk_text_embedding_004",
-    ),
     SupportedEmbeddingModel(
         name="google/textembedding-gecko@003",
         dim=768,
         index_name="danswer_chunk_google_textembedding_gecko_003",
     ),
-    SupportedEmbeddingModel(
-        name="google/textembedding-gecko@003",
-        dim=768,
-        index_name="danswer_chunk_textembedding_gecko_003",
-    ),
     SupportedEmbeddingModel(
         name="voyage/voyage-large-2-instruct",
         dim=1024,
         index_name="danswer_chunk_voyage_large_2_instruct",
     ),
-    SupportedEmbeddingModel(
-        name="voyage/voyage-large-2-instruct",
-        dim=1024,
-        index_name="danswer_chunk_large_2_instruct",
-    ),
     SupportedEmbeddingModel(
         name="voyage/voyage-light-2-instruct",
         dim=384,
         index_name="danswer_chunk_voyage_light_2_instruct",
     ),
-    SupportedEmbeddingModel(
-        name="voyage/voyage-light-2-instruct",
-        dim=384,
-        index_name="danswer_chunk_light_2_instruct",
-    ),
     # Self-hosted models
     SupportedEmbeddingModel(
         name="nomic-ai/nomic-embed-text-v1",
         dim=768,
         index_name="danswer_chunk_nomic_ai_nomic_embed_text_v1",
     ),
-    SupportedEmbeddingModel(
-        name="nomic-ai/nomic-embed-text-v1",
-        dim=768,
-        index_name="danswer_chunk_nomic_embed_text_v1",
-    ),
     SupportedEmbeddingModel(
         name="intfloat/e5-base-v2",
         dim=768,

backend/tests/daily/connectors/slab/test_slab_connector.py

@@ -1,88 +0,0 @@
-import json
-import os
-import time
-from pathlib import Path
-
-import pytest
-
-from danswer.configs.constants import DocumentSource
-from danswer.connectors.models import Document
-from danswer.connectors.slab.connector import SlabConnector
-
-
-def load_test_data(file_name: str = "test_slab_data.json") -> dict[str, str]:
-    current_dir = Path(__file__).parent
-    with open(current_dir / file_name, "r") as f:
-        return json.load(f)
-
-
-@pytest.fixture
-def slab_connector() -> SlabConnector:
-    connector = SlabConnector(
-        base_url="https://onyx-test.slab.com/",
-    )
-    connector.load_credentials(
-        {
-            "slab_bot_token": os.environ["SLAB_BOT_TOKEN"],
-        }
-    )
-    return connector
-
-
-@pytest.mark.xfail(
-    reason=(
-        "Need a test account with a slab subscription to run this test."
-        "Trial only lasts 14 days."
-    )
-)
-def test_slab_connector_basic(slab_connector: SlabConnector) -> None:
-    all_docs: list[Document] = []
-    target_test_doc_id = "jcp6cohu"
-    target_test_doc: Document | None = None
-    for doc_batch in slab_connector.poll_source(0, time.time()):
-        for doc in doc_batch:
-            all_docs.append(doc)
-            if doc.id == target_test_doc_id:
-                target_test_doc = doc
-
-    assert len(all_docs) == 6
-    assert target_test_doc is not None
-
-    desired_test_data = load_test_data()
-    assert (
-        target_test_doc.semantic_identifier == desired_test_data["semantic_identifier"]
-    )
-    assert target_test_doc.source == DocumentSource.SLAB
-    assert target_test_doc.metadata == {}
-    assert target_test_doc.primary_owners is None
-    assert target_test_doc.secondary_owners is None
-    assert target_test_doc.title is None
-    assert target_test_doc.from_ingestion_api is False
-    assert target_test_doc.additional_info is None
-
-    assert len(target_test_doc.sections) == 1
-    section = target_test_doc.sections[0]
-    # Need to replace the weird apostrophe with a normal one
-    assert section.text.replace("\u2019", "'") == desired_test_data["section_text"]
-    assert section.link == desired_test_data["link"]
-
-
-@pytest.mark.xfail(
-    reason=(
-        "Need a test account with a slab subscription to run this test."
-        "Trial only lasts 14 days."
-    )
-)
-def test_slab_connector_slim(slab_connector: SlabConnector) -> None:
-    # Get all doc IDs from the full connector
-    all_full_doc_ids = set()
-    for doc_batch in slab_connector.load_from_state():
-        all_full_doc_ids.update([doc.id for doc in doc_batch])
-
-    # Get all doc IDs from the slim connector
-    all_slim_doc_ids = set()
-    for slim_doc_batch in slab_connector.retrieve_all_slim_documents():
-        all_slim_doc_ids.update([doc.id for doc in slim_doc_batch])
-
-    # The set of full doc IDs should be always be a subset of the slim doc IDs
-    assert all_full_doc_ids.issubset(all_slim_doc_ids)

backend/tests/daily/connectors/slab/test_slab_data.json

@@ -1,5 +0,0 @@
-{
-    "section_text": "Learn about Posts\nWelcome\nThis is a post, where you can edit, share, and collaborate in real time with your team. We'd love to show you how it works!\nReading and editing\nClick the mode button to toggle between read and edit modes. You can only make changes to a post when editing.\nOrganize your posts\nWhen in edit mode, you can add topics to a post, which will keep it organized for the right 👀 to see.\nSmart mentions\nMentions are references to users, posts, topics and third party tools that show details on hover. Paste in a link for automatic conversion.\nLook back in time\nYou are ready to begin writing. You can always bring back this tour in the help menu.\nGreat job!\nYou are ready to begin writing. You can always bring back this tour in the help menu.\n\n",
-    "link": "https://onyx-test.slab.com/posts/learn-about-posts-jcp6cohu",
-    "semantic_identifier": "Learn about Posts"
-} 

backend/tests/integration/common_utils/managers/file.py

@@ -1,62 +0,0 @@
-import mimetypes
-from typing import cast
-from typing import IO
-from typing import List
-from typing import Tuple
-
-import requests
-
-from danswer.file_store.models import FileDescriptor
-from tests.integration.common_utils.constants import API_SERVER_URL
-from tests.integration.common_utils.constants import GENERAL_HEADERS
-from tests.integration.common_utils.test_models import DATestUser
-
-
-class FileManager:
-    @staticmethod
-    def upload_files(
-        files: List[Tuple[str, IO]],
-        user_performing_action: DATestUser | None = None,
-    ) -> Tuple[List[FileDescriptor], str]:
-        headers = (
-            user_performing_action.headers
-            if user_performing_action
-            else GENERAL_HEADERS
-        )
-        headers.pop("Content-Type", None)
-
-        files_param = []
-        for filename, file_obj in files:
-            mime_type, _ = mimetypes.guess_type(filename)
-            if mime_type is None:
-                mime_type = "application/octet-stream"
-            files_param.append(("files", (filename, file_obj, mime_type)))
-
-        response = requests.post(
-            f"{API_SERVER_URL}/chat/file",
-            files=files_param,
-            headers=headers,
-        )
-
-        if not response.ok:
-            return (
-                cast(List[FileDescriptor], []),
-                f"Failed to upload files - {response.json().get('detail', 'Unknown error')}",
-            )
-
-        response_json = response.json()
-        return response_json.get("files", cast(List[FileDescriptor], [])), ""
-
-    @staticmethod
-    def fetch_uploaded_file(
-        file_id: str,
-        user_performing_action: DATestUser | None = None,
-    ) -> bytes:
-        response = requests.get(
-            f"{API_SERVER_URL}/chat/file/{file_id}",
-            headers=user_performing_action.headers
-            if user_performing_action
-            else GENERAL_HEADERS,
-        )
-        response.raise_for_status()
-        return response.content

backend/tests/integration/common_utils/managers/tenant.py

@@ -1,84 +0,0 @@
-from datetime import datetime
-from datetime import timedelta
-
-import jwt
-import requests
-
-from danswer.server.manage.models import AllUsersResponse
-from danswer.server.models import FullUserSnapshot
-from danswer.server.models import InvitedUserSnapshot
-from tests.integration.common_utils.constants import API_SERVER_URL
-from tests.integration.common_utils.constants import GENERAL_HEADERS
-from tests.integration.common_utils.test_models import DATestUser
-
-
-def generate_auth_token() -> str:
-    payload = {
-        "iss": "control_plane",
-        "exp": datetime.utcnow() + timedelta(minutes=5),
-        "iat": datetime.utcnow(),
-        "scope": "tenant:create",
-    }
-    token = jwt.encode(payload, "", algorithm="HS256")
-    return token
-
-
-class TenantManager:
-    @staticmethod
-    def create(
-        tenant_id: str | None = None,
-        initial_admin_email: str | None = None,
-        referral_source: str | None = None,
-    ) -> dict[str, str]:
-        body = {
-            "tenant_id": tenant_id,
-            "initial_admin_email": initial_admin_email,
-            "referral_source": referral_source,
-        }
-
-        token = generate_auth_token()
-        headers = {
-            "Authorization": f"Bearer {token}",
-            "X-API-KEY": "",
-            "Content-Type": "application/json",
-        }
-
-        response = requests.post(
-            url=f"{API_SERVER_URL}/tenants/create",
-            json=body,
-            headers=headers,
-        )
-
-        response.raise_for_status()
-
-        return response.json()
-
-    @staticmethod
-    def get_all_users(
-        user_performing_action: DATestUser | None = None,
-    ) -> AllUsersResponse:
-        response = requests.get(
-            url=f"{API_SERVER_URL}/manage/users",
-            headers=user_performing_action.headers
-            if user_performing_action
-            else GENERAL_HEADERS,
-        )
-        response.raise_for_status()
-
-        data = response.json()
-        return AllUsersResponse(
-            accepted=[FullUserSnapshot(**user) for user in data["accepted"]],
-            invited=[InvitedUserSnapshot(**user) for user in data["invited"]],
-            accepted_pages=data["accepted_pages"],
-            invited_pages=data["invited_pages"],
-        )
-
-    @staticmethod
-    def verify_user_in_tenant(
-        user: DATestUser, user_performing_action: DATestUser | None = None
-    ) -> None:
-        all_users = TenantManager.get_all_users(user_performing_action)
-        for accepted_user in all_users.accepted:
-            if accepted_user.email == user.email and accepted_user.id == user.id:
-                return
-        raise ValueError(f"User {user.email} not found in tenant")

backend/tests/integration/common_utils/reset.py

@@ -211,7 +211,6 @@ def reset_postgres_multitenant() -> None:
     for schema in tenant_schemas:
         schema_name = schema[0]
         cur.execute(f'DROP SCHEMA "{schema_name}" CASCADE')
-
     cur.close()
     conn.close()
 

backend/tests/integration/multitenant_tests/syncing/test_search_permissions.py

@@ -4,7 +4,6 @@ from tests.integration.common_utils.managers.cc_pair import CCPairManager
 from tests.integration.common_utils.managers.chat import ChatSessionManager
 from tests.integration.common_utils.managers.document import DocumentManager
 from tests.integration.common_utils.managers.llm_provider import LLMProviderManager
-from tests.integration.common_utils.managers.tenant import TenantManager
 from tests.integration.common_utils.managers.user import UserManager
 from tests.integration.common_utils.test_models import DATestAPIKey
 from tests.integration.common_utils.test_models import DATestCCPair
@@ -13,66 +12,49 @@ from tests.integration.common_utils.test_models import DATestUser
 
 
 def test_multi_tenant_access_control(reset_multitenant: None) -> None:
-    # Create Tenant 1 and its Admin User
-    TenantManager.create("tenant_dev1", "test1@test.com", "Data Plane Registration")
-    test_user1: DATestUser = UserManager.create(name="test1", email="test1@test.com")
-    assert UserManager.verify_role(test_user1, UserRole.ADMIN)
+    # Create Tenants and Admin Users
+    test_user1: DATestUser = UserManager.create(name="test1", email="test_1@test.com")
+    test_user2: DATestUser = UserManager.create(name="test2", email="test_2@test.com")
 
-    # Create Tenant 2 and its Admin User
-    TenantManager.create("tenant_dev2", "test2@test.com", "Data Plane Registration")
-    test_user2: DATestUser = UserManager.create(name="test2", email="test2@test.com")
+    assert UserManager.verify_role(test_user1, UserRole.ADMIN)
     assert UserManager.verify_role(test_user2, UserRole.ADMIN)
 
-    # Create connectors for Tenant 1
+    # Create connectors and seed documents for Tenant 1
     cc_pair_1: DATestCCPair = CCPairManager.create_from_scratch(
-        user_performing_action=test_user1,
-    )
-    api_key_1: DATestAPIKey = APIKeyManager.create(
-        user_performing_action=test_user1,
+        user_performing_action=test_user1
     )
+    api_key_1: DATestAPIKey = APIKeyManager.create(user_performing_action=test_user1)
     api_key_1.headers.update(test_user1.headers)
     LLMProviderManager.create(user_performing_action=test_user1)
 
-    # Seed documents for Tenant 1
     cc_pair_1.documents = []
-    doc1_tenant1 = DocumentManager.seed_doc_with_content(
-        cc_pair=cc_pair_1,
-        content="Tenant 1 Document Content",
-        api_key=api_key_1,
-    )
-    doc2_tenant1 = DocumentManager.seed_doc_with_content(
-        cc_pair=cc_pair_1,
-        content="Tenant 1 Document Content",
-        api_key=api_key_1,
-    )
-    cc_pair_1.documents.extend([doc1_tenant1, doc2_tenant1])
+    docs_tenant1 = [
+        DocumentManager.seed_doc_with_content(
+            cc_pair=cc_pair_1, content="Tenant 1 Document Content", api_key=api_key_1
+        )
+        for _ in range(2)
+    ]
+    cc_pair_1.documents.extend(docs_tenant1)
 
-    # Create connectors for Tenant 2
+    # Create connectors and seed documents for Tenant 2
     cc_pair_2: DATestCCPair = CCPairManager.create_from_scratch(
-        user_performing_action=test_user2,
-    )
-    api_key_2: DATestAPIKey = APIKeyManager.create(
-        user_performing_action=test_user2,
+        user_performing_action=test_user2
     )
+    api_key_2: DATestAPIKey = APIKeyManager.create(user_performing_action=test_user2)
     api_key_2.headers.update(test_user2.headers)
     LLMProviderManager.create(user_performing_action=test_user2)
 
-    # Seed documents for Tenant 2
     cc_pair_2.documents = []
-    doc1_tenant2 = DocumentManager.seed_doc_with_content(
-        cc_pair=cc_pair_2,
-        content="Tenant 2 Document Content",
-        api_key=api_key_2,
-    )
-    doc2_tenant2 = DocumentManager.seed_doc_with_content(
-        cc_pair=cc_pair_2,
-        content="Tenant 2 Document Content",
-        api_key=api_key_2,
-    )
-    cc_pair_2.documents.extend([doc1_tenant2, doc2_tenant2])
+    docs_tenant2 = [
+        DocumentManager.seed_doc_with_content(
+            cc_pair=cc_pair_2, content="Tenant 2 Document Content", api_key=api_key_2
+        )
+        for _ in range(2)
+    ]
+    cc_pair_2.documents.extend(docs_tenant2)
 
-    tenant1_doc_ids = {doc1_tenant1.id, doc2_tenant1.id}
-    tenant2_doc_ids = {doc1_tenant2.id, doc2_tenant2.id}
+    tenant1_doc_ids = {doc.id for doc in docs_tenant1}
+    tenant2_doc_ids = {doc.id for doc in docs_tenant2}
 
     # Create chat sessions for each user
     chat_session1: DATestChatSession = ChatSessionManager.create(
@@ -82,69 +64,63 @@ def test_multi_tenant_access_control(reset_multitenant: None) -> None:
         user_performing_action=test_user2
     )
 
-    # User 1 sends a message and gets a response
+    # Test access for Tenant 1
     response1 = ChatSessionManager.send_message(
         chat_session_id=chat_session1.id,
         message="What is in Tenant 1's documents?",
         user_performing_action=test_user1,
     )
-    # Assert that the search tool was used
     assert response1.tool_name == "run_search"
-
-    response_doc_ids = {doc["document_id"] for doc in response1.tool_result or []}
+    response1_doc_ids = {doc["document_id"] for doc in response1.tool_result or []}
     assert tenant1_doc_ids.issubset(
-        response_doc_ids
+        response1_doc_ids
     ), "Not all Tenant 1 document IDs are in the response"
-    assert not response_doc_ids.intersection(
+    assert not response1_doc_ids.intersection(
         tenant2_doc_ids
-    ), "Tenant 2 document IDs should not be in the response"
-
-    # Assert that the contents are correct
+    ), "Tenant 2's document IDs should not be in the response"
     for doc in response1.tool_result or []:
         assert doc["content"] == "Tenant 1 Document Content"
 
-    # User 2 sends a message and gets a response
+    # Test access for Tenant 2
     response2 = ChatSessionManager.send_message(
         chat_session_id=chat_session2.id,
         message="What is in Tenant 2's documents?",
         user_performing_action=test_user2,
     )
-    # Assert that the search tool was used
     assert response2.tool_name == "run_search"
-    # Assert that the tool_result contains Tenant 2's documents
-    response_doc_ids = {doc["document_id"] for doc in response2.tool_result or []}
+    response2_doc_ids = {doc["document_id"] for doc in response2.tool_result or []}
     assert tenant2_doc_ids.issubset(
-        response_doc_ids
+        response2_doc_ids
     ), "Not all Tenant 2 document IDs are in the response"
-    assert not response_doc_ids.intersection(
+    assert not response2_doc_ids.intersection(
         tenant1_doc_ids
-    ), "Tenant 1 document IDs should not be in the response"
-    # Assert that the contents are correct
+    ), "Tenant 1's document IDs should not be in the response"
     for doc in response2.tool_result or []:
         assert doc["content"] == "Tenant 2 Document Content"
 
-    # User 1 tries to access Tenant 2's documents
-    response_cross = ChatSessionManager.send_message(
+    # Test cross-tenant access attempts
+    response_cross1 = ChatSessionManager.send_message(
         chat_session_id=chat_session1.id,
         message="What is in Tenant 2's documents?",
         user_performing_action=test_user1,
     )
-    # Assert that the search tool was used
-    assert response_cross.tool_name == "run_search"
-    # Assert that the tool_result is empty or does not contain Tenant 2's documents
-    response_doc_ids = {doc["document_id"] for doc in response_cross.tool_result or []}
-    # Ensure none of Tenant 2's document IDs are in the response
-    assert not response_doc_ids.intersection(tenant2_doc_ids)
+    assert response_cross1.tool_name == "run_search"
+    response_cross1_doc_ids = {
+        doc["document_id"] for doc in response_cross1.tool_result or []
+    }
+    assert not response_cross1_doc_ids.intersection(
+        tenant2_doc_ids
+    ), "Tenant 2's document IDs should not be in the response"
 
-    # User 2 tries to access Tenant 1's documents
     response_cross2 = ChatSessionManager.send_message(
         chat_session_id=chat_session2.id,
         message="What is in Tenant 1's documents?",
         user_performing_action=test_user2,
     )
-    # Assert that the search tool was used
     assert response_cross2.tool_name == "run_search"
-    # Assert that the tool_result is empty or does not contain Tenant 1's documents
-    response_doc_ids = {doc["document_id"] for doc in response_cross2.tool_result or []}
-    # Ensure none of Tenant 1's document IDs are in the response
-    assert not response_doc_ids.intersection(tenant1_doc_ids)
+    response_cross2_doc_ids = {
+        doc["document_id"] for doc in response_cross2.tool_result or []
+    }
+    assert not response_cross2_doc_ids.intersection(
+        tenant1_doc_ids
+    ), "Tenant 1's document IDs should not be in the response"

backend/tests/integration/multitenant_tests/tenants/test_tenant_creation.py

@@ -1,41 +0,0 @@
-from danswer.configs.constants import DocumentSource
-from danswer.db.enums import AccessType
-from danswer.db.models import UserRole
-from tests.integration.common_utils.managers.cc_pair import CCPairManager
-from tests.integration.common_utils.managers.connector import ConnectorManager
-from tests.integration.common_utils.managers.credential import CredentialManager
-from tests.integration.common_utils.managers.tenant import TenantManager
-from tests.integration.common_utils.managers.user import UserManager
-from tests.integration.common_utils.test_models import DATestUser
-
-
-# Test flow from creating tenant to registering as a user
-def test_tenant_creation(reset_multitenant: None) -> None:
-    TenantManager.create("tenant_dev", "test@test.com", "Data Plane Registration")
-    test_user: DATestUser = UserManager.create(name="test", email="test@test.com")
-
-    assert UserManager.verify_role(test_user, UserRole.ADMIN)
-
-    test_credential = CredentialManager.create(
-        name="admin_test_credential",
-        source=DocumentSource.FILE,
-        curator_public=False,
-        user_performing_action=test_user,
-    )
-
-    test_connector = ConnectorManager.create(
-        name="admin_test_connector",
-        source=DocumentSource.FILE,
-        access_type=AccessType.PRIVATE,
-        user_performing_action=test_user,
-    )
-
-    test_cc_pair = CCPairManager.create(
-        connector_id=test_connector.id,
-        credential_id=test_credential.id,
-        name="admin_test_cc_pair",
-        access_type=AccessType.PRIVATE,
-        user_performing_action=test_user,
-    )
-
-    CCPairManager.verify(cc_pair=test_cc_pair, user_performing_action=test_user)

backend/tests/integration/tests/personas/test_persona_categories.py

@@ -44,7 +44,6 @@ def test_persona_category_management(reset: None) -> None:
             category=updated_persona_category,
             user_performing_action=regular_user,
         )
-    assert exc_info.value.response is not None
     assert exc_info.value.response.status_code == 403
 
     assert PersonaCategoryManager.verify(

backend/tests/unit/danswer/llm/answering/conftest.py

@@ -64,7 +64,6 @@ def mock_search_results() -> list[LlmDoc]:
             updated_at=datetime(2023, 1, 1),
             link="https://example.com/doc1",
             source_links={0: "https://example.com/doc1"},
-            match_highlights=[],
         ),
         LlmDoc(
             content="Search result 2",
@@ -76,7 +75,6 @@ def mock_search_results() -> list[LlmDoc]:
             updated_at=datetime(2023, 1, 2),
             link="https://example.com/doc2",
             source_links={0: "https://example.com/doc2"},
-            match_highlights=[],
         ),
     ]
 

backend/tests/unit/danswer/llm/answering/stream_processing/test_citation_processing.py

@@ -46,7 +46,6 @@ mock_docs = [
         updated_at=datetime.now(),
         link=f"https://{int(id/2)}.com" if int(id / 2) % 2 == 0 else None,
         source_links={0: "https://mintlify.com/docs/settings/broken-links"},
-        match_highlights=[],
     )
     for id in range(10)
 ]

backend/tests/unit/danswer/llm/answering/stream_processing/test_quote_processing.py

@@ -20,7 +20,6 @@ mock_docs = [
         updated_at=datetime.now(),
         link=f"https://{int(id/2)}.com" if int(id / 2) % 2 == 0 else None,
         source_links={0: "https://mintlify.com/docs/settings/broken-links"},
-        match_highlights=[],
     )
     for id in range(10)
 ]

deployment/docker_compose/docker-compose.dev.yml

@@ -130,7 +130,6 @@ services:
     restart: always
     environment:
       - ENCRYPTION_KEY_SECRET=${ENCRYPTION_KEY_SECRET:-}
-      - JWT_PUBLIC_KEY_URL=${JWT_PUBLIC_KEY_URL:-} # used for JWT authentication of users via API
       # Gen AI Settings (Needed by DanswerBot)
       - GEN_AI_MAX_TOKENS=${GEN_AI_MAX_TOKENS:-}
       - QA_TIMEOUT=${QA_TIMEOUT:-}

deployment/docker_compose/docker-compose.multi-tenant.yml

@@ -0,0 +1,30 @@
+version: "3"
+services:
+  control-tenants-service:
+    image: danswer/control-tenants-service:test
+    environment:
+      - POSTGRES_HOST=relational_db
+      - POSTGRES_PORT=5432
+    ports:
+      - "8082:8082"
+    depends_on:
+      relational_db:
+        condition: service_healthy
+
+  relational_db:
+    image: postgres:15.2-alpine
+    restart: always
+    ports:
+      - "5434:5432"
+    volumes:
+      - db_volume:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    command: ["postgres", "-c", "log_statement=all"]
+
+volumes:
+  db_volume:

node_modules/.package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "danswer",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}

web/@types/favicon-fetch.d.ts

@@ -1,9 +0,0 @@
-declare module "favicon-fetch" {
-  interface FaviconFetchOptions {
-    uri: string;
-  }
-
-  function faviconFetch(options: FaviconFetchOptions): string | null;
-
-  export default faviconFetch;
-}

web/package.json

@@ -17,13 +17,11 @@
     "@headlessui/react": "^2.2.0",
     "@headlessui/tailwindcss": "^0.2.1",
     "@phosphor-icons/react": "^2.0.8",
-    "@radix-ui/react-checkbox": "^1.1.2",
-    "@radix-ui/react-dialog": "^1.1.2",
+    "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-popover": "^1.1.2",
     "@radix-ui/react-select": "^2.1.2",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
-    "@radix-ui/react-switch": "^1.1.1",
     "@radix-ui/react-tabs": "^1.1.1",
     "@radix-ui/react-tooltip": "^1.1.3",
     "@sentry/nextjs": "^8.34.0",
@@ -39,7 +37,6 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
-    "favicon-fetch": "^1.0.0",
     "formik": "^2.2.9",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
@@ -70,7 +67,6 @@
     "tailwindcss-animate": "^1.0.7",
     "typescript": "5.0.3",
     "uuid": "^9.0.1",
-    "vaul": "^1.1.1",
     "yup": "^1.4.0"
   },
   "devDependencies": {

web/src/app/admin/assistants/AssistantEditor.tsx

@@ -24,6 +24,13 @@ import {
   TextFormField,
 } from "@/components/admin/connectors/Field";
 
+import {
+  Card,
+  CardHeader,
+  CardTitle,
+  CardContent,
+  CardFooter,
+} from "@/components/ui/card";
 import { usePopup } from "@/components/admin/connectors/Popup";
 import { getDisplayNameForModel, useCategories } from "@/lib/hooks";
 import { DocumentSetSelectable } from "@/components/documentSet/DocumentSetSelectable";

web/src/app/admin/configuration/llm/interfaces.ts

@@ -89,6 +89,3 @@ export const getProviderIcon = (providerName: string, modelName?: string) => {
       return CPUIcon;
   }
 };
-
-export const isAnthropic = (provider: string, modelName: string) =>
-  provider === "anthropic" || modelName.toLowerCase().includes("claude");

web/src/app/admin/documents/sets/page.tsx

@@ -83,7 +83,7 @@ const EditRow = ({
             </div>
           </TooltipTrigger>
           {!documentSet.is_up_to_date && (
-            <TooltipContent width="max-w-sm">
+            <TooltipContent maxWidth="max-w-sm">
               <div className="flex break-words break-keep whitespace-pre-wrap items-start">
                 <InfoIcon className="mr-2 mt-0.5" />
                 Cannot update while syncing! Wait for the sync to finish, then

web/src/app/admin/embeddings/pages/EmbeddingFormPage.tsx

@@ -28,8 +28,7 @@ import { Modal } from "@/components/Modal";
 
 import { useRouter } from "next/navigation";
 import CardSection from "@/components/admin/CardSection";
-import { combineSearchSettings } from "./utils";
-
+import { CardDescription } from "@/components/ui/card";
 export default function EmbeddingForm() {
   const { formStep, nextFormStep, prevFormStep } = useEmbeddingFormContext();
   const { popup, setPopup } = usePopup();
@@ -223,14 +222,15 @@ export default function EmbeddingForm() {
   };
 
   const updateSearch = async () => {
-    const searchSettings = combineSearchSettings(
-      selectedProvider,
-      advancedEmbeddingDetails,
-      rerankingDetails,
-      selectedProvider.provider_type?.toLowerCase() as EmbeddingProvider | null
-    );
+    const values: SavedSearchSettings = {
+      ...rerankingDetails,
+      ...advancedEmbeddingDetails,
+      ...selectedProvider,
+      provider_type:
+        selectedProvider.provider_type?.toLowerCase() as EmbeddingProvider | null,
+    };
 
-    const response = await updateSearchSettings(searchSettings);
+    const response = await updateSearchSettings(values);
     if (response.ok) {
       return true;
     } else {
@@ -247,35 +247,39 @@ export default function EmbeddingForm() {
     if (!selectedProvider) {
       return;
     }
-    let searchSettings: SavedSearchSettings;
+    let newModel: SavedSearchSettings;
 
+    // We use a spread operation to merge properties from multiple objects into a single object.
+    // Advanced embedding details may update default values.
+    // Do NOT modify the order unless you are positive the new hierarchy is correct.
     if (selectedProvider.provider_type != null) {
       // This is a cloud model
-      searchSettings = combineSearchSettings(
-        selectedProvider,
-        advancedEmbeddingDetails,
-        rerankingDetails,
-        selectedProvider.provider_type
-          ?.toLowerCase()
-          .split(" ")[0] as EmbeddingProvider | null
-      );
+      newModel = {
+        ...selectedProvider,
+        ...advancedEmbeddingDetails,
+        ...rerankingDetails,
+        provider_type:
+          (selectedProvider.provider_type
+            ?.toLowerCase()
+            .split(" ")[0] as EmbeddingProvider) || null,
+      };
     } else {
       // This is a locally hosted model
-      searchSettings = combineSearchSettings(
-        selectedProvider,
-        advancedEmbeddingDetails,
-        rerankingDetails,
-        null
-      );
+      newModel = {
+        ...selectedProvider,
+        ...advancedEmbeddingDetails,
+        ...rerankingDetails,
+        provider_type: null,
+      };
     }
 
-    searchSettings.index_name = null;
+    newModel.index_name = null;
 
     const response = await fetch(
       "/api/search-settings/set-new-search-settings",
       {
         method: "POST",
-        body: JSON.stringify(searchSettings),
+        body: JSON.stringify(newModel),
         headers: {
           "Content-Type": "application/json",
         },

web/src/app/admin/embeddings/pages/utils.ts

@@ -1,16 +1,3 @@
-import {
-  CloudEmbeddingProvider,
-  HostedEmbeddingModel,
-} from "@/components/embedding/interfaces";
-
-import {
-  AdvancedSearchConfiguration,
-  SavedSearchSettings,
-} from "../interfaces";
-
-import { EmbeddingProvider } from "@/components/embedding/interfaces";
-import { RerankingDetails } from "../interfaces";
-
 export const deleteSearchSettings = async (search_settings_id: number) => {
   const response = await fetch(`/api/search-settings/delete-search-settings`, {
     method: "DELETE",
@@ -55,20 +42,3 @@ export const testEmbedding = async ({
 
   return testResponse;
 };
-
-// We use a spread operation to merge properties from multiple objects into a single object.
-// Advanced embedding details may update default values.
-// Do NOT modify the order unless you are positive the new hierarchy is correct.
-export const combineSearchSettings = (
-  selectedProvider: CloudEmbeddingProvider | HostedEmbeddingModel,
-  advancedEmbeddingDetails: AdvancedSearchConfiguration,
-  rerankingDetails: RerankingDetails,
-  provider_type: EmbeddingProvider | null
-): SavedSearchSettings => {
-  return {
-    ...selectedProvider,
-    ...advancedEmbeddingDetails,
-    ...rerankingDetails,
-    provider_type: provider_type,
-  };
-};

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

@@ -175,6 +175,29 @@ export function SettingsForm() {
       { fieldName, newValue: checked },
     ];
 
+    // If we're disabling a page, check if we need to update the default page
+    if (
+      !checked &&
+      (fieldName === "search_page_enabled" || fieldName === "chat_page_enabled")
+    ) {
+      const otherPageField =
+        fieldName === "search_page_enabled"
+          ? "chat_page_enabled"
+          : "search_page_enabled";
+      const otherPageEnabled = settings && settings[otherPageField];
+
+      if (
+        otherPageEnabled &&
+        settings?.default_page ===
+          (fieldName === "search_page_enabled" ? "search" : "chat")
+      ) {
+        updates.push({
+          fieldName: "default_page",
+          newValue: fieldName === "search_page_enabled" ? "chat" : "search",
+        });
+      }
+    }
+
     updateSettingField(updates);
   }
 
@@ -195,17 +218,42 @@ export function SettingsForm() {
   return (
     <div>
       {popup}
-      <Title className="mb-4">Workspace Settings</Title>
+      <Title className="mb-4">Page Visibility</Title>
 
       <Checkbox
-        label="Auto-scroll"
-        sublabel="If set, the chat window will automatically scroll to the bottom as new lines of text are generated by the AI model."
-        checked={settings.auto_scroll}
+        label="Search Page Enabled?"
+        sublabel="If set, then the 'Search' page will be accessible to all users and will show up as an option on the top navbar. If unset, then this page will not be available."
+        checked={settings.search_page_enabled}
         onChange={(e) =>
-          handleToggleSettingsField("auto_scroll", e.target.checked)
+          handleToggleSettingsField("search_page_enabled", e.target.checked)
         }
       />
 
+      <Checkbox
+        label="Chat Page Enabled?"
+        sublabel="If set, then the 'Chat' page will be accessible to all users and will show up as an option on the top navbar. If unset, then this page will not be available."
+        checked={settings.chat_page_enabled}
+        onChange={(e) =>
+          handleToggleSettingsField("chat_page_enabled", e.target.checked)
+        }
+      />
+
+      <Selector
+        label="Default Page"
+        subtext="The page that users will be redirected to after logging in. Can only be set to a page that is enabled."
+        options={[
+          { value: "search", name: "Search" },
+          { value: "chat", name: "Chat" },
+        ]}
+        selected={settings.default_page}
+        onSelect={(value) => {
+          value &&
+            updateSettingField([
+              { fieldName: "default_page", newValue: value },
+            ]);
+        }}
+      />
+
       {isEnterpriseEnabled && (
         <>
           <Title className="mb-4">Chat Settings</Title>

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

@@ -5,12 +5,14 @@ export enum GatingType {
 }
 
 export interface Settings {
+  chat_page_enabled: boolean;
+  search_page_enabled: boolean;
+  default_page: "search" | "chat";
   maximum_chat_retention_days: number | null;
   notifications: Notification[];
   needs_reindexing: boolean;
   gpu_enabled: boolean;
   product_gating: GatingType;
-  auto_scroll: boolean;
 }
 
 export enum NotificationType {
@@ -52,7 +54,6 @@ export interface EnterpriseSettings {
   custom_popup_header: string | null;
   custom_popup_content: string | null;
   enable_consent_screen: boolean | null;
-  auto_scroll: boolean;
 }
 
 export interface CombinedSettings {

web/src/app/auth/login/EmailPasswordForm.tsx

@@ -5,6 +5,7 @@ import { usePopup } from "@/components/admin/connectors/Popup";
 import { basicLogin, basicSignup } from "@/lib/user";
 import { Button } from "@/components/ui/button";
 import { Form, Formik } from "formik";
+import { useRouter } from "next/navigation";
 import * as Yup from "yup";
 import { requestEmailVerification } from "../lib";
 import { useState } from "react";
@@ -21,8 +22,10 @@ export function EmailPasswordForm({
   referralSource?: string;
   nextUrl?: string | null;
 }) {
+  const router = useRouter();
   const { popup, setPopup } = usePopup();
   const [isWorking, setIsWorking] = useState(false);
+
   return (
     <>
       {isWorking && <Spinner />}
@@ -66,13 +69,9 @@ export function EmailPasswordForm({
           if (loginResponse.ok) {
             if (isSignup && shouldVerify) {
               await requestEmailVerification(values.email);
-              // Use window.location.href to force a full page reload,
-              // ensuring app re-initializes with the new state (including
-              // server-side provider values)
-              window.location.href = "/auth/waiting-on-verification";
+              router.push("/auth/waiting-on-verification");
             } else {
-              // See above comment
-              window.location.href = nextUrl ? encodeURI(nextUrl) : "/";
+              router.push(nextUrl ? encodeURI(nextUrl) : "/");
             }
           } else {
             setIsWorking(false);

web/src/app/chat/ChatPage.tsx

@@ -8,6 +8,7 @@ import {
   ChatFileType,
   ChatSession,
   ChatSessionSharedStatus,
+  DocumentsResponse,
   FileDescriptor,
   FileChatDisplay,
   Message,
@@ -59,7 +60,7 @@ import { useDocumentSelection } from "./useDocumentSelection";
 import { LlmOverride, useFilters, useLlmOverride } from "@/lib/hooks";
 import { computeAvailableFilters } from "@/lib/filters";
 import { ChatState, FeedbackType, RegenerationState } from "./types";
-import { ChatFilters } from "./documentSidebar/ChatFilters";
+import { DocumentSidebar } from "./documentSidebar/DocumentSidebar";
 import { DanswerInitializingLoader } from "@/components/DanswerInitializingLoader";
 import { FeedbackModal } from "./modal/FeedbackModal";
 import { ShareChatSessionModal } from "./modal/ShareChatSessionModal";
@@ -70,7 +71,6 @@ import { StarterMessages } from "../../components/assistants/StarterMessage";
 import {
   AnswerPiecePacket,
   DanswerDocument,
-  DocumentInfoPacket,
   StreamStopInfo,
   StreamStopReason,
 } from "@/lib/search/interfaces";
@@ -105,11 +105,14 @@ import BlurBackground from "./shared_chat_search/BlurBackground";
 import { NoAssistantModal } from "@/components/modals/NoAssistantModal";
 import { useAssistants } from "@/components/context/AssistantsContext";
 import { Separator } from "@/components/ui/separator";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+} from "@/components/ui/card";
+import { AssistantIcon } from "@/components/assistants/AssistantIcon";
 import AssistantBanner from "../../components/assistants/AssistantBanner";
-import TextView from "@/components/chat_search/TextView";
-import AssistantSelector from "@/components/chat_search/AssistantSelector";
-import { Modal } from "@/components/Modal";
-import { createPostponedAbortSignal } from "next/dist/server/app-render/dynamic-rendering";
 
 const TEMP_USER_MESSAGE_ID = -1;
 const TEMP_ASSISTANT_MESSAGE_ID = -2;
@@ -129,9 +132,8 @@ export function ChatPage({
 
   const {
     chatSessions,
-    ccPairs,
-    tags,
-    documentSets,
+    availableSources,
+    availableDocumentSets,
     llmProviders,
     folders,
     openedFolders,
@@ -140,36 +142,6 @@ export function ChatPage({
     shouldShowWelcomeModal,
     refreshChatSessions,
   } = useChatContext();
-  function useScreenSize() {
-    const [screenSize, setScreenSize] = useState({
-      width: typeof window !== "undefined" ? window.innerWidth : 0,
-      height: typeof window !== "undefined" ? window.innerHeight : 0,
-    });
-
-    useEffect(() => {
-      const handleResize = () => {
-        setScreenSize({
-          width: window.innerWidth,
-          height: window.innerHeight,
-        });
-      };
-
-      window.addEventListener("resize", handleResize);
-      return () => window.removeEventListener("resize", handleResize);
-    }, []);
-
-    return screenSize;
-  }
-
-  const { height: screenHeight } = useScreenSize();
-
-  const getContainerHeight = () => {
-    if (autoScrollEnabled) return undefined;
-
-    if (screenHeight < 600) return "20vh";
-    if (screenHeight < 1200) return "30vh";
-    return "40vh";
-  };
 
   // handle redirect if chat page is disabled
   // NOTE: this must be done here, in a client component since
@@ -177,11 +149,9 @@ export function ChatPage({
   // available in server-side components
   const settings = useContext(SettingsContext);
   const enterpriseSettings = settings?.enterpriseSettings;
-
-  const [documentSidebarToggled, setDocumentSidebarToggled] = useState(false);
-  const [filtersToggled, setFiltersToggled] = useState(false);
-
-  const [userSettingsToggled, setUserSettingsToggled] = useState(false);
+  if (settings?.settings?.chat_page_enabled === false) {
+    router.push("/search");
+  }
 
   const { assistants: availableAssistants, finalAssistants } = useAssistants();
 
@@ -189,13 +159,16 @@ export function ChatPage({
     !shouldShowWelcomeModal
   );
 
-  const { user, isAdmin, isLoadingUser } = useUser();
+  const { user, isAdmin, isLoadingUser, refreshUser } = useUser();
+
   const slackChatId = searchParams.get("slackChatId");
+
   const existingChatIdRaw = searchParams.get("chatId");
   const [sendOnLoad, setSendOnLoad] = useState<string | null>(
     searchParams.get(SEARCH_PARAM_NAMES.SEND_ON_LOAD)
   );
 
+  const currentPersonaId = searchParams.get(SEARCH_PARAM_NAMES.PERSONA_ID);
   const modelVersionFromSearchParams = searchParams.get(
     SEARCH_PARAM_NAMES.STRUCTURED_MODEL
   );
@@ -281,9 +254,6 @@ export function ChatPage({
   const [alternativeAssistant, setAlternativeAssistant] =
     useState<Persona | null>(null);
 
-  const [presentingDocument, setPresentingDocument] =
-    useState<DanswerDocument | null>(null);
-
   const {
     visibleAssistants: assistants,
     recentAssistants,
@@ -291,7 +261,7 @@ export function ChatPage({
     refreshRecentAssistants,
   } = useAssistants();
 
-  const liveAssistant: Persona | undefined =
+  const liveAssistant =
     alternativeAssistant ||
     selectedAssistant ||
     recentAssistants[0] ||
@@ -299,20 +269,8 @@ export function ChatPage({
     availableAssistants[0];
 
   const noAssistants = liveAssistant == null || liveAssistant == undefined;
-
-  const availableSources = ccPairs.map((ccPair) => ccPair.source);
-  const [finalAvailableSources, finalAvailableDocumentSets] =
-    computeAvailableFilters({
-      selectedPersona: availableAssistants.find(
-        (assistant) => assistant.id === liveAssistant?.id
-      ),
-      availableSources: availableSources,
-      availableDocumentSets: documentSets,
-    });
-
   // always set the model override for the chat session, when an assistant, llm provider, or user preference exists
   useEffect(() => {
-    if (noAssistants) return;
     const personaDefault = getLLMProviderOverrideForPersona(
       liveAssistant,
       llmProviders
@@ -399,7 +357,9 @@ export function ChatPage({
     textAreaRef.current?.focus();
 
     // only clear things if we're going from one chat session to another
-    const isChatSessionSwitch = existingChatSessionId !== priorChatSessionId;
+    const isChatSessionSwitch =
+      chatSessionIdRef.current !== null &&
+      existingChatSessionId !== priorChatSessionId;
     if (isChatSessionSwitch) {
       // de-select documents
       clearSelectedDocuments();
@@ -412,7 +372,7 @@ export function ChatPage({
 
       // reset LLM overrides (based on chat session!)
       llmOverrideManager.updateModelOverrideForChatSession(selectedChatSession);
-      llmOverrideManager.updateTemperature(null);
+      llmOverrideManager.setTemperature(null);
 
       // remove uploaded files
       setCurrentMessageFiles([]);
@@ -489,13 +449,12 @@ export function ChatPage({
       }
 
       if (shouldScrollToBottom) {
-        if (!hasPerformedInitialScroll && autoScrollEnabled) {
+        if (!hasPerformedInitialScroll) {
           clientScrollToBottom();
-        } else if (isChatSessionSwitch && autoScrollEnabled) {
+        } else if (isChatSessionSwitch) {
           clientScrollToBottom(true);
         }
       }
-
       setIsFetchingChatMessages(false);
 
       // if this is a seeded chat, then kick off the AI message generation
@@ -800,7 +759,7 @@ export function ChatPage({
   useEffect(() => {
     async function fetchMaxTokens() {
       const response = await fetch(
-        `/api/chat/max-selected-document-tokens?persona_id=${liveAssistant?.id}`
+        `/api/chat/max-selected-document-tokens?persona_id=${liveAssistant.id}`
       );
       if (response.ok) {
         const maxTokens = (await response.json()).max_tokens as number;
@@ -874,13 +833,11 @@ export function ChatPage({
             0
           )}px`;
 
-          if (autoScrollEnabled) {
-            scrollableDivRef?.current.scrollBy({
-              left: 0,
-              top: Math.max(heightDifference, 0),
-              behavior: "smooth",
-            });
-          }
+          scrollableDivRef?.current.scrollBy({
+            left: 0,
+            top: Math.max(heightDifference, 0),
+            behavior: "smooth",
+          });
         }
         previousHeight.current = newHeight;
       }
@@ -922,11 +879,11 @@ export function ChatPage({
           setHasPerformedInitialScroll(true);
         }, 100);
       } else {
+        console.log("All messages are already rendered, scrolling immediately");
         // If all messages are already rendered, scroll immediately
         endDivRef.current.scrollIntoView({
           behavior: fast ? "auto" : "smooth",
         });
-
         setHasPerformedInitialScroll(true);
       }
     }, 50);
@@ -974,16 +931,6 @@ export function ChatPage({
     }
   };
 
-  useEffect(() => {
-    if (
-      (!selectedDocuments || selectedDocuments.length === 0) &&
-      documentSidebarToggled &&
-      !filtersToggled
-    ) {
-      setDocumentSidebarToggled(false);
-    }
-  }, [selectedDocuments, filtersToggled]);
-
   useEffect(() => {
     adjustDocumentSidebarWidth(); // Adjust the width on initial render
     window.addEventListener("resize", adjustDocumentSidebarWidth); // Add resize event listener
@@ -1088,9 +1035,7 @@ export function ChatPage({
     }
 
     setAlternativeGeneratingAssistant(alternativeAssistantOverride);
-
     clientScrollToBottom();
-
     let currChatSessionId: string;
     const isNewSession = chatSessionIdRef.current === null;
     const searchParamBasedChatSessionName =
@@ -1262,6 +1207,7 @@ export function ChatPage({
           if (!packet) {
             continue;
           }
+
           if (!initialFetchDetails) {
             if (!Object.hasOwn(packet, "user_message_id")) {
               console.error(
@@ -1336,7 +1282,7 @@ export function ChatPage({
             if (Object.hasOwn(packet, "answer_piece")) {
               answer += (packet as AnswerPiecePacket).answer_piece;
             } else if (Object.hasOwn(packet, "top_documents")) {
-              documents = (packet as DocumentInfoPacket).top_documents;
+              documents = (packet as DocumentsResponse).top_documents;
               retrievalType = RetrievalType.Search;
               if (documents && documents.length > 0) {
                 // point to the latest message (we don't know the messageId yet, which is why
@@ -1433,7 +1379,8 @@ export function ChatPage({
                 type: error ? "error" : "assistant",
                 retrievalType,
                 query: finalMessage?.rephrased_query || query,
-                documents: documents,
+                documents:
+                  finalMessage?.context_docs?.top_documents || documents,
                 citations: finalMessage?.citations || {},
                 files: finalMessage?.files || aiMessageImages || [],
                 toolCall: finalMessage?.tool_call || toolCall,
@@ -1652,19 +1599,14 @@ export function ChatPage({
     mobile: settings?.isMobile,
   });
 
-  const autoScrollEnabled =
-    user?.preferences?.auto_scroll == null
-      ? settings?.enterpriseSettings?.auto_scroll || false
-      : user?.preferences?.auto_scroll!;
-
   useScrollonStream({
     chatState: currentSessionChatState,
     scrollableDivRef,
     scrollDist,
     endDivRef,
     debounceNumber,
+    waitForScrollRef,
     mobile: settings?.isMobile,
-    enableAutoScroll: autoScrollEnabled,
   });
 
   // Virtualization + Scrolling related effects and functions
@@ -1814,13 +1756,6 @@ export function ChatPage({
       liveAssistant
     );
   });
-
-  useEffect(() => {
-    if (!retrievalEnabled) {
-      setDocumentSidebarToggled(false);
-    }
-  }, [retrievalEnabled]);
-
   const [stackTraceModalContent, setStackTraceModalContent] = useState<
     string | null
   >(null);
@@ -1829,6 +1764,58 @@ export function ChatPage({
   const [settingsToggled, setSettingsToggled] = useState(false);
 
   const currentPersona = alternativeAssistant || liveAssistant;
+
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.metaKey || event.ctrlKey) {
+        switch (event.key.toLowerCase()) {
+          case "e":
+            event.preventDefault();
+            toggleSidebar();
+            break;
+        }
+      }
+    };
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => {
+      window.removeEventListener("keydown", handleKeyDown);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [router]);
+  const [sharedChatSession, setSharedChatSession] =
+    useState<ChatSession | null>();
+  const [deletingChatSession, setDeletingChatSession] =
+    useState<ChatSession | null>();
+
+  const showDeleteModal = (chatSession: ChatSession) => {
+    setDeletingChatSession(chatSession);
+  };
+  const showShareModal = (chatSession: ChatSession) => {
+    setSharedChatSession(chatSession);
+  };
+  const [documentSelection, setDocumentSelection] = useState(false);
+  const toggleDocumentSelectionAspects = () => {
+    setDocumentSelection((documentSelection) => !documentSelection);
+    setShowDocSidebar(false);
+  };
+
+  interface RegenerationRequest {
+    messageId: number;
+    parentMessage: Message;
+  }
+
+  function createRegenerator(regenerationRequest: RegenerationRequest) {
+    // Returns new function that only needs `modelOverRide` to be specified when called
+    return async function (modelOverRide: LlmOverride) {
+      return await onSubmit({
+        modelOverRide,
+        messageIdToResend: regenerationRequest.parentMessage.messageId,
+        regenerationRequest,
+      });
+    };
+  }
+
   useEffect(() => {
     const handleSlackChatRedirect = async () => {
       if (!slackChatId) return;
@@ -1864,94 +1851,18 @@ export function ChatPage({
 
     handleSlackChatRedirect();
   }, [searchParams, router]);
-  useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.metaKey || event.ctrlKey) {
-        switch (event.key.toLowerCase()) {
-          case "e":
-            event.preventDefault();
-            toggleSidebar();
-            break;
-        }
-      }
-    };
-
-    window.addEventListener("keydown", handleKeyDown);
-    return () => {
-      window.removeEventListener("keydown", handleKeyDown);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [router]);
-  const [sharedChatSession, setSharedChatSession] =
-    useState<ChatSession | null>();
-  const [deletingChatSession, setDeletingChatSession] =
-    useState<ChatSession | null>();
-
-  const showDeleteModal = (chatSession: ChatSession) => {
-    setDeletingChatSession(chatSession);
-  };
-  const showShareModal = (chatSession: ChatSession) => {
-    setSharedChatSession(chatSession);
-  };
-  const [documentSelection, setDocumentSelection] = useState(false);
-  // const toggleDocumentSelectionAspects = () => {
-  //   setDocumentSelection((documentSelection) => !documentSelection);
-  //   setShowDocSidebar(false);
-  // };
-
-  const toggleDocumentSidebar = () => {
-    if (!documentSidebarToggled) {
-      setFiltersToggled(false);
-      setDocumentSidebarToggled(true);
-    } else if (!filtersToggled) {
-      setDocumentSidebarToggled(false);
-    } else {
-      setFiltersToggled(false);
-    }
-  };
-  const toggleFilters = () => {
-    if (!documentSidebarToggled) {
-      setFiltersToggled(true);
-      setDocumentSidebarToggled(true);
-    } else if (filtersToggled) {
-      setDocumentSidebarToggled(false);
-    } else {
-      setFiltersToggled(true);
-    }
-  };
-
-  interface RegenerationRequest {
-    messageId: number;
-    parentMessage: Message;
-  }
-
-  function createRegenerator(regenerationRequest: RegenerationRequest) {
-    // Returns new function that only needs `modelOverRide` to be specified when called
-    return async function (modelOverRide: LlmOverride) {
-      return await onSubmit({
-        modelOverRide,
-        messageIdToResend: regenerationRequest.parentMessage.messageId,
-        regenerationRequest,
-      });
-    };
-  }
-  if (noAssistants)
-    return (
-      <>
-        <HealthCheckBanner />
-        <NoAssistantModal isAdmin={isAdmin} />
-      </>
-    );
 
   return (
     <>
       <HealthCheckBanner />
 
-      {showApiKeyModal && !shouldShowWelcomeModal && (
+      {showApiKeyModal && !shouldShowWelcomeModal ? (
         <ApiKeyModal
           hide={() => setShowApiKeyModal(false)}
           setPopup={setPopup}
         />
+      ) : (
+        noAssistants && <NoAssistantModal isAdmin={isAdmin} />
       )}
 
       {/* ChatPopup is a custom popup that displays a admin-specified message on initial user visit. 
@@ -1959,7 +1870,6 @@ export function ChatPage({
       {popup}
 
       <ChatPopup />
-
       {currentFeedback && (
         <FeedbackModal
           feedbackType={currentFeedback[0]}
@@ -1976,47 +1886,16 @@ export function ChatPage({
         />
       )}
 
-      {(settingsToggled || userSettingsToggled) && (
+      {settingsToggled && (
         <SetDefaultModelModal
           setPopup={setPopup}
           setLlmOverride={llmOverrideManager.setGlobalDefault}
           defaultModel={user?.preferences.default_model!}
           llmProviders={llmProviders}
-          onClose={() => {
-            setUserSettingsToggled(false);
-            setSettingsToggled(false);
-          }}
+          onClose={() => setSettingsToggled(false)}
         />
       )}
 
-      {retrievalEnabled && documentSidebarToggled && settings?.isMobile && (
-        <div className="md:hidden">
-          <Modal noPadding noScroll>
-            <ChatFilters
-              setPresentingDocument={setPresentingDocument}
-              modal={true}
-              filterManager={filterManager}
-              ccPairs={ccPairs}
-              tags={tags}
-              documentSets={documentSets}
-              ref={innerSidebarElementRef}
-              showFilters={filtersToggled}
-              closeSidebar={() => {
-                setDocumentSidebarToggled(false);
-              }}
-              selectedMessage={aiMessage}
-              selectedDocuments={selectedDocuments}
-              toggleDocumentSelection={toggleDocumentSelection}
-              clearSelectedDocuments={clearSelectedDocuments}
-              selectedDocumentTokens={selectedDocumentTokens}
-              maxTokens={maxTokens}
-              initialWidth={400}
-              isOpen={true}
-            />
-          </Modal>
-        </div>
-      )}
-
       {deletingChatSession && (
         <DeleteEntityModal
           entityType="chat"
@@ -2039,13 +1918,6 @@ export function ChatPage({
         />
       )}
 
-      {presentingDocument && (
-        <TextView
-          presentingDocument={presentingDocument}
-          onClose={() => setPresentingDocument(null)}
-        />
-      )}
-
       {stackTraceModalContent && (
         <ExceptionTraceModal
           onOutsideClick={() => setStackTraceModalContent(null)}
@@ -2124,51 +1996,6 @@ export function ChatPage({
               </div>
             </div>
           </div>
-          {!settings?.isMobile && retrievalEnabled && (
-            <div
-              style={{ transition: "width 0.30s ease-out" }}
-              className={`
-                flex-none 
-                fixed
-                right-0
-                z-[1000]
-
-                bg-background
-                h-screen
-                transition-all
-                bg-opacity-80
-                duration-300
-                ease-in-out
-                bg-transparent
-                transition-all
-                bg-opacity-80
-                duration-300
-                ease-in-out
-                h-full
-                ${documentSidebarToggled ? "w-[400px]" : "w-[0px]"}
-            `}
-            >
-              <ChatFilters
-                setPresentingDocument={setPresentingDocument}
-                modal={false}
-                filterManager={filterManager}
-                ccPairs={ccPairs}
-                tags={tags}
-                documentSets={documentSets}
-                ref={innerSidebarElementRef}
-                showFilters={filtersToggled}
-                closeSidebar={() => setDocumentSidebarToggled(false)}
-                selectedMessage={aiMessage}
-                selectedDocuments={selectedDocuments}
-                toggleDocumentSelection={toggleDocumentSelection}
-                clearSelectedDocuments={clearSelectedDocuments}
-                selectedDocumentTokens={selectedDocumentTokens}
-                maxTokens={maxTokens}
-                initialWidth={400}
-                isOpen={documentSidebarToggled}
-              />
-            </div>
-          )}
 
           <BlurBackground
             visible={!untoggled && (showDocSidebar || toggledSidebar)}
@@ -2178,12 +2005,9 @@ export function ChatPage({
             ref={masterFlexboxRef}
             className="flex h-full w-full overflow-x-hidden"
           >
-            <div className="flex h-full relative px-2 flex-col w-full">
+            <div className="flex h-full flex-col w-full">
               {liveAssistant && (
                 <FunctionalHeader
-                  toggleUserSettings={() => setUserSettingsToggled(true)}
-                  liveAssistant={liveAssistant}
-                  onAssistantChange={onAssistantChange}
                   sidebarToggled={toggledSidebar}
                   reset={() => setMessage("")}
                   page="chat"
@@ -2194,8 +2018,6 @@ export function ChatPage({
                   }
                   toggleSidebar={toggleSidebar}
                   currentChatSession={selectedChatSession}
-                  documentSidebarToggled={documentSidebarToggled}
-                  llmOverrideManager={llmOverrideManager}
                 />
               )}
 
@@ -2217,7 +2039,7 @@ export function ChatPage({
                           duration-300 
                           ease-in-out
                           h-full
-                          ${toggledSidebar ? "w-[200px]" : "w-[0px]"}
+                          ${toggledSidebar ? "w-[250px]" : "w-[0px]"}
                       `}
                         ></div>
                       )}
@@ -2227,55 +2049,9 @@ export function ChatPage({
                         {...getRootProps()}
                       >
                         <div
-                          className={`w-full h-[calc(100vh-160px)] flex flex-col default-scrollbar overflow-y-auto overflow-x-hidden relative`}
+                          className={`w-full h-full flex flex-col default-scrollbar overflow-y-auto overflow-x-hidden relative`}
                           ref={scrollableDivRef}
                         >
-                          {liveAssistant && onAssistantChange && (
-                            <div className="z-20 fixed top-4 pointer-events-none left-0 w-full flex justify-center overflow-visible">
-                              {!settings?.isMobile && (
-                                <div
-                                  style={{ transition: "width 0.30s ease-out" }}
-                                  className={`
-                                  flex-none 
-                                  overflow-y-hidden 
-                                  transition-all 
-                                  pointer-events-none
-                                  duration-300 
-                                  ease-in-out
-                                  h-full
-                                  ${toggledSidebar ? "w-[200px]" : "w-[0px]"}
-                              `}
-                                ></div>
-                              )}
-
-                              <AssistantSelector
-                                isMobile={settings?.isMobile!}
-                                liveAssistant={liveAssistant}
-                                onAssistantChange={onAssistantChange}
-                                llmOverrideManager={llmOverrideManager}
-                              />
-                              {!settings?.isMobile && (
-                                <div
-                                  style={{ transition: "width 0.30s ease-out" }}
-                                  className={`
-                                    flex-none 
-                                    overflow-y-hidden 
-                                    transition-all 
-                                    duration-300 
-                                    ease-in-out
-                                    h-full
-                                    pointer-events-none
-                                    ${
-                                      documentSidebarToggled && retrievalEnabled
-                                        ? "w-[400px]"
-                                        : "w-[0px]"
-                                    }
-                                `}
-                                ></div>
-                              )}
-                            </div>
-                          )}
-
                           {/* ChatBanner is a custom banner that displays a admin-specified message at 
                       the top of the chat page. Oly used in the EE version of the app. */}
 
@@ -2283,7 +2059,7 @@ export function ChatPage({
                             !isFetchingChatMessages &&
                             currentSessionChatState == "input" &&
                             !loadingError && (
-                              <div className="h-full w-[95%] mx-auto mt-12 flex flex-col justify-center items-center">
+                              <div className="h-full mt-12 flex flex-col justify-center items-center">
                                 <ChatIntro selectedPersona={liveAssistant} />
 
                                 <StarterMessages
@@ -2305,7 +2081,6 @@ export function ChatPage({
                                         Recent Assistants
                                       </div>
                                       <AssistantBanner
-                                        mobile={settings?.isMobile}
                                         recentAssistants={recentAssistants}
                                         liveAssistant={liveAssistant}
                                         allAssistants={allAssistants}
@@ -2447,17 +2222,6 @@ export function ChatPage({
                                     }
                                   >
                                     <AIMessage
-                                      setPresentingDocument={
-                                        setPresentingDocument
-                                      }
-                                      index={i}
-                                      selectedMessageForDocDisplay={
-                                        selectedMessageForDocDisplay
-                                      }
-                                      documentSelectionToggled={
-                                        documentSidebarToggled &&
-                                        !filtersToggled
-                                      }
                                       continueGenerating={
                                         i == messageHistory.length - 1 &&
                                         currentCanContinue()
@@ -2494,19 +2258,9 @@ export function ChatPage({
                                       }}
                                       isActive={messageHistory.length - 1 == i}
                                       selectedDocuments={selectedDocuments}
-                                      toggleDocumentSelection={() => {
-                                        if (
-                                          !documentSidebarToggled ||
-                                          (documentSidebarToggled &&
-                                            selectedMessageForDocDisplay ===
-                                              message.messageId)
-                                        ) {
-                                          toggleDocumentSidebar();
-                                        }
-                                        setSelectedMessageForDocDisplay(
-                                          message.messageId
-                                        );
-                                      }}
+                                      toggleDocumentSelection={
+                                        toggleDocumentSelectionAspects
+                                      }
                                       docs={message.documents}
                                       currentPersona={liveAssistant}
                                       alternativeAssistant={
@@ -2514,6 +2268,7 @@ export function ChatPage({
                                       }
                                       messageId={message.messageId}
                                       content={message.message}
+                                      // content={message.message}
                                       files={message.files}
                                       query={
                                         messageHistory[i]?.query || undefined
@@ -2699,15 +2454,6 @@ export function ChatPage({
                                 />
                               </div>
                             )}
-                            {messageHistory.length > 0 && (
-                              <div
-                                style={{
-                                  height: !autoScrollEnabled
-                                    ? getContainerHeight()
-                                    : undefined,
-                                }}
-                              />
-                            )}
 
                             {/* Some padding at the bottom so the search bar has space at the bottom to not cover the last message*/}
                             <div ref={endPaddingRef} className="h-[95px]" />
@@ -2731,15 +2477,6 @@ export function ChatPage({
                               </div>
                             )}
                             <ChatInputBar
-                              removeDocs={() => {
-                                clearSelectedDocuments();
-                              }}
-                              removeFilters={() => {
-                                filterManager.setSelectedSources([]);
-                                filterManager.setSelectedTags([]);
-                                filterManager.setSelectedDocumentSets([]);
-                                setDocumentSidebarToggled(false);
-                              }}
                               showConfigureAPIKey={() =>
                                 setShowApiKeyModal(true)
                               }
@@ -2762,9 +2499,6 @@ export function ChatPage({
                               llmOverrideManager={llmOverrideManager}
                               files={currentMessageFiles}
                               setFiles={setCurrentMessageFiles}
-                              toggleFilters={
-                                retrievalEnabled ? toggleFilters : undefined
-                              }
                               handleFileUpload={handleImageUpload}
                               textAreaRef={textAreaRef}
                               chatSessionId={chatSessionIdRef.current!}
@@ -2795,23 +2529,6 @@ export function ChatPage({
                           </div>
                         </div>
                       </div>
-                      {!settings?.isMobile && (
-                        <div
-                          style={{ transition: "width 0.30s ease-out" }}
-                          className={`
-                          flex-none 
-                          overflow-y-hidden 
-                          transition-all 
-                          duration-300 
-                          ease-in-out
-                          ${
-                            documentSidebarToggled && retrievalEnabled
-                              ? "w-[400px]"
-                              : "w-[0px]"
-                          }
-                      `}
-                        ></div>
-                      )}
                     </div>
                   )}
                 </Dropzone>
@@ -2820,11 +2537,7 @@ export function ChatPage({
                   <div
                     style={{ transition: "width 0.30s ease-out" }}
                     className={`flex-none bg-transparent transition-all bg-opacity-80 duration-300 epase-in-out h-full
-                        ${
-                          toggledSidebar && !settings?.isMobile
-                            ? "w-[250px] "
-                            : "w-[0px]"
-                        }`}
+                        ${toggledSidebar ? "w-[250px] " : "w-[0px]"}`}
                   />
                   <div className="my-auto">
                     <DanswerInitializingLoader />
@@ -2835,8 +2548,20 @@ export function ChatPage({
           </div>
           <FixedLogo backgroundToggled={toggledSidebar || showDocSidebar} />
         </div>
-        {/* Right Sidebar - DocumentSidebar */}
       </div>
+      <DocumentSidebar
+        initialWidth={350}
+        ref={innerSidebarElementRef}
+        closeSidebar={() => setDocumentSelection(false)}
+        selectedMessage={aiMessage}
+        selectedDocuments={selectedDocuments}
+        toggleDocumentSelection={toggleDocumentSelection}
+        clearSelectedDocuments={clearSelectedDocuments}
+        selectedDocumentTokens={selectedDocumentTokens}
+        maxTokens={maxTokens}
+        isLoading={isFetchingChatMessages}
+        isOpen={documentSelection}
+      />
     </>
   );
 }

web/src/app/chat/RegenerateOption.tsx

@@ -14,6 +14,7 @@ import { destructureValue, getFinalLLM, structureValue } from "@/lib/llm/utils";
 import { useState } from "react";
 import { Hoverable } from "@/components/Hoverable";
 import { Popover } from "@/components/popover/Popover";
+import { StarFeedback } from "@/components/icons/icons";
 import { IconType } from "react-icons";
 import { FiRefreshCw } from "react-icons/fi";
 

web/src/app/chat/documentSidebar/ChatDocumentDisplay.tsx

@@ -1,132 +1,133 @@
+import { HoverPopup } from "@/components/HoverPopup";
 import { SourceIcon } from "@/components/SourceIcon";
+import { PopupSpec } from "@/components/admin/connectors/Popup";
 import { DanswerDocument } from "@/lib/search/interfaces";
-import { FiTag } from "react-icons/fi";
+import { FiInfo, FiRadio } from "react-icons/fi";
 import { DocumentSelector } from "./DocumentSelector";
-import { buildDocumentSummaryDisplay } from "@/components/search/DocumentDisplay";
-import { DocumentUpdatedAtBadge } from "@/components/search/DocumentUpdatedAtBadge";
-import { MetadataBadge } from "@/components/MetadataBadge";
-import { WebResultIcon } from "@/components/WebResultIcon";
-import { Dispatch, SetStateAction } from "react";
+import {
+  DocumentMetadataBlock,
+  buildDocumentSummaryDisplay,
+} from "@/components/search/DocumentDisplay";
+import { InternetSearchIcon } from "@/components/InternetSearchIcon";
 
 interface DocumentDisplayProps {
-  closeSidebar: () => void;
   document: DanswerDocument;
-  modal?: boolean;
+  queryEventId: number | null;
+  isAIPick: boolean;
   isSelected: boolean;
   handleSelect: (documentId: string) => void;
+  setPopup: (popupSpec: PopupSpec | null) => void;
   tokenLimitReached: boolean;
-  setPresentingDocument: Dispatch<SetStateAction<DanswerDocument | null>>;
-}
-
-export function DocumentMetadataBlock({
-  modal,
-  document,
-}: {
-  modal?: boolean;
-  document: DanswerDocument;
-}) {
-  const MAX_METADATA_ITEMS = 3;
-  const metadataEntries = Object.entries(document.metadata);
-
-  return (
-    <div className="flex items-center overflow-hidden">
-      {document.updated_at && (
-        <DocumentUpdatedAtBadge updatedAt={document.updated_at} modal={modal} />
-      )}
-
-      {metadataEntries.length > 0 && (
-        <>
-          <div className="mx-1 h-4 border-l border-border" />
-          <div className="flex items-center overflow-hidden">
-            {metadataEntries
-              .slice(0, MAX_METADATA_ITEMS)
-              .map(([key, value], index) => (
-                <MetadataBadge
-                  key={index}
-                  icon={FiTag}
-                  value={`${key}=${value}`}
-                />
-              ))}
-            {metadataEntries.length > MAX_METADATA_ITEMS && (
-              <span className="ml-1 text-xs text-gray-500">...</span>
-            )}
-          </div>
-        </>
-      )}
-    </div>
-  );
 }
 
 export function ChatDocumentDisplay({
-  closeSidebar,
   document,
-  modal,
+  queryEventId,
+  isAIPick,
   isSelected,
   handleSelect,
+  setPopup,
   tokenLimitReached,
-  setPresentingDocument,
 }: DocumentDisplayProps) {
   const isInternet = document.is_internet;
+  // Consider reintroducing null scored docs in the future
 
   if (document.score === null) {
     return null;
   }
 
-  const handleViewFile = async () => {
-    if (document.link) {
-      window.open(document.link, "_blank");
-    } else {
-      closeSidebar();
-
-      setTimeout(async () => {
-        setPresentingDocument(document);
-      }, 100);
-    }
-  };
-
   return (
-    <div className={`opacity-100   ${modal ? "w-[90vw]" : "w-full"}`}>
-      <div
-        className={`flex relative flex-col gap-0.5  rounded-xl mx-2 my-1 ${
-          isSelected ? "bg-gray-200" : "hover:bg-background-125"
-        }`}
-      >
-        <button
-          onClick={handleViewFile}
-          className="cursor-pointer text-left flex flex-col px-2 py-1.5"
+    <div
+      key={document.semantic_identifier}
+      className={`p-2 w-[325px] justify-start rounded-md ${
+        isSelected ? "bg-background-200" : "bg-background-125"
+      } text-sm mx-3`}
+    >
+      <div className="flex relative justify-start overflow-y-visible">
+        <a
+          href={document.link}
+          target="_blank"
+          className={
+            "rounded-lg flex font-bold flex-shrink truncate" +
+            (document.link ? "" : "pointer-events-none")
+          }
+          rel="noreferrer"
         >
-          <div className="line-clamp-1 mb-1 flex h-6 items-center gap-2 text-xs">
-            {document.is_internet || document.source_type === "web" ? (
-              <WebResultIcon url={document.link} />
-            ) : (
-              <SourceIcon sourceType={document.source_type} iconSize={18} />
+          {isInternet ? (
+            <InternetSearchIcon url={document.link} />
+          ) : (
+            <SourceIcon sourceType={document.source_type} iconSize={18} />
+          )}
+          <p className="overflow-hidden text-left text-ellipsis mx-2 my-auto text-sm">
+            {document.semantic_identifier || document.document_id}
+          </p>
+        </a>
+        {document.score !== null && (
+          <div className="my-auto">
+            {isAIPick && (
+              <div className="w-4 h-4 my-auto mr-1 flex flex-col">
+                <HoverPopup
+                  mainContent={<FiRadio className="text-gray-500 my-auto" />}
+                  popupContent={
+                    <div className="text-xs text-gray-300 w-36 flex">
+                      <div className="flex mx-auto">
+                        <div className="w-3 h-3 flex flex-col my-auto mr-1">
+                          <FiInfo className="my-auto" />
+                        </div>
+                        <div className="my-auto">The AI liked this doc!</div>
+                      </div>
+                    </div>
+                  }
+                  direction="bottom"
+                  style="dark"
+                />
+              </div>
             )}
-            <div className="line-clamp-1 text-text-900 text-sm font-semibold">
-              {(document.semantic_identifier || document.document_id).length >
-              (modal ? 30 : 40)
-                ? `${(document.semantic_identifier || document.document_id)
-                    .slice(0, modal ? 30 : 40)
-                    .trim()}...`
-                : document.semantic_identifier || document.document_id}
+            <div
+              className={`
+                text-xs
+                text-emphasis
+                bg-hover
+                rounded
+                p-0.5
+                w-fit
+                my-auto
+                select-none
+                my-auto
+                mr-2`}
+            >
+              {Math.abs(document.score).toFixed(2)}
             </div>
           </div>
-          <DocumentMetadataBlock modal={modal} document={document} />
-          <div className="line-clamp-3 pt-2 text-sm font-normal leading-snug text-gray-600">
-            {buildDocumentSummaryDisplay(
-              document.match_highlights,
-              document.blurb
-            )}
-          </div>
-          <div className="absolute top-2 right-2">
-            {!isInternet && (
-              <DocumentSelector
-                isSelected={isSelected}
-                handleSelect={() => handleSelect(document.document_id)}
-                isDisabled={tokenLimitReached && !isSelected}
-              />
-            )}
-          </div>
-        </button>
+        )}
+
+        {!isInternet && (
+          <DocumentSelector
+            isSelected={isSelected}
+            handleSelect={() => handleSelect(document.document_id)}
+            isDisabled={tokenLimitReached && !isSelected}
+          />
+        )}
+      </div>
+      <div>
+        <div className="mt-1">
+          <DocumentMetadataBlock document={document} />
+        </div>
+      </div>
+      <p className="line-clamp-3 pl-1 pt-2 mb-1 text-start break-words">
+        {buildDocumentSummaryDisplay(document.match_highlights, document.blurb)}
+        test
+      </p>
+      <div className="mb-2">
+        {/* 
+        // TODO: find a way to include this
+        {queryEventId && (
+          <DocumentFeedbackBlock
+            documentId={document.document_id}
+            queryId={queryEventId}
+            setPopup={setPopup}
+          />
+        )} */}
       </div>
     </div>
   );

web/src/app/chat/documentSidebar/ChatFilters.tsx

@@ -1,197 +0,0 @@
-import { DanswerDocument } from "@/lib/search/interfaces";
-import { ChatDocumentDisplay } from "./ChatDocumentDisplay";
-import { usePopup } from "@/components/admin/connectors/Popup";
-import { removeDuplicateDocs } from "@/lib/documentUtils";
-import { Message } from "../interfaces";
-import {
-  Dispatch,
-  ForwardedRef,
-  forwardRef,
-  SetStateAction,
-  useEffect,
-  useState,
-} from "react";
-import { FilterManager } from "@/lib/hooks";
-import { CCPairBasicInfo, DocumentSet, Tag } from "@/lib/types";
-import { SourceSelector } from "../shared_chat_search/SearchFilters";
-import { XIcon } from "@/components/icons/icons";
-
-interface ChatFiltersProps {
-  filterManager: FilterManager;
-  closeSidebar: () => void;
-  selectedMessage: Message | null;
-  selectedDocuments: DanswerDocument[] | null;
-  toggleDocumentSelection: (document: DanswerDocument) => void;
-  clearSelectedDocuments: () => void;
-  selectedDocumentTokens: number;
-  maxTokens: number;
-  initialWidth: number;
-  isOpen: boolean;
-  modal: boolean;
-  ccPairs: CCPairBasicInfo[];
-  tags: Tag[];
-  documentSets: DocumentSet[];
-  showFilters: boolean;
-  setPresentingDocument: Dispatch<SetStateAction<DanswerDocument | null>>;
-}
-
-export const ChatFilters = forwardRef<HTMLDivElement, ChatFiltersProps>(
-  (
-    {
-      closeSidebar,
-      modal,
-      selectedMessage,
-      selectedDocuments,
-      filterManager,
-      toggleDocumentSelection,
-      clearSelectedDocuments,
-      selectedDocumentTokens,
-      maxTokens,
-      initialWidth,
-      isOpen,
-      ccPairs,
-      tags,
-      setPresentingDocument,
-      documentSets,
-      showFilters,
-    },
-    ref: ForwardedRef<HTMLDivElement>
-  ) => {
-    const { popup, setPopup } = usePopup();
-    const [delayedSelectedDocumentCount, setDelayedSelectedDocumentCount] =
-      useState(0);
-
-    useEffect(() => {
-      const timer = setTimeout(
-        () => {
-          setDelayedSelectedDocumentCount(selectedDocuments?.length || 0);
-        },
-        selectedDocuments?.length == 0 ? 1000 : 0
-      );
-
-      return () => clearTimeout(timer);
-    }, [selectedDocuments]);
-
-    const selectedDocumentIds =
-      selectedDocuments?.map((document) => document.document_id) || [];
-
-    const currentDocuments = selectedMessage?.documents || null;
-    const dedupedDocuments = removeDuplicateDocs(currentDocuments || []);
-
-    const tokenLimitReached = selectedDocumentTokens > maxTokens - 75;
-
-    const hasSelectedDocuments = selectedDocumentIds.length > 0;
-
-    return (
-      <div
-        id="danswer-chat-sidebar"
-        className={`relative py-2 max-w-full ${
-          !modal ? "border-l h-full border-sidebar-border" : ""
-        }`}
-        onClick={(e) => {
-          if (e.target === e.currentTarget) {
-            closeSidebar();
-          }
-        }}
-      >
-        <div
-          className={`ml-auto h-full relative sidebar transition-all duration-300 
-            ${
-              isOpen
-                ? "opacity-100 translate-x-0"
-                : "opacity-0 translate-x-[10%]"
-            }`}
-          style={{
-            width: modal ? undefined : initialWidth,
-          }}
-        >
-          <div className="flex flex-col h-full">
-            {popup}
-            <div className="p-4 flex justify-between items-center">
-              <h2 className="text-xl font-bold text-text-900">
-                {showFilters ? "Filters" : "Sources"}
-              </h2>
-              <button
-                onClick={closeSidebar}
-                className="text-sm text-primary-600 mr-2  hover:text-primary-800 transition-colors duration-200 ease-in-out"
-              >
-                <XIcon className="w-4 h-4" />
-              </button>
-            </div>
-            <div className="border-b border-divider-history-sidebar-bar mx-3" />
-            <div className="overflow-y-auto -mx-1 sm:mx-0 flex-grow gap-y-0 default-scrollbar dark-scrollbar flex flex-col">
-              {showFilters ? (
-                <SourceSelector
-                  modal={modal}
-                  tagsOnLeft={true}
-                  filtersUntoggled={false}
-                  {...filterManager}
-                  availableDocumentSets={documentSets}
-                  existingSources={ccPairs.map((ccPair) => ccPair.source)}
-                  availableTags={tags}
-                />
-              ) : (
-                <>
-                  {dedupedDocuments.length > 0 ? (
-                    dedupedDocuments.map((document, ind) => (
-                      <div
-                        key={document.document_id}
-                        className={`${
-                          ind === dedupedDocuments.length - 1
-                            ? ""
-                            : "border-b border-border-light w-full"
-                        }`}
-                      >
-                        <ChatDocumentDisplay
-                          setPresentingDocument={setPresentingDocument}
-                          closeSidebar={closeSidebar}
-                          modal={modal}
-                          document={document}
-                          isSelected={selectedDocumentIds.includes(
-                            document.document_id
-                          )}
-                          handleSelect={(documentId) => {
-                            toggleDocumentSelection(
-                              dedupedDocuments.find(
-                                (doc) => doc.document_id === documentId
-                              )!
-                            );
-                          }}
-                          tokenLimitReached={tokenLimitReached}
-                        />
-                      </div>
-                    ))
-                  ) : (
-                    <div className="mx-3" />
-                  )}
-                </>
-              )}
-            </div>
-          </div>
-          {!showFilters && (
-            <div
-              className={`sticky bottom-4 w-full left-0 flex justify-center transition-opacity duration-300 ${
-                hasSelectedDocuments
-                  ? "opacity-100"
-                  : "opacity-0 pointer-events-none"
-              }`}
-            >
-              <button
-                className="text-sm font-medium py-2 px-4 rounded-full transition-colors bg-gray-900 text-white"
-                onClick={clearSelectedDocuments}
-              >
-                {`Remove ${
-                  delayedSelectedDocumentCount > 0
-                    ? delayedSelectedDocumentCount
-                    : ""
-                } Source${delayedSelectedDocumentCount > 1 ? "s" : ""}`}
-              </button>
-            </div>
-          )}
-        </div>
-      </div>
-    );
-  }
-);
-
-ChatFilters.displayName = "ChatFilters";

web/src/app/chat/documentSidebar/DocumentSidebar.tsx

@@ -0,0 +1,168 @@
+import { DanswerDocument } from "@/lib/search/interfaces";
+import Text from "@/components/ui/text";
+import { ChatDocumentDisplay } from "./ChatDocumentDisplay";
+import { usePopup } from "@/components/admin/connectors/Popup";
+import { removeDuplicateDocs } from "@/lib/documentUtils";
+import { Message } from "../interfaces";
+import { ForwardedRef, forwardRef } from "react";
+import { Separator } from "@/components/ui/separator";
+
+interface DocumentSidebarProps {
+  closeSidebar: () => void;
+  selectedMessage: Message | null;
+  selectedDocuments: DanswerDocument[] | null;
+  toggleDocumentSelection: (document: DanswerDocument) => void;
+  clearSelectedDocuments: () => void;
+  selectedDocumentTokens: number;
+  maxTokens: number;
+  isLoading: boolean;
+  initialWidth: number;
+  isOpen: boolean;
+}
+
+export const DocumentSidebar = forwardRef<HTMLDivElement, DocumentSidebarProps>(
+  (
+    {
+      closeSidebar,
+      selectedMessage,
+      selectedDocuments,
+      toggleDocumentSelection,
+      clearSelectedDocuments,
+      selectedDocumentTokens,
+      maxTokens,
+      isLoading,
+      initialWidth,
+      isOpen,
+    },
+    ref: ForwardedRef<HTMLDivElement>
+  ) => {
+    const { popup, setPopup } = usePopup();
+
+    const selectedDocumentIds =
+      selectedDocuments?.map((document) => document.document_id) || [];
+
+    const currentDocuments = selectedMessage?.documents || null;
+    const dedupedDocuments = removeDuplicateDocs(currentDocuments || []);
+
+    // NOTE: do not allow selection if less than 75 tokens are left
+    // this is to prevent the case where they are able to select the doc
+    // but it basically is unused since it's truncated right at the very
+    // start of the document (since title + metadata + misc overhead) takes up
+    // space
+    const tokenLimitReached = selectedDocumentTokens > maxTokens - 75;
+
+    return (
+      <div
+        id="danswer-chat-sidebar"
+        className={`fixed inset-0 transition-opacity duration-300 z-50 bg-black/80 ${
+          isOpen ? "opacity-100" : "opacity-0 pointer-events-none"
+        }`}
+        onClick={(e) => {
+          if (e.target === e.currentTarget) {
+            closeSidebar();
+          }
+        }}
+      >
+        <div
+          className={`ml-auto rounded-l-lg relative border-l bg-text-100 sidebar z-50 absolute right-0 h-screen transition-all duration-300 ${
+            isOpen ? "opacity-100 translate-x-0" : "opacity-0 translate-x-[10%]"
+          }`}
+          ref={ref}
+          style={{
+            width: initialWidth,
+          }}
+        >
+          <div className="pb-6 flex-initial overflow-y-hidden flex flex-col h-screen">
+            {popup}
+            <div className="pl-3 mx-2 pr-6 mt-3 flex text-text-800 flex-col text-2xl text-emphasis flex font-semibold">
+              {dedupedDocuments.length} Document
+              {dedupedDocuments.length > 1 ? "s" : ""}
+              <p className="text-sm font-semibold flex flex-wrap gap-x-2 text-text-600 mt-1">
+                Select to add to continuous context
+                <a
+                  href="https://docs.danswer.dev/introduction"
+                  className="underline cursor-pointer hover:text-strong"
+                >
+                  Learn more
+                </a>
+              </p>
+            </div>
+
+            <Separator className="mb-0 mt-4 pb-2" />
+
+            {currentDocuments ? (
+              <div className="overflow-y-auto flex-grow dark-scrollbar flex relative flex-col">
+                {dedupedDocuments.length > 0 ? (
+                  dedupedDocuments.map((document, ind) => (
+                    <div
+                      key={document.document_id}
+                      className={`${
+                        ind === dedupedDocuments.length - 1
+                          ? "mb-5"
+                          : "border-b border-border-light mb-3"
+                      }`}
+                    >
+                      <ChatDocumentDisplay
+                        document={document}
+                        setPopup={setPopup}
+                        queryEventId={null}
+                        isAIPick={false}
+                        isSelected={selectedDocumentIds.includes(
+                          document.document_id
+                        )}
+                        handleSelect={(documentId) => {
+                          toggleDocumentSelection(
+                            dedupedDocuments.find(
+                              (document) => document.document_id === documentId
+                            )!
+                          );
+                        }}
+                        tokenLimitReached={tokenLimitReached}
+                      />
+                    </div>
+                  ))
+                ) : (
+                  <div className="mx-3">
+                    <Text>No documents found for the query.</Text>
+                  </div>
+                )}
+              </div>
+            ) : (
+              !isLoading && (
+                <div className="ml-4 mr-3">
+                  <Text>
+                    When you run ask a question, the retrieved documents will
+                    show up here!
+                  </Text>
+                </div>
+              )
+            )}
+          </div>
+
+          <div className="absolute left-0 bottom-0 w-full bg-gradient-to-b from-neutral-100/0 via-neutral-100/40 backdrop-blur-xs to-neutral-100 h-[100px]" />
+          <div className="sticky bottom-4 w-full left-0 justify-center flex gap-x-4">
+            <button
+              className="bg-[#84e49e] text-xs p-2 rounded text-text-800"
+              onClick={() => closeSidebar()}
+            >
+              Save Changes
+            </button>
+
+            <button
+              className="bg-error text-xs p-2 rounded text-text-200"
+              onClick={() => {
+                clearSelectedDocuments();
+
+                closeSidebar();
+              }}
+            >
+              Delete Context
+            </button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+);
+
+DocumentSidebar.displayName = "DocumentSidebar";

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

@@ -1,9 +1,13 @@
 import React, { useContext, useEffect, useRef, useState } from "react";
-import { FiPlusCircle, FiPlus, FiInfo, FiX, FiSearch } from "react-icons/fi";
+import { FiPlusCircle, FiPlus, FiInfo, FiX } from "react-icons/fi";
 import { ChatInputOption } from "./ChatInputOption";
 import { Persona } from "@/app/admin/assistants/interfaces";
 import { InputPrompt } from "@/app/admin/prompt-library/interfaces";
-import { FilterManager, LlmOverrideManager } from "@/lib/hooks";
+import {
+  FilterManager,
+  getDisplayNameForModel,
+  LlmOverrideManager,
+} from "@/lib/hooks";
 import { SelectedFilterDisplay } from "./SelectedFilterDisplay";
 import { useChatContext } from "@/components/context/ChatContext";
 import { getFinalLLM } from "@/lib/llm/utils";
@@ -14,11 +18,16 @@ import {
 } from "../files/InputBarPreview";
 import {
   AssistantsIconSkeleton,
+  CpuIconSkeleton,
   FileIcon,
   SendIcon,
   StopGeneratingIcon,
 } from "@/components/icons/icons";
-import { DanswerDocument, SourceMetadata } from "@/lib/search/interfaces";
+import { IconType } from "react-icons";
+import Popup from "../../../components/popup/Popup";
+import { LlmTab } from "../modal/configuration/LlmTab";
+import { AssistantsTab } from "../modal/configuration/AssistantsTab";
+import { DanswerDocument } from "@/lib/search/interfaces";
 import { AssistantIcon } from "@/components/assistants/AssistantIcon";
 import {
   Tooltip,
@@ -31,50 +40,10 @@ import { SettingsContext } from "@/components/settings/SettingsProvider";
 import { ChatState } from "../types";
 import UnconfiguredProviderText from "@/components/chat_search/UnconfiguredProviderText";
 import { useAssistants } from "@/components/context/AssistantsContext";
-import AnimatedToggle from "@/components/search/SearchBar";
-import { Popup } from "@/components/admin/connectors/Popup";
-import { AssistantsTab } from "../modal/configuration/AssistantsTab";
-import { IconType } from "react-icons";
-import { LlmTab } from "../modal/configuration/LlmTab";
-import { XIcon } from "lucide-react";
-import { FilterPills } from "./FilterPills";
-import { Tag } from "@/lib/types";
-import FiltersDisplay from "./FilterDisplay";
 
 const MAX_INPUT_HEIGHT = 200;
 
-interface ChatInputBarProps {
-  removeFilters: () => void;
-  removeDocs: () => void;
-  openModelSettings: () => void;
-  showDocs: () => void;
-  showConfigureAPIKey: () => void;
-  selectedDocuments: DanswerDocument[];
-  message: string;
-  setMessage: (message: string) => void;
-  stopGenerating: () => void;
-  onSubmit: () => void;
-  filterManager: FilterManager;
-  llmOverrideManager: LlmOverrideManager;
-  chatState: ChatState;
-  alternativeAssistant: Persona | null;
-  inputPrompts: InputPrompt[];
-  // assistants
-  selectedAssistant: Persona;
-  setSelectedAssistant: (assistant: Persona) => void;
-  setAlternativeAssistant: (alternativeAssistant: Persona | null) => void;
-
-  files: FileDescriptor[];
-  setFiles: (files: FileDescriptor[]) => void;
-  handleFileUpload: (files: File[]) => void;
-  textAreaRef: React.RefObject<HTMLTextAreaElement>;
-  chatSessionId?: string;
-  toggleFilters?: () => void;
-}
-
 export function ChatInputBar({
-  removeFilters,
-  removeDocs,
   openModelSettings,
   showDocs,
   showConfigureAPIKey,
@@ -99,8 +68,29 @@ export function ChatInputBar({
   alternativeAssistant,
   chatSessionId,
   inputPrompts,
-  toggleFilters,
-}: ChatInputBarProps) {
+}: {
+  showConfigureAPIKey: () => void;
+  openModelSettings: () => void;
+  chatState: ChatState;
+  stopGenerating: () => void;
+  showDocs: () => void;
+  selectedDocuments: DanswerDocument[];
+  setAlternativeAssistant: (alternativeAssistant: Persona | null) => void;
+  setSelectedAssistant: (assistant: Persona) => void;
+  inputPrompts: InputPrompt[];
+  message: string;
+  setMessage: (message: string) => void;
+  onSubmit: () => void;
+  filterManager: FilterManager;
+  llmOverrideManager: LlmOverrideManager;
+  selectedAssistant: Persona;
+  alternativeAssistant: Persona | null;
+  files: FileDescriptor[];
+  setFiles: (files: FileDescriptor[]) => void;
+  handleFileUpload: (files: File[]) => void;
+  textAreaRef: React.RefObject<HTMLTextAreaElement>;
+  chatSessionId?: string;
+}) {
   useEffect(() => {
     const textarea = textAreaRef.current;
     if (textarea) {
@@ -347,26 +337,23 @@ export function ChatInputBar({
               className="text-sm absolute inset-x-0 top-0 w-full transform -translate-y-full"
             >
               <div className="rounded-lg py-1.5 bg-white border border-border-medium overflow-hidden shadow-lg mx-2 px-1.5 mt-2 rounded z-10">
-                {filteredPrompts.map(
-                  (currentPrompt: InputPrompt, index: number) => (
-                    <button
-                      key={index}
-                      className={`px-2 ${
-                        tabbingIconIndex == index && "bg-hover"
-                      } rounded content-start flex gap-x-1 py-1.5 w-full  hover:bg-hover cursor-pointer`}
-                      onClick={() => {
-                        updateInputPrompt(currentPrompt);
-                      }}
-                    >
-                      <p className="font-bold">{currentPrompt.prompt}:</p>
-                      <p className="text-left flex-grow mr-auto line-clamp-1">
-                        {currentPrompt.id == selectedAssistant.id &&
-                          "(default) "}
-                        {currentPrompt.content?.trim()}
-                      </p>
-                    </button>
-                  )
-                )}
+                {filteredPrompts.map((currentPrompt, index) => (
+                  <button
+                    key={index}
+                    className={`px-2 ${
+                      tabbingIconIndex == index && "bg-hover"
+                    } rounded content-start flex gap-x-1 py-1.5 w-full  hover:bg-hover cursor-pointer`}
+                    onClick={() => {
+                      updateInputPrompt(currentPrompt);
+                    }}
+                  >
+                    <p className="font-bold">{currentPrompt.prompt}:</p>
+                    <p className="text-left flex-grow mr-auto line-clamp-1">
+                      {currentPrompt.id == selectedAssistant.id && "(default) "}
+                      {currentPrompt.content?.trim()}
+                    </p>
+                  </button>
+                ))}
 
                 <a
                   key={filteredPrompts.length}
@@ -383,9 +370,9 @@ export function ChatInputBar({
             </div>
           )}
 
-          {/* <div>
+          <div>
             <SelectedFilterDisplay filterManager={filterManager} />
-          </div> */}
+          </div>
 
           <UnconfiguredProviderText showConfigureAPIKey={showConfigureAPIKey} />
 
@@ -440,24 +427,18 @@ export function ChatInputBar({
                 </div>
               </div>
             )}
-
             {(selectedDocuments.length > 0 || files.length > 0) && (
               <div className="flex gap-x-2 px-2 pt-2">
-                <div className="flex gap-x-1 px-2 overflow-visible overflow-x-scroll items-end miniscroll">
+                <div className="flex gap-x-1 px-2 overflow-y-auto overflow-x-scroll items-end miniscroll">
                   {selectedDocuments.length > 0 && (
                     <button
                       onClick={showDocs}
-                      className="flex-none relative overflow-visible flex items-center gap-x-2 h-10 px-3 rounded-lg bg-background-150 hover:bg-background-200 transition-colors duration-300 cursor-pointer max-w-[150px]"
+                      className="flex-none flex cursor-pointer hover:bg-background-200 transition-colors duration-300 h-10 p-1 items-center gap-x-1 rounded-lg bg-background-150 max-w-[100px]"
                     >
-                      <FileIcon size={20} />
-                      <span className="text-sm whitespace-nowrap overflow-hidden text-ellipsis">
+                      <FileIcon size={24} />
+                      <p className="text-xs">
                         {selectedDocuments.length} selected
-                      </span>
-                      <XIcon
-                        onClick={removeDocs}
-                        size={16}
-                        className="text-text-400 hover:text-text-600 ml-auto"
-                      />
+                      </p>
                     </button>
                   )}
                   {files.map((file) => (
@@ -548,6 +529,72 @@ export function ChatInputBar({
               suppressContentEditableWarning={true}
             />
             <div className="flex items-center space-x-3 mr-12 px-4 pb-2">
+              <Popup
+                removePadding
+                content={(close) => (
+                  <AssistantsTab
+                    llmProviders={llmProviders}
+                    selectedAssistant={selectedAssistant}
+                    onSelect={(assistant) => {
+                      setSelectedAssistant(assistant);
+                      close();
+                    }}
+                  />
+                )}
+                flexPriority="shrink"
+                position="top"
+                mobilePosition="top-right"
+              >
+                <ChatInputOption
+                  toggle
+                  flexPriority="shrink"
+                  name={
+                    selectedAssistant ? selectedAssistant.name : "Assistants"
+                  }
+                  Icon={AssistantsIconSkeleton as IconType}
+                />
+              </Popup>
+              <Popup
+                tab
+                content={(close, ref) => (
+                  <LlmTab
+                    currentAssistant={alternativeAssistant || selectedAssistant}
+                    openModelSettings={openModelSettings}
+                    currentLlm={
+                      llmOverrideManager.llmOverride.modelName ||
+                      (selectedAssistant
+                        ? selectedAssistant.llm_model_version_override ||
+                          llmOverrideManager.globalDefault.modelName ||
+                          llmName
+                        : llmName)
+                    }
+                    close={close}
+                    ref={ref}
+                    llmOverrideManager={llmOverrideManager}
+                    chatSessionId={chatSessionId}
+                  />
+                )}
+                position="top"
+              >
+                <ChatInputOption
+                  flexPriority="second"
+                  toggle
+                  name={
+                    settings?.isMobile
+                      ? undefined
+                      : getDisplayNameForModel(
+                          llmOverrideManager.llmOverride.modelName ||
+                            (selectedAssistant
+                              ? selectedAssistant.llm_model_version_override ||
+                                llmOverrideManager.globalDefault.modelName ||
+                                llmName
+                              : llmName)
+                        )
+                  }
+                  Icon={CpuIconSkeleton}
+                />
+              </Popup>
+
               <ChatInputOption
                 flexPriority="stiff"
                 name="File"
@@ -567,24 +614,6 @@ export function ChatInputBar({
                   input.click();
                 }}
               />
-              {toggleFilters && (
-                <ChatInputOption
-                  flexPriority="stiff"
-                  name="Filters"
-                  Icon={FiSearch}
-                  onClick={toggleFilters}
-                />
-              )}
-              {(filterManager.selectedSources.length > 0 ||
-                filterManager.selectedDocumentSets.length > 0 ||
-                filterManager.selectedTags.length > 0 ||
-                filterManager.timeRange) &&
-                toggleFilters && (
-                  <FiltersDisplay
-                    filterManager={filterManager}
-                    toggleFilters={toggleFilters}
-                  />
-                )}
             </div>
 
             <div className="absolute bottom-2.5 mobile:right-4 desktop:right-10">

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

@@ -1,109 +0,0 @@
-import React from "react";
-import { XIcon } from "lucide-react";
-
-import { FilterPills } from "./FilterPills";
-import { SourceMetadata } from "@/lib/search/interfaces";
-import { FilterManager } from "@/lib/hooks";
-import { Tag } from "@/lib/types";
-
-interface FiltersDisplayProps {
-  filterManager: FilterManager;
-  toggleFilters: () => void;
-}
-export default function FiltersDisplay({
-  filterManager,
-  toggleFilters,
-}: FiltersDisplayProps) {
-  return (
-    <div className="flex my-auto flex-wrap gap-2 px-2">
-      {(() => {
-        const allFilters = [
-          ...filterManager.selectedSources,
-          ...filterManager.selectedDocumentSets,
-          ...filterManager.selectedTags,
-          ...(filterManager.timeRange ? [filterManager.timeRange] : []),
-        ];
-        const filtersToShow = allFilters.slice(0, 2);
-        const remainingFilters = allFilters.length - 2;
-
-        return (
-          <>
-            {filtersToShow.map((filter, index) => {
-              if (typeof filter === "object" && "displayName" in filter) {
-                return (
-                  <FilterPills<SourceMetadata>
-                    key={index}
-                    item={filter}
-                    itemToString={(source) => source.displayName}
-                    onRemove={(source) =>
-                      filterManager.setSelectedSources((prev) =>
-                        prev.filter(
-                          (s) => s.internalName !== source.internalName
-                        )
-                      )
-                    }
-                    toggleFilters={toggleFilters}
-                  />
-                );
-              } else if (typeof filter === "string") {
-                return (
-                  <FilterPills<string>
-                    key={index}
-                    item={filter}
-                    itemToString={(set) => set}
-                    onRemove={(set) =>
-                      filterManager.setSelectedDocumentSets((prev) =>
-                        prev.filter((s) => s !== set)
-                      )
-                    }
-                    toggleFilters={toggleFilters}
-                  />
-                );
-              } else if ("tag_key" in filter) {
-                return (
-                  <FilterPills<Tag>
-                    key={index}
-                    item={filter}
-                    itemToString={(tag) => `${tag.tag_key}:${tag.tag_value}`}
-                    onRemove={(tag) =>
-                      filterManager.setSelectedTags((prev) =>
-                        prev.filter(
-                          (t) =>
-                            t.tag_key !== tag.tag_key ||
-                            t.tag_value !== tag.tag_value
-                        )
-                      )
-                    }
-                    toggleFilters={toggleFilters}
-                  />
-                );
-              } else if ("from" in filter && "to" in filter) {
-                return (
-                  <div
-                    key={index}
-                    className="flex items-center bg-background-150 rounded-full px-3 py-1 text-sm"
-                  >
-                    <span>
-                      {filter.from.toLocaleDateString()} -{" "}
-                      {filter.to.toLocaleDateString()}
-                    </span>
-                    <XIcon
-                      onClick={() => filterManager.setTimeRange(null)}
-                      size={16}
-                      className="ml-2 text-text-400 hover:text-text-600 cursor-pointer"
-                    />
-                  </div>
-                );
-              }
-            })}
-            {remainingFilters > 0 && (
-              <div className="flex items-center bg-background-150 rounded-full px-3 py-1 text-sm">
-                <span>+{remainingFilters} more</span>
-              </div>
-            )}
-          </>
-        );
-      })()}
-    </div>
-  );
-}

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

@@ -1,39 +0,0 @@
-import React from "react";
-import { XIcon } from "lucide-react";
-import { SourceMetadata } from "@/lib/search/interfaces";
-import { Tag } from "@/lib/types";
-
-type FilterItem = SourceMetadata | string | Tag;
-
-interface FilterPillsProps<T extends FilterItem> {
-  item: T;
-  itemToString: (item: T) => string;
-  onRemove: (item: T) => void;
-  toggleFilters?: () => void;
-}
-
-export function FilterPills<T extends FilterItem>({
-  item,
-  itemToString,
-  onRemove,
-  toggleFilters,
-}: FilterPillsProps<T>) {
-  return (
-    <button
-      onClick={toggleFilters}
-      className="cursor-pointer flex flex-wrap gap-2"
-    >
-      <div className="flex items-center bg-background-150 rounded-full px-3 py-1 text-sm">
-        <span>{itemToString(item)}</span>
-        <XIcon
-          onClick={(e) => {
-            e.stopPropagation();
-            onRemove(item);
-          }}
-          size={16}
-          className="ml-2 text-text-400 hover:text-text-600 cursor-pointer"
-        />
-      </div>
-    </button>
-  );
-}

web/src/app/chat/lib.tsx

@@ -2,7 +2,6 @@ import {
   AnswerPiecePacket,
   DanswerDocument,
   Filters,
-  DocumentInfoPacket,
   StreamStopInfo,
 } from "@/lib/search/interfaces";
 import { handleSSEStream } from "@/lib/search/streamingUtils";
@@ -103,7 +102,6 @@ export type PacketType =
   | ToolCallMetadata
   | BackendMessage
   | AnswerPiecePacket
-  | DocumentInfoPacket
   | DocumentsResponse
   | FileChatDisplay
   | StreamingError
@@ -149,6 +147,7 @@ export async function* sendMessage({
 }): AsyncGenerator<PacketType, void, unknown> {
   const documentsAreSelected =
     selectedDocumentIds && selectedDocumentIds.length > 0;
+
   const body = JSON.stringify({
     alternate_assistant_id: alternateAssistantId,
     chat_session_id: chatSessionId,
@@ -640,15 +639,14 @@ export async function useScrollonStream({
   endDivRef,
   debounceNumber,
   mobile,
-  enableAutoScroll,
 }: {
   chatState: ChatState;
   scrollableDivRef: RefObject<HTMLDivElement>;
+  waitForScrollRef: RefObject<boolean>;
   scrollDist: MutableRefObject<number>;
   endDivRef: RefObject<HTMLDivElement>;
   debounceNumber: number;
   mobile?: boolean;
-  enableAutoScroll?: boolean;
 }) {
   const mobileDistance = 900; // distance that should "engage" the scroll
   const desktopDistance = 500; // distance that should "engage" the scroll
@@ -661,10 +659,6 @@ export async function useScrollonStream({
   const previousScroll = useRef<number>(0);
 
   useEffect(() => {
-    if (!enableAutoScroll) {
-      return;
-    }
-
     if (chatState != "input" && scrollableDivRef && scrollableDivRef.current) {
       const newHeight: number = scrollableDivRef.current?.scrollTop!;
       const heightDifference = newHeight - previousScroll.current;
@@ -722,7 +716,7 @@ export async function useScrollonStream({
 
   // scroll on end of stream if within distance
   useEffect(() => {
-    if (scrollableDivRef?.current && chatState == "input" && enableAutoScroll) {
+    if (scrollableDivRef?.current && chatState == "input") {
       if (scrollDist.current < distance - 50) {
         scrollableDivRef?.current?.scrollBy({
           left: 0,

web/src/app/chat/message/MemoizedTextComponents.tsx

@@ -1,58 +1,8 @@
 import { Citation } from "@/components/search/results/Citation";
-import { WebResultIcon } from "@/components/WebResultIcon";
-import { LoadedDanswerDocument } from "@/lib/search/interfaces";
-import { getSourceMetadata } from "@/lib/sources";
-import { ValidSources } from "@/lib/types";
 import React, { memo } from "react";
-import isEqual from "lodash/isEqual";
-
-export const MemoizedAnchor = memo(
-  ({ docs, updatePresentingDocument, children }: any) => {
-    const value = children?.toString();
-    if (value?.startsWith("[") && value?.endsWith("]")) {
-      const match = value.match(/\[(\d+)\]/);
-      if (match) {
-        const index = parseInt(match[1], 10) - 1;
-        const associatedDoc = docs && docs[index];
-
-        const url = associatedDoc?.link
-          ? new URL(associatedDoc.link).origin + "/favicon.ico"
-          : "";
-
-        const getIcon = (sourceType: ValidSources, link: string) => {
-          return getSourceMetadata(sourceType).icon({ size: 18 });
-        };
-
-        const icon =
-          associatedDoc?.source_type === "web" ? (
-            <WebResultIcon url={associatedDoc.link} />
-          ) : (
-            getIcon(
-              associatedDoc?.source_type || "web",
-              associatedDoc?.link || ""
-            )
-          );
-
-        return (
-          <MemoizedLink
-            updatePresentingDocument={updatePresentingDocument}
-            document={{ ...associatedDoc, icon, url }}
-          >
-            {children}
-          </MemoizedLink>
-        );
-      }
-    }
-    return (
-      <MemoizedLink updatePresentingDocument={updatePresentingDocument}>
-        {children}
-      </MemoizedLink>
-    );
-  }
-);
 
 export const MemoizedLink = memo((props: any) => {
-  const { node, document, updatePresentingDocument, ...rest } = props;
+  const { node, ...rest } = props;
   const value = rest.children;
 
   if (value?.toString().startsWith("*")) {
@@ -60,39 +10,24 @@ export const MemoizedLink = memo((props: any) => {
       <div className="flex-none bg-background-800 inline-block rounded-full h-3 w-3 ml-2" />
     );
   } else if (value?.toString().startsWith("[")) {
+    return <Citation link={rest?.href}>{rest.children}</Citation>;
+  } else {
     return (
-      <Citation
-        url={document?.url}
-        icon={document?.icon as React.ReactNode}
-        link={rest?.href}
-        document={document as LoadedDanswerDocument}
-        updatePresentingDocument={updatePresentingDocument}
+      <a
+        onMouseDown={() =>
+          rest.href ? window.open(rest.href, "_blank") : undefined
+        }
+        className="cursor-pointer text-link hover:text-link-hover"
       >
         {rest.children}
-      </Citation>
+      </a>
     );
   }
-
-  return (
-    <a
-      onMouseDown={() => rest.href && window.open(rest.href, "_blank")}
-      className="cursor-pointer text-link hover:text-link-hover"
-    >
-      {rest.children}
-    </a>
-  );
 });
 
-export const MemoizedParagraph = memo(
-  function MemoizedParagraph({ children }: any) {
-    return <p className="text-default">{children}</p>;
-  },
-  (prevProps, nextProps) => {
-    const areEqual = isEqual(prevProps.children, nextProps.children);
-    return areEqual;
-  }
-);
+export const MemoizedParagraph = memo(({ ...props }: any) => {
+  return <p {...props} className="text-default" />;
+});
 
-MemoizedAnchor.displayName = "MemoizedAnchor";
 MemoizedLink.displayName = "MemoizedLink";
 MemoizedParagraph.displayName = "MemoizedParagraph";

web/src/app/chat/message/Messages.tsx

@@ -8,24 +8,14 @@ import {
   FiGlobe,
 } from "react-icons/fi";
 import { FeedbackType } from "../types";
-import React, {
-  memo,
-  ReactNode,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
+import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
 import ReactMarkdown from "react-markdown";
 import {
   DanswerDocument,
   FilteredDanswerDocument,
-  LoadedDanswerDocument,
 } from "@/lib/search/interfaces";
 import { SearchSummary } from "./SearchSummary";
-
+import { SourceIcon } from "@/components/SourceIcon";
 import { SkippedSearch } from "./SkippedSearch";
 import remarkGfm from "remark-gfm";
 import { CopyButton } from "@/components/CopyButton";
@@ -46,6 +36,8 @@ import "prismjs/themes/prism-tomorrow.css";
 import "./custom-code-styles.css";
 import { Persona } from "@/app/admin/assistants/interfaces";
 import { AssistantIcon } from "@/components/assistants/AssistantIcon";
+import { Citation } from "@/components/search/results/Citation";
+import { DocumentMetadataBlock } from "@/components/search/DocumentDisplay";
 
 import { LikeFeedback, DislikeFeedback } from "@/components/icons/icons";
 import {
@@ -60,18 +52,16 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { useMouseTracking } from "./hooks";
+import { InternetSearchIcon } from "@/components/InternetSearchIcon";
 import { SettingsContext } from "@/components/settings/SettingsProvider";
 import GeneratingImageDisplay from "../tools/GeneratingImageDisplay";
 import RegenerateOption from "../RegenerateOption";
 import { LlmOverride } from "@/lib/hooks";
 import { ContinueGenerating } from "./ContinueMessage";
-import { MemoizedAnchor, MemoizedParagraph } from "./MemoizedTextComponents";
+import { MemoizedLink, MemoizedParagraph } from "./MemoizedTextComponents";
 import { extractCodeText } from "./codeUtils";
 import ToolResult from "../../../components/tools/ToolResult";
 import CsvContent from "../../../components/tools/CSVContent";
-import SourceCard, {
-  SeeMoreBlock,
-} from "@/components/chat_search/sources/SourceCard";
 
 const TOOLS_WITH_CUSTOM_HANDLING = [
   SEARCH_TOOL_NAME,
@@ -165,7 +155,6 @@ function FileDisplay({
 export const AIMessage = ({
   regenerate,
   overriddenModel,
-  selectedMessageForDocDisplay,
   continueGenerating,
   shared,
   isActive,
@@ -173,7 +162,6 @@ export const AIMessage = ({
   alternativeAssistant,
   docs,
   messageId,
-  documentSelectionToggled,
   content,
   files,
   selectedDocuments,
@@ -190,11 +178,7 @@ export const AIMessage = ({
   currentPersona,
   otherMessagesCanSwitchTo,
   onMessageSelection,
-  setPresentingDocument,
-  index,
 }: {
-  index?: number;
-  selectedMessageForDocDisplay?: number | null;
   shared?: boolean;
   isActive?: boolean;
   continueGenerating?: () => void;
@@ -207,7 +191,6 @@ export const AIMessage = ({
   currentPersona: Persona;
   messageId: number | null;
   content: string | JSX.Element;
-  documentSelectionToggled?: boolean;
   files?: FileDescriptor[];
   query?: string;
   citedDocuments?: [string, DanswerDocument][] | null;
@@ -221,7 +204,6 @@ export const AIMessage = ({
   retrievalDisabled?: boolean;
   overriddenModel?: string;
   regenerate?: (modelOverRide: LlmOverride) => Promise<void>;
-  setPresentingDocument?: (document: DanswerDocument) => void;
 }) => {
   const toolCallGenerating = toolCall && !toolCall.tool_result;
   const processContent = (content: string | JSX.Element) => {
@@ -305,36 +287,18 @@ export const AIMessage = ({
       });
   }
 
-  const paragraphCallback = useCallback(
-    (props: any) => <MemoizedParagraph>{props.children}</MemoizedParagraph>,
-    []
-  );
-
-  const anchorCallback = useCallback(
-    (props: any) => (
-      <MemoizedAnchor
-        updatePresentingDocument={setPresentingDocument}
-        docs={docs}
-      >
-        {props.children}
-      </MemoizedAnchor>
-    ),
-    [docs]
-  );
-
   const currentMessageInd = messageId
     ? otherMessagesCanSwitchTo?.indexOf(messageId)
     : undefined;
-
   const uniqueSources: ValidSources[] = Array.from(
     new Set((docs || []).map((doc) => doc.source_type))
   ).slice(0, 3);
 
   const markdownComponents = useMemo(
     () => ({
-      a: anchorCallback,
-      p: paragraphCallback,
-      code: ({ node, className, children }: any) => {
+      a: MemoizedLink,
+      p: MemoizedParagraph,
+      code: ({ node, className, children, ...props }: any) => {
         const codeText = extractCodeText(
           node,
           finalContent as string,
@@ -348,7 +312,7 @@ export const AIMessage = ({
         );
       },
     }),
-    [anchorCallback, paragraphCallback, finalContent]
+    [finalContent]
   );
 
   const renderedMarkdown = useMemo(() => {
@@ -369,11 +333,12 @@ export const AIMessage = ({
     onMessageSelection &&
     otherMessagesCanSwitchTo &&
     otherMessagesCanSwitchTo.length > 1;
+
   return (
     <div
       id="danswer-ai-message"
       ref={trackedElementRef}
-      className={`py-5 ml-4 px-5 relative flex `}
+      className={"py-5 ml-4 px-5 relative flex "}
     >
       <div
         className={`mx-auto ${
@@ -398,7 +363,6 @@ export const AIMessage = ({
                           !retrievalDisabled && (
                             <div className="mb-1">
                               <SearchSummary
-                                index={index || 0}
                                 query={query}
                                 finished={toolCall?.tool_result != undefined}
                                 hasDocs={hasDocs || false}
@@ -459,31 +423,6 @@ export const AIMessage = ({
                         />
                       )}
 
-                    {docs && docs.length > 0 && (
-                      <div className="mt-2 -mx-8 w-full mb-4 flex relative">
-                        <div className="w-full">
-                          <div className="px-8 flex gap-x-2">
-                            {!settings?.isMobile &&
-                              docs.length > 0 &&
-                              docs
-                                .slice(0, 2)
-                                .map((doc, ind) => (
-                                  <SourceCard doc={doc} key={ind} />
-                                ))}
-                            <SeeMoreBlock
-                              documentSelectionToggled={
-                                (documentSelectionToggled &&
-                                  selectedMessageForDocDisplay === messageId) ||
-                                false
-                              }
-                              toggleDocumentSelection={toggleDocumentSelection}
-                              uniqueSources={uniqueSources}
-                            />
-                          </div>
-                        </div>
-                      </div>
-                    )}
-
                     {content || files ? (
                       <>
                         <FileDisplay files={files || []} />
@@ -499,6 +438,81 @@ export const AIMessage = ({
                     ) : isComplete ? null : (
                       <></>
                     )}
+                    {isComplete && docs && docs.length > 0 && (
+                      <div className="mt-2 -mx-8 w-full mb-4 flex relative">
+                        <div className="w-full">
+                          <div className="px-8 flex gap-x-2">
+                            {!settings?.isMobile &&
+                              filteredDocs.length > 0 &&
+                              filteredDocs.slice(0, 2).map((doc, ind) => (
+                                <div
+                                  key={doc.document_id}
+                                  className={`w-[200px] rounded-lg flex-none transition-all duration-500 hover:bg-background-125 bg-text-100 px-4 pb-2 pt-1 border-b
+                              `}
+                                >
+                                  <a
+                                    href={doc.link || undefined}
+                                    target="_blank"
+                                    className="text-sm flex w-full pt-1 gap-x-1.5 overflow-hidden justify-between font-semibold text-text-700"
+                                    rel="noreferrer"
+                                  >
+                                    <Citation link={doc.link} index={ind + 1} />
+                                    <p className="shrink truncate ellipsis break-all">
+                                      {doc.semantic_identifier ||
+                                        doc.document_id}
+                                    </p>
+                                    <div className="ml-auto flex-none">
+                                      {doc.is_internet ? (
+                                        <InternetSearchIcon url={doc.link} />
+                                      ) : (
+                                        <SourceIcon
+                                          sourceType={doc.source_type}
+                                          iconSize={18}
+                                        />
+                                      )}
+                                    </div>
+                                  </a>
+                                  <div className="flex overscroll-x-scroll mt-.5">
+                                    <DocumentMetadataBlock document={doc} />
+                                  </div>
+                                  <div className="line-clamp-3 text-xs break-words pt-1">
+                                    {doc.blurb}
+                                  </div>
+                                </div>
+                              ))}
+                            <div
+                              onClick={() => {
+                                if (messageId) {
+                                  onMessageSelection?.(messageId);
+                                }
+                                toggleDocumentSelection?.();
+                              }}
+                              key={-1}
+                              className="cursor-pointer w-[200px] rounded-lg flex-none transition-all duration-500 hover:bg-background-125 bg-text-100 px-4 py-2 border-b"
+                            >
+                              <div className="text-sm flex justify-between font-semibold text-text-700">
+                                <p className="line-clamp-1">See context</p>
+                                <div className="flex gap-x-1">
+                                  {uniqueSources.map((sourceType, ind) => {
+                                    return (
+                                      <div key={ind} className="flex-none">
+                                        <SourceIcon
+                                          sourceType={sourceType}
+                                          iconSize={18}
+                                        />
+                                      </div>
+                                    );
+                                  })}
+                                </div>
+                              </div>
+                              <div className="line-clamp-3 text-xs break-words pt-1">
+                                See more
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    )}
                   </div>
 
                   {handleFeedback &&

web/src/app/chat/message/SearchSummary.tsx

@@ -41,7 +41,6 @@ export function ShowHideDocsButton({
 }
 
 export function SearchSummary({
-  index,
   query,
   hasDocs,
   finished,
@@ -49,7 +48,6 @@ export function SearchSummary({
   handleShowRetrieved,
   handleSearchQueryEdit,
 }: {
-  index: number;
   finished: boolean;
   query: string;
   hasDocs: boolean;
@@ -100,14 +98,7 @@ export function SearchSummary({
         !text-sm !line-clamp-1 !break-all px-0.5`}
         ref={searchingForRef}
       >
-        {finished ? "Searched" : "Searching"} for:{" "}
-        <i>
-          {index === 1
-            ? finalQuery.length > 50
-              ? `${finalQuery.slice(0, 50)}...`
-              : finalQuery
-            : finalQuery}
-        </i>
+        {finished ? "Searched" : "Searching"} for: <i> {finalQuery}</i>
       </div>
     </div>
   );

web/src/app/chat/modal/FeedbackModal.tsx

@@ -53,7 +53,7 @@ export const FeedbackModal = ({
       : predefinedNegativeFeedbackOptions;
 
   return (
-    <Modal onOutsideClick={onClose} width="w-full max-w-3xl">
+    <Modal onOutsideClick={onClose} width="max-w-3xl">
       <>
         <h2 className="text-2xl text-emphasis font-bold mb-4 flex">
           <div className="mr-1 my-auto">

web/src/app/chat/modal/SetDefaultModelModal.tsx

@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction, useContext, useEffect, useRef } from "react";
+import { Dispatch, SetStateAction, useEffect, useRef } from "react";
 import { Modal } from "@/components/Modal";
 import Text from "@/components/ui/text";
 import { getDisplayNameForModel, LlmOverride } from "@/lib/hooks";
@@ -9,10 +9,6 @@ import { setUserDefaultModel } from "@/lib/users/UserSettings";
 import { useRouter } from "next/navigation";
 import { PopupSpec } from "@/components/admin/connectors/Popup";
 import { useUser } from "@/components/user/UserProvider";
-import { Separator } from "@/components/ui/separator";
-import { Switch } from "@/components/ui/switch";
-import { Label } from "@/components/admin/connectors/Field";
-import { SettingsContext } from "@/components/settings/SettingsProvider";
 
 export function SetDefaultModelModal({
   setPopup,
@@ -27,7 +23,7 @@ export function SetDefaultModelModal({
   onClose: () => void;
   defaultModel: string | null;
 }) {
-  const { refreshUser, user, updateUserAutoScroll } = useUser();
+  const { refreshUser } = useUser();
   const containerRef = useRef<HTMLDivElement>(null);
   const messageRef = useRef<HTMLDivElement>(null);
 
@@ -125,41 +121,16 @@ export function SetDefaultModelModal({
   const defaultProvider = llmProviders.find(
     (llmProvider) => llmProvider.is_default_provider
   );
-  const settings = useContext(SettingsContext);
-  const autoScroll = settings?.enterpriseSettings?.auto_scroll;
-
-  const checked =
-    user?.preferences?.auto_scroll === null
-      ? autoScroll
-      : user?.preferences?.auto_scroll;
 
   return (
     <Modal onOutsideClick={onClose} width="rounded-lg  bg-white max-w-xl">
       <>
         <div className="flex mb-4">
           <h2 className="text-2xl text-emphasis font-bold flex my-auto">
-            User settings
+            Set Default Model
           </h2>
         </div>
 
-        <div className="flex flex-col gap-y-2">
-          <div className="flex items-center gap-x-2">
-            <Switch
-              checked={checked}
-              onCheckedChange={(checked) => {
-                updateUserAutoScroll(checked);
-              }}
-            />
-            <Label className="text-sm">Enable auto-scroll</Label>
-          </div>
-        </div>
-
-        <Separator />
-
-        <h3 className="text-lg text-emphasis font-bold">
-          Default model for assistants
-        </h3>
-
         <Text className="mb-4">
           Choose a Large Language Model (LLM) to serve as the default for
           assistants that don&apos;t have a default model assigned.

web/src/app/chat/modal/configuration/LlmTab.tsx

@@ -35,9 +35,25 @@ export const LlmTab = forwardRef<HTMLDivElement, LlmTabProps>(
       checkPersonaRequiresImageGeneration(currentAssistant);
 
     const { llmProviders } = useChatContext();
-    const { setLlmOverride, temperature, updateTemperature } =
-      llmOverrideManager;
+    const { setLlmOverride, temperature, setTemperature } = llmOverrideManager;
     const [isTemperatureExpanded, setIsTemperatureExpanded] = useState(false);
+    const [localTemperature, setLocalTemperature] = useState<number>(
+      temperature || 0
+    );
+    const debouncedSetTemperature = useCallback(
+      (value: number) => {
+        const debouncedFunction = debounce((value: number) => {
+          setTemperature(value);
+        }, 300);
+        return debouncedFunction(value);
+      },
+      [setTemperature]
+    );
+
+    const handleTemperatureChange = (value: number) => {
+      setLocalTemperature(value);
+      debouncedSetTemperature(value);
+    };
 
     return (
       <div className="w-full">
@@ -92,26 +108,26 @@ export const LlmTab = forwardRef<HTMLDivElement, LlmTabProps>(
                 <input
                   type="range"
                   onChange={(e) =>
-                    updateTemperature(parseFloat(e.target.value))
+                    handleTemperatureChange(parseFloat(e.target.value))
                   }
                   className="w-full p-2 border border-border rounded-md"
                   min="0"
                   max="2"
                   step="0.01"
-                  value={temperature || 0}
+                  value={localTemperature}
                 />
                 <div
                   className="absolute text-sm"
                   style={{
-                    left: `${(temperature || 0) * 50}%`,
+                    left: `${(localTemperature || 0) * 50}%`,
                     transform: `translateX(-${Math.min(
-                      Math.max((temperature || 0) * 50, 10),
+                      Math.max((localTemperature || 0) * 50, 10),
                       90
                     )}%)`,
                     top: "-1.5rem",
                   }}
                 >
-                  {temperature}
+                  {localTemperature}
                 </div>
               </div>
             </>

web/src/app/chat/page.tsx

@@ -32,7 +32,6 @@ export default async function Page(props: {
     defaultAssistantId,
     shouldShowWelcomeModal,
     userInputPrompts,
-    ccPairs,
   } = data;
 
   return (
@@ -45,9 +44,6 @@ export default async function Page(props: {
         value={{
           chatSessions,
           availableSources,
-          ccPairs,
-          documentSets,
-          tags,
           availableDocumentSets: documentSets,
           availableTags: tags,
           llmProviders,

web/src/app/chat/sessionSidebar/HistorySidebar.tsx

@@ -113,7 +113,7 @@ export const HistorySidebar = forwardRef<HTMLDivElement, HistorySidebarProps>(
           {page == "chat" && (
             <div className="mx-3 mt-4 gap-y-1 flex-col text-text-history-sidebar-button flex gap-x-1.5 items-center items-center">
               <Link
-                className=" w-full p-2 bg-white border-border border rounded items-center hover:bg-background-200 cursor-pointer transition-all duration-150 flex gap-x-2"
+                className="w-full p-2 bg-white border-border border rounded items-center hover:bg-background-200 cursor-pointer transition-all duration-150 flex gap-x-2"
                 href={
                   `/${page}` +
                   (NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA &&

web/src/app/chat/shared/[chatId]/SharedChatDisplay.tsx

@@ -17,8 +17,6 @@ import { SettingsContext } from "@/components/settings/SettingsProvider";
 import { DanswerInitializingLoader } from "@/components/DanswerInitializingLoader";
 import { Persona } from "@/app/admin/assistants/interfaces";
 import { Button } from "@/components/ui/button";
-import { DanswerDocument } from "@/lib/search/interfaces";
-import TextView from "@/components/chat_search/TextView";
 
 function BackToDanswerButton() {
   const router = useRouter();
@@ -43,9 +41,6 @@ export function SharedChatDisplay({
   persona: Persona;
 }) {
   const [isReady, setIsReady] = useState(false);
-  const [presentingDocument, setPresentingDocument] =
-    useState<DanswerDocument | null>(null);
-
   useEffect(() => {
     Prism.highlightAll();
     setIsReady(true);
@@ -68,70 +63,61 @@ export function SharedChatDisplay({
   );
 
   return (
-    <>
-      {presentingDocument && (
-        <TextView
-          presentingDocument={presentingDocument}
-          onClose={() => setPresentingDocument(null)}
-        />
-      )}
-      <div className="w-full h-[100dvh] overflow-hidden">
-        <div className="flex max-h-full overflow-hidden pb-[72px]">
-          <div className="flex w-full overflow-hidden overflow-y-scroll">
-            <div className="w-full h-full flex-col flex max-w-message-max mx-auto">
-              <div className="px-5 pt-8">
-                <h1 className="text-3xl text-strong font-bold">
-                  {chatSession.description ||
-                    `Chat ${chatSession.chat_session_id}`}
-                </h1>
-                <p className="text-emphasis">
-                  {humanReadableFormat(chatSession.time_created)}
-                </p>
+    <div className="w-full h-[100dvh] overflow-hidden">
+      <div className="flex max-h-full overflow-hidden pb-[72px]">
+        <div className="flex w-full overflow-hidden overflow-y-scroll">
+          <div className="w-full h-full flex-col flex max-w-message-max mx-auto">
+            <div className="px-5 pt-8">
+              <h1 className="text-3xl text-strong font-bold">
+                {chatSession.description ||
+                  `Chat ${chatSession.chat_session_id}`}
+              </h1>
+              <p className="text-emphasis">
+                {humanReadableFormat(chatSession.time_created)}
+              </p>
 
-                <Separator />
-              </div>
-              {isReady ? (
-                <div className="w-full pb-16">
-                  {messages.map((message) => {
-                    if (message.type === "user") {
-                      return (
-                        <HumanMessage
-                          shared
-                          key={message.messageId}
-                          content={message.message}
-                          files={message.files}
-                        />
-                      );
-                    } else {
-                      return (
-                        <AIMessage
-                          shared
-                          setPresentingDocument={setPresentingDocument}
-                          currentPersona={persona}
-                          key={message.messageId}
-                          messageId={message.messageId}
-                          content={message.message}
-                          files={message.files || []}
-                          citedDocuments={getCitedDocumentsFromMessage(message)}
-                          isComplete
-                        />
-                      );
-                    }
-                  })}
-                </div>
-              ) : (
-                <div className="grow flex-0 h-screen w-full flex items-center justify-center">
-                  <div className="mb-[33vh]">
-                    <DanswerInitializingLoader />
-                  </div>
-                </div>
-              )}
+              <Separator />
             </div>
+            {isReady ? (
+              <div className="w-full pb-16">
+                {messages.map((message) => {
+                  if (message.type === "user") {
+                    return (
+                      <HumanMessage
+                        shared
+                        key={message.messageId}
+                        content={message.message}
+                        files={message.files}
+                      />
+                    );
+                  } else {
+                    return (
+                      <AIMessage
+                        shared
+                        currentPersona={persona}
+                        key={message.messageId}
+                        messageId={message.messageId}
+                        content={message.message}
+                        files={message.files || []}
+                        citedDocuments={getCitedDocumentsFromMessage(message)}
+                        isComplete
+                      />
+                    );
+                  }
+                })}
+              </div>
+            ) : (
+              <div className="grow flex-0 h-screen w-full flex items-center justify-center">
+                <div className="mb-[33vh]">
+                  <DanswerInitializingLoader />
+                </div>
+              </div>
+            )}
           </div>
         </div>
-
-        <BackToDanswerButton />
       </div>
-    </>
+
+      <BackToDanswerButton />
+    </div>
   );
 }