From 82b9cb4cc10aea32833e8fc2cac475b9c3001b7c Mon Sep 17 00:00:00 2001
From: Weves <chrisweaver101@gmail.com>
Date: Thu, 18 Apr 2024 21:57:01 -0700
Subject: [PATCH 01/25] Add check to ensure auth is enabled for every endpoint
 unless explicitly whitelisted

---
 backend/danswer/main.py                       |  4 +
 .../danswer/search/retrieval/search_runner.py |  2 +-
 backend/danswer/server/auth_check.py          | 81 +++++++++++++++++++
 .../danswer/server/danswer_api/ingestion.py   | 22 -----
 4 files changed, 86 insertions(+), 23 deletions(-)
 create mode 100644 backend/danswer/server/auth_check.py

diff --git a/backend/danswer/main.py b/backend/danswer/main.py
index 0e43e9754cc..e8afa0838b1 100644
--- a/backend/danswer/main.py
+++ b/backend/danswer/main.py
@@ -52,6 +52,7 @@
 from danswer.llm.utils import get_default_llm_version
 from danswer.search.retrieval.search_runner import download_nltk_data
 from danswer.search.search_nlp_models import warm_up_encoders
+from danswer.server.auth_check import check_router_auth
 from danswer.server.danswer_api.ingestion import get_danswer_api_key
 from danswer.server.danswer_api.ingestion import router as danswer_api_router
 from danswer.server.documents.cc_pair import router as cc_pair_router
@@ -353,6 +354,9 @@ def get_application() -> FastAPI:
         allow_headers=["*"],
     )
 
+    # Ensure all routes have auth enabled or are explicitly marked as public
+    check_router_auth(application)
+
     return application
 
 
diff --git a/backend/danswer/search/retrieval/search_runner.py b/backend/danswer/search/retrieval/search_runner.py
index 092b755d9d8..411db5b0f56 100644
--- a/backend/danswer/search/retrieval/search_runner.py
+++ b/backend/danswer/search/retrieval/search_runner.py
@@ -32,7 +32,7 @@
 logger = setup_logger()
 
 
-def download_nltk_data():
+def download_nltk_data() -> None:
     resources = {
         "stopwords": "corpora/stopwords",
         "wordnet": "corpora/wordnet",
diff --git a/backend/danswer/server/auth_check.py b/backend/danswer/server/auth_check.py
new file mode 100644
index 00000000000..54efc49564a
--- /dev/null
+++ b/backend/danswer/server/auth_check.py
@@ -0,0 +1,81 @@
+from typing import cast
+
+from fastapi import FastAPI
+from fastapi.dependencies.models import Dependant
+
+from danswer.auth.users import current_admin_user
+from danswer.auth.users import current_user
+from danswer.server.danswer_api.ingestion import api_key_dep
+
+
+PUBLIC_ENDPOINT_SPECS = [
+    # built-in documentation functions
+    ("/openapi.json", {"GET", "HEAD"}),
+    ("/docs", {"GET", "HEAD"}),
+    ("/docs/oauth2-redirect", {"GET", "HEAD"}),
+    ("/redoc", {"GET", "HEAD"}),
+    # should always be callable, will just return 401 if not authenticated
+    ("/manage/me", {"GET"}),
+    # just returns 200 to validate that the server is up
+    ("/health", {"GET"}),
+    # just returns auth type, needs to be accessible before the user is logged
+    # in to determine what flow to give the user
+    ("/auth/type", {"GET"}),
+    # just gets the version of Danswer (e.g. 0.3.11)
+    ("/version", {"GET"}),
+    # stuff related to basic auth
+    ("/auth/register", {"POST"}),
+    ("/auth/login", {"POST"}),
+    ("/auth/logout", {"POST"}),
+    ("/auth/forgot-password", {"POST"}),
+    ("/auth/reset-password", {"POST"}),
+    ("/auth/request-verify-token", {"POST"}),
+    ("/auth/verify", {"POST"}),
+    ("/users/me", {"GET"}),
+    ("/users/me", {"PATCH"}),
+    ("/users/{id}", {"GET"}),
+    ("/users/{id}", {"PATCH"}),
+    ("/users/{id}", {"DELETE"}),
+    # oauth
+    ("/auth/oauth/authorize", {"GET"}),
+    ("/auth/oauth/callback", {"GET"}),
+]
+
+
+def check_router_auth(application: FastAPI) -> None:
+    """Ensures that all endpoints on the passed in application either
+    (1) have auth enabled OR
+    (2) are explicitly marked as a public endpoint
+    """
+    for route in application.routes:
+        # explicitly marked as public
+        if (
+            hasattr(route, "path")
+            and hasattr(route, "methods")
+            and (route.path, route.methods) in PUBLIC_ENDPOINT_SPECS
+        ):
+            continue
+
+        # check for auth
+        found_auth = False
+        route_dependant_obj = cast(
+            Dependant | None, route.dependant if hasattr(route, "dependant") else None
+        )
+        if route_dependant_obj:
+            for dependency in route_dependant_obj.dependencies:
+                depends_fn = dependency.cache_key[0]
+                if (
+                    depends_fn == current_user
+                    or depends_fn == current_admin_user
+                    or depends_fn == api_key_dep
+                ):
+                    found_auth = True
+                    break
+
+        if not found_auth:
+            # uncomment to print out all route(s) that are missing auth
+            # print(f"(\"{route.path}\", {set(route.methods)}),")
+
+            raise RuntimeError(
+                f"Did not find current_user or current_admin_user dependency in route - {route}"
+            )
diff --git a/backend/danswer/server/danswer_api/ingestion.py b/backend/danswer/server/danswer_api/ingestion.py
index 7fce8d1d38c..2b0bed6c31a 100644
--- a/backend/danswer/server/danswer_api/ingestion.py
+++ b/backend/danswer/server/danswer_api/ingestion.py
@@ -1,5 +1,4 @@
 import secrets
-from typing import cast
 
 from fastapi import APIRouter
 from fastapi import Depends
@@ -25,7 +24,6 @@
 from danswer.indexing.indexing_pipeline import build_indexing_pipeline
 from danswer.server.danswer_api.models import IngestionDocument
 from danswer.server.danswer_api.models import IngestionResult
-from danswer.server.models import ApiKey
 from danswer.utils.logger import setup_logger
 
 logger = setup_logger()
@@ -69,26 +67,6 @@ def api_key_dep(authorization: str = Header(...)) -> str:
     return token
 
 
-# Provides a way to recover if the api key is deleted for some reason
-# Can also just restart the server to regenerate a new one
-def api_key_dep_if_exist(authorization: str | None = Header(None)) -> str | None:
-    token = authorization.removeprefix("Bearer ").strip() if authorization else None
-    saved_key = get_danswer_api_key(dont_regenerate=True)
-    if not saved_key:
-        return None
-
-    if token != saved_key:
-        raise HTTPException(status_code=401, detail="Invalid API key")
-
-    return token
-
-
-@router.post("/regenerate-key")
-def regenerate_key(_: str | None = Depends(api_key_dep_if_exist)) -> ApiKey:
-    delete_danswer_api_key()
-    return ApiKey(api_key=cast(str, get_danswer_api_key()))
-
-
 @router.post("/doc-ingestion")
 def document_ingestion(
     doc_info: IngestionDocument,

From 87f304dfd0fa9157043869a12bd51b4e60acea13 Mon Sep 17 00:00:00 2001
From: Yuhong Sun <yuhongsun96@gmail.com>
Date: Fri, 19 Apr 2024 10:38:15 -0700
Subject: [PATCH 02/25] Swap Index Early (#1353)

---
 backend/danswer/background/update.py | 51 +-----------------------
 backend/danswer/db/swap_index.py     | 58 ++++++++++++++++++++++++++++
 backend/danswer/main.py              |  2 +
 3 files changed, 62 insertions(+), 49 deletions(-)
 create mode 100644 backend/danswer/db/swap_index.py

diff --git a/backend/danswer/background/update.py b/backend/danswer/background/update.py
index 6042e02b1cd..ae629696579 100755
--- a/backend/danswer/background/update.py
+++ b/backend/danswer/background/update.py
@@ -17,19 +17,12 @@
 from danswer.configs.app_configs import DISABLE_INDEX_UPDATE_ON_SWAP
 from danswer.configs.app_configs import NUM_INDEXING_WORKERS
 from danswer.db.connector import fetch_connectors
-from danswer.db.connector_credential_pair import get_connector_credential_pairs
 from danswer.db.connector_credential_pair import mark_all_in_progress_cc_pairs_failed
-from danswer.db.connector_credential_pair import resync_cc_pair
 from danswer.db.connector_credential_pair import update_connector_credential_pair
 from danswer.db.embedding_model import get_current_db_embedding_model
 from danswer.db.embedding_model import get_secondary_db_embedding_model
-from danswer.db.embedding_model import update_embedding_model_status
 from danswer.db.engine import get_db_current_time
 from danswer.db.engine import get_sqlalchemy_engine
-from danswer.db.index_attempt import cancel_indexing_attempts_past_model
-from danswer.db.index_attempt import (
-    count_unique_cc_pairs_with_successful_index_attempts,
-)
 from danswer.db.index_attempt import create_index_attempt
 from danswer.db.index_attempt import get_index_attempt
 from danswer.db.index_attempt import get_inprogress_index_attempts
@@ -41,6 +34,7 @@
 from danswer.db.models import IndexAttempt
 from danswer.db.models import IndexingStatus
 from danswer.db.models import IndexModelStatus
+from danswer.db.swap_index import check_index_swap
 from danswer.search.search_nlp_models import warm_up_encoders
 from danswer.utils.logger import setup_logger
 from shared_configs.configs import INDEXING_MODEL_SERVER_HOST
@@ -354,51 +348,10 @@ def kickoff_indexing_jobs(
     return existing_jobs_copy
 
 
-def check_index_swap(db_session: Session) -> None:
-    """Get count of cc-pairs and count of successful index_attempts for the
-    new model grouped by connector + credential, if it's the same, then assume
-    new index is done building. If so, swap the indices and expire the old one."""
-    # Default CC-pair created for Ingestion API unused here
-    all_cc_pairs = get_connector_credential_pairs(db_session)
-    cc_pair_count = len(all_cc_pairs) - 1
-    embedding_model = get_secondary_db_embedding_model(db_session)
-
-    if not embedding_model:
-        return
-
-    unique_cc_indexings = count_unique_cc_pairs_with_successful_index_attempts(
-        embedding_model_id=embedding_model.id, db_session=db_session
-    )
-
-    if unique_cc_indexings > cc_pair_count:
-        raise RuntimeError("More unique indexings than cc pairs, should not occur")
-
-    if cc_pair_count == unique_cc_indexings:
-        # Swap indices
-        now_old_embedding_model = get_current_db_embedding_model(db_session)
-        update_embedding_model_status(
-            embedding_model=now_old_embedding_model,
-            new_status=IndexModelStatus.PAST,
-            db_session=db_session,
-        )
-
-        update_embedding_model_status(
-            embedding_model=embedding_model,
-            new_status=IndexModelStatus.PRESENT,
-            db_session=db_session,
-        )
-
-        # Expire jobs for the now past index/embedding model
-        cancel_indexing_attempts_past_model(db_session)
-
-        # Recount aggregates
-        for cc_pair in all_cc_pairs:
-            resync_cc_pair(cc_pair, db_session=db_session)
-
-
 def update_loop(delay: int = 10, num_workers: int = NUM_INDEXING_WORKERS) -> None:
     engine = get_sqlalchemy_engine()
     with Session(engine) as db_session:
+        check_index_swap(db_session=db_session)
         db_embedding_model = get_current_db_embedding_model(db_session)
 
     # So that the first time users aren't surprised by really slow speed of first
diff --git a/backend/danswer/db/swap_index.py b/backend/danswer/db/swap_index.py
new file mode 100644
index 00000000000..93eb4714ac3
--- /dev/null
+++ b/backend/danswer/db/swap_index.py
@@ -0,0 +1,58 @@
+from sqlalchemy.orm import Session
+
+from danswer.db.connector_credential_pair import get_connector_credential_pairs
+from danswer.db.connector_credential_pair import resync_cc_pair
+from danswer.db.embedding_model import get_current_db_embedding_model
+from danswer.db.embedding_model import get_secondary_db_embedding_model
+from danswer.db.embedding_model import update_embedding_model_status
+from danswer.db.enums import IndexModelStatus
+from danswer.db.index_attempt import cancel_indexing_attempts_past_model
+from danswer.db.index_attempt import (
+    count_unique_cc_pairs_with_successful_index_attempts,
+)
+from danswer.utils.logger import setup_logger
+
+logger = setup_logger()
+
+
+def check_index_swap(db_session: Session) -> None:
+    """Get count of cc-pairs and count of successful index_attempts for the
+    new model grouped by connector + credential, if it's the same, then assume
+    new index is done building. If so, swap the indices and expire the old one."""
+    # Default CC-pair created for Ingestion API unused here
+    all_cc_pairs = get_connector_credential_pairs(db_session)
+    cc_pair_count = max(len(all_cc_pairs) - 1, 0)
+    embedding_model = get_secondary_db_embedding_model(db_session)
+
+    if not embedding_model:
+        return
+
+    unique_cc_indexings = count_unique_cc_pairs_with_successful_index_attempts(
+        embedding_model_id=embedding_model.id, db_session=db_session
+    )
+
+    if unique_cc_indexings > cc_pair_count:
+        raise RuntimeError("More unique indexings than cc pairs, should not occur")
+
+    if cc_pair_count == 0 or cc_pair_count == unique_cc_indexings:
+        # Swap indices
+        now_old_embedding_model = get_current_db_embedding_model(db_session)
+        update_embedding_model_status(
+            embedding_model=now_old_embedding_model,
+            new_status=IndexModelStatus.PAST,
+            db_session=db_session,
+        )
+
+        update_embedding_model_status(
+            embedding_model=embedding_model,
+            new_status=IndexModelStatus.PRESENT,
+            db_session=db_session,
+        )
+
+        if cc_pair_count > 0:
+            # Expire jobs for the now past index/embedding model
+            cancel_indexing_attempts_past_model(db_session)
+
+            # Recount aggregates
+            for cc_pair in all_cc_pairs:
+                resync_cc_pair(cc_pair, db_session=db_session)
diff --git a/backend/danswer/main.py b/backend/danswer/main.py
index e8afa0838b1..8e27482ae07 100644
--- a/backend/danswer/main.py
+++ b/backend/danswer/main.py
@@ -46,6 +46,7 @@
 from danswer.db.engine import get_sqlalchemy_engine
 from danswer.db.index_attempt import cancel_indexing_attempts_past_model
 from danswer.db.index_attempt import expire_index_attempts
+from danswer.db.swap_index import check_index_swap
 from danswer.document_index.factory import get_default_document_index
 from danswer.dynamic_configs.port_configs import port_filesystem_to_postgres
 from danswer.llm.factory import get_default_llm
@@ -180,6 +181,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
         )
 
     with Session(engine) as db_session:
+        check_index_swap(db_session=db_session)
         db_embedding_model = get_current_db_embedding_model(db_session)
         secondary_db_embedding_model = get_secondary_db_embedding_model(db_session)
 

From 58545ccf3a530a195a2c9d2e98674b111f3b8dee Mon Sep 17 00:00:00 2001
From: Yuhong Sun <yuhongsun96@gmail.com>
Date: Fri, 19 Apr 2024 21:52:53 -0700
Subject: [PATCH 03/25] Pre download models (#1354)

---
 backend/Dockerfile              |  9 +++++++++
 backend/Dockerfile.model_server | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index a61864fa2c0..533a94b24a2 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -42,6 +42,15 @@ RUN apt-get remove -y --allow-remove-essential perl-base xserver-common xvfb cma
     rm -rf /var/lib/apt/lists/* && \
     rm /usr/local/lib/python3.11/site-packages/tornado/test/test.key
 
+# Pre-downloading models for setups with limited egress
+RUN python -c "from transformers import AutoTokenizer; AutoTokenizer.from_pretrained('intfloat/e5-base-v2')"
+
+# Pre-downloading NLTK for setups with limited egress
+RUN python -c "import nltk; \
+nltk.download('stopwords', quiet=True); \
+nltk.download('wordnet', quiet=True); \
+nltk.download('punkt', quiet=True);"
+
 # Set up application files
 WORKDIR /app
 COPY ./danswer /app/danswer
diff --git a/backend/Dockerfile.model_server b/backend/Dockerfile.model_server
index 365a553c9f1..89f24e2ac26 100644
--- a/backend/Dockerfile.model_server
+++ b/backend/Dockerfile.model_server
@@ -17,6 +17,16 @@ RUN pip install --no-cache-dir --upgrade -r /tmp/requirements.txt
 RUN apt-get remove -y --allow-remove-essential perl-base && \
     apt-get autoremove -y
 
+# Pre-downloading models for setups with limited egress
+RUN python -c "from transformers import AutoModel, AutoTokenizer, TFDistilBertForSequenceClassification; \
+from huggingface_hub import snapshot_download; \
+AutoTokenizer.from_pretrained('danswer/intent-model'); \
+AutoTokenizer.from_pretrained('intfloat/e5-base-v2'); \
+AutoTokenizer.from_pretrained('mixedbread-ai/mxbai-rerank-xsmall-v1'); \
+snapshot_download('danswer/intent-model'); \
+snapshot_download('intfloat/e5-base-v2'); \
+snapshot_download('mixedbread-ai/mxbai-rerank-xsmall-v1')"
+
 WORKDIR /app
 
 # Utils used by model server

From 4e9605e6522ebe25937a589ffee412fea854788c Mon Sep 17 00:00:00 2001
From: Yuhong Sun <yuhongsun96@gmail.com>
Date: Sat, 20 Apr 2024 09:25:08 -0700
Subject: [PATCH 04/25] Only Log Index Attempt CC Pair Miscount (#1355)

---
 backend/danswer/db/index_attempt.py | 3 +++
 backend/danswer/db/swap_index.py    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/danswer/db/index_attempt.py b/backend/danswer/db/index_attempt.py
index 4580140a5f1..df42d869d65 100644
--- a/backend/danswer/db/index_attempt.py
+++ b/backend/danswer/db/index_attempt.py
@@ -295,6 +295,9 @@ def count_unique_cc_pairs_with_successful_index_attempts(
     embedding_model_id: int | None,
     db_session: Session,
 ) -> int:
+    """Collect all of the Index Attempts that are successful and for the specified embedding model
+    Then do distinct by connector_id and credential_id which is equivalent to the cc-pair. Finally,
+    do a count to get the total number of unique cc-pairs with successful attempts"""
     unique_pairs_count = (
         db_session.query(IndexAttempt.connector_id, IndexAttempt.credential_id)
         .filter(
diff --git a/backend/danswer/db/swap_index.py b/backend/danswer/db/swap_index.py
index 93eb4714ac3..f14a45f296e 100644
--- a/backend/danswer/db/swap_index.py
+++ b/backend/danswer/db/swap_index.py
@@ -31,8 +31,10 @@ def check_index_swap(db_session: Session) -> None:
         embedding_model_id=embedding_model.id, db_session=db_session
     )
 
+    # Index Attempts are cleaned up as well when the cc-pair is deleted so the logic in this
+    # function is correct. The unique_cc_indexings are specifically for the existing cc-pairs
     if unique_cc_indexings > cc_pair_count:
-        raise RuntimeError("More unique indexings than cc pairs, should not occur")
+        logger.error("More unique indexings than cc pairs, should not occur")
 
     if cc_pair_count == 0 or cc_pair_count == unique_cc_indexings:
         # Swap indices

From 7d51549b1b45643667d8ecf0a415ab6d93d56fa0 Mon Sep 17 00:00:00 2001
From: Yuhong Sun <yuhongsun96@gmail.com>
Date: Sat, 20 Apr 2024 10:27:41 -0700
Subject: [PATCH 05/25] Remove Unused Volumes (#1356)

---
 deployment/docker_compose/docker-compose.dev.yml     | 12 +++++-------
 .../docker-compose.prod-no-letsencrypt.yml           | 12 +++++-------
 deployment/docker_compose/docker-compose.prod.yml    | 12 +++++-------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml
index 9b5115f801f..f3a56934016 100644
--- a/deployment/docker_compose/docker-compose.dev.yml
+++ b/deployment/docker_compose/docker-compose.dev.yml
@@ -80,7 +80,6 @@ services:
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
-      - model_cache_nltk:/root/nltk_data/
     extra_hosts:
       - "host.docker.internal:host-gateway"
     logging:
@@ -174,7 +173,6 @@ services:
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
-      - model_cache_nltk:/root/nltk_data/
     extra_hosts:
       - "host.docker.internal:host-gateway"
     logging:
@@ -218,7 +216,6 @@ services:
       # Set to debug to get more fine-grained logs
       - LOG_LEVEL=${LOG_LEVEL:-info}
     volumes:
-      - model_cache_torch:/root/.cache/torch/
       - model_cache_huggingface:/root/.cache/huggingface/
     logging:
       driver: json-file
@@ -246,7 +243,6 @@ services:
       # Set to debug to get more fine-grained logs
       - LOG_LEVEL=${LOG_LEVEL:-info}
     volumes:
-      - model_cache_torch:/root/.cache/torch/
       - model_cache_huggingface:/root/.cache/huggingface/
     logging:
       driver: json-file
@@ -314,10 +310,12 @@ services:
         
 
 volumes:
+  # local_dynamic_storage is legacy only now
   local_dynamic_storage:
-  file_connector_tmp_storage:  # used to store files uploaded by the user temporarily while we are indexing them
+  # used to store files uploaded by the user temporarily while we are indexing them
+  # file_connector_tmp_storage is legacy only now
+  file_connector_tmp_storage:
   db_volume:
   vespa_volume:
-  model_cache_torch:
-  model_cache_nltk:
+  # Created by the container itself
   model_cache_huggingface:
diff --git a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
index 5c5cd5a4663..32a7dae2659 100644
--- a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
+++ b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
@@ -23,7 +23,6 @@ services:
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
-      - model_cache_nltk:/root/nltk_data/
     extra_hosts:
       - "host.docker.internal:host-gateway"
     logging:
@@ -54,7 +53,6 @@ services:
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
-      - model_cache_nltk:/root/nltk_data/
     extra_hosts:
       - "host.docker.internal:host-gateway"
     logging:
@@ -104,7 +102,6 @@ services:
       # Set to debug to get more fine-grained logs
       - LOG_LEVEL=${LOG_LEVEL:-info}
     volumes:
-      - model_cache_torch:/root/.cache/torch/
       - model_cache_huggingface:/root/.cache/huggingface/
     logging:
       driver: json-file
@@ -132,7 +129,6 @@ services:
       # Set to debug to get more fine-grained logs
       - LOG_LEVEL=${LOG_LEVEL:-info}
     volumes:
-      - model_cache_torch:/root/.cache/torch/
       - model_cache_huggingface:/root/.cache/huggingface/
     logging:
       driver: json-file
@@ -204,10 +200,12 @@ services:
 
 
 volumes:
+  # local_dynamic_storage is legacy only now
   local_dynamic_storage:
-  file_connector_tmp_storage:  # used to store files uploaded by the user temporarily while we are indexing them
+  # used to store files uploaded by the user temporarily while we are indexing them
+  # file_connector_tmp_storage is legacy only now
+  file_connector_tmp_storage:
   db_volume:
   vespa_volume:
-  model_cache_torch:
-  model_cache_nltk:
+  # Created by the container itself
   model_cache_huggingface:
diff --git a/deployment/docker_compose/docker-compose.prod.yml b/deployment/docker_compose/docker-compose.prod.yml
index 9c7202abd3c..c5b8177c4c4 100644
--- a/deployment/docker_compose/docker-compose.prod.yml
+++ b/deployment/docker_compose/docker-compose.prod.yml
@@ -23,7 +23,6 @@ services:
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
-      - model_cache_nltk:/root/nltk_data/
     extra_hosts:
       - "host.docker.internal:host-gateway"
     logging:
@@ -54,7 +53,6 @@ services:
     volumes:
       - local_dynamic_storage:/home/storage
       - file_connector_tmp_storage:/home/file_connector_storage
-      - model_cache_nltk:/root/nltk_data/
     extra_hosts:
       - "host.docker.internal:host-gateway"
     logging:
@@ -117,7 +115,6 @@ services:
       # Set to debug to get more fine-grained logs
       - LOG_LEVEL=${LOG_LEVEL:-info}
     volumes:
-      - model_cache_torch:/root/.cache/torch/
       - model_cache_huggingface:/root/.cache/huggingface/
     logging:
       driver: json-file
@@ -145,7 +142,6 @@ services:
       # Set to debug to get more fine-grained logs
       - LOG_LEVEL=${LOG_LEVEL:-info}
     volumes:
-      - model_cache_torch:/root/.cache/torch/
       - model_cache_huggingface:/root/.cache/huggingface/
     logging:
       driver: json-file
@@ -221,10 +217,12 @@ services:
 
 
 volumes:
+  # local_dynamic_storage is legacy only now
   local_dynamic_storage:
-  file_connector_tmp_storage:  # used to store files uploaded by the user temporarily while we are indexing them
+  # used to store files uploaded by the user temporarily while we are indexing them
+  # file_connector_tmp_storage is legacy only now
+  file_connector_tmp_storage:
   db_volume:
   vespa_volume:
-  model_cache_torch:
-  model_cache_nltk:
+  # Created by the container itself
   model_cache_huggingface:

From f616b7e6e562e2b416b265619136caf1e7db0a0e Mon Sep 17 00:00:00 2001
From: Yuhong Sun <yuhongsun96@gmail.com>
Date: Sat, 20 Apr 2024 15:24:00 -0700
Subject: [PATCH 06/25] Web Connector to only allow Global IPs (#1357)

---
 backend/danswer/connectors/web/connector.py | 64 ++++++++++++++++-----
 1 file changed, 49 insertions(+), 15 deletions(-)

diff --git a/backend/danswer/connectors/web/connector.py b/backend/danswer/connectors/web/connector.py
index 6114f0a867a..c5fb6db26d4 100644
--- a/backend/danswer/connectors/web/connector.py
+++ b/backend/danswer/connectors/web/connector.py
@@ -1,4 +1,6 @@
 import io
+import ipaddress
+import socket
 from enum import Enum
 from typing import Any
 from typing import cast
@@ -27,7 +29,6 @@
 from danswer.connectors.models import Section
 from danswer.utils.logger import setup_logger
 
-
 logger = setup_logger()
 
 
@@ -43,16 +44,33 @@ class WEB_CONNECTOR_VALID_SETTINGS(str, Enum):
 
 
 def protected_url_check(url: str) -> None:
+    """Couple considerations:
+    - DNS mapping changes over time so we don't want to cache the results
+    - Fetching this is assumed to be relatively fast compared to other bottlenecks like reading
+      the page or embedding the contents
+    - To be extra safe, all IPs associated with the URL must be global
+    """
     parse = urlparse(url)
-    if parse.scheme == "file":
-        raise ValueError("Not permitted to read local files via Web Connector.")
-    if (
-        parse.scheme == "localhost"
-        or parse.scheme == "127.0.0.1"
-        or parse.hostname == "localhost"
-        or parse.hostname == "127.0.0.1"
-    ):
-        raise ValueError("Not permitted to read localhost urls.")
+    if parse.scheme != "http" and parse.scheme != "https":
+        raise ValueError("URL must be of scheme https?://")
+
+    if not parse.hostname:
+        raise ValueError("URL must include a hostname")
+
+    try:
+        # This may give a large list of IP addresses for domains with extensive DNS configurations
+        # such as large distributed systems of CDNs
+        info = socket.getaddrinfo(parse.hostname, None)
+    except socket.gaierror as e:
+        raise ConnectionError(f"DNS resolution failed for {parse.hostname}: {e}")
+
+    for address in info:
+        ip = address[4][0]
+        if not ipaddress.ip_address(ip).is_global:
+            raise ValueError(
+                f"Non-global IP address detected: {ip}, skipping page {url}. "
+                f"The Web Connector is not allowed to read loopback, link-local, or private ranges"
+            )
 
 
 def check_internet_connection(url: str) -> None:
@@ -194,6 +212,10 @@ def load_from_state(self) -> GenerateDocumentsOutput:
         base_url = to_visit[0]  # For the recursive case
         doc_batch: list[Document] = []
 
+        # Needed to report error
+        at_least_one_doc = False
+        last_error = None
+
         playwright, context = start_playwright()
         restart_playwright = False
         while to_visit:
@@ -202,7 +224,12 @@ def load_from_state(self) -> GenerateDocumentsOutput:
                 continue
             visited_links.add(current_url)
 
-            protected_url_check(current_url)
+            try:
+                protected_url_check(current_url)
+            except Exception as e:
+                last_error = f"Invalid URL {current_url} due to {e}"
+                logger.warning(last_error)
+                continue
 
             logger.info(f"Visiting {current_url}")
 
@@ -251,9 +278,8 @@ def load_from_state(self) -> GenerateDocumentsOutput:
                             to_visit.append(link)
 
                 if page_response and str(page_response.status)[0] in ("4", "5"):
-                    logger.info(
-                        f"Skipped indexing {current_url} due to HTTP {page_response.status} response"
-                    )
+                    last_error = f"Skipped indexing {current_url} due to HTTP {page_response.status} response"
+                    logger.info(last_error)
                     continue
 
                 parsed_html = web_html_cleanup(soup, self.mintlify_cleanup)
@@ -272,7 +298,8 @@ def load_from_state(self) -> GenerateDocumentsOutput:
 
                 page.close()
             except Exception as e:
-                logger.error(f"Failed to fetch '{current_url}': {e}")
+                last_error = f"Failed to fetch '{current_url}': {e}"
+                logger.error(last_error)
                 playwright.stop()
                 restart_playwright = True
                 continue
@@ -280,13 +307,20 @@ def load_from_state(self) -> GenerateDocumentsOutput:
             if len(doc_batch) >= self.batch_size:
                 playwright.stop()
                 restart_playwright = True
+                at_least_one_doc = True
                 yield doc_batch
                 doc_batch = []
 
         if doc_batch:
             playwright.stop()
+            at_least_one_doc = True
             yield doc_batch
 
+        if not at_least_one_doc:
+            if last_error:
+                raise RuntimeError(last_error)
+            raise RuntimeError("No valid pages found.")
+
 
 if __name__ == "__main__":
     connector = WebConnector("https://docs.danswer.dev/")

From b407edbe4919b624f5fa8d6e88b15b945b64271e Mon Sep 17 00:00:00 2001
From: Weves <chrisweaver101@gmail.com>
Date: Sat, 20 Apr 2024 16:20:26 -0700
Subject: [PATCH 07/25] Personal assistants

---
 backend/danswer/chat/load_yamls.py            |  10 +-
 backend/danswer/db/chat.py                    |  79 +-
 backend/danswer/db/models.py                  |   4 +-
 backend/danswer/db/persona.py                 |  20 +-
 backend/danswer/db/slack_bot_config.py        |   3 +-
 .../one_shot_answer/answer_question.py        |   2 +-
 .../danswer/server/features/persona/api.py    |  94 +-
 .../danswer/server/features/persona/models.py |  12 +-
 backend/danswer/server/features/prompt/api.py |  12 +-
 .../danswer/server/features/prompt/models.py  |   3 -
 backend/danswer/server/manage/slack_bot.py    |   2 +-
 backend/danswer/server/models.py              |   6 +
 .../server/query_and_chat/chat_backend.py     |   2 +-
 .../AssistantEditor.tsx}                      | 385 ++++---
 .../HidableSection.tsx                        |   0
 .../{personas => assistants}/PersonaTable.tsx |  24 +-
 .../[personaId]/DeletePersonaButton.tsx       |   0
 .../app/admin/assistants/[personaId]/page.tsx |  53 +
 web/src/app/admin/assistants/enums.ts         |   4 +
 .../{personas => assistants}/interfaces.ts    |   6 +-
 .../app/admin/{personas => assistants}/lib.ts |  13 +-
 web/src/app/admin/assistants/new/page.tsx     |  42 +
 .../admin/{personas => assistants}/page.tsx   |  14 +-
 .../admin/bot/SlackBotConfigCreationForm.tsx  |   2 +-
 web/src/app/admin/bot/[id]/page.tsx           |   2 +-
 web/src/app/admin/bot/lib.ts                  |   2 +-
 web/src/app/admin/bot/new/page.tsx            |   2 +-
 .../app/admin/personas/[personaId]/page.tsx   |  92 --
 web/src/app/admin/personas/new/page.tsx       |  66 --
 web/src/app/admin/settings/interfaces.ts      |  16 +
 web/src/app/assistants/edit/[id]/page.tsx     |  59 ++
 web/src/app/assistants/new/page.tsx           |  59 ++
 web/src/app/chat/Chat.tsx                     | 966 -----------------
 web/src/app/chat/ChatIntro.tsx                |   2 +-
 web/src/app/chat/ChatPage.tsx                 | 999 +++++++++++++++++-
 web/src/app/chat/ChatPersonaSelector.tsx      |   2 +-
 web/src/app/chat/StarterMessage.tsx           |   2 +-
 web/src/app/chat/lib.tsx                      |   4 +-
 web/src/app/chat/page.tsx                     |  22 +-
 web/src/app/chat/searchParams.ts              |   2 +-
 .../app/chat/sessionSidebar/AssistantsTab.tsx | 105 ++
 .../app/chat/sessionSidebar/ChatSidebar.tsx   | 132 ++-
 web/src/app/chat/sessionSidebar/ChatTab.tsx   |  40 +
 web/src/app/chat/sessionSidebar/constants.ts  |   6 +
 web/src/app/chat/shared/[chatId]/page.tsx     |  10 +-
 web/src/app/layout.tsx                        |  13 +-
 web/src/app/page.tsx                          |   6 +-
 web/src/app/search/page.tsx                   |  19 +-
 web/src/components/admin/Layout.tsx           |  15 +-
 .../documentSet/DocumentSetSelectable.tsx     |  54 +
 web/src/components/{ => header}/Header.tsx    |  23 +-
 web/src/components/header/HeaderWrapper.tsx   |  11 +
 web/src/components/search/PersonaSelector.tsx |   2 +-
 web/src/components/search/SearchSection.tsx   |  16 +-
 .../components/settings/SettingsProvider.tsx  |  20 +
 web/src/components/settings/lib.ts            |  30 +
 .../assistants/fetchPersonaEditorInfoSS.ts    | 103 ++
 web/src/lib/constants.ts                      |   5 +
 web/src/lib/filters.ts                        |   2 +-
 web/src/lib/search/interfaces.ts              |   2 +-
 web/src/lib/settings.ts                       |  10 -
 web/src/lib/sources.ts                        |   2 +-
 web/src/lib/types.ts                          |   7 +-
 63 files changed, 2128 insertions(+), 1594 deletions(-)
 rename web/src/app/admin/{personas/PersonaEditor.tsx => assistants/AssistantEditor.tsx} (74%)
 rename web/src/app/admin/{personas => assistants}/HidableSection.tsx (100%)
 rename web/src/app/admin/{personas => assistants}/PersonaTable.tsx (88%)
 rename web/src/app/admin/{personas => assistants}/[personaId]/DeletePersonaButton.tsx (100%)
 create mode 100644 web/src/app/admin/assistants/[personaId]/page.tsx
 create mode 100644 web/src/app/admin/assistants/enums.ts
 rename web/src/app/admin/{personas => assistants}/interfaces.ts (86%)
 rename web/src/app/admin/{personas => assistants}/lib.ts (96%)
 create mode 100644 web/src/app/admin/assistants/new/page.tsx
 rename web/src/app/admin/{personas => assistants}/page.tsx (82%)
 delete mode 100644 web/src/app/admin/personas/[personaId]/page.tsx
 delete mode 100644 web/src/app/admin/personas/new/page.tsx
 create mode 100644 web/src/app/assistants/edit/[id]/page.tsx
 create mode 100644 web/src/app/assistants/new/page.tsx
 delete mode 100644 web/src/app/chat/Chat.tsx
 create mode 100644 web/src/app/chat/sessionSidebar/AssistantsTab.tsx
 create mode 100644 web/src/app/chat/sessionSidebar/ChatTab.tsx
 create mode 100644 web/src/app/chat/sessionSidebar/constants.ts
 create mode 100644 web/src/components/documentSet/DocumentSetSelectable.tsx
 rename web/src/components/{ => header}/Header.tsx (88%)
 create mode 100644 web/src/components/header/HeaderWrapper.tsx
 create mode 100644 web/src/components/settings/SettingsProvider.tsx
 create mode 100644 web/src/components/settings/lib.ts
 create mode 100644 web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
 delete mode 100644 web/src/lib/settings.ts

diff --git a/backend/danswer/chat/load_yamls.py b/backend/danswer/chat/load_yamls.py
index ccc75443749..1b1e615bb72 100644
--- a/backend/danswer/chat/load_yamls.py
+++ b/backend/danswer/chat/load_yamls.py
@@ -24,7 +24,7 @@ def load_prompts_from_yaml(prompts_yaml: str = PROMPTS_YAML) -> None:
     with Session(get_sqlalchemy_engine()) as db_session:
         for prompt in all_prompts:
             upsert_prompt(
-                user_id=None,
+                user=None,
                 prompt_id=prompt.get("id"),
                 name=prompt["name"],
                 description=prompt["description"].strip(),
@@ -34,7 +34,6 @@ def load_prompts_from_yaml(prompts_yaml: str = PROMPTS_YAML) -> None:
                 datetime_aware=prompt.get("datetime_aware", True),
                 default_prompt=True,
                 personas=None,
-                shared=True,
                 db_session=db_session,
                 commit=True,
             )
@@ -67,9 +66,7 @@ def load_personas_from_yaml(
                 prompts: list[PromptDBModel | None] | None = None
             else:
                 prompts = [
-                    get_prompt_by_name(
-                        prompt_name, user_id=None, shared=True, db_session=db_session
-                    )
+                    get_prompt_by_name(prompt_name, user=None, db_session=db_session)
                     for prompt_name in prompt_set_names
                 ]
                 if any([prompt is None for prompt in prompts]):
@@ -80,7 +77,7 @@ def load_personas_from_yaml(
 
             p_id = persona.get("id")
             upsert_persona(
-                user_id=None,
+                user=None,
                 # Negative to not conflict with existing personas
                 persona_id=(-1 * p_id) if p_id is not None else None,
                 name=persona["name"],
@@ -96,7 +93,6 @@ def load_personas_from_yaml(
                 prompts=cast(list[PromptDBModel] | None, prompts),
                 document_sets=doc_sets,
                 default_persona=True,
-                shared=True,
                 is_public=True,
                 db_session=db_session,
             )
diff --git a/backend/danswer/db/chat.py b/backend/danswer/db/chat.py
index 738d02a1657..d45fe95a78d 100644
--- a/backend/danswer/db/chat.py
+++ b/backend/danswer/db/chat.py
@@ -12,6 +12,7 @@
 from sqlalchemy.exc import MultipleResultsFound
 from sqlalchemy.orm import Session
 
+from danswer.auth.schemas import UserRole
 from danswer.configs.chat_configs import HARD_DELETE_CHATS
 from danswer.configs.constants import MessageType
 from danswer.db.constants import SLACK_BOT_PERSONA_PREFIX
@@ -27,6 +28,7 @@
 from danswer.db.models import SearchDoc
 from danswer.db.models import SearchDoc as DBSearchDoc
 from danswer.db.models import StarterMessage
+from danswer.db.models import User
 from danswer.db.models import User__UserGroup
 from danswer.llm.override_models import LLMOverride
 from danswer.llm.override_models import PromptOverride
@@ -313,13 +315,16 @@ def set_as_latest_chat_message(
 
 def get_prompt_by_id(
     prompt_id: int,
-    user_id: UUID | None,
+    user: User | None,
     db_session: Session,
     include_deleted: bool = False,
 ) -> Prompt:
-    stmt = select(Prompt).where(
-        Prompt.id == prompt_id, or_(Prompt.user_id == user_id, Prompt.user_id.is_(None))
-    )
+    stmt = select(Prompt).where(Prompt.id == prompt_id)
+
+    # if user is not specified OR they are an admin, they should
+    # have access to all prompts, so this where clause is not needed
+    if user and user.role != UserRole.ADMIN:
+        stmt = stmt.where(or_(Prompt.user_id == user.id, Prompt.user_id.is_(None)))
 
     if not include_deleted:
         stmt = stmt.where(Prompt.deleted.is_(False))
@@ -351,14 +356,16 @@ def get_default_prompt() -> Prompt:
 
 def get_persona_by_id(
     persona_id: int,
-    # if user_id is `None` assume the user is an admin or auth is disabled
-    user_id: UUID | None,
+    # if user is `None` assume the user is an admin or auth is disabled
+    user: User | None,
     db_session: Session,
     include_deleted: bool = False,
 ) -> Persona:
     stmt = select(Persona).where(Persona.id == persona_id)
-    if user_id is not None:
-        stmt = stmt.where(or_(Persona.user_id == user_id, Persona.user_id.is_(None)))
+
+    # if user is an admin, they should have access to all Personas
+    if user is not None and user.role != UserRole.ADMIN:
+        stmt = stmt.where(or_(Persona.user_id == user.id, Persona.user_id.is_(None)))
 
     if not include_deleted:
         stmt = stmt.where(Persona.deleted.is_(False))
@@ -397,33 +404,33 @@ def get_personas_by_ids(
 
 
 def get_prompt_by_name(
-    prompt_name: str, user_id: UUID | None, shared: bool, db_session: Session
+    prompt_name: str, user: User | None, db_session: Session
 ) -> Prompt | None:
-    """Cannot do shared and user owned simultaneously as there may be two of those"""
     stmt = select(Prompt).where(Prompt.name == prompt_name)
-    if shared:
-        stmt = stmt.where(Prompt.user_id.is_(None))
-    else:
-        stmt = stmt.where(Prompt.user_id == user_id)
+
+    # if user is not specified OR they are an admin, they should
+    # have access to all prompts, so this where clause is not needed
+    if user and user.role != UserRole.ADMIN:
+        stmt = stmt.where(Prompt.user_id == user.id)
+
     result = db_session.execute(stmt).scalar_one_or_none()
     return result
 
 
 def get_persona_by_name(
-    persona_name: str, user_id: UUID | None, shared: bool, db_session: Session
+    persona_name: str, user: User | None, db_session: Session
 ) -> Persona | None:
-    """Cannot do shared and user owned simultaneously as there may be two of those"""
+    """Admins can see all, regular users can only fetch their own.
+    If user is None, assume the user is an admin or auth is disabled."""
     stmt = select(Persona).where(Persona.name == persona_name)
-    if shared:
-        stmt = stmt.where(Persona.user_id.is_(None))
-    else:
-        stmt = stmt.where(Persona.user_id == user_id)
+    if user and user.role != UserRole.ADMIN:
+        stmt = stmt.where(Persona.user_id == user.id)
     result = db_session.execute(stmt).scalar_one_or_none()
     return result
 
 
 def upsert_prompt(
-    user_id: UUID | None,
+    user: User | None,
     name: str,
     description: str,
     system_prompt: str,
@@ -431,7 +438,6 @@ def upsert_prompt(
     include_citations: bool,
     datetime_aware: bool,
     personas: list[Persona] | None,
-    shared: bool,
     db_session: Session,
     prompt_id: int | None = None,
     default_prompt: bool = True,
@@ -440,9 +446,7 @@ def upsert_prompt(
     if prompt_id is not None:
         prompt = db_session.query(Prompt).filter_by(id=prompt_id).first()
     else:
-        prompt = get_prompt_by_name(
-            prompt_name=name, user_id=user_id, shared=shared, db_session=db_session
-        )
+        prompt = get_prompt_by_name(prompt_name=name, user=user, db_session=db_session)
 
     if prompt:
         if not default_prompt and prompt.default_prompt:
@@ -463,7 +467,7 @@ def upsert_prompt(
     else:
         prompt = Prompt(
             id=prompt_id,
-            user_id=None if shared else user_id,
+            user_id=user.id if user else None,
             name=name,
             description=description,
             system_prompt=system_prompt,
@@ -485,7 +489,7 @@ def upsert_prompt(
 
 
 def upsert_persona(
-    user_id: UUID | None,
+    user: User | None,
     name: str,
     description: str,
     num_chunks: float,
@@ -496,7 +500,6 @@ def upsert_persona(
     document_sets: list[DBDocumentSet] | None,
     llm_model_version_override: str | None,
     starter_messages: list[StarterMessage] | None,
-    shared: bool,
     is_public: bool,
     db_session: Session,
     persona_id: int | None = None,
@@ -507,7 +510,7 @@ def upsert_persona(
         persona = db_session.query(Persona).filter_by(id=persona_id).first()
     else:
         persona = get_persona_by_name(
-            persona_name=name, user_id=user_id, shared=shared, db_session=db_session
+            persona_name=name, user=user, db_session=db_session
         )
 
     if persona:
@@ -539,7 +542,7 @@ def upsert_persona(
     else:
         persona = Persona(
             id=persona_id,
-            user_id=None if shared else user_id,
+            user_id=user.id if user else None,
             is_public=is_public,
             name=name,
             description=description,
@@ -566,24 +569,20 @@ def upsert_persona(
 
 def mark_prompt_as_deleted(
     prompt_id: int,
-    user_id: UUID | None,
+    user: User | None,
     db_session: Session,
 ) -> None:
-    prompt = get_prompt_by_id(
-        prompt_id=prompt_id, user_id=user_id, db_session=db_session
-    )
+    prompt = get_prompt_by_id(prompt_id=prompt_id, user=user, db_session=db_session)
     prompt.deleted = True
     db_session.commit()
 
 
 def mark_persona_as_deleted(
     persona_id: int,
-    user_id: UUID | None,
+    user: User | None,
     db_session: Session,
 ) -> None:
-    persona = get_persona_by_id(
-        persona_id=persona_id, user_id=user_id, db_session=db_session
-    )
+    persona = get_persona_by_id(persona_id=persona_id, user=user, db_session=db_session)
     persona.deleted = True
     db_session.commit()
 
@@ -621,9 +620,7 @@ def update_persona_visibility(
     is_visible: bool,
     db_session: Session,
 ) -> None:
-    persona = get_persona_by_id(
-        persona_id=persona_id, user_id=None, db_session=db_session
-    )
+    persona = get_persona_by_id(persona_id=persona_id, user=None, db_session=db_session)
     persona.is_visible = is_visible
     db_session.commit()
 
diff --git a/backend/danswer/db/models.py b/backend/danswer/db/models.py
index 004025d7ee2..8e1540f20f1 100644
--- a/backend/danswer/db/models.py
+++ b/backend/danswer/db/models.py
@@ -736,7 +736,6 @@ class Prompt(Base):
     __tablename__ = "prompt"
 
     id: Mapped[int] = mapped_column(primary_key=True)
-    # If not belong to a user, then it's shared
     user_id: Mapped[UUID | None] = mapped_column(ForeignKey("user.id"), nullable=True)
     name: Mapped[str] = mapped_column(String)
     description: Mapped[str] = mapped_column(String)
@@ -770,7 +769,6 @@ class Persona(Base):
     __tablename__ = "persona"
 
     id: Mapped[int] = mapped_column(primary_key=True)
-    # If not belong to a user, then it's shared
     user_id: Mapped[UUID | None] = mapped_column(ForeignKey("user.id"), nullable=True)
     name: Mapped[str] = mapped_column(String)
     description: Mapped[str] = mapped_column(String)
@@ -824,7 +822,7 @@ class Persona(Base):
         back_populates="personas",
     )
     # Owner
-    user: Mapped[User] = relationship("User", back_populates="personas")
+    user: Mapped[User | None] = relationship("User", back_populates="personas")
     # Other users with access
     users: Mapped[list[User]] = relationship(
         "User",
diff --git a/backend/danswer/db/persona.py b/backend/danswer/db/persona.py
index 38351b18b02..7b1116b5ffa 100644
--- a/backend/danswer/db/persona.py
+++ b/backend/danswer/db/persona.py
@@ -6,6 +6,7 @@
 from danswer.db.chat import get_prompts_by_ids
 from danswer.db.chat import upsert_persona
 from danswer.db.document_set import get_document_sets_by_ids
+from danswer.db.models import Persona__User
 from danswer.db.models import User
 from danswer.server.features.persona.models import CreatePersonaRequest
 from danswer.server.features.persona.models import PersonaSnapshot
@@ -21,9 +22,19 @@ def make_persona_private(
     group_ids: list[int] | None,
     db_session: Session,
 ) -> None:
+    if user_ids is not None:
+        db_session.query(Persona__User).filter(
+            Persona__User.persona_id == persona_id
+        ).delete(synchronize_session="fetch")
+
+        for user_uuid in user_ids:
+            db_session.add(Persona__User(persona_id=persona_id, user_id=user_uuid))
+
+        db_session.commit()
+
     # May cause error if someone switches down to MIT from EE
-    if user_ids or group_ids:
-        raise NotImplementedError("Danswer MIT does not support private Document Sets")
+    if group_ids:
+        raise NotImplementedError("Danswer MIT does not support private Personas")
 
 
 def create_update_persona(
@@ -32,8 +43,6 @@ def create_update_persona(
     user: User | None,
     db_session: Session,
 ) -> PersonaSnapshot:
-    user_id = user.id if user is not None else None
-
     # Permission to actually use these is checked later
     document_sets = list(
         get_document_sets_by_ids(
@@ -51,7 +60,7 @@ def create_update_persona(
     try:
         persona = upsert_persona(
             persona_id=persona_id,
-            user_id=user_id,
+            user=user,
             name=create_persona_request.name,
             description=create_persona_request.description,
             num_chunks=create_persona_request.num_chunks,
@@ -62,7 +71,6 @@ def create_update_persona(
             document_sets=document_sets,
             llm_model_version_override=create_persona_request.llm_model_version_override,
             starter_messages=create_persona_request.starter_messages,
-            shared=create_persona_request.shared,
             is_public=create_persona_request.is_public,
             db_session=db_session,
         )
diff --git a/backend/danswer/db/slack_bot_config.py b/backend/danswer/db/slack_bot_config.py
index c3b463e35d2..9b792ff08bb 100644
--- a/backend/danswer/db/slack_bot_config.py
+++ b/backend/danswer/db/slack_bot_config.py
@@ -49,7 +49,7 @@ def create_slack_bot_persona(
     # create/update persona associated with the slack bot
     persona_name = _build_persona_name(channel_names)
     persona = upsert_persona(
-        user_id=None,  # Slack Bot Personas are not attached to users
+        user=None,  # Slack Bot Personas are not attached to users
         persona_id=existing_persona_id,
         name=persona_name,
         description="",
@@ -61,7 +61,6 @@ def create_slack_bot_persona(
         document_sets=document_sets,
         llm_model_version_override=None,
         starter_messages=None,
-        shared=True,
         is_public=True,
         default_persona=False,
         db_session=db_session,
diff --git a/backend/danswer/one_shot_answer/answer_question.py b/backend/danswer/one_shot_answer/answer_question.py
index c0c036339fc..ff6e04a217f 100644
--- a/backend/danswer/one_shot_answer/answer_question.py
+++ b/backend/danswer/one_shot_answer/answer_question.py
@@ -173,7 +173,7 @@ def stream_answer_objects(
     prompt = None
     if query_req.prompt_id is not None:
         prompt = get_prompt_by_id(
-            prompt_id=query_req.prompt_id, user_id=user_id, db_session=db_session
+            prompt_id=query_req.prompt_id, user=user, db_session=db_session
         )
     if prompt is None:
         if not chat_session.persona.prompts:
diff --git a/backend/danswer/server/features/persona/api.py b/backend/danswer/server/features/persona/api.py
index b4359f6a1fb..bfaea792f66 100644
--- a/backend/danswer/server/features/persona/api.py
+++ b/backend/danswer/server/features/persona/api.py
@@ -28,35 +28,6 @@
 basic_router = APIRouter(prefix="/persona")
 
 
-@admin_router.post("")
-def create_persona(
-    create_persona_request: CreatePersonaRequest,
-    user: User | None = Depends(current_admin_user),
-    db_session: Session = Depends(get_session),
-) -> PersonaSnapshot:
-    return create_update_persona(
-        persona_id=None,
-        create_persona_request=create_persona_request,
-        user=user,
-        db_session=db_session,
-    )
-
-
-@admin_router.patch("/{persona_id}")
-def update_persona(
-    persona_id: int,
-    update_persona_request: CreatePersonaRequest,
-    user: User | None = Depends(current_admin_user),
-    db_session: Session = Depends(get_session),
-) -> PersonaSnapshot:
-    return create_update_persona(
-        persona_id=persona_id,
-        create_persona_request=update_persona_request,
-        user=user,
-        db_session=db_session,
-    )
-
-
 class IsVisibleRequest(BaseModel):
     is_visible: bool
 
@@ -92,19 +63,6 @@ def patch_persona_display_priority(
     )
 
 
-@admin_router.delete("/{persona_id}")
-def delete_persona(
-    persona_id: int,
-    user: User | None = Depends(current_admin_user),
-    db_session: Session = Depends(get_session),
-) -> None:
-    mark_persona_as_deleted(
-        persona_id=persona_id,
-        user_id=user.id if user is not None else None,
-        db_session=db_session,
-    )
-
-
 @admin_router.get("")
 def list_personas_admin(
     _: User | None = Depends(current_admin_user),
@@ -124,6 +82,48 @@ def list_personas_admin(
 """Endpoints for all"""
 
 
+@basic_router.post("")
+def create_persona(
+    create_persona_request: CreatePersonaRequest,
+    user: User | None = Depends(current_user),
+    db_session: Session = Depends(get_session),
+) -> PersonaSnapshot:
+    return create_update_persona(
+        persona_id=None,
+        create_persona_request=create_persona_request,
+        user=user,
+        db_session=db_session,
+    )
+
+
+@basic_router.patch("/{persona_id}")
+def update_persona(
+    persona_id: int,
+    update_persona_request: CreatePersonaRequest,
+    user: User | None = Depends(current_user),
+    db_session: Session = Depends(get_session),
+) -> PersonaSnapshot:
+    return create_update_persona(
+        persona_id=persona_id,
+        create_persona_request=update_persona_request,
+        user=user,
+        db_session=db_session,
+    )
+
+
+@basic_router.delete("/{persona_id}")
+def delete_persona(
+    persona_id: int,
+    user: User | None = Depends(current_user),
+    db_session: Session = Depends(get_session),
+) -> None:
+    mark_persona_as_deleted(
+        persona_id=persona_id,
+        user=user,
+        db_session=db_session,
+    )
+
+
 @basic_router.get("")
 def list_personas(
     user: User | None = Depends(current_user),
@@ -148,7 +148,7 @@ def get_persona(
     return PersonaSnapshot.from_model(
         get_persona_by_id(
             persona_id=persona_id,
-            user_id=user.id if user is not None else None,
+            user=user,
             db_session=db_session,
         )
     )
@@ -194,9 +194,9 @@ def build_final_template_prompt(
 ]
 
 
-@admin_router.get("/utils/list-available-models")
+@basic_router.get("/utils/list-available-models")
 def list_available_model_versions(
-    _: User | None = Depends(current_admin_user),
+    _: User | None = Depends(current_user),
 ) -> list[str]:
     # currently only support selecting different models for OpenAI
     if GEN_AI_MODEL_PROVIDER != "openai":
@@ -205,9 +205,9 @@ def list_available_model_versions(
     return GPT_4_MODEL_VERSIONS + GPT_3_5_TURBO_MODEL_VERSIONS
 
 
-@admin_router.get("/utils/default-model")
+@basic_router.get("/utils/default-model")
 def get_default_model(
-    _: User | None = Depends(current_admin_user),
+    _: User | None = Depends(current_user),
 ) -> str:
     # currently only support selecting different models for OpenAI
     if GEN_AI_MODEL_PROVIDER != "openai":
diff --git a/backend/danswer/server/features/persona/models.py b/backend/danswer/server/features/persona/models.py
index 4cc80eec0ee..8826be2c307 100644
--- a/backend/danswer/server/features/persona/models.py
+++ b/backend/danswer/server/features/persona/models.py
@@ -7,12 +7,12 @@
 from danswer.search.enums import RecencyBiasSetting
 from danswer.server.features.document_set.models import DocumentSet
 from danswer.server.features.prompt.models import PromptSnapshot
+from danswer.server.models import MinimalUserSnapshot
 
 
 class CreatePersonaRequest(BaseModel):
     name: str
     description: str
-    shared: bool
     num_chunks: float
     llm_relevance_filter: bool
     is_public: bool
@@ -29,8 +29,8 @@ class CreatePersonaRequest(BaseModel):
 
 class PersonaSnapshot(BaseModel):
     id: int
+    owner: MinimalUserSnapshot | None
     name: str
-    shared: bool
     is_visible: bool
     is_public: bool
     display_priority: int | None
@@ -43,6 +43,7 @@ class PersonaSnapshot(BaseModel):
     default_persona: bool
     prompts: list[PromptSnapshot]
     document_sets: list[DocumentSet]
+    users: list[UUID]
     groups: list[int]
 
     @classmethod
@@ -53,7 +54,11 @@ def from_model(cls, persona: Persona) -> "PersonaSnapshot":
         return PersonaSnapshot(
             id=persona.id,
             name=persona.name,
-            shared=persona.user_id is None,
+            owner=(
+                MinimalUserSnapshot(id=persona.user.id, email=persona.user.email)
+                if persona.user
+                else None
+            ),
             is_visible=persona.is_visible,
             is_public=persona.is_public,
             display_priority=persona.display_priority,
@@ -69,6 +74,7 @@ def from_model(cls, persona: Persona) -> "PersonaSnapshot":
                 DocumentSet.from_model(document_set_model)
                 for document_set_model in persona.document_sets
             ],
+            users=[user.id for user in persona.users],
             groups=[user_group.id for user_group in persona.groups],
         )
 
diff --git a/backend/danswer/server/features/prompt/api.py b/backend/danswer/server/features/prompt/api.py
index b9f27675dc3..24c886ab915 100644
--- a/backend/danswer/server/features/prompt/api.py
+++ b/backend/danswer/server/features/prompt/api.py
@@ -4,7 +4,6 @@
 from sqlalchemy.orm import Session
 from starlette import status
 
-from danswer.auth.users import current_admin_user
 from danswer.auth.users import current_user
 from danswer.db.chat import get_personas_by_ids
 from danswer.db.chat import get_prompt_by_id
@@ -32,8 +31,6 @@ def create_update_prompt(
     user: User | None,
     db_session: Session,
 ) -> PromptSnapshot:
-    user_id = user.id if user is not None else None
-
     personas = (
         list(
             get_personas_by_ids(
@@ -47,7 +44,7 @@ def create_update_prompt(
 
     prompt = upsert_prompt(
         prompt_id=prompt_id,
-        user_id=user_id,
+        user=user,
         name=create_prompt_request.name,
         description=create_prompt_request.description,
         system_prompt=create_prompt_request.system_prompt,
@@ -55,7 +52,6 @@ def create_update_prompt(
         include_citations=create_prompt_request.include_citations,
         datetime_aware=create_prompt_request.datetime_aware,
         personas=personas,
-        shared=create_prompt_request.shared,
         db_session=db_session,
     )
     return PromptSnapshot.from_model(prompt)
@@ -64,7 +60,7 @@ def create_update_prompt(
 @basic_router.post("")
 def create_prompt(
     create_prompt_request: CreatePromptRequest,
-    user: User | None = Depends(current_admin_user),
+    user: User | None = Depends(current_user),
     db_session: Session = Depends(get_session),
 ) -> PromptSnapshot:
     try:
@@ -124,7 +120,7 @@ def delete_prompt(
 ) -> None:
     mark_prompt_as_deleted(
         prompt_id=prompt_id,
-        user_id=user.id if user is not None else None,
+        user=user,
         db_session=db_session,
     )
 
@@ -150,7 +146,7 @@ def get_prompt(
     return PromptSnapshot.from_model(
         get_prompt_by_id(
             prompt_id=prompt_id,
-            user_id=user.id if user is not None else None,
+            user=user,
             db_session=db_session,
         )
     )
diff --git a/backend/danswer/server/features/prompt/models.py b/backend/danswer/server/features/prompt/models.py
index 0ae70c58d0c..1cc9452f435 100644
--- a/backend/danswer/server/features/prompt/models.py
+++ b/backend/danswer/server/features/prompt/models.py
@@ -6,7 +6,6 @@
 class CreatePromptRequest(BaseModel):
     name: str
     description: str
-    shared: bool
     system_prompt: str
     task_prompt: str
     include_citations: bool = False
@@ -17,7 +16,6 @@ class CreatePromptRequest(BaseModel):
 class PromptSnapshot(BaseModel):
     id: int
     name: str
-    shared: bool
     description: str
     system_prompt: str
     task_prompt: str
@@ -34,7 +32,6 @@ def from_model(cls, prompt: Prompt) -> "PromptSnapshot":
         return PromptSnapshot(
             id=prompt.id,
             name=prompt.name,
-            shared=prompt.user_id is None,
             description=prompt.description,
             system_prompt=prompt.system_prompt,
             task_prompt=prompt.task_prompt,
diff --git a/backend/danswer/server/manage/slack_bot.py b/backend/danswer/server/manage/slack_bot.py
index 19003f09d68..40e8663b054 100644
--- a/backend/danswer/server/manage/slack_bot.py
+++ b/backend/danswer/server/manage/slack_bot.py
@@ -140,7 +140,7 @@ def patch_slack_bot_config(
         existing_persona_id = existing_slack_bot_config.persona_id
         if existing_persona_id is not None:
             persona = get_persona_by_id(
-                persona_id=existing_persona_id, user_id=None, db_session=db_session
+                persona_id=existing_persona_id, user=None, db_session=db_session
             )
 
             if not persona.name.startswith(SLACK_BOT_PERSONA_PREFIX):
diff --git a/backend/danswer/server/models.py b/backend/danswer/server/models.py
index d616edd4f86..ca23f0a15a7 100644
--- a/backend/danswer/server/models.py
+++ b/backend/danswer/server/models.py
@@ -1,6 +1,7 @@
 from typing import Generic
 from typing import Optional
 from typing import TypeVar
+from uuid import UUID
 
 from pydantic import BaseModel
 from pydantic.generics import GenericModel
@@ -21,3 +22,8 @@ class ApiKey(BaseModel):
 
 class IdReturn(BaseModel):
     id: int
+
+
+class MinimalUserSnapshot(BaseModel):
+    id: UUID
+    email: str
diff --git a/backend/danswer/server/query_and_chat/chat_backend.py b/backend/danswer/server/query_and_chat/chat_backend.py
index 52d879dfe69..bbc8eb425b2 100644
--- a/backend/danswer/server/query_and_chat/chat_backend.py
+++ b/backend/danswer/server/query_and_chat/chat_backend.py
@@ -327,7 +327,7 @@ def get_max_document_tokens(
     try:
         persona = get_persona_by_id(
             persona_id=persona_id,
-            user_id=user.id if user else None,
+            user=user,
             db_session=db_session,
         )
     except ValueError:
diff --git a/web/src/app/admin/personas/PersonaEditor.tsx b/web/src/app/admin/assistants/AssistantEditor.tsx
similarity index 74%
rename from web/src/app/admin/personas/PersonaEditor.tsx
rename to web/src/app/admin/assistants/AssistantEditor.tsx
index 6ce77edb561..05c5a71a277 100644
--- a/web/src/app/admin/personas/PersonaEditor.tsx
+++ b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { DocumentSet, UserGroup } from "@/lib/types";
-import { Button, Divider, Text } from "@tremor/react";
+import { CCPairBasicInfo, DocumentSet, User, UserGroup } from "@/lib/types";
+import { Button, Divider, Italic, Text } from "@tremor/react";
 import {
   ArrayHelpers,
   ErrorMessage,
@@ -29,6 +29,8 @@ import { EE_ENABLED } from "@/lib/constants";
 import { useUserGroups } from "@/lib/hooks";
 import { Bubble } from "@/components/Bubble";
 import { GroupsIcon } from "@/components/icons/icons";
+import { SuccessfulPersonaUpdateRedirectType } from "./enums";
+import { DocumentSetSelectable } from "@/components/documentSet/DocumentSetSelectable";
 
 function Label({ children }: { children: string | JSX.Element }) {
   return (
@@ -40,16 +42,24 @@ function SubLabel({ children }: { children: string | JSX.Element }) {
   return <div className="text-sm text-subtle mb-2">{children}</div>;
 }
 
-export function PersonaEditor({
+export function AssistantEditor({
   existingPersona,
+  ccPairs,
   documentSets,
   llmOverrideOptions,
   defaultLLM,
+  user,
+  defaultPublic,
+  redirectType,
 }: {
   existingPersona?: Persona | null;
+  ccPairs: CCPairBasicInfo[];
   documentSets: DocumentSet[];
   llmOverrideOptions: string[];
   defaultLLM: string;
+  user: User | null;
+  defaultPublic: boolean;
+  redirectType: SuccessfulPersonaUpdateRedirectType;
 }) {
   const router = useRouter();
   const { popup, setPopup } = usePopup();
@@ -99,7 +109,7 @@ export function PersonaEditor({
           system_prompt: existingPrompt?.system_prompt ?? "",
           task_prompt: existingPrompt?.task_prompt ?? "",
           disable_retrieval: (existingPersona?.num_chunks ?? 10) === 0,
-          is_public: existingPersona?.is_public ?? true,
+          is_public: existingPersona?.is_public ?? defaultPublic,
           document_set_ids:
             existingPersona?.document_sets?.map(
               (documentSet) => documentSet.id
@@ -116,9 +126,9 @@ export function PersonaEditor({
         }}
         validationSchema={Yup.object()
           .shape({
-            name: Yup.string().required("Must give the Persona a name!"),
+            name: Yup.string().required("Must give the Assistant a name!"),
             description: Yup.string().required(
-              "Must give the Persona a description!"
+              "Must give the Assistant a description!"
             ),
             system_prompt: Yup.string(),
             task_prompt: Yup.string(),
@@ -187,12 +197,14 @@ export function PersonaEditor({
               existingPromptId: existingPrompt?.id,
               ...values,
               num_chunks: numChunks,
+              users: user ? [user.id] : undefined,
               groups,
             });
           } else {
             [promptResponse, personaResponse] = await createPersona({
               ...values,
               num_chunks: numChunks,
+              users: user ? [user.id] : undefined,
               groups,
             });
           }
@@ -201,51 +213,53 @@ export function PersonaEditor({
           if (!promptResponse.ok) {
             error = await promptResponse.text();
           }
-          if (personaResponse && !personaResponse.ok) {
+          if (!personaResponse) {
+            error = "Failed to create Assistant - no response received";
+          } else if (!personaResponse.ok) {
             error = await personaResponse.text();
           }
 
-          if (error) {
+          if (error || !personaResponse) {
             setPopup({
               type: "error",
-              message: `Failed to create Persona - ${error}`,
+              message: `Failed to create Assistant - ${error}`,
             });
             formikHelpers.setSubmitting(false);
           } else {
-            router.push(`/admin/personas?u=${Date.now()}`);
+            router.push(
+              redirectType === SuccessfulPersonaUpdateRedirectType.ADMIN
+                ? `/admin/assistants?u=${Date.now()}`
+                : `/chat?assistantId=${
+                    ((await personaResponse.json()) as Persona).id
+                  }`
+            );
           }
         }}
       >
         {({ isSubmitting, values, setFieldValue }) => (
           <Form>
             <div className="pb-6">
-              <HidableSection sectionTitle="Who am I?">
+              <HidableSection sectionTitle="Basics">
                 <>
                   <TextFormField
                     name="name"
                     label="Name"
                     disabled={isUpdate}
-                    subtext="Users will be able to select this Persona based on this name."
+                    subtext="Users will be able to select this Assistant based on this name."
                   />
 
                   <TextFormField
                     name="description"
                     label="Description"
-                    subtext="Provide a short descriptions which gives users a hint as to what they should use this Persona for."
+                    subtext="Provide a short descriptions which gives users a hint as to what they should use this Assistant for."
                   />
-                </>
-              </HidableSection>
 
-              <Divider />
-
-              <HidableSection sectionTitle="Customize my response style">
-                <>
                   <TextFormField
                     name="system_prompt"
                     label="System Prompt"
                     isTextArea={true}
                     subtext={
-                      'Give general info about what the Persona is about. For example, "You are an assistant for On-Call engineers. Your goal is to read the provided context documents and give recommendations as to how to resolve the issue."'
+                      'Give general info about what the Assistant is about. For example, "You are an assistant for On-Call engineers. Your goal is to read the provided context documents and give recommendations as to how to resolve the issue."'
                     }
                     onChange={(e) => {
                       setFieldValue("system_prompt", e.target.value);
@@ -260,11 +274,11 @@ export function PersonaEditor({
 
                   <TextFormField
                     name="task_prompt"
-                    label="Task Prompt"
+                    label="Task Prompt (Optional)"
                     isTextArea={true}
-                    subtext={
-                      'Give specific instructions as to what to do with the user query. For example, "Find any relevant sections from the provided documents that can help the user resolve their issue and explain how they are relevant."'
-                    }
+                    subtext={`Give specific instructions as to what to do with the user query. 
+                      For example, "Find any relevant sections from the provided documents that can 
+                      help the user resolve their issue and explain how they are relevant."`}
                     onChange={(e) => {
                       setFieldValue("task_prompt", e.target.value);
                       triggerFinalPromptUpdate(
@@ -276,35 +290,6 @@ export function PersonaEditor({
                     error={finalPromptError}
                   />
 
-                  {!values.disable_retrieval && (
-                    <BooleanFormField
-                      name="include_citations"
-                      label="Include Citations"
-                      subtext={`
-                        If set, the response will include bracket citations ([1], [2], etc.) 
-                        for each document used by the LLM to help inform the response. This is 
-                        the same technique used by the default Personas. In general, we recommend 
-                        to leave this enabled in order to increase trust in the LLM answer.`}
-                    />
-                  )}
-
-                  <BooleanFormField
-                    name="disable_retrieval"
-                    label="Disable Retrieval"
-                    subtext={`
-                      If set, the Persona will not fetch any context documents to aid in the response. 
-                      Instead, it will only use the supplied system and task prompts plus the user 
-                      query in order to generate a response`}
-                    onChange={(e) => {
-                      setFieldValue("disable_retrieval", e.target.checked);
-                      triggerFinalPromptUpdate(
-                        values.system_prompt,
-                        values.task_prompt,
-                        e.target.checked
-                      );
-                    }}
-                  />
-
                   <Label>Final Prompt</Label>
 
                   {finalPrompt ? (
@@ -319,73 +304,100 @@ export function PersonaEditor({
 
               <Divider />
 
-              {!values.disable_retrieval && (
+              {ccPairs.length > 0 && (
                 <>
-                  <HidableSection sectionTitle="What data should I have access to?">
+                  <HidableSection
+                    sectionTitle="[Advanced] Knowledge Base"
+                    defaultHidden
+                  >
                     <>
-                      <FieldArray
-                        name="document_set_ids"
-                        render={(arrayHelpers: ArrayHelpers) => (
+                      <BooleanFormField
+                        name="disable_retrieval"
+                        label="Disable Retrieval"
+                        subtext={`
+                          If set, the Assistant will not fetch any context documents to aid in the response. 
+                          Instead, it will only use the supplied system and task prompts plus the user 
+                          query in order to generate a response`}
+                        onChange={(e) => {
+                          setFieldValue("disable_retrieval", e.target.checked);
+                          triggerFinalPromptUpdate(
+                            values.system_prompt,
+                            values.task_prompt,
+                            e.target.checked
+                          );
+                        }}
+                      />
+
+                      {!values.disable_retrieval && (
+                        <>
                           <div>
-                            <div>
-                              <SubLabel>
-                                <>
-                                  Select which{" "}
+                            <SubLabel>
+                              <>
+                                Select which{" "}
+                                {!user || user.role === "admin" ? (
                                   <Link
                                     href="/admin/documents/sets"
                                     className="text-blue-500"
                                     target="_blank"
                                   >
                                     Document Sets
-                                  </Link>{" "}
-                                  that this Persona should search through. If
-                                  none are specified, the Persona will search
-                                  through all available documents in order to
-                                  try and response to queries.
-                                </>
-                              </SubLabel>
-                            </div>
-                            <div className="mb-3 mt-2 flex gap-2 flex-wrap text-sm">
-                              {documentSets.map((documentSet) => {
-                                const ind = values.document_set_ids.indexOf(
-                                  documentSet.id
-                                );
-                                let isSelected = ind !== -1;
-                                return (
-                                  <div
-                                    key={documentSet.id}
-                                    className={
-                                      `
-                                      px-3 
-                                      py-1
-                                      rounded-lg 
-                                      border
-                                      border-border
-                                      w-fit 
-                                      flex 
-                                      cursor-pointer ` +
-                                      (isSelected
-                                        ? " bg-hover"
-                                        : " bg-background hover:bg-hover-light")
-                                    }
-                                    onClick={() => {
-                                      if (isSelected) {
-                                        arrayHelpers.remove(ind);
-                                      } else {
-                                        arrayHelpers.push(documentSet.id);
-                                      }
-                                    }}
-                                  >
-                                    <div className="my-auto">
-                                      {documentSet.name}
-                                    </div>
-                                  </div>
-                                );
-                              })}
-                            </div>
+                                  </Link>
+                                ) : (
+                                  "Document Sets"
+                                )}{" "}
+                                that this Assistant should search through. If
+                                none are specified, the Assistant will search
+                                through all available documents in order to try
+                                and respond to queries.
+                              </>
+                            </SubLabel>
                           </div>
-                        )}
-                      />
+
+                          {documentSets.length > 0 ? (
+                            <FieldArray
+                              name="document_set_ids"
+                              render={(arrayHelpers: ArrayHelpers) => (
+                                <div>
+                                  <div className="mb-3 mt-2 flex gap-2 flex-wrap text-sm">
+                                    {documentSets.map((documentSet) => {
+                                      const ind =
+                                        values.document_set_ids.indexOf(
+                                          documentSet.id
+                                        );
+                                      let isSelected = ind !== -1;
+                                      return (
+                                        <DocumentSetSelectable
+                                          key={documentSet.id}
+                                          documentSet={documentSet}
+                                          isSelected={isSelected}
+                                          onSelect={() => {
+                                            if (isSelected) {
+                                              arrayHelpers.remove(ind);
+                                            } else {
+                                              arrayHelpers.push(documentSet.id);
+                                            }
+                                          }}
+                                        />
+                                      );
+                                    })}
+                                  </div>
+                                </div>
+                              )}
+                            />
+                          ) : (
+                            <Italic className="text-sm">
+                              No Document Sets available.{" "}
+                              {user?.role !== "admin" && (
+                                <>
+                                  If this functionality would be useful, reach
+                                  out to the administrators of Danswer for
+                                  assistance.
+                                </>
+                              )}
+                            </Italic>
+                          )}
+                        </>
+                      )}
                     </>
                   </HidableSection>
 
@@ -393,73 +405,38 @@ export function PersonaEditor({
                 </>
               )}
 
-              {EE_ENABLED && userGroups && (
+              {!values.disable_retrieval && (
                 <>
-                  <HidableSection sectionTitle="Which groups should have access to this Persona?">
+                  <HidableSection
+                    sectionTitle="[Advanced] Response Style"
+                    defaultHidden
+                  >
                     <>
                       <BooleanFormField
-                        name="is_public"
-                        label="Is Public?"
-                        subtext="If set, this Persona will be available to all users. If not, only the specified User Groups will be able to access it."
+                        name="include_citations"
+                        label="Include Citations"
+                        subtext={`
+                        If set, the response will include bracket citations ([1], [2], etc.) 
+                        for each document used by the LLM to help inform the response. This is 
+                        the same technique used by the default Assistants. In general, we recommend 
+                        to leave this enabled in order to increase trust in the LLM answer.`}
                       />
-
-                      {userGroups &&
-                        userGroups.length > 0 &&
-                        !values.is_public && (
-                          <div>
-                            <Text>
-                              Select which User Groups should have access to
-                              this Persona.
-                            </Text>
-                            <div className="flex flex-wrap gap-2 mt-2">
-                              {userGroups.map((userGroup) => {
-                                const isSelected = values.groups.includes(
-                                  userGroup.id
-                                );
-                                return (
-                                  <Bubble
-                                    key={userGroup.id}
-                                    isSelected={isSelected}
-                                    onClick={() => {
-                                      if (isSelected) {
-                                        setFieldValue(
-                                          "groups",
-                                          values.groups.filter(
-                                            (id) => id !== userGroup.id
-                                          )
-                                        );
-                                      } else {
-                                        setFieldValue("groups", [
-                                          ...values.groups,
-                                          userGroup.id,
-                                        ]);
-                                      }
-                                    }}
-                                  >
-                                    <div className="flex">
-                                      <GroupsIcon />
-                                      <div className="ml-1">
-                                        {userGroup.name}
-                                      </div>
-                                    </div>
-                                  </Bubble>
-                                );
-                              })}
-                            </div>
-                          </div>
-                        )}
                     </>
                   </HidableSection>
+
                   <Divider />
                 </>
               )}
 
               {llmOverrideOptions.length > 0 && defaultLLM && (
                 <>
-                  <HidableSection sectionTitle="[Advanced] Model Selection">
+                  <HidableSection
+                    sectionTitle="[Advanced] Model Selection"
+                    defaultHidden
+                  >
                     <>
                       <Text>
-                        Pick which LLM to use for this Persona. If left as
+                        Pick which LLM to use for this Assistant. If left as
                         Default, will use <b className="italic">{defaultLLM}</b>
                         .
                         <br />
@@ -496,7 +473,10 @@ export function PersonaEditor({
 
               {!values.disable_retrieval && (
                 <>
-                  <HidableSection sectionTitle="[Advanced] Retrieval Customization">
+                  <HidableSection
+                    sectionTitle="[Advanced] Retrieval Customization"
+                    defaultHidden
+                  >
                     <>
                       <TextFormField
                         name="num_chunks"
@@ -505,10 +485,7 @@ export function PersonaEditor({
                           <div>
                             How many chunks should we feed into the LLM when
                             generating the final response? Each chunk is ~400
-                            words long. If you are using gpt-3.5-turbo or other
-                            similar models, setting this to a value greater than
-                            5 will result in errors at query time due to the
-                            model&apos;s input length limit.
+                            words long.
                             <br />
                             <br />
                             If unspecified, will use 10 chunks.
@@ -537,14 +514,17 @@ export function PersonaEditor({
                 </>
               )}
 
-              <HidableSection sectionTitle="[Advanced] Starter Messages">
+              <HidableSection
+                sectionTitle="[Advanced] Starter Messages"
+                defaultHidden
+              >
                 <>
                   <div className="mb-4">
                     <SubLabel>
-                      Starter Messages help guide users to use this Persona.
+                      Starter Messages help guide users to use this Assistant.
                       They are shown to the user as clickable options when they
-                      select this Persona. When selected, the specified message
-                      is sent to the LLM as the initial user message.
+                      select this Assistant. When selected, the specified
+                      message is sent to the LLM as the initial user message.
                     </SubLabel>
                   </div>
 
@@ -686,6 +666,67 @@ export function PersonaEditor({
 
               <Divider />
 
+              {EE_ENABLED && userGroups && (!user || user.role === "admin") && (
+                <>
+                  <HidableSection sectionTitle="Access">
+                    <>
+                      <BooleanFormField
+                        name="is_public"
+                        label="Is Public?"
+                        subtext="If set, this Assistant will be available to all users. If not, only the specified User Groups will be able to access it."
+                      />
+
+                      {userGroups &&
+                        userGroups.length > 0 &&
+                        !values.is_public && (
+                          <div>
+                            <Text>
+                              Select which User Groups should have access to
+                              this Assistant.
+                            </Text>
+                            <div className="flex flex-wrap gap-2 mt-2">
+                              {userGroups.map((userGroup) => {
+                                const isSelected = values.groups.includes(
+                                  userGroup.id
+                                );
+                                return (
+                                  <Bubble
+                                    key={userGroup.id}
+                                    isSelected={isSelected}
+                                    onClick={() => {
+                                      if (isSelected) {
+                                        setFieldValue(
+                                          "groups",
+                                          values.groups.filter(
+                                            (id) => id !== userGroup.id
+                                          )
+                                        );
+                                      } else {
+                                        setFieldValue("groups", [
+                                          ...values.groups,
+                                          userGroup.id,
+                                        ]);
+                                      }
+                                    }}
+                                  >
+                                    <div className="flex">
+                                      <GroupsIcon />
+                                      <div className="ml-1">
+                                        {userGroup.name}
+                                      </div>
+                                    </div>
+                                  </Bubble>
+                                );
+                              })}
+                            </div>
+                          </div>
+                        )}
+                    </>
+                  </HidableSection>
+                  <Divider />
+                </>
+              )}
+
               <div className="flex">
                 <Button
                   className="mx-auto"
diff --git a/web/src/app/admin/personas/HidableSection.tsx b/web/src/app/admin/assistants/HidableSection.tsx
similarity index 100%
rename from web/src/app/admin/personas/HidableSection.tsx
rename to web/src/app/admin/assistants/HidableSection.tsx
diff --git a/web/src/app/admin/personas/PersonaTable.tsx b/web/src/app/admin/assistants/PersonaTable.tsx
similarity index 88%
rename from web/src/app/admin/personas/PersonaTable.tsx
rename to web/src/app/admin/assistants/PersonaTable.tsx
index f2aef72277f..cc18ce5b2c2 100644
--- a/web/src/app/admin/personas/PersonaTable.tsx
+++ b/web/src/app/admin/assistants/PersonaTable.tsx
@@ -12,6 +12,18 @@ import { deletePersona, personaComparator } from "./lib";
 import { FiEdit } from "react-icons/fi";
 import { TrashIcon } from "@/components/icons/icons";
 
+function PersonaTypeDisplay({ persona }: { persona: Persona }) {
+  if (persona.default_persona) {
+    return <Text>Built-In</Text>;
+  }
+
+  if (persona.is_public) {
+    return <Text>Global</Text>;
+  }
+
+  return <Text>Personal {persona.owner && <>({persona.owner.email})</>}</Text>;
+}
+
 export function PersonasTable({ personas }: { personas: Persona[] }) {
   const router = useRouter();
   const { popup, setPopup } = usePopup();
@@ -64,13 +76,13 @@ export function PersonasTable({ personas }: { personas: Persona[] }) {
       {popup}
 
       <Text className="my-2">
-        Personas will be displayed as options on the Chat / Search interfaces in
-        the order they are displayed below. Personas marked as hidden will not
-        be displayed.
+        Assistants will be displayed as options on the Chat / Search interfaces
+        in the order they are displayed below. Assistants marked as hidden will
+        not be displayed.
       </Text>
 
       <DraggableTable
-        headers={["Name", "Description", "Built-In", "Is Visible", "Delete"]}
+        headers={["Name", "Description", "Type", "Is Visible", "Delete"]}
         rows={finalPersonaValues.map((persona) => {
           return {
             id: persona.id.toString(),
@@ -81,7 +93,7 @@ export function PersonasTable({ personas }: { personas: Persona[] }) {
                     className="mr-1 my-auto cursor-pointer"
                     onClick={() =>
                       router.push(
-                        `/admin/personas/${persona.id}?u=${Date.now()}`
+                        `/admin/assistants/${persona.id}?u=${Date.now()}`
                       )
                     }
                   />
@@ -96,7 +108,7 @@ export function PersonasTable({ personas }: { personas: Persona[] }) {
               >
                 {persona.description}
               </p>,
-              persona.default_persona ? "Yes" : "No",
+              <PersonaTypeDisplay key={persona.id} persona={persona} />,
               <div
                 key="is_visible"
                 onClick={async () => {
diff --git a/web/src/app/admin/personas/[personaId]/DeletePersonaButton.tsx b/web/src/app/admin/assistants/[personaId]/DeletePersonaButton.tsx
similarity index 100%
rename from web/src/app/admin/personas/[personaId]/DeletePersonaButton.tsx
rename to web/src/app/admin/assistants/[personaId]/DeletePersonaButton.tsx
diff --git a/web/src/app/admin/assistants/[personaId]/page.tsx b/web/src/app/admin/assistants/[personaId]/page.tsx
new file mode 100644
index 00000000000..6b527f16521
--- /dev/null
+++ b/web/src/app/admin/assistants/[personaId]/page.tsx
@@ -0,0 +1,53 @@
+import { ErrorCallout } from "@/components/ErrorCallout";
+import { AssistantEditor } from "../AssistantEditor";
+import { BackButton } from "@/components/BackButton";
+import { Card, Title } from "@tremor/react";
+import { DeletePersonaButton } from "./DeletePersonaButton";
+import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { SuccessfulPersonaUpdateRedirectType } from "../enums";
+import { RobotIcon } from "@/components/icons/icons";
+import { AdminPageTitle } from "@/components/admin/Title";
+
+export default async function Page({
+  params,
+}: {
+  params: { personaId: string };
+}) {
+  const [values, error] = await fetchPersonaEditorInfoSS(params.personaId);
+
+  let body;
+  if (!values) {
+    body = (
+      <ErrorCallout errorTitle="Something went wrong :(" errorMsg={error} />
+    );
+  } else {
+    body = (
+      <>
+        <Card>
+          <AssistantEditor
+            {...values}
+            defaultPublic={true}
+            redirectType={SuccessfulPersonaUpdateRedirectType.ADMIN}
+          />
+        </Card>
+
+        <div className="mt-12">
+          <Title>Delete Assistant</Title>
+          <div className="flex mt-6">
+            <DeletePersonaButton personaId={values.existingPersona!.id} />
+          </div>
+        </div>
+      </>
+    );
+  }
+
+  return (
+    <div>
+      <BackButton />
+
+      <AdminPageTitle title="Edit Assistant" icon={<RobotIcon size={32} />} />
+
+      {body}
+    </div>
+  );
+}
diff --git a/web/src/app/admin/assistants/enums.ts b/web/src/app/admin/assistants/enums.ts
new file mode 100644
index 00000000000..602d1692f27
--- /dev/null
+++ b/web/src/app/admin/assistants/enums.ts
@@ -0,0 +1,4 @@
+export enum SuccessfulPersonaUpdateRedirectType {
+  ADMIN = "ADMIN",
+  CHAT = "CHAT",
+}
diff --git a/web/src/app/admin/personas/interfaces.ts b/web/src/app/admin/assistants/interfaces.ts
similarity index 86%
rename from web/src/app/admin/personas/interfaces.ts
rename to web/src/app/admin/assistants/interfaces.ts
index 0e800b2cc76..6e694d80f4a 100644
--- a/web/src/app/admin/personas/interfaces.ts
+++ b/web/src/app/admin/assistants/interfaces.ts
@@ -1,4 +1,4 @@
-import { DocumentSet } from "@/lib/types";
+import { DocumentSet, MinimalUserSnapshot } from "@/lib/types";
 
 export interface StarterMessage {
   name: string;
@@ -9,7 +9,6 @@ export interface StarterMessage {
 export interface Prompt {
   id: number;
   name: string;
-  shared: boolean;
   description: string;
   system_prompt: string;
   task_prompt: string;
@@ -21,7 +20,7 @@ export interface Prompt {
 export interface Persona {
   id: number;
   name: string;
-  shared: boolean;
+  owner: MinimalUserSnapshot | null;
   is_visible: boolean;
   is_public: boolean;
   display_priority: number | null;
@@ -34,5 +33,6 @@ export interface Persona {
   llm_model_version_override?: string;
   starter_messages: StarterMessage[] | null;
   default_persona: boolean;
+  users: string[];
   groups: number[];
 }
diff --git a/web/src/app/admin/personas/lib.ts b/web/src/app/admin/assistants/lib.ts
similarity index 96%
rename from web/src/app/admin/personas/lib.ts
rename to web/src/app/admin/assistants/lib.ts
index 49dfbec6b3b..e5075f33e03 100644
--- a/web/src/app/admin/personas/lib.ts
+++ b/web/src/app/admin/assistants/lib.ts
@@ -12,6 +12,7 @@ interface PersonaCreationRequest {
   llm_relevance_filter: boolean | null;
   llm_model_version_override: string | null;
   starter_messages: StarterMessage[] | null;
+  users?: string[];
   groups: number[];
 }
 
@@ -29,6 +30,7 @@ interface PersonaUpdateRequest {
   llm_relevance_filter: boolean | null;
   llm_model_version_override: string | null;
   starter_messages: StarterMessage[] | null;
+  users?: string[];
   groups: number[];
 }
 
@@ -55,7 +57,6 @@ function createPrompt({
     body: JSON.stringify({
       name: promptNameFromPersonaName(personaName),
       description: `Default prompt for persona ${personaName}`,
-      shared: true,
       system_prompt: systemPrompt,
       task_prompt: taskPrompt,
       include_citations: includeCitations,
@@ -84,7 +85,6 @@ function updatePrompt({
     body: JSON.stringify({
       name: promptNameFromPersonaName(personaName),
       description: `Default prompt for persona ${personaName}`,
-      shared: true,
       system_prompt: systemPrompt,
       task_prompt: taskPrompt,
       include_citations: includeCitations,
@@ -104,12 +104,12 @@ function buildPersonaAPIBody(
     llm_relevance_filter,
     is_public,
     groups,
+    users,
   } = creationRequest;
 
   return {
     name,
     description,
-    shared: true,
     num_chunks,
     llm_relevance_filter,
     llm_filter_extraction: false,
@@ -119,6 +119,7 @@ function buildPersonaAPIBody(
     document_set_ids,
     llm_model_version_override: creationRequest.llm_model_version_override,
     starter_messages: creationRequest.starter_messages,
+    users,
     groups,
   };
 }
@@ -139,7 +140,7 @@ export async function createPersona(
 
   const createPersonaResponse =
     promptId !== null
-      ? await fetch("/api/admin/persona", {
+      ? await fetch("/api/persona", {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
@@ -182,7 +183,7 @@ export async function updatePersona(
 
   const updatePersonaResponse =
     promptResponse.ok && promptId
-      ? await fetch(`/api/admin/persona/${id}`, {
+      ? await fetch(`/api/persona/${id}`, {
           method: "PATCH",
           headers: {
             "Content-Type": "application/json",
@@ -197,7 +198,7 @@ export async function updatePersona(
 }
 
 export function deletePersona(personaId: number) {
-  return fetch(`/api/admin/persona/${personaId}`, {
+  return fetch(`/api/persona/${personaId}`, {
     method: "DELETE",
   });
 }
diff --git a/web/src/app/admin/assistants/new/page.tsx b/web/src/app/admin/assistants/new/page.tsx
new file mode 100644
index 00000000000..7f91200804f
--- /dev/null
+++ b/web/src/app/admin/assistants/new/page.tsx
@@ -0,0 +1,42 @@
+import { AssistantEditor } from "../AssistantEditor";
+import { ErrorCallout } from "@/components/ErrorCallout";
+import { RobotIcon } from "@/components/icons/icons";
+import { BackButton } from "@/components/BackButton";
+import { Card } from "@tremor/react";
+import { AdminPageTitle } from "@/components/admin/Title";
+import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { SuccessfulPersonaUpdateRedirectType } from "../enums";
+
+export default async function Page() {
+  const [values, error] = await fetchPersonaEditorInfoSS();
+
+  let body;
+  if (!values) {
+    body = (
+      <ErrorCallout errorTitle="Something went wrong :(" errorMsg={error} />
+    );
+  } else {
+    body = (
+      <Card>
+        <AssistantEditor
+          {...values}
+          defaultPublic={true}
+          redirectType={SuccessfulPersonaUpdateRedirectType.ADMIN}
+        />
+      </Card>
+    );
+  }
+
+  return (
+    <div>
+      <BackButton />
+
+      <AdminPageTitle
+        title="Create a New Persona"
+        icon={<RobotIcon size={32} />}
+      />
+
+      {body}
+    </div>
+  );
+}
diff --git a/web/src/app/admin/personas/page.tsx b/web/src/app/admin/assistants/page.tsx
similarity index 82%
rename from web/src/app/admin/personas/page.tsx
rename to web/src/app/admin/assistants/page.tsx
index 1f78d6cfdd1..cfb0bf6e18b 100644
--- a/web/src/app/admin/personas/page.tsx
+++ b/web/src/app/admin/assistants/page.tsx
@@ -24,11 +24,11 @@ export default async function Page() {
 
   return (
     <div className="mx-auto container">
-      <AdminPageTitle icon={<RobotIcon size={32} />} title="Personas" />
+      <AdminPageTitle icon={<RobotIcon size={32} />} title="Assistants" />
 
       <Text className="mb-2">
-        Personas are a way to build custom search/question-answering experiences
-        for different use cases.
+        Assistants are a way to build custom search/question-answering
+        experiences for different use cases.
       </Text>
       <Text className="mt-2">They allow you to customize:</Text>
       <div className="text-sm">
@@ -43,20 +43,20 @@ export default async function Page() {
       <div>
         <Divider />
 
-        <Title>Create a Persona</Title>
+        <Title>Create an Assistant</Title>
         <Link
           href="/admin/personas/new"
-          className="flex py-2 px-4 mt-2 border border-border h-fit cursor-pointer hover:bg-hover text-sm w-36"
+          className="flex py-2 px-4 mt-2 border border-border h-fit cursor-pointer hover:bg-hover text-sm w-40"
         >
           <div className="mx-auto flex">
             <FiPlusSquare className="my-auto mr-2" />
-            New Persona
+            New Assistant
           </div>
         </Link>
 
         <Divider />
 
-        <Title>Existing Personas</Title>
+        <Title>Existing Assistants</Title>
         <PersonasTable personas={personas} />
       </div>
     </div>
diff --git a/web/src/app/admin/bot/SlackBotConfigCreationForm.tsx b/web/src/app/admin/bot/SlackBotConfigCreationForm.tsx
index e7ee46151c4..6a598412541 100644
--- a/web/src/app/admin/bot/SlackBotConfigCreationForm.tsx
+++ b/web/src/app/admin/bot/SlackBotConfigCreationForm.tsx
@@ -28,7 +28,7 @@ import {
   Text,
 } from "@tremor/react";
 import { useRouter } from "next/navigation";
-import { Persona } from "../personas/interfaces";
+import { Persona } from "../assistants/interfaces";
 import { useState } from "react";
 import { BookmarkIcon, RobotIcon } from "@/components/icons/icons";
 
diff --git a/web/src/app/admin/bot/[id]/page.tsx b/web/src/app/admin/bot/[id]/page.tsx
index 1fc544e5da8..2cc5eaea18e 100644
--- a/web/src/app/admin/bot/[id]/page.tsx
+++ b/web/src/app/admin/bot/[id]/page.tsx
@@ -6,7 +6,7 @@ import { ErrorCallout } from "@/components/ErrorCallout";
 import { DocumentSet, SlackBotConfig } from "@/lib/types";
 import { Text } from "@tremor/react";
 import { BackButton } from "@/components/BackButton";
-import { Persona } from "../../personas/interfaces";
+import { Persona } from "../../assistants/interfaces";
 import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
 
 async function Page({ params }: { params: { id: string } }) {
diff --git a/web/src/app/admin/bot/lib.ts b/web/src/app/admin/bot/lib.ts
index 2da96c4ef05..b6c6bec1642 100644
--- a/web/src/app/admin/bot/lib.ts
+++ b/web/src/app/admin/bot/lib.ts
@@ -3,7 +3,7 @@ import {
   SlackBotResponseType,
   SlackBotTokens,
 } from "@/lib/types";
-import { Persona } from "../personas/interfaces";
+import { Persona } from "../assistants/interfaces";
 
 interface SlackBotConfigCreationRequest {
   document_sets: number[];
diff --git a/web/src/app/admin/bot/new/page.tsx b/web/src/app/admin/bot/new/page.tsx
index 93c9c7f469f..3c4972b9277 100644
--- a/web/src/app/admin/bot/new/page.tsx
+++ b/web/src/app/admin/bot/new/page.tsx
@@ -6,7 +6,7 @@ import { ErrorCallout } from "@/components/ErrorCallout";
 import { DocumentSet } from "@/lib/types";
 import { BackButton } from "@/components/BackButton";
 import { Text } from "@tremor/react";
-import { Persona } from "../../personas/interfaces";
+import { Persona } from "../../assistants/interfaces";
 
 async function Page() {
   const tasks = [fetchSS("/manage/document-set"), fetchSS("/persona")];
diff --git a/web/src/app/admin/personas/[personaId]/page.tsx b/web/src/app/admin/personas/[personaId]/page.tsx
deleted file mode 100644
index e9102d219bb..00000000000
--- a/web/src/app/admin/personas/[personaId]/page.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { ErrorCallout } from "@/components/ErrorCallout";
-import { fetchSS } from "@/lib/utilsSS";
-import { Persona } from "../interfaces";
-import { PersonaEditor } from "../PersonaEditor";
-import { DocumentSet } from "@/lib/types";
-import { BackButton } from "@/components/BackButton";
-import { Card, Title } from "@tremor/react";
-import { DeletePersonaButton } from "./DeletePersonaButton";
-
-export default async function Page({
-  params,
-}: {
-  params: { personaId: string };
-}) {
-  const [
-    personaResponse,
-    documentSetsResponse,
-    llmOverridesResponse,
-    defaultLLMResponse,
-  ] = await Promise.all([
-    fetchSS(`/persona/${params.personaId}`),
-    fetchSS("/manage/document-set"),
-    fetchSS("/admin/persona/utils/list-available-models"),
-    fetchSS("/admin/persona/utils/default-model"),
-  ]);
-
-  if (!personaResponse.ok) {
-    return (
-      <ErrorCallout
-        errorTitle="Something went wrong :("
-        errorMsg={`Failed to fetch Persona - ${await personaResponse.text()}`}
-      />
-    );
-  }
-
-  if (!documentSetsResponse.ok) {
-    return (
-      <ErrorCallout
-        errorTitle="Something went wrong :("
-        errorMsg={`Failed to fetch document sets - ${await documentSetsResponse.text()}`}
-      />
-    );
-  }
-
-  if (!llmOverridesResponse.ok) {
-    return (
-      <ErrorCallout
-        errorTitle="Something went wrong :("
-        errorMsg={`Failed to fetch LLM override options - ${await documentSetsResponse.text()}`}
-      />
-    );
-  }
-
-  if (!defaultLLMResponse.ok) {
-    return (
-      <ErrorCallout
-        errorTitle="Something went wrong :("
-        errorMsg={`Failed to fetch default LLM - ${await documentSetsResponse.text()}`}
-      />
-    );
-  }
-
-  const documentSets = (await documentSetsResponse.json()) as DocumentSet[];
-  const persona = (await personaResponse.json()) as Persona;
-  const llmOverrideOptions = (await llmOverridesResponse.json()) as string[];
-  const defaultLLM = (await defaultLLMResponse.json()) as string;
-
-  return (
-    <div>
-      <BackButton />
-      <div className="pb-2 mb-4 flex">
-        <h1 className="text-3xl font-bold pl-2">Edit Persona</h1>
-      </div>
-
-      <Card>
-        <PersonaEditor
-          existingPersona={persona}
-          documentSets={documentSets}
-          llmOverrideOptions={llmOverrideOptions}
-          defaultLLM={defaultLLM}
-        />
-      </Card>
-
-      <div className="mt-12">
-        <Title>Delete Persona</Title>
-        <div className="flex mt-6">
-          <DeletePersonaButton personaId={persona.id} />
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/web/src/app/admin/personas/new/page.tsx b/web/src/app/admin/personas/new/page.tsx
deleted file mode 100644
index 6fd675ae6f3..00000000000
--- a/web/src/app/admin/personas/new/page.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { PersonaEditor } from "../PersonaEditor";
-import { fetchSS } from "@/lib/utilsSS";
-import { ErrorCallout } from "@/components/ErrorCallout";
-import { DocumentSet } from "@/lib/types";
-import { RobotIcon } from "@/components/icons/icons";
-import { BackButton } from "@/components/BackButton";
-import { Card } from "@tremor/react";
-import { AdminPageTitle } from "@/components/admin/Title";
-
-export default async function Page() {
-  const [documentSetsResponse, llmOverridesResponse, defaultLLMResponse] =
-    await Promise.all([
-      fetchSS("/manage/document-set"),
-      fetchSS("/admin/persona/utils/list-available-models"),
-      fetchSS("/admin/persona/utils/default-model"),
-    ]);
-
-  if (!documentSetsResponse.ok) {
-    return (
-      <ErrorCallout
-        errorTitle="Something went wrong :("
-        errorMsg={`Failed to fetch document sets - ${await documentSetsResponse.text()}`}
-      />
-    );
-  }
-  const documentSets = (await documentSetsResponse.json()) as DocumentSet[];
-
-  if (!llmOverridesResponse.ok) {
-    return (
-      <ErrorCallout
-        errorTitle="Something went wrong :("
-        errorMsg={`Failed to fetch LLM override options - ${await documentSetsResponse.text()}`}
-      />
-    );
-  }
-  const llmOverrideOptions = (await llmOverridesResponse.json()) as string[];
-
-  if (!defaultLLMResponse.ok) {
-    return (
-      <ErrorCallout
-        errorTitle="Something went wrong :("
-        errorMsg={`Failed to fetch default LLM - ${await documentSetsResponse.text()}`}
-      />
-    );
-  }
-  const defaultLLM = (await defaultLLMResponse.json()) as string;
-
-  return (
-    <div>
-      <BackButton />
-
-      <AdminPageTitle
-        title="Create a New Persona"
-        icon={<RobotIcon size={32} />}
-      />
-
-      <Card>
-        <PersonaEditor
-          documentSets={documentSets}
-          llmOverrideOptions={llmOverrideOptions}
-          defaultLLM={defaultLLM}
-        />
-      </Card>
-    </div>
-  );
-}
diff --git a/web/src/app/admin/settings/interfaces.ts b/web/src/app/admin/settings/interfaces.ts
index c62a392141b..3e997a56267 100644
--- a/web/src/app/admin/settings/interfaces.ts
+++ b/web/src/app/admin/settings/interfaces.ts
@@ -3,3 +3,19 @@ export interface Settings {
   search_page_enabled: boolean;
   default_page: "search" | "chat";
 }
+
+export interface EnterpriseSettings {
+  application_name: string | null;
+  use_custom_logo: boolean;
+
+  // custom Chat components
+  custom_header_content: string | null;
+  custom_popup_header: string | null;
+  custom_popup_content: string | null;
+}
+
+export interface CombinedSettings {
+  settings: Settings;
+  enterpriseSettings: EnterpriseSettings | null;
+  customAnalyticsScript: string | null;
+}
diff --git a/web/src/app/assistants/edit/[id]/page.tsx b/web/src/app/assistants/edit/[id]/page.tsx
new file mode 100644
index 00000000000..e4d2459e077
--- /dev/null
+++ b/web/src/app/assistants/edit/[id]/page.tsx
@@ -0,0 +1,59 @@
+import { ErrorCallout } from "@/components/ErrorCallout";
+import { Card } from "@tremor/react";
+import { HeaderWrapper } from "@/components/header/HeaderWrapper";
+import { FiChevronLeft } from "react-icons/fi";
+import Link from "next/link";
+import { AssistantEditor } from "@/app/admin/assistants/AssistantEditor";
+import { SuccessfulPersonaUpdateRedirectType } from "@/app/admin/assistants/enums";
+import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+
+export default async function Page({ params }: { params: { id: string } }) {
+  const [values, error] = await fetchPersonaEditorInfoSS(params.id);
+
+  let body;
+  if (!values) {
+    body = (
+      <div className="px-32">
+        <ErrorCallout errorTitle="Something went wrong :(" errorMsg={error} />
+      </div>
+    );
+  } else {
+    body = (
+      <div className="w-full my-16">
+        <div className="px-32">
+          <div className="mx-auto container">
+            <Card>
+              <AssistantEditor
+                {...values}
+                defaultPublic={false}
+                redirectType={SuccessfulPersonaUpdateRedirectType.CHAT}
+              />
+            </Card>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      <HeaderWrapper>
+        <div className="h-full flex flex-col">
+          <div className="flex my-auto">
+            <Link href="/chat">
+              <FiChevronLeft
+                className="mr-1 my-auto p-1 hover:bg-hover rounded cursor-pointer"
+                size={32}
+              />
+            </Link>
+            <h1 className="flex text-xl text-strong font-bold my-auto">
+              Edit Assistant
+            </h1>
+          </div>
+        </div>
+      </HeaderWrapper>
+
+      {body}
+    </div>
+  );
+}
diff --git a/web/src/app/assistants/new/page.tsx b/web/src/app/assistants/new/page.tsx
new file mode 100644
index 00000000000..fed21b26e50
--- /dev/null
+++ b/web/src/app/assistants/new/page.tsx
@@ -0,0 +1,59 @@
+import { Card } from "@tremor/react";
+import { HeaderWrapper } from "@/components/header/HeaderWrapper";
+import { FiChevronLeft } from "react-icons/fi";
+import Link from "next/link";
+import { AssistantEditor } from "@/app/admin/assistants/AssistantEditor";
+import { SuccessfulPersonaUpdateRedirectType } from "@/app/admin/assistants/enums";
+import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { ErrorCallout } from "@/components/ErrorCallout";
+
+export default async function Page() {
+  const [values, error] = await fetchPersonaEditorInfoSS();
+
+  let body;
+  if (!values) {
+    body = (
+      <div className="px-32">
+        <ErrorCallout errorTitle="Something went wrong :(" errorMsg={error} />
+      </div>
+    );
+  } else {
+    body = (
+      <div className="w-full my-16">
+        <div className="px-32">
+          <div className="mx-auto container">
+            <Card>
+              <AssistantEditor
+                {...values}
+                defaultPublic={false}
+                redirectType={SuccessfulPersonaUpdateRedirectType.CHAT}
+              />
+            </Card>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      <HeaderWrapper>
+        <div className="h-full flex flex-col">
+          <div className="flex my-auto">
+            <Link href="/chat">
+              <FiChevronLeft
+                className="mr-1 my-auto p-1 hover:bg-hover rounded cursor-pointer"
+                size={32}
+              />
+            </Link>
+            <h1 className="flex text-xl text-strong font-bold my-auto">
+              New Assistant
+            </h1>
+          </div>
+        </div>
+      </HeaderWrapper>
+
+      {body}
+    </div>
+  );
+}
diff --git a/web/src/app/chat/Chat.tsx b/web/src/app/chat/Chat.tsx
deleted file mode 100644
index 7c174f18d50..00000000000
--- a/web/src/app/chat/Chat.tsx
+++ /dev/null
@@ -1,966 +0,0 @@
-"use client";
-
-import { useEffect, useRef, useState } from "react";
-import { FiSend, FiShare2, FiStopCircle } from "react-icons/fi";
-import { AIMessage, HumanMessage } from "./message/Messages";
-import { AnswerPiecePacket, DanswerDocument } from "@/lib/search/interfaces";
-import {
-  BackendChatSession,
-  BackendMessage,
-  ChatSessionSharedStatus,
-  DocumentsResponse,
-  Message,
-  RetrievalType,
-  StreamingError,
-} from "./interfaces";
-import { useRouter, useSearchParams } from "next/navigation";
-import { FeedbackType } from "./types";
-import {
-  buildChatUrl,
-  createChatSession,
-  getCitedDocumentsFromMessage,
-  getHumanAndAIMessageFromMessageNumber,
-  getLastSuccessfulMessageId,
-  handleAutoScroll,
-  handleChatFeedback,
-  nameChatSession,
-  personaIncludesRetrieval,
-  processRawChatHistory,
-  sendMessage,
-} from "./lib";
-import { ThreeDots } from "react-loader-spinner";
-import { FeedbackModal } from "./modal/FeedbackModal";
-import { DocumentSidebar } from "./documentSidebar/DocumentSidebar";
-import { Persona } from "../admin/personas/interfaces";
-import { ChatPersonaSelector } from "./ChatPersonaSelector";
-import { useFilters } from "@/lib/hooks";
-import { DocumentSet, Tag, ValidSources } from "@/lib/types";
-import { ChatFilters } from "./modifiers/ChatFilters";
-import { buildFilters } from "@/lib/search/utils";
-import { SelectedDocuments } from "./modifiers/SelectedDocuments";
-import { usePopup } from "@/components/admin/connectors/Popup";
-import { ResizableSection } from "@/components/resizable/ResizableSection";
-import { DanswerInitializingLoader } from "@/components/DanswerInitializingLoader";
-import { ChatIntro } from "./ChatIntro";
-import { HEADER_PADDING } from "@/lib/constants";
-import { computeAvailableFilters } from "@/lib/filters";
-import { useDocumentSelection } from "./useDocumentSelection";
-import { StarterMessage } from "./StarterMessage";
-import { ShareChatSessionModal } from "./modal/ShareChatSessionModal";
-import { SEARCH_PARAM_NAMES, shouldSubmitOnLoad } from "./searchParams";
-
-const MAX_INPUT_HEIGHT = 200;
-
-export const Chat = ({
-  existingChatSessionId,
-  existingChatSessionPersonaId,
-  availableSources,
-  availableDocumentSets,
-  availablePersonas,
-  availableTags,
-  defaultSelectedPersonaId,
-  documentSidebarInitialWidth,
-  shouldhideBeforeScroll,
-}: {
-  existingChatSessionId: number | null;
-  existingChatSessionPersonaId: number | undefined;
-  availableSources: ValidSources[];
-  availableDocumentSets: DocumentSet[];
-  availablePersonas: Persona[];
-  availableTags: Tag[];
-  defaultSelectedPersonaId?: number; // what persona to default to
-  documentSidebarInitialWidth?: number;
-  shouldhideBeforeScroll?: boolean;
-}) => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  // used to track whether or not the initial "submit on load" has been performed
-  // this only applies if `?submit-on-load=true` or `?submit-on-load=1` is in the URL
-  // NOTE: this is required due to React strict mode, where all `useEffect` hooks
-  // are run twice on initial load during development
-  const submitOnLoadPerformed = useRef<boolean>(false);
-
-  const { popup, setPopup } = usePopup();
-
-  // fetch messages for the chat session
-  const [isFetchingChatMessages, setIsFetchingChatMessages] = useState(
-    existingChatSessionId !== null
-  );
-
-  // needed so closures (e.g. onSubmit) can access the current value
-  const urlChatSessionId = useRef<number | null>();
-  // this is triggered every time the user switches which chat
-  // session they are using
-  useEffect(() => {
-    urlChatSessionId.current = existingChatSessionId;
-
-    textareaRef.current?.focus();
-
-    // only clear things if we're going from one chat session to another
-    if (chatSessionId !== null && existingChatSessionId !== chatSessionId) {
-      // de-select documents
-      clearSelectedDocuments();
-      // reset all filters
-      filterManager.setSelectedDocumentSets([]);
-      filterManager.setSelectedSources([]);
-      filterManager.setSelectedTags([]);
-      filterManager.setTimeRange(null);
-      if (isStreaming) {
-        setIsCancelled(true);
-      }
-    }
-
-    setChatSessionId(existingChatSessionId);
-
-    async function initialSessionFetch() {
-      if (existingChatSessionId === null) {
-        setIsFetchingChatMessages(false);
-        if (defaultSelectedPersonaId !== undefined) {
-          setSelectedPersona(
-            availablePersonas.find(
-              (persona) => persona.id === defaultSelectedPersonaId
-            )
-          );
-        } else {
-          setSelectedPersona(undefined);
-        }
-        setMessageHistory([]);
-        setChatSessionSharedStatus(ChatSessionSharedStatus.Private);
-
-        // if we're supposed to submit on initial load, then do that here
-        if (
-          shouldSubmitOnLoad(searchParams) &&
-          !submitOnLoadPerformed.current
-        ) {
-          submitOnLoadPerformed.current = true;
-          await onSubmit();
-        }
-
-        return;
-      }
-
-      setIsFetchingChatMessages(true);
-      const response = await fetch(
-        `/api/chat/get-chat-session/${existingChatSessionId}`
-      );
-      const chatSession = (await response.json()) as BackendChatSession;
-      setSelectedPersona(
-        availablePersonas.find(
-          (persona) => persona.id === chatSession.persona_id
-        )
-      );
-
-      const newMessageHistory = processRawChatHistory(chatSession.messages);
-      setMessageHistory(newMessageHistory);
-
-      const latestMessageId =
-        newMessageHistory[newMessageHistory.length - 1]?.messageId;
-      setSelectedMessageForDocDisplay(
-        latestMessageId !== undefined ? latestMessageId : null
-      );
-
-      setChatSessionSharedStatus(chatSession.shared_status);
-
-      setIsFetchingChatMessages(false);
-
-      // if this is a seeded chat, then kick off the AI message generation
-      if (newMessageHistory.length === 1 && !submitOnLoadPerformed.current) {
-        submitOnLoadPerformed.current = true;
-        const seededMessage = newMessageHistory[0].message;
-        await onSubmit({
-          isSeededChat: true,
-          messageOverride: seededMessage,
-        });
-        // force re-name if the chat session doesn't have one
-        if (!chatSession.description) {
-          await nameChatSession(existingChatSessionId, seededMessage);
-          router.refresh(); // need to refresh to update name on sidebar
-        }
-      }
-    }
-
-    initialSessionFetch();
-  }, [existingChatSessionId]);
-
-  const [chatSessionId, setChatSessionId] = useState<number | null>(
-    existingChatSessionId
-  );
-  const [message, setMessage] = useState(
-    searchParams.get(SEARCH_PARAM_NAMES.USER_MESSAGE) || ""
-  );
-  const [messageHistory, setMessageHistory] = useState<Message[]>([]);
-  const [isStreaming, setIsStreaming] = useState(false);
-
-  // for document display
-  // NOTE: -1 is a special designation that means the latest AI message
-  const [selectedMessageForDocDisplay, setSelectedMessageForDocDisplay] =
-    useState<number | null>(null);
-  const { aiMessage } = selectedMessageForDocDisplay
-    ? getHumanAndAIMessageFromMessageNumber(
-        messageHistory,
-        selectedMessageForDocDisplay
-      )
-    : { aiMessage: null };
-
-  const [selectedPersona, setSelectedPersona] = useState<Persona | undefined>(
-    existingChatSessionPersonaId !== undefined
-      ? availablePersonas.find(
-          (persona) => persona.id === existingChatSessionPersonaId
-        )
-      : defaultSelectedPersonaId !== undefined
-        ? availablePersonas.find(
-            (persona) => persona.id === defaultSelectedPersonaId
-          )
-        : undefined
-  );
-  const livePersona = selectedPersona || availablePersonas[0];
-
-  const [chatSessionSharedStatus, setChatSessionSharedStatus] =
-    useState<ChatSessionSharedStatus>(ChatSessionSharedStatus.Private);
-
-  useEffect(() => {
-    if (messageHistory.length === 0 && chatSessionId === null) {
-      setSelectedPersona(
-        availablePersonas.find(
-          (persona) => persona.id === defaultSelectedPersonaId
-        )
-      );
-    }
-  }, [defaultSelectedPersonaId]);
-
-  const [
-    selectedDocuments,
-    toggleDocumentSelection,
-    clearSelectedDocuments,
-    selectedDocumentTokens,
-  ] = useDocumentSelection();
-  // just choose a conservative default, this will be updated in the
-  // background on initial load / on persona change
-  const [maxTokens, setMaxTokens] = useState<number>(4096);
-  // fetch # of allowed document tokens for the selected Persona
-  useEffect(() => {
-    async function fetchMaxTokens() {
-      const response = await fetch(
-        `/api/chat/max-selected-document-tokens?persona_id=${livePersona.id}`
-      );
-      if (response.ok) {
-        const maxTokens = (await response.json()).max_tokens as number;
-        setMaxTokens(maxTokens);
-      }
-    }
-
-    fetchMaxTokens();
-  }, [livePersona]);
-
-  const filterManager = useFilters();
-  const [finalAvailableSources, finalAvailableDocumentSets] =
-    computeAvailableFilters({
-      selectedPersona,
-      availableSources,
-      availableDocumentSets,
-    });
-
-  // state for cancelling streaming
-  const [isCancelled, setIsCancelled] = useState(false);
-  const isCancelledRef = useRef(isCancelled);
-  useEffect(() => {
-    isCancelledRef.current = isCancelled;
-  }, [isCancelled]);
-
-  const [currentFeedback, setCurrentFeedback] = useState<
-    [FeedbackType, number] | null
-  >(null);
-  const [sharingModalVisible, setSharingModalVisible] =
-    useState<boolean>(false);
-
-  // auto scroll as message comes out
-  const scrollableDivRef = useRef<HTMLDivElement>(null);
-  const endDivRef = useRef<HTMLDivElement>(null);
-  useEffect(() => {
-    if (isStreaming || !message) {
-      handleAutoScroll(endDivRef, scrollableDivRef);
-    }
-  });
-
-  // scroll to bottom initially
-  const [hasPerformedInitialScroll, setHasPerformedInitialScroll] = useState(
-    shouldhideBeforeScroll !== true
-  );
-  useEffect(() => {
-    endDivRef.current?.scrollIntoView();
-    setHasPerformedInitialScroll(true);
-  }, [isFetchingChatMessages]);
-
-  // handle re-sizing of the text area
-  const textareaRef = useRef<HTMLTextAreaElement>(null);
-  useEffect(() => {
-    const textarea = textareaRef.current;
-    if (textarea) {
-      textarea.style.height = "0px";
-      textarea.style.height = `${Math.min(
-        textarea.scrollHeight,
-        MAX_INPUT_HEIGHT
-      )}px`;
-    }
-  }, [message]);
-
-  // used for resizing of the document sidebar
-  const masterFlexboxRef = useRef<HTMLDivElement>(null);
-  const [maxDocumentSidebarWidth, setMaxDocumentSidebarWidth] = useState<
-    number | null
-  >(null);
-  const adjustDocumentSidebarWidth = () => {
-    if (masterFlexboxRef.current && document.documentElement.clientWidth) {
-      // numbers below are based on the actual width the center section for different
-      // screen sizes. `1700` corresponds to the custom "3xl" tailwind breakpoint
-      // NOTE: some buffer is needed to account for scroll bars
-      if (document.documentElement.clientWidth > 1700) {
-        setMaxDocumentSidebarWidth(masterFlexboxRef.current.clientWidth - 950);
-      } else if (document.documentElement.clientWidth > 1420) {
-        setMaxDocumentSidebarWidth(masterFlexboxRef.current.clientWidth - 760);
-      } else {
-        setMaxDocumentSidebarWidth(masterFlexboxRef.current.clientWidth - 660);
-      }
-    }
-  };
-  useEffect(() => {
-    adjustDocumentSidebarWidth(); // Adjust the width on initial render
-    window.addEventListener("resize", adjustDocumentSidebarWidth); // Add resize event listener
-
-    return () => {
-      window.removeEventListener("resize", adjustDocumentSidebarWidth); // Cleanup the event listener
-    };
-  }, []);
-
-  if (!documentSidebarInitialWidth && maxDocumentSidebarWidth) {
-    documentSidebarInitialWidth = Math.min(700, maxDocumentSidebarWidth);
-  }
-
-  const onSubmit = async ({
-    messageIdToResend,
-    messageOverride,
-    queryOverride,
-    forceSearch,
-    isSeededChat,
-  }: {
-    messageIdToResend?: number;
-    messageOverride?: string;
-    queryOverride?: string;
-    forceSearch?: boolean;
-    isSeededChat?: boolean;
-  } = {}) => {
-    let currChatSessionId: number;
-    let isNewSession = chatSessionId === null;
-    const searchParamBasedChatSessionName =
-      searchParams.get(SEARCH_PARAM_NAMES.TITLE) || null;
-
-    if (isNewSession) {
-      currChatSessionId = await createChatSession(
-        livePersona?.id || 0,
-        searchParamBasedChatSessionName
-      );
-    } else {
-      currChatSessionId = chatSessionId as number;
-    }
-    setChatSessionId(currChatSessionId);
-
-    const messageToResend = messageHistory.find(
-      (message) => message.messageId === messageIdToResend
-    );
-    const messageToResendIndex = messageToResend
-      ? messageHistory.indexOf(messageToResend)
-      : null;
-    if (!messageToResend && messageIdToResend !== undefined) {
-      setPopup({
-        message:
-          "Failed to re-send message - please refresh the page and try again.",
-        type: "error",
-      });
-      return;
-    }
-
-    let currMessage = messageToResend ? messageToResend.message : message;
-    if (messageOverride) {
-      currMessage = messageOverride;
-    }
-    const currMessageHistory =
-      messageToResendIndex !== null
-        ? messageHistory.slice(0, messageToResendIndex)
-        : messageHistory;
-    setMessageHistory([
-      ...currMessageHistory,
-      {
-        messageId: 0,
-        message: currMessage,
-        type: "user",
-      },
-    ]);
-    setMessage("");
-
-    setIsStreaming(true);
-    let answer = "";
-    let query: string | null = null;
-    let retrievalType: RetrievalType =
-      selectedDocuments.length > 0
-        ? RetrievalType.SelectedDocs
-        : RetrievalType.None;
-    let documents: DanswerDocument[] = selectedDocuments;
-    let error: string | null = null;
-    let finalMessage: BackendMessage | null = null;
-    try {
-      const lastSuccessfulMessageId =
-        getLastSuccessfulMessageId(currMessageHistory);
-      for await (const packetBunch of sendMessage({
-        message: currMessage,
-        parentMessageId: lastSuccessfulMessageId,
-        chatSessionId: currChatSessionId,
-        promptId: livePersona?.prompts[0]?.id || 0,
-        filters: buildFilters(
-          filterManager.selectedSources,
-          filterManager.selectedDocumentSets,
-          filterManager.timeRange,
-          filterManager.selectedTags
-        ),
-        selectedDocumentIds: selectedDocuments
-          .filter(
-            (document) =>
-              document.db_doc_id !== undefined && document.db_doc_id !== null
-          )
-          .map((document) => document.db_doc_id as number),
-        queryOverride,
-        forceSearch,
-        modelVersion:
-          searchParams.get(SEARCH_PARAM_NAMES.MODEL_VERSION) || undefined,
-        temperature:
-          parseFloat(searchParams.get(SEARCH_PARAM_NAMES.TEMPERATURE) || "") ||
-          undefined,
-        systemPromptOverride:
-          searchParams.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined,
-        useExistingUserMessage: isSeededChat,
-      })) {
-        for (const packet of packetBunch) {
-          if (Object.hasOwn(packet, "answer_piece")) {
-            answer += (packet as AnswerPiecePacket).answer_piece;
-          } else if (Object.hasOwn(packet, "top_documents")) {
-            documents = (packet as DocumentsResponse).top_documents;
-            query = (packet as DocumentsResponse).rephrased_query;
-            retrievalType = RetrievalType.Search;
-            if (documents && documents.length > 0) {
-              // point to the latest message (we don't know the messageId yet, which is why
-              // we have to use -1)
-              setSelectedMessageForDocDisplay(-1);
-            }
-          } else if (Object.hasOwn(packet, "error")) {
-            error = (packet as StreamingError).error;
-          } else if (Object.hasOwn(packet, "message_id")) {
-            finalMessage = packet as BackendMessage;
-          }
-        }
-        setMessageHistory([
-          ...currMessageHistory,
-          {
-            messageId: finalMessage?.parent_message || null,
-            message: currMessage,
-            type: "user",
-          },
-          {
-            messageId: finalMessage?.message_id || null,
-            message: error || answer,
-            type: error ? "error" : "assistant",
-            retrievalType,
-            query: finalMessage?.rephrased_query || query,
-            documents: finalMessage?.context_docs?.top_documents || documents,
-            citations: finalMessage?.citations || {},
-          },
-        ]);
-        if (isCancelledRef.current) {
-          setIsCancelled(false);
-          break;
-        }
-      }
-    } catch (e: any) {
-      const errorMsg = e.message;
-      setMessageHistory([
-        ...currMessageHistory,
-        {
-          messageId: null,
-          message: currMessage,
-          type: "user",
-        },
-        {
-          messageId: null,
-          message: errorMsg,
-          type: "error",
-        },
-      ]);
-    }
-    setIsStreaming(false);
-    if (isNewSession) {
-      if (finalMessage) {
-        setSelectedMessageForDocDisplay(finalMessage.message_id);
-      }
-      if (!searchParamBasedChatSessionName) {
-        await nameChatSession(currChatSessionId, currMessage);
-      }
-
-      // NOTE: don't switch pages if the user has navigated away from the chat
-      if (
-        currChatSessionId === urlChatSessionId.current ||
-        urlChatSessionId.current === null
-      ) {
-        router.push(buildChatUrl(searchParams, currChatSessionId, null), {
-          scroll: false,
-        });
-      }
-    }
-    if (
-      finalMessage?.context_docs &&
-      finalMessage.context_docs.top_documents.length > 0 &&
-      retrievalType === RetrievalType.Search
-    ) {
-      setSelectedMessageForDocDisplay(finalMessage.message_id);
-    }
-  };
-
-  const onFeedback = async (
-    messageId: number,
-    feedbackType: FeedbackType,
-    feedbackDetails: string
-  ) => {
-    if (chatSessionId === null) {
-      return;
-    }
-
-    const response = await handleChatFeedback(
-      messageId,
-      feedbackType,
-      feedbackDetails
-    );
-
-    if (response.ok) {
-      setPopup({
-        message: "Thanks for your feedback!",
-        type: "success",
-      });
-    } else {
-      const responseJson = await response.json();
-      const errorMsg = responseJson.detail || responseJson.message;
-      setPopup({
-        message: `Failed to submit feedback - ${errorMsg}`,
-        type: "error",
-      });
-    }
-  };
-
-  const retrievalDisabled = !personaIncludesRetrieval(livePersona);
-
-  return (
-    <div className="flex w-full overflow-x-hidden" ref={masterFlexboxRef}>
-      {popup}
-      {currentFeedback && (
-        <FeedbackModal
-          feedbackType={currentFeedback[0]}
-          onClose={() => setCurrentFeedback(null)}
-          onSubmit={(feedbackDetails) => {
-            onFeedback(currentFeedback[1], currentFeedback[0], feedbackDetails);
-            setCurrentFeedback(null);
-          }}
-        />
-      )}
-
-      {sharingModalVisible && chatSessionId !== null && (
-        <ShareChatSessionModal
-          chatSessionId={chatSessionId}
-          existingSharedStatus={chatSessionSharedStatus}
-          onClose={() => setSharingModalVisible(false)}
-          onShare={(shared) =>
-            setChatSessionSharedStatus(
-              shared
-                ? ChatSessionSharedStatus.Public
-                : ChatSessionSharedStatus.Private
-            )
-          }
-        />
-      )}
-
-      {documentSidebarInitialWidth !== undefined ? (
-        <>
-          <div
-            className={`w-full sm:relative h-screen ${
-              retrievalDisabled ? "pb-[111px]" : "pb-[140px]"
-            }`}
-          >
-            <div
-              className={`w-full h-full ${HEADER_PADDING} flex flex-col overflow-y-auto overflow-x-hidden relative`}
-              ref={scrollableDivRef}
-            >
-              {livePersona && (
-                <div className="sticky top-0 left-80 z-10 w-full bg-background/90 flex">
-                  <div className="ml-2 p-1 rounded mt-2 w-fit">
-                    <ChatPersonaSelector
-                      personas={availablePersonas}
-                      selectedPersonaId={livePersona.id}
-                      onPersonaChange={(persona) => {
-                        if (persona) {
-                          setSelectedPersona(persona);
-                          textareaRef.current?.focus();
-                          router.push(
-                            buildChatUrl(searchParams, null, persona.id)
-                          );
-                        }
-                      }}
-                    />
-                  </div>
-
-                  {chatSessionId !== null && (
-                    <div
-                      onClick={() => setSharingModalVisible(true)}
-                      className="ml-auto mr-6 my-auto border-border border p-2 rounded cursor-pointer hover:bg-hover-light"
-                    >
-                      <FiShare2 />
-                    </div>
-                  )}
-                </div>
-              )}
-
-              {messageHistory.length === 0 &&
-                !isFetchingChatMessages &&
-                !isStreaming && (
-                  <ChatIntro
-                    availableSources={finalAvailableSources}
-                    availablePersonas={availablePersonas}
-                    selectedPersona={selectedPersona}
-                    handlePersonaSelect={(persona) => {
-                      setSelectedPersona(persona);
-                      textareaRef.current?.focus();
-                      router.push(buildChatUrl(searchParams, null, persona.id));
-                    }}
-                  />
-                )}
-
-              <div
-                className={
-                  "mt-4 pt-12 sm:pt-0 mx-8" +
-                  (hasPerformedInitialScroll ? "" : " invisible")
-                }
-              >
-                {messageHistory.map((message, i) => {
-                  if (message.type === "user") {
-                    return (
-                      <div key={i}>
-                        <HumanMessage content={message.message} />
-                      </div>
-                    );
-                  } else if (message.type === "assistant") {
-                    const isShowingRetrieved =
-                      (selectedMessageForDocDisplay !== null &&
-                        selectedMessageForDocDisplay === message.messageId) ||
-                      (selectedMessageForDocDisplay === -1 &&
-                        i === messageHistory.length - 1);
-                    const previousMessage =
-                      i !== 0 ? messageHistory[i - 1] : null;
-                    return (
-                      <div key={i}>
-                        <AIMessage
-                          messageId={message.messageId}
-                          content={message.message}
-                          query={messageHistory[i]?.query || undefined}
-                          personaName={livePersona.name}
-                          citedDocuments={getCitedDocumentsFromMessage(message)}
-                          isComplete={
-                            i !== messageHistory.length - 1 || !isStreaming
-                          }
-                          hasDocs={
-                            (message.documents &&
-                              message.documents.length > 0) === true
-                          }
-                          handleFeedback={
-                            i === messageHistory.length - 1 && isStreaming
-                              ? undefined
-                              : (feedbackType) =>
-                                  setCurrentFeedback([
-                                    feedbackType,
-                                    message.messageId as number,
-                                  ])
-                          }
-                          handleSearchQueryEdit={
-                            i === messageHistory.length - 1 && !isStreaming
-                              ? (newQuery) => {
-                                  if (!previousMessage) {
-                                    setPopup({
-                                      type: "error",
-                                      message:
-                                        "Cannot edit query of first message - please refresh the page and try again.",
-                                    });
-                                    return;
-                                  }
-
-                                  if (previousMessage.messageId === null) {
-                                    setPopup({
-                                      type: "error",
-                                      message:
-                                        "Cannot edit query of a pending message - please wait a few seconds and try again.",
-                                    });
-                                    return;
-                                  }
-                                  onSubmit({
-                                    messageIdToResend:
-                                      previousMessage.messageId,
-                                    queryOverride: newQuery,
-                                  });
-                                }
-                              : undefined
-                          }
-                          isCurrentlyShowingRetrieved={isShowingRetrieved}
-                          handleShowRetrieved={(messageNumber) => {
-                            if (isShowingRetrieved) {
-                              setSelectedMessageForDocDisplay(null);
-                            } else {
-                              if (messageNumber !== null) {
-                                setSelectedMessageForDocDisplay(messageNumber);
-                              } else {
-                                setSelectedMessageForDocDisplay(-1);
-                              }
-                            }
-                          }}
-                          handleForceSearch={() => {
-                            if (previousMessage && previousMessage.messageId) {
-                              onSubmit({
-                                messageIdToResend: previousMessage.messageId,
-                                forceSearch: true,
-                              });
-                            } else {
-                              setPopup({
-                                type: "error",
-                                message:
-                                  "Failed to force search - please refresh the page and try again.",
-                              });
-                            }
-                          }}
-                          retrievalDisabled={retrievalDisabled}
-                        />
-                      </div>
-                    );
-                  } else {
-                    return (
-                      <div key={i}>
-                        <AIMessage
-                          messageId={message.messageId}
-                          personaName={livePersona.name}
-                          content={
-                            <p className="text-red-700 text-sm my-auto">
-                              {message.message}
-                            </p>
-                          }
-                        />
-                      </div>
-                    );
-                  }
-                })}
-
-                {isStreaming &&
-                  messageHistory.length &&
-                  messageHistory[messageHistory.length - 1].type === "user" && (
-                    <div key={messageHistory.length}>
-                      <AIMessage
-                        messageId={null}
-                        personaName={livePersona.name}
-                        content={
-                          <div className="text-sm my-auto">
-                            <ThreeDots
-                              height="30"
-                              width="50"
-                              color="#3b82f6"
-                              ariaLabel="grid-loading"
-                              radius="12.5"
-                              wrapperStyle={{}}
-                              wrapperClass=""
-                              visible={true}
-                            />
-                          </div>
-                        }
-                      />
-                    </div>
-                  )}
-
-                {/* Some padding at the bottom so the search bar has space at the bottom to not cover the last message*/}
-                <div className={`min-h-[30px] w-full`}></div>
-
-                {livePersona &&
-                  livePersona.starter_messages &&
-                  livePersona.starter_messages.length > 0 &&
-                  selectedPersona &&
-                  messageHistory.length === 0 &&
-                  !isFetchingChatMessages && (
-                    <div
-                      className={`
-                      mx-auto 
-                      px-4 
-                      w-searchbar-xs 
-                      2xl:w-searchbar-sm 
-                      3xl:w-searchbar 
-                      grid 
-                      gap-4 
-                      grid-cols-1 
-                      grid-rows-1 
-                      mt-4 
-                      md:grid-cols-2 
-                      mb-6`}
-                    >
-                      {livePersona.starter_messages.map((starterMessage, i) => (
-                        <div key={i} className="w-full">
-                          <StarterMessage
-                            starterMessage={starterMessage}
-                            onClick={() =>
-                              onSubmit({
-                                messageOverride: starterMessage.message,
-                              })
-                            }
-                          />
-                        </div>
-                      ))}
-                    </div>
-                  )}
-
-                <div ref={endDivRef} />
-              </div>
-            </div>
-
-            <div className="absolute bottom-0 z-10 w-full bg-background border-t border-border">
-              <div className="w-full pb-4 pt-2">
-                {!retrievalDisabled && (
-                  <div className="flex">
-                    <div className="w-searchbar-xs 2xl:w-searchbar-sm 3xl:w-searchbar mx-auto px-4 pt-1 flex">
-                      {selectedDocuments.length > 0 ? (
-                        <SelectedDocuments
-                          selectedDocuments={selectedDocuments}
-                        />
-                      ) : (
-                        <ChatFilters
-                          {...filterManager}
-                          existingSources={finalAvailableSources}
-                          availableDocumentSets={finalAvailableDocumentSets}
-                          availableTags={availableTags}
-                        />
-                      )}
-                    </div>
-                  </div>
-                )}
-
-                <div className="flex justify-center py-2 max-w-screen-lg mx-auto mb-2">
-                  <div className="w-full shrink relative px-4 w-searchbar-xs 2xl:w-searchbar-sm 3xl:w-searchbar mx-auto">
-                    <textarea
-                      ref={textareaRef}
-                      autoFocus
-                      className={`
-                        opacity-100
-                        w-full
-                        shrink
-                        border 
-                        border-border 
-                        rounded-lg 
-                        outline-none 
-                        placeholder-gray-400 
-                        pl-4
-                        pr-12 
-                        py-4 
-                        overflow-hidden
-                        h-14
-                        ${
-                          (textareaRef?.current?.scrollHeight || 0) >
-                          MAX_INPUT_HEIGHT
-                            ? "overflow-y-auto"
-                            : ""
-                        } 
-                        whitespace-normal 
-                        break-word
-                        overscroll-contain
-                        resize-none
-                      `}
-                      style={{ scrollbarWidth: "thin" }}
-                      role="textarea"
-                      aria-multiline
-                      placeholder="Ask me anything..."
-                      value={message}
-                      onChange={(e) => setMessage(e.target.value)}
-                      onKeyDown={(event) => {
-                        if (
-                          event.key === "Enter" &&
-                          !event.shiftKey &&
-                          message &&
-                          !isStreaming
-                        ) {
-                          onSubmit();
-                          event.preventDefault();
-                        }
-                      }}
-                      suppressContentEditableWarning={true}
-                    />
-                    <div className="absolute bottom-4 right-10">
-                      <div
-                        className={"cursor-pointer"}
-                        onClick={() => {
-                          if (!isStreaming) {
-                            if (message) {
-                              onSubmit();
-                            }
-                          } else {
-                            setIsCancelled(true);
-                          }
-                        }}
-                      >
-                        {isStreaming ? (
-                          <FiStopCircle
-                            size={18}
-                            className={
-                              "text-emphasis w-9 h-9 p-2 rounded-lg hover:bg-hover"
-                            }
-                          />
-                        ) : (
-                          <FiSend
-                            size={18}
-                            className={
-                              "text-emphasis w-9 h-9 p-2 rounded-lg " +
-                              (message ? "bg-blue-200" : "")
-                            }
-                          />
-                        )}
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          {!retrievalDisabled ? (
-            <ResizableSection
-              intialWidth={documentSidebarInitialWidth}
-              minWidth={400}
-              maxWidth={maxDocumentSidebarWidth || undefined}
-            >
-              <DocumentSidebar
-                selectedMessage={aiMessage}
-                selectedDocuments={selectedDocuments}
-                toggleDocumentSelection={toggleDocumentSelection}
-                clearSelectedDocuments={clearSelectedDocuments}
-                selectedDocumentTokens={selectedDocumentTokens}
-                maxTokens={maxTokens}
-                isLoading={isFetchingChatMessages}
-              />
-            </ResizableSection>
-          ) : // Another option is to use a div with the width set to the initial width, so that the
-          // chat section appears in the same place as before
-          // <div style={documentSidebarInitialWidth ? {width: documentSidebarInitialWidth} : {}}></div>
-          null}
-        </>
-      ) : (
-        <div className="mx-auto h-full flex flex-col">
-          <div className="my-auto">
-            <DanswerInitializingLoader />
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
diff --git a/web/src/app/chat/ChatIntro.tsx b/web/src/app/chat/ChatIntro.tsx
index adb17a38392..047ff54e476 100644
--- a/web/src/app/chat/ChatIntro.tsx
+++ b/web/src/app/chat/ChatIntro.tsx
@@ -1,7 +1,7 @@
 import { getSourceMetadataForSources, listSourceMetadata } from "@/lib/sources";
 import { ValidSources } from "@/lib/types";
 import Image from "next/image";
-import { Persona } from "../admin/personas/interfaces";
+import { Persona } from "../admin/assistants/interfaces";
 import { Divider } from "@tremor/react";
 import { FiBookmark, FiCpu, FiInfo, FiX, FiZoomIn } from "react-icons/fi";
 import { HoverPopup } from "@/components/HoverPopup";
diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx
index 1fc1b4e5fb4..5009850305c 100644
--- a/web/src/app/chat/ChatPage.tsx
+++ b/web/src/app/chat/ChatPage.tsx
@@ -1,19 +1,66 @@
 "use client";
 
-import { useSearchParams } from "next/navigation";
-import { ChatSession } from "./interfaces";
+import { useRouter, useSearchParams } from "next/navigation";
+import {
+  BackendChatSession,
+  BackendMessage,
+  ChatSession,
+  ChatSessionSharedStatus,
+  DocumentsResponse,
+  Message,
+  RetrievalType,
+  StreamingError,
+} from "./interfaces";
 import { ChatSidebar } from "./sessionSidebar/ChatSidebar";
-import { Chat } from "./Chat";
 import { DocumentSet, Tag, User, ValidSources } from "@/lib/types";
-import { Persona } from "../admin/personas/interfaces";
-import { Header } from "@/components/Header";
+import { Persona } from "../admin/assistants/interfaces";
+import { Header } from "@/components/header/Header";
 import { HealthCheckBanner } from "@/components/health/healthcheck";
 import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
 import { Settings } from "../admin/settings/interfaces";
+import {
+  buildChatUrl,
+  createChatSession,
+  getCitedDocumentsFromMessage,
+  getHumanAndAIMessageFromMessageNumber,
+  getLastSuccessfulMessageId,
+  handleAutoScroll,
+  handleChatFeedback,
+  nameChatSession,
+  personaIncludesRetrieval,
+  processRawChatHistory,
+  sendMessage,
+} from "./lib";
+import { useContext, useEffect, useRef, useState } from "react";
+import { usePopup } from "@/components/admin/connectors/Popup";
+import { SEARCH_PARAM_NAMES, shouldSubmitOnLoad } from "./searchParams";
+import { useDocumentSelection } from "./useDocumentSelection";
+import { useFilters } from "@/lib/hooks";
+import { computeAvailableFilters } from "@/lib/filters";
+import { FeedbackType } from "./types";
+import ResizableSection from "@/components/resizable/ResizableSection";
+import { DocumentSidebar } from "./documentSidebar/DocumentSidebar";
+import { DanswerInitializingLoader } from "@/components/DanswerInitializingLoader";
+import { FeedbackModal } from "./modal/FeedbackModal";
+import { ShareChatSessionModal } from "./modal/ShareChatSessionModal";
+import { ChatPersonaSelector } from "./ChatPersonaSelector";
+import { HEADER_PADDING } from "@/lib/constants";
+import { FiSend, FiShare2, FiStopCircle } from "react-icons/fi";
+import { ChatIntro } from "./ChatIntro";
+import { AIMessage, HumanMessage } from "./message/Messages";
+import { ThreeDots } from "react-loader-spinner";
+import { StarterMessage } from "./StarterMessage";
+import { SelectedDocuments } from "./modifiers/SelectedDocuments";
+import { ChatFilters } from "./modifiers/ChatFilters";
+import { AnswerPiecePacket, DanswerDocument } from "@/lib/search/interfaces";
+import { buildFilters } from "@/lib/search/utils";
+import { Tabs } from "./sessionSidebar/constants";
+import { SettingsContext } from "@/components/settings/SettingsProvider";
+
+const MAX_INPUT_HEIGHT = 200;
 
 export function ChatLayout({
   user,
-  settings,
   chatSessions,
   availableSources,
   availableDocumentSets,
@@ -21,9 +68,9 @@ export function ChatLayout({
   availableTags,
   defaultSelectedPersonaId,
   documentSidebarInitialWidth,
+  defaultSidebarTab,
 }: {
   user: User | null;
-  settings: Settings | null;
   chatSessions: ChatSession[];
   availableSources: ValidSources[];
   availableDocumentSets: DocumentSet[];
@@ -31,19 +78,519 @@ export function ChatLayout({
   availableTags: Tag[];
   defaultSelectedPersonaId?: number; // what persona to default to
   documentSidebarInitialWidth?: number;
+  defaultSidebarTab?: Tabs;
 }) {
+  const router = useRouter();
   const searchParams = useSearchParams();
-  const chatIdRaw = searchParams.get("chatId");
-  const chatId = chatIdRaw ? parseInt(chatIdRaw) : null;
+  const existingChatIdRaw = searchParams.get("chatId");
+  const existingChatSessionId = existingChatIdRaw
+    ? parseInt(existingChatIdRaw)
+    : null;
 
   const selectedChatSession = chatSessions.find(
-    (chatSession) => chatSession.id === chatId
+    (chatSession) => chatSession.id === existingChatSessionId
+  );
+  const existingChatSessionPersonaId = selectedChatSession?.persona_id;
+
+  // used to track whether or not the initial "submit on load" has been performed
+  // this only applies if `?submit-on-load=true` or `?submit-on-load=1` is in the URL
+  // NOTE: this is required due to React strict mode, where all `useEffect` hooks
+  // are run twice on initial load during development
+  const submitOnLoadPerformed = useRef<boolean>(false);
+
+  const { popup, setPopup } = usePopup();
+
+  // fetch messages for the chat session
+  const [isFetchingChatMessages, setIsFetchingChatMessages] = useState(
+    existingChatSessionId !== null
+  );
+
+  // needed so closures (e.g. onSubmit) can access the current value
+  const urlChatSessionId = useRef<number | null>();
+  // this is triggered every time the user switches which chat
+  // session they are using
+  useEffect(() => {
+    urlChatSessionId.current = existingChatSessionId;
+
+    textareaRef.current?.focus();
+
+    // only clear things if we're going from one chat session to another
+    if (chatSessionId !== null && existingChatSessionId !== chatSessionId) {
+      // de-select documents
+      clearSelectedDocuments();
+      // reset all filters
+      filterManager.setSelectedDocumentSets([]);
+      filterManager.setSelectedSources([]);
+      filterManager.setSelectedTags([]);
+      filterManager.setTimeRange(null);
+      if (isStreaming) {
+        setIsCancelled(true);
+      }
+    }
+
+    setChatSessionId(existingChatSessionId);
+
+    async function initialSessionFetch() {
+      if (existingChatSessionId === null) {
+        setIsFetchingChatMessages(false);
+        if (defaultSelectedPersonaId !== undefined) {
+          setSelectedPersona(
+            availablePersonas.find(
+              (persona) => persona.id === defaultSelectedPersonaId
+            )
+          );
+        } else {
+          setSelectedPersona(undefined);
+        }
+        setMessageHistory([]);
+        setChatSessionSharedStatus(ChatSessionSharedStatus.Private);
+
+        // if we're supposed to submit on initial load, then do that here
+        if (
+          shouldSubmitOnLoad(searchParams) &&
+          !submitOnLoadPerformed.current
+        ) {
+          submitOnLoadPerformed.current = true;
+          await onSubmit();
+        }
+
+        return;
+      }
+
+      setIsFetchingChatMessages(true);
+      const response = await fetch(
+        `/api/chat/get-chat-session/${existingChatSessionId}`
+      );
+      const chatSession = (await response.json()) as BackendChatSession;
+      setSelectedPersona(
+        availablePersonas.find(
+          (persona) => persona.id === chatSession.persona_id
+        )
+      );
+
+      const newMessageHistory = processRawChatHistory(chatSession.messages);
+      setMessageHistory(newMessageHistory);
+
+      const latestMessageId =
+        newMessageHistory[newMessageHistory.length - 1]?.messageId;
+      setSelectedMessageForDocDisplay(
+        latestMessageId !== undefined ? latestMessageId : null
+      );
+
+      setChatSessionSharedStatus(chatSession.shared_status);
+
+      setIsFetchingChatMessages(false);
+
+      // if this is a seeded chat, then kick off the AI message generation
+      if (newMessageHistory.length === 1 && !submitOnLoadPerformed.current) {
+        submitOnLoadPerformed.current = true;
+        const seededMessage = newMessageHistory[0].message;
+        await onSubmit({
+          isSeededChat: true,
+          messageOverride: seededMessage,
+        });
+        // force re-name if the chat session doesn't have one
+        if (!chatSession.description) {
+          await nameChatSession(existingChatSessionId, seededMessage);
+          router.refresh(); // need to refresh to update name on sidebar
+        }
+      }
+    }
+
+    initialSessionFetch();
+  }, [existingChatSessionId]);
+
+  const [chatSessionId, setChatSessionId] = useState<number | null>(
+    existingChatSessionId
+  );
+  const [message, setMessage] = useState(
+    searchParams.get(SEARCH_PARAM_NAMES.USER_MESSAGE) || ""
+  );
+  const [messageHistory, setMessageHistory] = useState<Message[]>([]);
+  const [isStreaming, setIsStreaming] = useState(false);
+
+  // for document display
+  // NOTE: -1 is a special designation that means the latest AI message
+  const [selectedMessageForDocDisplay, setSelectedMessageForDocDisplay] =
+    useState<number | null>(null);
+  const { aiMessage } = selectedMessageForDocDisplay
+    ? getHumanAndAIMessageFromMessageNumber(
+        messageHistory,
+        selectedMessageForDocDisplay
+      )
+    : { aiMessage: null };
+
+  const [selectedPersona, setSelectedPersona] = useState<Persona | undefined>(
+    existingChatSessionPersonaId !== undefined
+      ? availablePersonas.find(
+          (persona) => persona.id === existingChatSessionPersonaId
+        )
+      : defaultSelectedPersonaId !== undefined
+        ? availablePersonas.find(
+            (persona) => persona.id === defaultSelectedPersonaId
+          )
+        : undefined
   );
+  const livePersona = selectedPersona || availablePersonas[0];
+
+  const [chatSessionSharedStatus, setChatSessionSharedStatus] =
+    useState<ChatSessionSharedStatus>(ChatSessionSharedStatus.Private);
+
+  useEffect(() => {
+    if (messageHistory.length === 0 && chatSessionId === null) {
+      setSelectedPersona(
+        availablePersonas.find(
+          (persona) => persona.id === defaultSelectedPersonaId
+        )
+      );
+    }
+  }, [defaultSelectedPersonaId]);
+
+  const [
+    selectedDocuments,
+    toggleDocumentSelection,
+    clearSelectedDocuments,
+    selectedDocumentTokens,
+  ] = useDocumentSelection();
+  // just choose a conservative default, this will be updated in the
+  // background on initial load / on persona change
+  const [maxTokens, setMaxTokens] = useState<number>(4096);
+  // fetch # of allowed document tokens for the selected Persona
+  useEffect(() => {
+    async function fetchMaxTokens() {
+      const response = await fetch(
+        `/api/chat/max-selected-document-tokens?persona_id=${livePersona.id}`
+      );
+      if (response.ok) {
+        const maxTokens = (await response.json()).max_tokens as number;
+        setMaxTokens(maxTokens);
+      }
+    }
+
+    fetchMaxTokens();
+  }, [livePersona]);
+
+  const filterManager = useFilters();
+  const [finalAvailableSources, finalAvailableDocumentSets] =
+    computeAvailableFilters({
+      selectedPersona,
+      availableSources,
+      availableDocumentSets,
+    });
+
+  // state for cancelling streaming
+  const [isCancelled, setIsCancelled] = useState(false);
+  const isCancelledRef = useRef(isCancelled);
+  useEffect(() => {
+    isCancelledRef.current = isCancelled;
+  }, [isCancelled]);
+
+  const [currentFeedback, setCurrentFeedback] = useState<
+    [FeedbackType, number] | null
+  >(null);
+  const [sharingModalVisible, setSharingModalVisible] =
+    useState<boolean>(false);
 
+  // auto scroll as message comes out
+  const scrollableDivRef = useRef<HTMLDivElement>(null);
+  const endDivRef = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    if (isStreaming || !message) {
+      handleAutoScroll(endDivRef, scrollableDivRef);
+    }
+  });
+
+  // scroll to bottom initially
+  const [hasPerformedInitialScroll, setHasPerformedInitialScroll] =
+    useState(false);
+  useEffect(() => {
+    endDivRef.current?.scrollIntoView();
+    setHasPerformedInitialScroll(true);
+  }, [isFetchingChatMessages]);
+
+  // handle re-sizing of the text area
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+  useEffect(() => {
+    const textarea = textareaRef.current;
+    if (textarea) {
+      textarea.style.height = "0px";
+      textarea.style.height = `${Math.min(
+        textarea.scrollHeight,
+        MAX_INPUT_HEIGHT
+      )}px`;
+    }
+  }, [message]);
+
+  // used for resizing of the document sidebar
+  const masterFlexboxRef = useRef<HTMLDivElement>(null);
+  const [maxDocumentSidebarWidth, setMaxDocumentSidebarWidth] = useState<
+    number | null
+  >(null);
+  const adjustDocumentSidebarWidth = () => {
+    if (masterFlexboxRef.current && document.documentElement.clientWidth) {
+      // numbers below are based on the actual width the center section for different
+      // screen sizes. `1700` corresponds to the custom "3xl" tailwind breakpoint
+      // NOTE: some buffer is needed to account for scroll bars
+      if (document.documentElement.clientWidth > 1700) {
+        setMaxDocumentSidebarWidth(masterFlexboxRef.current.clientWidth - 950);
+      } else if (document.documentElement.clientWidth > 1420) {
+        setMaxDocumentSidebarWidth(masterFlexboxRef.current.clientWidth - 760);
+      } else {
+        setMaxDocumentSidebarWidth(masterFlexboxRef.current.clientWidth - 660);
+      }
+    }
+  };
+  useEffect(() => {
+    adjustDocumentSidebarWidth(); // Adjust the width on initial render
+    window.addEventListener("resize", adjustDocumentSidebarWidth); // Add resize event listener
+
+    return () => {
+      window.removeEventListener("resize", adjustDocumentSidebarWidth); // Cleanup the event listener
+    };
+  }, []);
+
+  if (!documentSidebarInitialWidth && maxDocumentSidebarWidth) {
+    documentSidebarInitialWidth = Math.min(700, maxDocumentSidebarWidth);
+  }
+
+  const onSubmit = async ({
+    messageIdToResend,
+    messageOverride,
+    queryOverride,
+    forceSearch,
+    isSeededChat,
+  }: {
+    messageIdToResend?: number;
+    messageOverride?: string;
+    queryOverride?: string;
+    forceSearch?: boolean;
+    isSeededChat?: boolean;
+  } = {}) => {
+    let currChatSessionId: number;
+    let isNewSession = chatSessionId === null;
+    const searchParamBasedChatSessionName =
+      searchParams.get(SEARCH_PARAM_NAMES.TITLE) || null;
+
+    if (isNewSession) {
+      currChatSessionId = await createChatSession(
+        livePersona?.id || 0,
+        searchParamBasedChatSessionName
+      );
+    } else {
+      currChatSessionId = chatSessionId as number;
+    }
+    setChatSessionId(currChatSessionId);
+
+    const messageToResend = messageHistory.find(
+      (message) => message.messageId === messageIdToResend
+    );
+    const messageToResendIndex = messageToResend
+      ? messageHistory.indexOf(messageToResend)
+      : null;
+    if (!messageToResend && messageIdToResend !== undefined) {
+      setPopup({
+        message:
+          "Failed to re-send message - please refresh the page and try again.",
+        type: "error",
+      });
+      return;
+    }
+
+    let currMessage = messageToResend ? messageToResend.message : message;
+    if (messageOverride) {
+      currMessage = messageOverride;
+    }
+    const currMessageHistory =
+      messageToResendIndex !== null
+        ? messageHistory.slice(0, messageToResendIndex)
+        : messageHistory;
+    setMessageHistory([
+      ...currMessageHistory,
+      {
+        messageId: 0,
+        message: currMessage,
+        type: "user",
+      },
+    ]);
+    setMessage("");
+
+    setIsStreaming(true);
+    let answer = "";
+    let query: string | null = null;
+    let retrievalType: RetrievalType =
+      selectedDocuments.length > 0
+        ? RetrievalType.SelectedDocs
+        : RetrievalType.None;
+    let documents: DanswerDocument[] = selectedDocuments;
+    let error: string | null = null;
+    let finalMessage: BackendMessage | null = null;
+    try {
+      const lastSuccessfulMessageId =
+        getLastSuccessfulMessageId(currMessageHistory);
+      for await (const packetBunch of sendMessage({
+        message: currMessage,
+        parentMessageId: lastSuccessfulMessageId,
+        chatSessionId: currChatSessionId,
+        promptId: livePersona?.prompts[0]?.id || 0,
+        filters: buildFilters(
+          filterManager.selectedSources,
+          filterManager.selectedDocumentSets,
+          filterManager.timeRange,
+          filterManager.selectedTags
+        ),
+        selectedDocumentIds: selectedDocuments
+          .filter(
+            (document) =>
+              document.db_doc_id !== undefined && document.db_doc_id !== null
+          )
+          .map((document) => document.db_doc_id as number),
+        queryOverride,
+        forceSearch,
+        modelVersion:
+          searchParams.get(SEARCH_PARAM_NAMES.MODEL_VERSION) || undefined,
+        temperature:
+          parseFloat(searchParams.get(SEARCH_PARAM_NAMES.TEMPERATURE) || "") ||
+          undefined,
+        systemPromptOverride:
+          searchParams.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined,
+        useExistingUserMessage: isSeededChat,
+      })) {
+        for (const packet of packetBunch) {
+          if (Object.hasOwn(packet, "answer_piece")) {
+            answer += (packet as AnswerPiecePacket).answer_piece;
+          } else if (Object.hasOwn(packet, "top_documents")) {
+            documents = (packet as DocumentsResponse).top_documents;
+            query = (packet as DocumentsResponse).rephrased_query;
+            retrievalType = RetrievalType.Search;
+            if (documents && documents.length > 0) {
+              // point to the latest message (we don't know the messageId yet, which is why
+              // we have to use -1)
+              setSelectedMessageForDocDisplay(-1);
+            }
+          } else if (Object.hasOwn(packet, "error")) {
+            error = (packet as StreamingError).error;
+          } else if (Object.hasOwn(packet, "message_id")) {
+            finalMessage = packet as BackendMessage;
+          }
+        }
+        setMessageHistory([
+          ...currMessageHistory,
+          {
+            messageId: finalMessage?.parent_message || null,
+            message: currMessage,
+            type: "user",
+          },
+          {
+            messageId: finalMessage?.message_id || null,
+            message: error || answer,
+            type: error ? "error" : "assistant",
+            retrievalType,
+            query: finalMessage?.rephrased_query || query,
+            documents: finalMessage?.context_docs?.top_documents || documents,
+            citations: finalMessage?.citations || {},
+          },
+        ]);
+        if (isCancelledRef.current) {
+          setIsCancelled(false);
+          break;
+        }
+      }
+    } catch (e: any) {
+      const errorMsg = e.message;
+      setMessageHistory([
+        ...currMessageHistory,
+        {
+          messageId: null,
+          message: currMessage,
+          type: "user",
+        },
+        {
+          messageId: null,
+          message: errorMsg,
+          type: "error",
+        },
+      ]);
+    }
+    setIsStreaming(false);
+    if (isNewSession) {
+      if (finalMessage) {
+        setSelectedMessageForDocDisplay(finalMessage.message_id);
+      }
+      if (!searchParamBasedChatSessionName) {
+        await nameChatSession(currChatSessionId, currMessage);
+      }
+
+      // NOTE: don't switch pages if the user has navigated away from the chat
+      if (
+        currChatSessionId === urlChatSessionId.current ||
+        urlChatSessionId.current === null
+      ) {
+        router.push(buildChatUrl(searchParams, currChatSessionId, null), {
+          scroll: false,
+        });
+      }
+    }
+    if (
+      finalMessage?.context_docs &&
+      finalMessage.context_docs.top_documents.length > 0 &&
+      retrievalType === RetrievalType.Search
+    ) {
+      setSelectedMessageForDocDisplay(finalMessage.message_id);
+    }
+  };
+
+  const onFeedback = async (
+    messageId: number,
+    feedbackType: FeedbackType,
+    feedbackDetails: string
+  ) => {
+    if (chatSessionId === null) {
+      return;
+    }
+
+    const response = await handleChatFeedback(
+      messageId,
+      feedbackType,
+      feedbackDetails
+    );
+
+    if (response.ok) {
+      setPopup({
+        message: "Thanks for your feedback!",
+        type: "success",
+      });
+    } else {
+      const responseJson = await response.json();
+      const errorMsg = responseJson.detail || responseJson.message;
+      setPopup({
+        message: `Failed to submit feedback - ${errorMsg}`,
+        type: "error",
+      });
+    }
+  };
+
+  const onPersonaChange = (persona: Persona | null) => {
+    if (persona) {
+      setSelectedPersona(persona);
+      textareaRef.current?.focus();
+      router.push(buildChatUrl(searchParams, null, persona.id));
+    }
+  };
+
+  // handle redirect if chat page is disabled
+  // NOTE: this must be done here, in a client component since
+  // settings are passed in via Context and therefore aren't
+  // available in server-side components
+  const settings = useContext(SettingsContext);
+  if (settings?.settings?.chat_page_enabled === false) {
+    router.push("/search");
+  }
+
+  const retrievalDisabled = !personaIncludesRetrieval(livePersona);
   return (
     <>
       <div className="absolute top-0 z-40 w-full">
-        <Header user={user} settings={settings} />
+        <Header user={user} />
       </div>
       <HealthCheckBanner />
       <InstantSSRAutoRefresh />
@@ -52,19 +599,429 @@ export function ChatLayout({
         <ChatSidebar
           existingChats={chatSessions}
           currentChatSession={selectedChatSession}
+          personas={availablePersonas}
+          onPersonaChange={onPersonaChange}
           user={user}
+          defaultTab={defaultSidebarTab}
         />
 
-        <Chat
-          existingChatSessionId={chatId}
-          existingChatSessionPersonaId={selectedChatSession?.persona_id}
-          availableSources={availableSources}
-          availableDocumentSets={availableDocumentSets}
-          availablePersonas={availablePersonas}
-          availableTags={availableTags}
-          defaultSelectedPersonaId={defaultSelectedPersonaId}
-          documentSidebarInitialWidth={documentSidebarInitialWidth}
-        />
+        <div className="flex w-full overflow-x-hidden" ref={masterFlexboxRef}>
+          {popup}
+          {currentFeedback && (
+            <FeedbackModal
+              feedbackType={currentFeedback[0]}
+              onClose={() => setCurrentFeedback(null)}
+              onSubmit={(feedbackDetails) => {
+                onFeedback(
+                  currentFeedback[1],
+                  currentFeedback[0],
+                  feedbackDetails
+                );
+                setCurrentFeedback(null);
+              }}
+            />
+          )}
+
+          {sharingModalVisible && chatSessionId !== null && (
+            <ShareChatSessionModal
+              chatSessionId={chatSessionId}
+              existingSharedStatus={chatSessionSharedStatus}
+              onClose={() => setSharingModalVisible(false)}
+              onShare={(shared) =>
+                setChatSessionSharedStatus(
+                  shared
+                    ? ChatSessionSharedStatus.Public
+                    : ChatSessionSharedStatus.Private
+                )
+              }
+            />
+          )}
+
+          {documentSidebarInitialWidth !== undefined ? (
+            <>
+              <div
+                className={`w-full sm:relative h-screen ${
+                  retrievalDisabled ? "pb-[111px]" : "pb-[140px]"
+                }`}
+              >
+                <div
+                  className={`w-full h-full ${HEADER_PADDING} flex flex-col overflow-y-auto overflow-x-hidden relative`}
+                  ref={scrollableDivRef}
+                >
+                  {livePersona && (
+                    <div className="sticky top-0 left-80 z-10 w-full bg-background/90 flex">
+                      <div className="ml-2 p-1 rounded mt-2 w-fit">
+                        <ChatPersonaSelector
+                          personas={availablePersonas}
+                          selectedPersonaId={livePersona.id}
+                          onPersonaChange={onPersonaChange}
+                        />
+                      </div>
+
+                      {chatSessionId !== null && (
+                        <div
+                          onClick={() => setSharingModalVisible(true)}
+                          className="ml-auto mr-6 my-auto border-border border p-2 rounded cursor-pointer hover:bg-hover-light"
+                        >
+                          <FiShare2 />
+                        </div>
+                      )}
+                    </div>
+                  )}
+
+                  {messageHistory.length === 0 &&
+                    !isFetchingChatMessages &&
+                    !isStreaming && (
+                      <ChatIntro
+                        availableSources={finalAvailableSources}
+                        availablePersonas={availablePersonas}
+                        selectedPersona={selectedPersona}
+                        handlePersonaSelect={(persona) => {
+                          setSelectedPersona(persona);
+                          textareaRef.current?.focus();
+                          router.push(
+                            buildChatUrl(searchParams, null, persona.id)
+                          );
+                        }}
+                      />
+                    )}
+
+                  <div
+                    className={
+                      "mt-4 pt-12 sm:pt-0 mx-8" +
+                      (hasPerformedInitialScroll ? "" : " invisible")
+                    }
+                  >
+                    {messageHistory.map((message, i) => {
+                      if (message.type === "user") {
+                        return (
+                          <div key={i}>
+                            <HumanMessage content={message.message} />
+                          </div>
+                        );
+                      } else if (message.type === "assistant") {
+                        const isShowingRetrieved =
+                          (selectedMessageForDocDisplay !== null &&
+                            selectedMessageForDocDisplay ===
+                              message.messageId) ||
+                          (selectedMessageForDocDisplay === -1 &&
+                            i === messageHistory.length - 1);
+                        const previousMessage =
+                          i !== 0 ? messageHistory[i - 1] : null;
+                        return (
+                          <div key={i}>
+                            <AIMessage
+                              messageId={message.messageId}
+                              content={message.message}
+                              query={messageHistory[i]?.query || undefined}
+                              personaName={livePersona.name}
+                              citedDocuments={getCitedDocumentsFromMessage(
+                                message
+                              )}
+                              isComplete={
+                                i !== messageHistory.length - 1 || !isStreaming
+                              }
+                              hasDocs={
+                                (message.documents &&
+                                  message.documents.length > 0) === true
+                              }
+                              handleFeedback={
+                                i === messageHistory.length - 1 && isStreaming
+                                  ? undefined
+                                  : (feedbackType) =>
+                                      setCurrentFeedback([
+                                        feedbackType,
+                                        message.messageId as number,
+                                      ])
+                              }
+                              handleSearchQueryEdit={
+                                i === messageHistory.length - 1 && !isStreaming
+                                  ? (newQuery) => {
+                                      if (!previousMessage) {
+                                        setPopup({
+                                          type: "error",
+                                          message:
+                                            "Cannot edit query of first message - please refresh the page and try again.",
+                                        });
+                                        return;
+                                      }
+
+                                      if (previousMessage.messageId === null) {
+                                        setPopup({
+                                          type: "error",
+                                          message:
+                                            "Cannot edit query of a pending message - please wait a few seconds and try again.",
+                                        });
+                                        return;
+                                      }
+                                      onSubmit({
+                                        messageIdToResend:
+                                          previousMessage.messageId,
+                                        queryOverride: newQuery,
+                                      });
+                                    }
+                                  : undefined
+                              }
+                              isCurrentlyShowingRetrieved={isShowingRetrieved}
+                              handleShowRetrieved={(messageNumber) => {
+                                if (isShowingRetrieved) {
+                                  setSelectedMessageForDocDisplay(null);
+                                } else {
+                                  if (messageNumber !== null) {
+                                    setSelectedMessageForDocDisplay(
+                                      messageNumber
+                                    );
+                                  } else {
+                                    setSelectedMessageForDocDisplay(-1);
+                                  }
+                                }
+                              }}
+                              handleForceSearch={() => {
+                                if (
+                                  previousMessage &&
+                                  previousMessage.messageId
+                                ) {
+                                  onSubmit({
+                                    messageIdToResend:
+                                      previousMessage.messageId,
+                                    forceSearch: true,
+                                  });
+                                } else {
+                                  setPopup({
+                                    type: "error",
+                                    message:
+                                      "Failed to force search - please refresh the page and try again.",
+                                  });
+                                }
+                              }}
+                              retrievalDisabled={retrievalDisabled}
+                            />
+                          </div>
+                        );
+                      } else {
+                        return (
+                          <div key={i}>
+                            <AIMessage
+                              messageId={message.messageId}
+                              personaName={livePersona.name}
+                              content={
+                                <p className="text-red-700 text-sm my-auto">
+                                  {message.message}
+                                </p>
+                              }
+                            />
+                          </div>
+                        );
+                      }
+                    })}
+
+                    {isStreaming &&
+                      messageHistory.length &&
+                      messageHistory[messageHistory.length - 1].type ===
+                        "user" && (
+                        <div key={messageHistory.length}>
+                          <AIMessage
+                            messageId={null}
+                            personaName={livePersona.name}
+                            content={
+                              <div className="text-sm my-auto">
+                                <ThreeDots
+                                  height="30"
+                                  width="50"
+                                  color="#3b82f6"
+                                  ariaLabel="grid-loading"
+                                  radius="12.5"
+                                  wrapperStyle={{}}
+                                  wrapperClass=""
+                                  visible={true}
+                                />
+                              </div>
+                            }
+                          />
+                        </div>
+                      )}
+
+                    {/* Some padding at the bottom so the search bar has space at the bottom to not cover the last message*/}
+                    <div className={`min-h-[30px] w-full`}></div>
+
+                    {livePersona &&
+                      livePersona.starter_messages &&
+                      livePersona.starter_messages.length > 0 &&
+                      selectedPersona &&
+                      messageHistory.length === 0 &&
+                      !isFetchingChatMessages && (
+                        <div
+                          className={`
+                            mx-auto 
+                            px-4 
+                            w-searchbar-xs 
+                            2xl:w-searchbar-sm 
+                            3xl:w-searchbar 
+                            grid 
+                            gap-4 
+                            grid-cols-1 
+                            grid-rows-1 
+                            mt-4 
+                            md:grid-cols-2 
+                            mb-6`}
+                        >
+                          {livePersona.starter_messages.map(
+                            (starterMessage, i) => (
+                              <div key={i} className="w-full">
+                                <StarterMessage
+                                  starterMessage={starterMessage}
+                                  onClick={() =>
+                                    onSubmit({
+                                      messageOverride: starterMessage.message,
+                                    })
+                                  }
+                                />
+                              </div>
+                            )
+                          )}
+                        </div>
+                      )}
+
+                    <div ref={endDivRef} />
+                  </div>
+                </div>
+
+                <div className="absolute bottom-0 z-10 w-full bg-background border-t border-border">
+                  <div className="w-full pb-4 pt-2">
+                    {!retrievalDisabled && (
+                      <div className="flex">
+                        <div className="w-searchbar-xs 2xl:w-searchbar-sm 3xl:w-searchbar mx-auto px-4 pt-1 flex">
+                          {selectedDocuments.length > 0 ? (
+                            <SelectedDocuments
+                              selectedDocuments={selectedDocuments}
+                            />
+                          ) : (
+                            <ChatFilters
+                              {...filterManager}
+                              existingSources={finalAvailableSources}
+                              availableDocumentSets={finalAvailableDocumentSets}
+                              availableTags={availableTags}
+                            />
+                          )}
+                        </div>
+                      </div>
+                    )}
+
+                    <div className="flex justify-center py-2 max-w-screen-lg mx-auto mb-2">
+                      <div className="w-full shrink relative px-4 w-searchbar-xs 2xl:w-searchbar-sm 3xl:w-searchbar mx-auto">
+                        <textarea
+                          ref={textareaRef}
+                          autoFocus
+                          className={`
+                            opacity-100
+                            w-full
+                            shrink
+                            border 
+                            border-border 
+                            rounded-lg 
+                            outline-none 
+                            placeholder-gray-400 
+                            pl-4
+                            pr-12 
+                            py-4 
+                            overflow-hidden
+                            h-14
+                            ${
+                              (textareaRef?.current?.scrollHeight || 0) >
+                              MAX_INPUT_HEIGHT
+                                ? "overflow-y-auto"
+                                : ""
+                            } 
+                            whitespace-normal 
+                            break-word
+                            overscroll-contain
+                            resize-none
+                          `}
+                          style={{ scrollbarWidth: "thin" }}
+                          role="textarea"
+                          aria-multiline
+                          placeholder="Ask me anything..."
+                          value={message}
+                          onChange={(e) => setMessage(e.target.value)}
+                          onKeyDown={(event) => {
+                            if (
+                              event.key === "Enter" &&
+                              !event.shiftKey &&
+                              message &&
+                              !isStreaming
+                            ) {
+                              onSubmit();
+                              event.preventDefault();
+                            }
+                          }}
+                          suppressContentEditableWarning={true}
+                        />
+                        <div className="absolute bottom-4 right-10">
+                          <div
+                            className={"cursor-pointer"}
+                            onClick={() => {
+                              if (!isStreaming) {
+                                if (message) {
+                                  onSubmit();
+                                }
+                              } else {
+                                setIsCancelled(true);
+                              }
+                            }}
+                          >
+                            {isStreaming ? (
+                              <FiStopCircle
+                                size={18}
+                                className={
+                                  "text-emphasis w-9 h-9 p-2 rounded-lg hover:bg-hover"
+                                }
+                              />
+                            ) : (
+                              <FiSend
+                                size={18}
+                                className={
+                                  "text-emphasis w-9 h-9 p-2 rounded-lg " +
+                                  (message ? "bg-blue-200" : "")
+                                }
+                              />
+                            )}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              {!retrievalDisabled ? (
+                <ResizableSection
+                  intialWidth={documentSidebarInitialWidth}
+                  minWidth={400}
+                  maxWidth={maxDocumentSidebarWidth || undefined}
+                >
+                  <DocumentSidebar
+                    selectedMessage={aiMessage}
+                    selectedDocuments={selectedDocuments}
+                    toggleDocumentSelection={toggleDocumentSelection}
+                    clearSelectedDocuments={clearSelectedDocuments}
+                    selectedDocumentTokens={selectedDocumentTokens}
+                    maxTokens={maxTokens}
+                    isLoading={isFetchingChatMessages}
+                  />
+                </ResizableSection>
+              ) : // Another option is to use a div with the width set to the initial width, so that the
+              // chat section appears in the same place as before
+              // <div style={documentSidebarInitialWidth ? {width: documentSidebarInitialWidth} : {}}></div>
+              null}
+            </>
+          ) : (
+            <div className="mx-auto h-full flex flex-col">
+              <div className="my-auto">
+                <DanswerInitializingLoader />
+              </div>
+            </div>
+          )}
+        </div>
       </div>
     </>
   );
diff --git a/web/src/app/chat/ChatPersonaSelector.tsx b/web/src/app/chat/ChatPersonaSelector.tsx
index 606610d6611..e6317950037 100644
--- a/web/src/app/chat/ChatPersonaSelector.tsx
+++ b/web/src/app/chat/ChatPersonaSelector.tsx
@@ -1,4 +1,4 @@
-import { Persona } from "@/app/admin/personas/interfaces";
+import { Persona } from "@/app/admin/assistants/interfaces";
 import { FiCheck, FiChevronDown } from "react-icons/fi";
 import { CustomDropdown } from "@/components/Dropdown";
 
diff --git a/web/src/app/chat/StarterMessage.tsx b/web/src/app/chat/StarterMessage.tsx
index 3c83dd3c689..8f3799772de 100644
--- a/web/src/app/chat/StarterMessage.tsx
+++ b/web/src/app/chat/StarterMessage.tsx
@@ -1,4 +1,4 @@
-import { StarterMessage } from "../admin/personas/interfaces";
+import { StarterMessage } from "../admin/assistants/interfaces";
 
 export function StarterMessage({
   starterMessage,
diff --git a/web/src/app/chat/lib.tsx b/web/src/app/chat/lib.tsx
index 29a90526cd4..575ea83e97e 100644
--- a/web/src/app/chat/lib.tsx
+++ b/web/src/app/chat/lib.tsx
@@ -14,7 +14,7 @@ import {
   RetrievalType,
   StreamingError,
 } from "./interfaces";
-import { Persona } from "../admin/personas/interfaces";
+import { Persona } from "../admin/assistants/interfaces";
 import { ReadonlyURLSearchParams } from "next/navigation";
 import { SEARCH_PARAM_NAMES } from "./searchParams";
 
@@ -402,7 +402,7 @@ export function buildChatUrl(
   if (chatSessionId) {
     finalSearchParams.push(`${SEARCH_PARAM_NAMES.CHAT_ID}=${chatSessionId}`);
   }
-  if (personaId) {
+  if (personaId !== null) {
     finalSearchParams.push(`${SEARCH_PARAM_NAMES.PERSONA_ID}=${personaId}`);
   }
 
diff --git a/web/src/app/chat/page.tsx b/web/src/app/chat/page.tsx
index 4e32d6ffcc0..f998870488e 100644
--- a/web/src/app/chat/page.tsx
+++ b/web/src/app/chat/page.tsx
@@ -14,7 +14,7 @@ import {
 } from "@/lib/types";
 import { ChatSession } from "./interfaces";
 import { unstable_noStore as noStore } from "next/cache";
-import { Persona } from "../admin/personas/interfaces";
+import { Persona } from "../admin/assistants/interfaces";
 import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
 import {
   WelcomeModal,
@@ -23,12 +23,12 @@ import {
 import { ApiKeyModal } from "@/components/openai/ApiKeyModal";
 import { cookies } from "next/headers";
 import { DOCUMENT_SIDEBAR_WIDTH_COOKIE_NAME } from "@/components/resizable/contants";
-import { personaComparator } from "../admin/personas/lib";
+import { personaComparator } from "../admin/assistants/lib";
 import { ChatLayout } from "./ChatPage";
 import { FullEmbeddingModelResponse } from "../admin/models/embedding/embeddingModels";
 import { NoCompleteSourcesModal } from "@/components/initialSetup/search/NoCompleteSourceModal";
-import { getSettingsSS } from "@/lib/settings";
 import { Settings } from "../admin/settings/interfaces";
+import { SIDEBAR_TAB_COOKIE, Tabs } from "./sessionSidebar/constants";
 
 export default async function Page({
   searchParams,
@@ -45,7 +45,6 @@ export default async function Page({
     fetchSS("/persona?include_default=true"),
     fetchSS("/chat/get-user-chat-sessions"),
     fetchSS("/query/valid-tags"),
-    getSettingsSS(),
   ];
 
   // catch cases where the backend is completely unreachable here
@@ -58,7 +57,7 @@ export default async function Page({
     | FullEmbeddingModelResponse
     | Settings
     | null
-  )[] = [null, null, null, null, null, null, null, null, null, null];
+  )[] = [null, null, null, null, null, null, null, null, null];
   try {
     results = await Promise.all(tasks);
   } catch (e) {
@@ -71,7 +70,6 @@ export default async function Page({
   const personasResponse = results[4] as Response | null;
   const chatSessionsResponse = results[5] as Response | null;
   const tagsResponse = results[6] as Response | null;
-  const settings = results[7] as Settings | null;
 
   const authDisabled = authTypeMetadata?.authType === "disabled";
   if (!authDisabled && !user) {
@@ -82,10 +80,6 @@ export default async function Page({
     return redirect("/auth/waiting-on-verification");
   }
 
-  if (settings && !settings.chat_page_enabled) {
-    return redirect("/search");
-  }
-
   let ccPairs: CCPairBasicInfo[] = [];
   if (ccPairsResponse?.ok) {
     ccPairs = await ccPairsResponse.json();
@@ -137,7 +131,7 @@ export default async function Page({
     console.log(`Failed to fetch tags - ${tagsResponse?.status}`);
   }
 
-  const defaultPersonaIdRaw = searchParams["personaId"];
+  const defaultPersonaIdRaw = searchParams["assistantId"];
   const defaultPersonaId = defaultPersonaIdRaw
     ? parseInt(defaultPersonaIdRaw)
     : undefined;
@@ -149,6 +143,10 @@ export default async function Page({
     ? parseInt(documentSidebarCookieInitialWidth.value)
     : undefined;
 
+  const defaultSidebarTab = cookies().get(SIDEBAR_TAB_COOKIE)?.value as
+    | Tabs
+    | undefined;
+
   const hasAnyConnectors = ccPairs.length > 0;
   const shouldShowWelcomeModal =
     !hasCompletedWelcomeFlowSS() &&
@@ -181,7 +179,6 @@ export default async function Page({
 
       <ChatLayout
         user={user}
-        settings={settings}
         chatSessions={chatSessions}
         availableSources={availableSources}
         availableDocumentSets={documentSets}
@@ -189,6 +186,7 @@ export default async function Page({
         availableTags={tags}
         defaultSelectedPersonaId={defaultPersonaId}
         documentSidebarInitialWidth={finalDocumentSidebarInitialWidth}
+        defaultSidebarTab={defaultSidebarTab}
       />
     </>
   );
diff --git a/web/src/app/chat/searchParams.ts b/web/src/app/chat/searchParams.ts
index 0ebfbe48225..ad438e0126a 100644
--- a/web/src/app/chat/searchParams.ts
+++ b/web/src/app/chat/searchParams.ts
@@ -3,7 +3,7 @@ import { ReadonlyURLSearchParams } from "next/navigation";
 // search params
 export const SEARCH_PARAM_NAMES = {
   CHAT_ID: "chatId",
-  PERSONA_ID: "personaId",
+  PERSONA_ID: "assistantId",
   // overrides
   TEMPERATURE: "temperature",
   MODEL_VERSION: "model-version",
diff --git a/web/src/app/chat/sessionSidebar/AssistantsTab.tsx b/web/src/app/chat/sessionSidebar/AssistantsTab.tsx
new file mode 100644
index 00000000000..83d4a34f49f
--- /dev/null
+++ b/web/src/app/chat/sessionSidebar/AssistantsTab.tsx
@@ -0,0 +1,105 @@
+import { Persona } from "@/app/admin/assistants/interfaces";
+import { BasicSelectable } from "@/components/BasicClickable";
+import { User } from "@/lib/types";
+import { Text } from "@tremor/react";
+import Link from "next/link";
+import { FiEdit } from "react-icons/fi";
+
+function AssistantDisplay({
+  persona,
+  onSelect,
+  user,
+}: {
+  persona: Persona;
+  onSelect: (persona: Persona) => void;
+  user: User | null;
+}) {
+  const isEditable =
+    (!user || user.id === persona.owner?.id) &&
+    !persona.default_persona &&
+    (!persona.is_public || !user || user.role === "admin");
+
+  return (
+    <div className="flex">
+      <div className="w-full" onClick={() => onSelect(persona)}>
+        <BasicSelectable selected={false} fullWidth>
+          <div className="flex">
+            <div className="truncate w-48 3xl:w-56">{persona.name}</div>
+          </div>
+        </BasicSelectable>
+      </div>
+      {isEditable && (
+        <div className="pl-2 my-auto">
+          <Link href={`/assistants/edit/${persona.id}`}>
+            <FiEdit
+              className="my-auto ml-auto hover:bg-hover p-0.5"
+              size={20}
+            />
+          </Link>
+        </div>
+      )}
+    </div>
+  );
+}
+
+export function AssistantsTab({
+  personas,
+  onPersonaChange,
+  user,
+}: {
+  personas: Persona[];
+  onPersonaChange: (persona: Persona | null) => void;
+  user: User | null;
+}) {
+  const globalAssistants = personas.filter((persona) => persona.is_public);
+  const personalAssistants = personas.filter(
+    (persona) =>
+      !user || (persona.users.includes(user.id) && !persona.is_public)
+  );
+
+  return (
+    <div className="mt-4 pb-1 overflow-y-auto h-full flex flex-col gap-y-1">
+      <Text className="mx-3 text-xs mb-4">
+        Select an Assistant below to begin a new chat with them!
+      </Text>
+
+      <div className="mx-3">
+        {globalAssistants.length > 0 && (
+          <>
+            <div className="text-xs text-subtle flex pb-0.5 ml-1 mb-1.5 font-bold">
+              Global
+            </div>
+            {globalAssistants.map((persona) => {
+              return (
+                <AssistantDisplay
+                  key={persona.id}
+                  persona={persona}
+                  onSelect={onPersonaChange}
+                  user={user}
+                />
+              );
+            })}
+          </>
+        )}
+
+        {personalAssistants.length > 0 && (
+          <>
+            <div className="text-xs text-subtle flex pb-0.5 ml-1 mb-1.5 mt-5 font-bold">
+              Personal
+            </div>
+            {personalAssistants.map((persona) => {
+              return (
+                <AssistantDisplay
+                  key={persona.id}
+                  persona={persona}
+                  onSelect={onPersonaChange}
+                  user={user}
+                />
+              );
+            })}
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/web/src/app/chat/sessionSidebar/ChatSidebar.tsx b/web/src/app/chat/sessionSidebar/ChatSidebar.tsx
index 175139c03d1..83fa822caf0 100644
--- a/web/src/app/chat/sessionSidebar/ChatSidebar.tsx
+++ b/web/src/app/chat/sessionSidebar/ChatSidebar.tsx
@@ -21,21 +21,50 @@ import {
   HEADER_PADDING,
   NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA,
 } from "@/lib/constants";
-
-interface ChatSidebarProps {
-  existingChats: ChatSession[];
-  currentChatSession: ChatSession | null | undefined;
-  user: User | null;
-}
+import { ChatTab } from "./ChatTab";
+import { AssistantsTab } from "./AssistantsTab";
+import { Persona } from "@/app/admin/assistants/interfaces";
+import Cookies from "js-cookie";
+import { SIDEBAR_TAB_COOKIE, Tabs } from "./constants";
 
 export const ChatSidebar = ({
   existingChats,
   currentChatSession,
+  personas,
+  onPersonaChange,
   user,
-}: ChatSidebarProps) => {
+  defaultTab,
+}: {
+  existingChats: ChatSession[];
+  currentChatSession: ChatSession | null | undefined;
+  personas: Persona[];
+  onPersonaChange: (persona: Persona | null) => void;
+  user: User | null;
+  defaultTab?: Tabs;
+}) => {
   const router = useRouter();
 
-  const groupedChatSessions = groupSessionsByDateRange(existingChats);
+  const [openTab, _setOpenTab] = useState(defaultTab || Tabs.CHATS);
+  const setOpenTab = (tab: Tabs) => {
+    Cookies.set(SIDEBAR_TAB_COOKIE, tab);
+    _setOpenTab(tab);
+  };
+
+  function TabOption({ tab }: { tab: Tabs }) {
+    return (
+      <div
+        className={
+          "font-bold p-1 rounded-lg hover:bg-hover cursor-pointer " +
+          (openTab === tab ? "bg-hover" : "")
+        }
+        onClick={() => {
+          setOpenTab(tab);
+        }}
+      >
+        {tab}
+      </div>
+    );
+  }
 
   const [userInfoVisible, setUserInfoVisible] = useState(false);
   const userInfoRef = useRef<HTMLDivElement>(null);
@@ -78,8 +107,9 @@ export const ChatSidebar = ({
   return (
     <div
       className={`
+        flex-none
         w-64
-        2xl:w-72
+        3xl:w-72
         ${HEADER_PADDING}
         border-r 
         border-border 
@@ -89,48 +119,52 @@ export const ChatSidebar = ({
         transition-transform`}
       id="chat-sidebar"
     >
-      <Link
-        href={
-          "/chat" +
-          (NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA && currentChatSession
-            ? `?personaId=${currentChatSession.persona_id}`
-            : "")
-        }
-        className="mx-3 mt-5"
-      >
-        <BasicClickable fullWidth>
-          <div className="flex text-sm">
-            <FiPlusSquare className="my-auto mr-2" /> New Chat
-          </div>
-        </BasicClickable>
-      </Link>
+      <div className="flex w-full mx-4 mt-4 text-sm gap-x-4 pb-2 border-b border-border">
+        <TabOption tab={Tabs.CHATS} />
+        <TabOption tab={Tabs.ASSISTANTS} />
+      </div>
 
-      <div className="mt-1 pb-1 mb-1 ml-3 overflow-y-auto h-full">
-        {Object.entries(groupedChatSessions).map(
-          ([dateRange, chatSessions]) => {
-            if (chatSessions.length > 0) {
-              return (
-                <div key={dateRange}>
-                  <div className="text-xs text-subtle flex pb-0.5 mb-1.5 mt-5 font-bold">
-                    {dateRange}
-                  </div>
-                  {chatSessions.map((chat) => {
-                    const isSelected = currentChatId === chat.id;
-                    return (
-                      <div key={`${chat.id}-${chat.name}`} className="mr-3">
-                        <ChatSessionDisplay
-                          chatSession={chat}
-                          isSelected={isSelected}
-                        />
-                      </div>
-                    );
-                  })}
-                </div>
-              );
+      {openTab == Tabs.CHATS && (
+        <>
+          <Link
+            href={
+              "/chat" +
+              (NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA &&
+              currentChatSession
+                ? `?assistantId=${currentChatSession.persona_id}`
+                : "")
             }
-          }
-        )}
-      </div>
+            className="mx-3 mt-5"
+          >
+            <BasicClickable fullWidth>
+              <div className="flex text-sm">
+                <FiPlusSquare className="my-auto mr-2" /> New Chat
+              </div>
+            </BasicClickable>
+          </Link>
+          <ChatTab
+            existingChats={existingChats}
+            currentChatId={currentChatId}
+          />
+        </>
+      )}
+
+      {openTab == Tabs.ASSISTANTS && (
+        <>
+          <Link href="/assistants/new" className="mx-3 mt-5">
+            <BasicClickable fullWidth>
+              <div className="flex text-sm">
+                <FiPlusSquare className="my-auto mr-2" /> New Assistant
+              </div>
+            </BasicClickable>
+          </Link>
+          <AssistantsTab
+            personas={personas}
+            onPersonaChange={onPersonaChange}
+            user={user}
+          />
+        </>
+      )}
 
       <div
         className="mt-auto py-2 border-t border-border px-3"
diff --git a/web/src/app/chat/sessionSidebar/ChatTab.tsx b/web/src/app/chat/sessionSidebar/ChatTab.tsx
new file mode 100644
index 00000000000..81aa633fee7
--- /dev/null
+++ b/web/src/app/chat/sessionSidebar/ChatTab.tsx
@@ -0,0 +1,40 @@
+import { ChatSession } from "../interfaces";
+import { groupSessionsByDateRange } from "../lib";
+import { ChatSessionDisplay } from "./SessionDisplay";
+
+export function ChatTab({
+  existingChats,
+  currentChatId,
+}: {
+  existingChats: ChatSession[];
+  currentChatId?: number;
+}) {
+  const groupedChatSessions = groupSessionsByDateRange(existingChats);
+
+  return (
+    <div className="mt-1 pb-1 mb-1 ml-3 overflow-y-auto h-full">
+      {Object.entries(groupedChatSessions).map(([dateRange, chatSessions]) => {
+        if (chatSessions.length > 0) {
+          return (
+            <div key={dateRange}>
+              <div className="text-xs text-subtle flex pb-0.5 mb-1.5 mt-5 font-bold">
+                {dateRange}
+              </div>
+              {chatSessions.map((chat) => {
+                const isSelected = currentChatId === chat.id;
+                return (
+                  <div key={`${chat.id}-${chat.name}`} className="mr-3">
+                    <ChatSessionDisplay
+                      chatSession={chat}
+                      isSelected={isSelected}
+                    />
+                  </div>
+                );
+              })}
+            </div>
+          );
+        }
+      })}
+    </div>
+  );
+}
diff --git a/web/src/app/chat/sessionSidebar/constants.ts b/web/src/app/chat/sessionSidebar/constants.ts
new file mode 100644
index 00000000000..1bb1fba8094
--- /dev/null
+++ b/web/src/app/chat/sessionSidebar/constants.ts
@@ -0,0 +1,6 @@
+export const SIDEBAR_TAB_COOKIE = "chatSidebarTab";
+
+export enum Tabs {
+  CHATS = "Chats",
+  ASSISTANTS = "Assistants",
+}
diff --git a/web/src/app/chat/shared/[chatId]/page.tsx b/web/src/app/chat/shared/[chatId]/page.tsx
index a708e484fec..6555f5e4163 100644
--- a/web/src/app/chat/shared/[chatId]/page.tsx
+++ b/web/src/app/chat/shared/[chatId]/page.tsx
@@ -7,10 +7,8 @@ import {
 import { fetchSS } from "@/lib/utilsSS";
 import { redirect } from "next/navigation";
 import { BackendChatSession } from "../../interfaces";
-import { Header } from "@/components/Header";
+import { Header } from "@/components/header/Header";
 import { SharedChatDisplay } from "./SharedChatDisplay";
-import { getSettingsSS } from "@/lib/settings";
-import { Settings } from "@/app/admin/settings/interfaces";
 
 async function getSharedChat(chatId: string) {
   const response = await fetchSS(
@@ -27,13 +25,12 @@ export default async function Page({ params }: { params: { chatId: string } }) {
     getAuthTypeMetadataSS(),
     getCurrentUserSS(),
     getSharedChat(params.chatId),
-    getSettingsSS(),
   ];
 
   // catch cases where the backend is completely unreachable here
   // without try / catch, will just raise an exception and the page
   // will not render
-  let results: (User | AuthTypeMetadata | null)[] = [null, null, null, null];
+  let results: (User | AuthTypeMetadata | null)[] = [null, null, null];
   try {
     results = await Promise.all(tasks);
   } catch (e) {
@@ -42,7 +39,6 @@ export default async function Page({ params }: { params: { chatId: string } }) {
   const authTypeMetadata = results[0] as AuthTypeMetadata | null;
   const user = results[1] as User | null;
   const chatSession = results[2] as BackendChatSession | null;
-  const settings = results[3] as Settings | null;
 
   const authDisabled = authTypeMetadata?.authType === "disabled";
   if (!authDisabled && !user) {
@@ -56,7 +52,7 @@ export default async function Page({ params }: { params: { chatId: string } }) {
   return (
     <div>
       <div className="absolute top-0 z-40 w-full">
-        <Header user={user} settings={settings} />
+        <Header user={user} />
       </div>
 
       <div className="flex relative bg-background text-default overflow-hidden pt-16 h-screen">
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
index 8232852932b..7c1a465e370 100644
--- a/web/src/app/layout.tsx
+++ b/web/src/app/layout.tsx
@@ -1,6 +1,8 @@
+import { fetchSettingsSS } from "@/components/settings/lib";
 import "./globals.css";
 
 import { Inter } from "next/font/google";
+import { SettingsProvider } from "@/components/settings/SettingsProvider";
 
 const inter = Inter({
   subsets: ["latin"],
@@ -19,12 +21,19 @@ export default async function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
+  const combinedSettings = await fetchSettingsSS();
+
   return (
     <html lang="en">
       <body
-        className={`${inter.variable} font-sans text-default bg-background`}
+        className={`${inter.variable} font-sans text-default bg-background ${
+          // TODO: remove this once proper dark mode exists
+          process.env.THEME_IS_DARK?.toLowerCase() === "true" ? "dark" : ""
+        }`}
       >
-        {children}
+        <SettingsProvider settings={combinedSettings}>
+          {children}
+        </SettingsProvider>
       </body>
     </html>
   );
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
index c6b291d22d8..9cc0c56c5e2 100644
--- a/web/src/app/page.tsx
+++ b/web/src/app/page.tsx
@@ -1,14 +1,14 @@
-import { getSettingsSS } from "@/lib/settings";
+import { fetchSettingsSS } from "@/components/settings/lib";
 import { redirect } from "next/navigation";
 
 export default async function Page() {
-  const settings = await getSettingsSS();
+  const settings = await fetchSettingsSS();
 
   if (!settings) {
     redirect("/search");
   }
 
-  if (settings.default_page === "search") {
+  if (settings.settings.default_page === "search") {
     redirect("/search");
   } else {
     redirect("/chat");
diff --git a/web/src/app/search/page.tsx b/web/src/app/search/page.tsx
index 2299ea77216..f4f217a9717 100644
--- a/web/src/app/search/page.tsx
+++ b/web/src/app/search/page.tsx
@@ -1,5 +1,5 @@
 import { SearchSection } from "@/components/search/SearchSection";
-import { Header } from "@/components/Header";
+import { Header } from "@/components/header/Header";
 import {
   AuthTypeMetadata,
   getAuthTypeMetadataSS,
@@ -12,19 +12,17 @@ import { fetchSS } from "@/lib/utilsSS";
 import { CCPairBasicInfo, DocumentSet, Tag, User } from "@/lib/types";
 import { cookies } from "next/headers";
 import { SearchType } from "@/lib/search/interfaces";
-import { Persona } from "../admin/personas/interfaces";
+import { Persona } from "../admin/assistants/interfaces";
 import {
   WelcomeModal,
   hasCompletedWelcomeFlowSS,
 } from "@/components/initialSetup/welcome/WelcomeModalWrapper";
 import { unstable_noStore as noStore } from "next/cache";
 import { InstantSSRAutoRefresh } from "@/components/SSRAutoRefresh";
-import { personaComparator } from "../admin/personas/lib";
+import { personaComparator } from "../admin/assistants/lib";
 import { FullEmbeddingModelResponse } from "../admin/models/embedding/embeddingModels";
 import { NoSourcesModal } from "@/components/initialSetup/search/NoSourcesModal";
 import { NoCompleteSourcesModal } from "@/components/initialSetup/search/NoCompleteSourceModal";
-import { getSettingsSS } from "@/lib/settings";
-import { Settings } from "../admin/settings/interfaces";
 
 export default async function Home() {
   // Disable caching so we always get the up to date connector / document set / persona info
@@ -40,7 +38,6 @@ export default async function Home() {
     fetchSS("/persona"),
     fetchSS("/query/valid-tags"),
     fetchSS("/secondary-index/get-embedding-models"),
-    getSettingsSS(),
   ];
 
   // catch cases where the backend is completely unreachable here
@@ -51,9 +48,8 @@ export default async function Home() {
     | Response
     | AuthTypeMetadata
     | FullEmbeddingModelResponse
-    | Settings
     | null
-  )[] = [null, null, null, null, null, null, null];
+  )[] = [null, null, null, null, null, null];
   try {
     results = await Promise.all(tasks);
   } catch (e) {
@@ -66,7 +62,6 @@ export default async function Home() {
   const personaResponse = results[4] as Response | null;
   const tagsResponse = results[5] as Response | null;
   const embeddingModelResponse = results[6] as Response | null;
-  const settings = results[7] as Settings | null;
 
   const authDisabled = authTypeMetadata?.authType === "disabled";
   if (!authDisabled && !user) {
@@ -77,10 +72,6 @@ export default async function Home() {
     return redirect("/auth/waiting-on-verification");
   }
 
-  if (settings && !settings.search_page_enabled) {
-    return redirect("/chat");
-  }
-
   let ccPairs: CCPairBasicInfo[] = [];
   if (ccPairsResponse?.ok) {
     ccPairs = await ccPairsResponse.json();
@@ -152,7 +143,7 @@ export default async function Home() {
 
   return (
     <>
-      <Header user={user} settings={settings} />
+      <Header user={user} />
       <div className="m-3">
         <HealthCheckBanner />
       </div>
diff --git a/web/src/components/admin/Layout.tsx b/web/src/components/admin/Layout.tsx
index 0221f5172d4..f02295a980b 100644
--- a/web/src/components/admin/Layout.tsx
+++ b/web/src/components/admin/Layout.tsx
@@ -1,5 +1,4 @@
-import { Settings } from "@/app/admin/settings/interfaces";
-import { Header } from "@/components/Header";
+import { Header } from "@/components/header/Header";
 import { AdminSidebar } from "@/components/admin/connectors/AdminSidebar";
 import {
   NotebookIcon,
@@ -13,7 +12,6 @@ import {
   ConnectorIcon,
   SlackIcon,
 } from "@/components/icons/icons";
-import { getSettingsSS } from "@/lib/settings";
 import { User } from "@/lib/types";
 import {
   AuthTypeMetadata,
@@ -30,12 +28,12 @@ import {
 } from "react-icons/fi";
 
 export async function Layout({ children }: { children: React.ReactNode }) {
-  const tasks = [getAuthTypeMetadataSS(), getCurrentUserSS(), getSettingsSS()];
+  const tasks = [getAuthTypeMetadataSS(), getCurrentUserSS()];
 
   // catch cases where the backend is completely unreachable here
   // without try / catch, will just raise an exception and the page
   // will not render
-  let results: (User | AuthTypeMetadata | Settings | null)[] = [null, null];
+  let results: (User | AuthTypeMetadata | null)[] = [null, null];
   try {
     results = await Promise.all(tasks);
   } catch (e) {
@@ -44,7 +42,6 @@ export async function Layout({ children }: { children: React.ReactNode }) {
 
   const authTypeMetadata = results[0] as AuthTypeMetadata | null;
   const user = results[1] as User | null;
-  const settings = results[2] as Settings | null;
 
   const authDisabled = authTypeMetadata?.authType === "disabled";
   const requiresVerification = authTypeMetadata?.requiresVerification;
@@ -63,7 +60,7 @@ export async function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div className="h-screen overflow-y-hidden">
       <div className="absolute top-0 z-50 w-full">
-        <Header user={user} settings={settings} />
+        <Header user={user} />
       </div>
       <div className="flex h-full pt-16">
         <div className="w-80 pt-12 pb-8 h-full border-r border-border">
@@ -131,10 +128,10 @@ export async function Layout({ children }: { children: React.ReactNode }) {
                     name: (
                       <div className="flex">
                         <RobotIcon size={18} />
-                        <div className="ml-1">Personas</div>
+                        <div className="ml-1">Assistants</div>
                       </div>
                     ),
-                    link: "/admin/personas",
+                    link: "/admin/assistants",
                   },
                   {
                     name: (
diff --git a/web/src/components/documentSet/DocumentSetSelectable.tsx b/web/src/components/documentSet/DocumentSetSelectable.tsx
new file mode 100644
index 00000000000..2021148cef5
--- /dev/null
+++ b/web/src/components/documentSet/DocumentSetSelectable.tsx
@@ -0,0 +1,54 @@
+import { DocumentSet, ValidSources } from "@/lib/types";
+import { CustomCheckbox } from "../CustomCheckbox";
+import { SourceIcon } from "../SourceIcon";
+
+export function DocumentSetSelectable({
+  documentSet,
+  isSelected,
+  onSelect,
+}: {
+  documentSet: DocumentSet;
+  isSelected: boolean;
+  onSelect: () => void;
+}) {
+  const uniqueSources = new Set<ValidSources>();
+  documentSet.cc_pair_descriptors.forEach((ccPairDescriptor) => {
+    uniqueSources.add(ccPairDescriptor.connector.source);
+  });
+
+  return (
+    <div
+      key={documentSet.id}
+      className={
+        `
+        w-72
+        px-3 
+        py-1
+        rounded-lg 
+        border
+        border-border
+        flex 
+        cursor-pointer ` +
+        (isSelected ? " bg-hover" : " bg-background hover:bg-hover-light")
+      }
+      onClick={onSelect}
+    >
+      <div className="flex w-full">
+        <div className="flex flex-col h-full">
+          <div className="font-bold">{documentSet.name}</div>
+          <div className="text-xs">{documentSet.description}</div>
+          <div className="flex gap-x-2 pt-1 mt-auto mb-1">
+            {Array.from(uniqueSources).map((source) => (
+              <SourceIcon key={source} sourceType={source} iconSize={16} />
+            ))}
+          </div>
+        </div>
+        <div className="ml-auto my-auto">
+          <div className="pl-1">
+            <CustomCheckbox checked={isSelected} onChange={() => null} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/web/src/components/Header.tsx b/web/src/components/header/Header.tsx
similarity index 88%
rename from web/src/components/Header.tsx
rename to web/src/components/header/Header.tsx
index 7a28a0aa7d1..5cc8c220b1e 100644
--- a/web/src/components/Header.tsx
+++ b/web/src/components/header/Header.tsx
@@ -5,18 +5,17 @@ import { logout } from "@/lib/user";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import React, { useEffect, useRef, useState } from "react";
-import { CustomDropdown, DefaultDropdownElement } from "./Dropdown";
+import React, { useContext, useEffect, useRef, useState } from "react";
+import { CustomDropdown, DefaultDropdownElement } from "../Dropdown";
 import { FiMessageSquare, FiSearch } from "react-icons/fi";
-import { usePathname } from "next/navigation";
-import { Settings } from "@/app/admin/settings/interfaces";
+import { HeaderWrapper } from "./HeaderWrapper";
+import { SettingsContext } from "../settings/SettingsProvider";
 
 interface HeaderProps {
   user: User | null;
-  settings: Settings | null;
 }
 
-export function Header({ user, settings }: HeaderProps) {
+export function Header({ user }: HeaderProps) {
   const router = useRouter();
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const dropdownRef = useRef<HTMLDivElement>(null);
@@ -54,9 +53,15 @@ export function Header({ user, settings }: HeaderProps) {
     };
   }, [dropdownOpen]);
 
+  const combinedSettings = useContext(SettingsContext);
+  if (!combinedSettings) {
+    return null;
+  }
+  const settings = combinedSettings.settings;
+
   return (
-    <header className="border-b border-border bg-background-emphasis">
-      <div className="mx-8 flex h-16">
+    <HeaderWrapper>
+      <div className="flex h-full">
         <Link
           className="py-4"
           href={
@@ -133,7 +138,7 @@ export function Header({ user, settings }: HeaderProps) {
           </div>
         </div>
       </div>
-    </header>
+    </HeaderWrapper>
   );
 }
 
diff --git a/web/src/components/header/HeaderWrapper.tsx b/web/src/components/header/HeaderWrapper.tsx
new file mode 100644
index 00000000000..c9a4bc0dec1
--- /dev/null
+++ b/web/src/components/header/HeaderWrapper.tsx
@@ -0,0 +1,11 @@
+export function HeaderWrapper({
+  children,
+}: {
+  children: JSX.Element | string;
+}) {
+  return (
+    <header className="border-b border-border bg-background-emphasis">
+      <div className="mx-8 h-16">{children}</div>
+    </header>
+  );
+}
diff --git a/web/src/components/search/PersonaSelector.tsx b/web/src/components/search/PersonaSelector.tsx
index 64a0fb44b9c..2c00a97e898 100644
--- a/web/src/components/search/PersonaSelector.tsx
+++ b/web/src/components/search/PersonaSelector.tsx
@@ -1,4 +1,4 @@
-import { Persona } from "@/app/admin/personas/interfaces";
+import { Persona } from "@/app/admin/assistants/interfaces";
 import { CustomDropdown, DefaultDropdownElement } from "../Dropdown";
 import { FiChevronDown } from "react-icons/fi";
 
diff --git a/web/src/components/search/SearchSection.tsx b/web/src/components/search/SearchSection.tsx
index ea07066ade8..e8c6164441f 100644
--- a/web/src/components/search/SearchSection.tsx
+++ b/web/src/components/search/SearchSection.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useRef, useState } from "react";
+import { useContext, useRef, useState } from "react";
 import { SearchBar } from "./SearchBar";
 import { SearchResultsDisplay } from "./SearchResultsDisplay";
 import { SourceSelector } from "./filtering/Filters";
@@ -20,9 +20,11 @@ import { SearchHelper } from "./SearchHelper";
 import { CancellationToken, cancellable } from "@/lib/search/cancellable";
 import { useFilters, useObjectState } from "@/lib/hooks";
 import { questionValidationStreamed } from "@/lib/search/streamingQuestionValidation";
-import { Persona } from "@/app/admin/personas/interfaces";
+import { Persona } from "@/app/admin/assistants/interfaces";
 import { PersonaSelector } from "./PersonaSelector";
 import { computeAvailableFilters } from "@/lib/filters";
+import { useRouter } from "next/router";
+import { SettingsContext } from "../settings/SettingsProvider";
 
 const SEARCH_DEFAULT_OVERRIDES_START: SearchDefaultOverrides = {
   forceDisplayQA: false,
@@ -211,6 +213,16 @@ export const SearchSection = ({
     setIsFetching(false);
   };
 
+  // handle redirect if search page is disabled
+  // NOTE: this must be done here, in a client component since
+  // settings are passed in via Context and therefore aren't
+  // available in server-side components
+  const router = useRouter();
+  const settings = useContext(SettingsContext);
+  if (settings?.settings?.search_page_enabled === false) {
+    router.push("/chat");
+  }
+
   return (
     <div className="relative max-w-[2000px] xl:max-w-[1430px] mx-auto">
       <div className="absolute left-0 hidden 2xl:block w-52 3xl:w-64">
diff --git a/web/src/components/settings/SettingsProvider.tsx b/web/src/components/settings/SettingsProvider.tsx
new file mode 100644
index 00000000000..db813f297de
--- /dev/null
+++ b/web/src/components/settings/SettingsProvider.tsx
@@ -0,0 +1,20 @@
+"use client";
+
+import { CombinedSettings } from "@/app/admin/settings/interfaces";
+import { createContext } from "react";
+
+export const SettingsContext = createContext<CombinedSettings | null>(null);
+
+export function SettingsProvider({
+  children,
+  settings,
+}: {
+  children: React.ReactNode | JSX.Element;
+  settings: CombinedSettings;
+}) {
+  return (
+    <SettingsContext.Provider value={settings}>
+      {children}
+    </SettingsContext.Provider>
+  );
+}
diff --git a/web/src/components/settings/lib.ts b/web/src/components/settings/lib.ts
new file mode 100644
index 00000000000..4a7355f96d6
--- /dev/null
+++ b/web/src/components/settings/lib.ts
@@ -0,0 +1,30 @@
+import { EnterpriseSettings, Settings } from "@/app/admin/settings/interfaces";
+import { CUSTOM_ANALYTICS_ENABLED, EE_ENABLED } from "@/lib/constants";
+import { fetchSS } from "@/lib/utilsSS";
+
+export async function fetchSettingsSS() {
+  const tasks = [fetchSS("/settings")];
+  if (EE_ENABLED) {
+    tasks.push(fetchSS("/enterprise-settings"));
+    if (CUSTOM_ANALYTICS_ENABLED) {
+      tasks.push(fetchSS("/enterprise-settings/custom-analytics-script"));
+    }
+  }
+
+  const results = await Promise.all(tasks);
+
+  const settings = (await results[0].json()) as Settings;
+  const enterpriseSettings =
+    tasks.length > 1 ? ((await results[1].json()) as EnterpriseSettings) : null;
+  const customAnalyticsScript = (
+    tasks.length > 2 ? await results[2].json() : null
+  ) as string | null;
+
+  const combinedSettings = {
+    settings,
+    enterpriseSettings,
+    customAnalyticsScript,
+  };
+
+  return combinedSettings;
+}
diff --git a/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts b/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
new file mode 100644
index 00000000000..ad01f19f77e
--- /dev/null
+++ b/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
@@ -0,0 +1,103 @@
+import { Persona } from "@/app/admin/assistants/interfaces";
+import { CCPairBasicInfo, DocumentSet, User } from "../types";
+import { getCurrentUserSS } from "../userSS";
+import { fetchSS } from "../utilsSS";
+
+export async function fetchPersonaEditorInfoSS(
+  personaId?: number | string
+): Promise<
+  | [
+      {
+        ccPairs: CCPairBasicInfo[];
+        documentSets: DocumentSet[];
+        llmOverrideOptions: string[];
+        defaultLLM: string;
+        user: User | null;
+        existingPersona: Persona | null;
+      },
+      null,
+    ]
+  | [null, string]
+> {
+  const tasks = [
+    fetchSS("/manage/indexing-status"),
+    fetchSS("/manage/document-set"),
+    fetchSS("/persona/utils/list-available-models"),
+    fetchSS("/persona/utils/default-model"),
+    // duplicate fetch, but shouldn't be too big of a deal
+    // this page is not a high traffic page
+    getCurrentUserSS(),
+  ];
+  if (personaId) {
+    tasks.push(fetchSS(`/persona/${personaId}`));
+  } else {
+    tasks.push((async () => null)());
+  }
+
+  const [
+    ccPairsInfoResponse,
+    documentSetsResponse,
+    llmOverridesResponse,
+    defaultLLMResponse,
+    user,
+    personaResponse,
+  ] = (await Promise.all(tasks)) as [
+    Response,
+    Response,
+    Response,
+    Response,
+    User | null,
+    Response | null,
+  ];
+
+  if (!ccPairsInfoResponse.ok) {
+    return [
+      null,
+      `Failed to fetch connectors - ${await ccPairsInfoResponse.text()}`,
+    ];
+  }
+  const ccPairs = (await ccPairsInfoResponse.json()) as CCPairBasicInfo[];
+
+  if (!documentSetsResponse.ok) {
+    return [
+      null,
+      `Failed to fetch document sets - ${await documentSetsResponse.text()}`,
+    ];
+  }
+  const documentSets = (await documentSetsResponse.json()) as DocumentSet[];
+
+  if (!llmOverridesResponse.ok) {
+    return [
+      null,
+      `Failed to fetch LLM override options - ${await llmOverridesResponse.text()}`,
+    ];
+  }
+  const llmOverrideOptions = (await llmOverridesResponse.json()) as string[];
+
+  if (!defaultLLMResponse.ok) {
+    return [
+      null,
+      `Failed to fetch default LLM - ${await defaultLLMResponse.text()}`,
+    ];
+  }
+  const defaultLLM = (await defaultLLMResponse.json()) as string;
+
+  if (personaId && personaResponse && !personaResponse.ok) {
+    return [null, `Failed to fetch Persona - ${await personaResponse.text()}`];
+  }
+  const existingPersona = personaResponse
+    ? ((await personaResponse.json()) as Persona)
+    : null;
+
+  return [
+    {
+      ccPairs,
+      documentSets,
+      llmOverrideOptions,
+      defaultLLM,
+      user,
+      existingPersona,
+    },
+    null,
+  ];
+}
diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts
index 3f54a784b7c..504e0c321b3 100644
--- a/web/src/lib/constants.ts
+++ b/web/src/lib/constants.ts
@@ -23,3 +23,8 @@ export const HEADER_PADDING = "pt-[64px]";
 // can be the single source of truth
 export const EE_ENABLED =
   process.env.NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES?.toLowerCase() === "true";
+
+// Enterprise-only settings
+export const CUSTOM_ANALYTICS_ENABLED = process.env.CUSTOM_ANALYTICS_SECRET_KEY
+  ? true
+  : false;
diff --git a/web/src/lib/filters.ts b/web/src/lib/filters.ts
index e900e87cc59..078398e64b1 100644
--- a/web/src/lib/filters.ts
+++ b/web/src/lib/filters.ts
@@ -1,4 +1,4 @@
-import { Persona } from "@/app/admin/personas/interfaces";
+import { Persona } from "@/app/admin/assistants/interfaces";
 import { DocumentSet, ValidSources } from "./types";
 import { getSourcesForPersona } from "./sources";
 
diff --git a/web/src/lib/search/interfaces.ts b/web/src/lib/search/interfaces.ts
index 83c2b407ab2..7ff2b195ae6 100644
--- a/web/src/lib/search/interfaces.ts
+++ b/web/src/lib/search/interfaces.ts
@@ -1,6 +1,6 @@
 import { DateRangePickerValue } from "@tremor/react";
 import { Tag, ValidSources } from "../types";
-import { Persona } from "@/app/admin/personas/interfaces";
+import { Persona } from "@/app/admin/assistants/interfaces";
 
 export const FlowType = {
   SEARCH: "search",
diff --git a/web/src/lib/settings.ts b/web/src/lib/settings.ts
deleted file mode 100644
index 260f62bf1c4..00000000000
--- a/web/src/lib/settings.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Settings } from "@/app/admin/settings/interfaces";
-import { fetchSS } from "./utilsSS";
-
-export async function getSettingsSS(): Promise<Settings | null> {
-  const response = await fetchSS("/settings");
-  if (response.ok) {
-    return await response.json();
-  }
-  return null;
-}
diff --git a/web/src/lib/sources.ts b/web/src/lib/sources.ts
index 92250de5bae..c561dd6d8d0 100644
--- a/web/src/lib/sources.ts
+++ b/web/src/lib/sources.ts
@@ -27,7 +27,7 @@ import {
 } from "@/components/icons/icons";
 import { ValidSources } from "./types";
 import { SourceCategory, SourceMetadata } from "./search/interfaces";
-import { Persona } from "@/app/admin/personas/interfaces";
+import { Persona } from "@/app/admin/assistants/interfaces";
 
 interface PartialSourceMetadata {
   icon: React.FC<{ size?: number; className?: string }>;
diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts
index d09ad6c9063..66b1f7f0eff 100644
--- a/web/src/lib/types.ts
+++ b/web/src/lib/types.ts
@@ -1,4 +1,4 @@
-import { Persona } from "@/app/admin/personas/interfaces";
+import { Persona } from "@/app/admin/assistants/interfaces";
 
 export interface User {
   id: string;
@@ -9,6 +9,11 @@ export interface User {
   role: "basic" | "admin";
 }
 
+export interface MinimalUserSnapshot {
+  id: string;
+  email: string;
+}
+
 export type ValidSources =
   | "web"
   | "github"

From df216eafa56f8d407ded8af1c9533d312446f0ca Mon Sep 17 00:00:00 2001
From: Weves <chrisweaver101@gmail.com>
Date: Mon, 22 Apr 2024 13:09:35 -0700
Subject: [PATCH 08/25] Assistant rework fixes

---
 web/src/app/admin/assistants/PersonaTable.tsx  |  2 +-
 .../DeletePersonaButton.tsx                    | 15 +++++++++++++--
 .../assistants/{[personaId] => [id]}/page.tsx  | 15 +++++++--------
 web/src/app/admin/assistants/new/page.tsx      |  4 ++--
 web/src/app/admin/assistants/page.tsx          |  2 +-
 web/src/app/admin/bot/page.tsx                 |  2 +-
 web/src/app/assistants/edit/[id]/page.tsx      | 18 +++++++++++++++---
 web/src/app/assistants/new/page.tsx            |  4 ++--
 .../lib/assistants/fetchPersonaEditorInfoSS.ts |  2 +-
 9 files changed, 43 insertions(+), 21 deletions(-)
 rename web/src/app/admin/assistants/{[personaId] => [id]}/DeletePersonaButton.tsx (58%)
 rename web/src/app/admin/assistants/{[personaId] => [id]}/page.tsx (73%)

diff --git a/web/src/app/admin/assistants/PersonaTable.tsx b/web/src/app/admin/assistants/PersonaTable.tsx
index cc18ce5b2c2..87873611559 100644
--- a/web/src/app/admin/assistants/PersonaTable.tsx
+++ b/web/src/app/admin/assistants/PersonaTable.tsx
@@ -154,7 +154,7 @@ export function PersonasTable({ personas }: { personas: Persona[] }) {
                       onClick={async () => {
                         const response = await deletePersona(persona.id);
                         if (response.ok) {
-                          router.push(`/admin/personas?u=${Date.now()}`);
+                          router.refresh();
                         } else {
                           alert(
                             `Failed to delete persona - ${await response.text()}`
diff --git a/web/src/app/admin/assistants/[personaId]/DeletePersonaButton.tsx b/web/src/app/admin/assistants/[id]/DeletePersonaButton.tsx
similarity index 58%
rename from web/src/app/admin/assistants/[personaId]/DeletePersonaButton.tsx
rename to web/src/app/admin/assistants/[id]/DeletePersonaButton.tsx
index f7e96041c68..0bbc268fae4 100644
--- a/web/src/app/admin/assistants/[personaId]/DeletePersonaButton.tsx
+++ b/web/src/app/admin/assistants/[id]/DeletePersonaButton.tsx
@@ -4,8 +4,15 @@ import { Button } from "@tremor/react";
 import { FiTrash } from "react-icons/fi";
 import { deletePersona } from "../lib";
 import { useRouter } from "next/navigation";
+import { SuccessfulPersonaUpdateRedirectType } from "../enums";
 
-export function DeletePersonaButton({ personaId }: { personaId: number }) {
+export function DeletePersonaButton({
+  personaId,
+  redirectType,
+}: {
+  personaId: number;
+  redirectType: SuccessfulPersonaUpdateRedirectType;
+}) {
   const router = useRouter();
 
   return (
@@ -15,7 +22,11 @@ export function DeletePersonaButton({ personaId }: { personaId: number }) {
       onClick={async () => {
         const response = await deletePersona(personaId);
         if (response.ok) {
-          router.push(`/admin/personas?u=${Date.now()}`);
+          router.push(
+            redirectType === SuccessfulPersonaUpdateRedirectType.ADMIN
+              ? `/admin/assistants?u=${Date.now()}`
+              : `/chat`
+          );
         } else {
           alert(`Failed to delete persona - ${await response.text()}`);
         }
diff --git a/web/src/app/admin/assistants/[personaId]/page.tsx b/web/src/app/admin/assistants/[id]/page.tsx
similarity index 73%
rename from web/src/app/admin/assistants/[personaId]/page.tsx
rename to web/src/app/admin/assistants/[id]/page.tsx
index 6b527f16521..86b73536037 100644
--- a/web/src/app/admin/assistants/[personaId]/page.tsx
+++ b/web/src/app/admin/assistants/[id]/page.tsx
@@ -3,17 +3,13 @@ import { AssistantEditor } from "../AssistantEditor";
 import { BackButton } from "@/components/BackButton";
 import { Card, Title } from "@tremor/react";
 import { DeletePersonaButton } from "./DeletePersonaButton";
-import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { fetchAssistantEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
 import { SuccessfulPersonaUpdateRedirectType } from "../enums";
 import { RobotIcon } from "@/components/icons/icons";
 import { AdminPageTitle } from "@/components/admin/Title";
 
-export default async function Page({
-  params,
-}: {
-  params: { personaId: string };
-}) {
-  const [values, error] = await fetchPersonaEditorInfoSS(params.personaId);
+export default async function Page({ params }: { params: { id: string } }) {
+  const [values, error] = await fetchAssistantEditorInfoSS(params.id);
 
   let body;
   if (!values) {
@@ -34,7 +30,10 @@ export default async function Page({
         <div className="mt-12">
           <Title>Delete Assistant</Title>
           <div className="flex mt-6">
-            <DeletePersonaButton personaId={values.existingPersona!.id} />
+            <DeletePersonaButton
+              personaId={values.existingPersona!.id}
+              redirectType={SuccessfulPersonaUpdateRedirectType.ADMIN}
+            />
           </div>
         </div>
       </>
diff --git a/web/src/app/admin/assistants/new/page.tsx b/web/src/app/admin/assistants/new/page.tsx
index 7f91200804f..343d78c7e59 100644
--- a/web/src/app/admin/assistants/new/page.tsx
+++ b/web/src/app/admin/assistants/new/page.tsx
@@ -4,11 +4,11 @@ import { RobotIcon } from "@/components/icons/icons";
 import { BackButton } from "@/components/BackButton";
 import { Card } from "@tremor/react";
 import { AdminPageTitle } from "@/components/admin/Title";
-import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { fetchAssistantEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
 import { SuccessfulPersonaUpdateRedirectType } from "../enums";
 
 export default async function Page() {
-  const [values, error] = await fetchPersonaEditorInfoSS();
+  const [values, error] = await fetchAssistantEditorInfoSS();
 
   let body;
   if (!values) {
diff --git a/web/src/app/admin/assistants/page.tsx b/web/src/app/admin/assistants/page.tsx
index cfb0bf6e18b..55b89045e23 100644
--- a/web/src/app/admin/assistants/page.tsx
+++ b/web/src/app/admin/assistants/page.tsx
@@ -45,7 +45,7 @@ export default async function Page() {
 
         <Title>Create an Assistant</Title>
         <Link
-          href="/admin/personas/new"
+          href="/admin/assistants/new"
           className="flex py-2 px-4 mt-2 border border-border h-fit cursor-pointer hover:bg-hover text-sm w-40"
         >
           <div className="mx-auto flex">
diff --git a/web/src/app/admin/bot/page.tsx b/web/src/app/admin/bot/page.tsx
index ddbb15f86ad..c0c728f8a12 100644
--- a/web/src/app/admin/bot/page.tsx
+++ b/web/src/app/admin/bot/page.tsx
@@ -95,7 +95,7 @@ const SlackBotConfigsTable = ({
                     {slackBotConfig.persona &&
                     !isPersonaASlackBotPersona(slackBotConfig.persona) ? (
                       <Link
-                        href={`/admin/personas/${slackBotConfig.persona.id}`}
+                        href={`/admin/assistants/${slackBotConfig.persona.id}`}
                         className="text-blue-500 flex"
                       >
                         <FiArrowUpRight className="my-auto mr-1" />
diff --git a/web/src/app/assistants/edit/[id]/page.tsx b/web/src/app/assistants/edit/[id]/page.tsx
index e4d2459e077..db4a54d6780 100644
--- a/web/src/app/assistants/edit/[id]/page.tsx
+++ b/web/src/app/assistants/edit/[id]/page.tsx
@@ -1,14 +1,15 @@
 import { ErrorCallout } from "@/components/ErrorCallout";
-import { Card } from "@tremor/react";
+import { Card, Text, Title } from "@tremor/react";
 import { HeaderWrapper } from "@/components/header/HeaderWrapper";
 import { FiChevronLeft } from "react-icons/fi";
 import Link from "next/link";
 import { AssistantEditor } from "@/app/admin/assistants/AssistantEditor";
 import { SuccessfulPersonaUpdateRedirectType } from "@/app/admin/assistants/enums";
-import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { fetchAssistantEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { DeletePersonaButton } from "@/app/admin/assistants/[id]/DeletePersonaButton";
 
 export default async function Page({ params }: { params: { id: string } }) {
-  const [values, error] = await fetchPersonaEditorInfoSS(params.id);
+  const [values, error] = await fetchAssistantEditorInfoSS(params.id);
 
   let body;
   if (!values) {
@@ -29,6 +30,17 @@ export default async function Page({ params }: { params: { id: string } }) {
                 redirectType={SuccessfulPersonaUpdateRedirectType.CHAT}
               />
             </Card>
+
+            <Title className="mt-12">Delete Assistant</Title>
+            <Text>
+              Click the button below to permanently delete this assistant.
+            </Text>
+            <div className="flex mt-6">
+              <DeletePersonaButton
+                personaId={values.existingPersona!.id}
+                redirectType={SuccessfulPersonaUpdateRedirectType.CHAT}
+              />
+            </div>
           </div>
         </div>
       </div>
diff --git a/web/src/app/assistants/new/page.tsx b/web/src/app/assistants/new/page.tsx
index fed21b26e50..1e17e553b85 100644
--- a/web/src/app/assistants/new/page.tsx
+++ b/web/src/app/assistants/new/page.tsx
@@ -4,11 +4,11 @@ import { FiChevronLeft } from "react-icons/fi";
 import Link from "next/link";
 import { AssistantEditor } from "@/app/admin/assistants/AssistantEditor";
 import { SuccessfulPersonaUpdateRedirectType } from "@/app/admin/assistants/enums";
-import { fetchPersonaEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
+import { fetchAssistantEditorInfoSS } from "@/lib/assistants/fetchPersonaEditorInfoSS";
 import { ErrorCallout } from "@/components/ErrorCallout";
 
 export default async function Page() {
-  const [values, error] = await fetchPersonaEditorInfoSS();
+  const [values, error] = await fetchAssistantEditorInfoSS();
 
   let body;
   if (!values) {
diff --git a/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts b/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
index ad01f19f77e..bba6e8b5314 100644
--- a/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
+++ b/web/src/lib/assistants/fetchPersonaEditorInfoSS.ts
@@ -3,7 +3,7 @@ import { CCPairBasicInfo, DocumentSet, User } from "../types";
 import { getCurrentUserSS } from "../userSS";
 import { fetchSS } from "../utilsSS";
 
-export async function fetchPersonaEditorInfoSS(
+export async function fetchAssistantEditorInfoSS(
   personaId?: number | string
 ): Promise<
   | [

From b32758b1823ddac050889240c26429ad1546ba9a Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 25 Mar 2024 15:06:21 +0800
Subject: [PATCH 09/25] Setup our own workflows to build and publish images
 (#1)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 ...ar-build-push-backend-container-on-tag.yml | 68 +++++++++++++++++++
 ...ild-push-model-server-container-on-tag.yml | 68 +++++++++++++++++++
 .../gar-build-push-web-container-on-tag.yml   | 68 +++++++++++++++++++
 3 files changed, 204 insertions(+)
 create mode 100644 .github/workflows/gar-build-push-backend-container-on-tag.yml
 create mode 100644 .github/workflows/gar-build-push-model-server-container-on-tag.yml
 create mode 100644 .github/workflows/gar-build-push-web-container-on-tag.yml

diff --git a/.github/workflows/gar-build-push-backend-container-on-tag.yml b/.github/workflows/gar-build-push-backend-container-on-tag.yml
new file mode 100644
index 00000000000..538e4e9b902
--- /dev/null
+++ b/.github/workflows/gar-build-push-backend-container-on-tag.yml
@@ -0,0 +1,68 @@
+name: Build and Push Web Image on Tag
+
+on:
+  push:
+    tags:
+      - "*"
+
+env:
+  GarProjectID: ${{ vars.GCR_PROJECT_ID }}
+  GarImageName: prod-danswer-backend-gke
+  GarRepo: mv-danswer
+  GarCacheRepo: mv-apps-container-cache
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Git repository
+        uses: actions/checkout@v4
+
+      - name: Authenticate to Google Cloud
+        id: auth
+        uses: google-github-actions/auth@v2
+        with:
+          token_format: access_token
+          workload_identity_provider: ${{ secrets.GCP_WIP }}
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v2
+
+      - name: Login to GAR
+        uses: docker/login-action@v3
+        with:
+          registry: us-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+
+      - uses: docker/metadata-action@v5
+        id: metadata
+        with:
+          images: |
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:${{ github.ref_name }}
+
+      - name: Web Image Docker Build and Push
+        uses: int128/kaniko-action@v1
+        with:
+          context: ./backend
+          file: ./backend/Dockerfile
+          push: true
+          cache: true
+          cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          kaniko-args: |
+            --snapshot-mode=redo
+            --cache-ttl=730h
+          tags: |
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:${{ github.ref_name }}
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:latest
+          build-args: |
+            DANSWER_VERSION=${{ github.ref_name }}
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: docker.io/danswer/danswer-web-server:${{ github.ref_name }}
+          severity: "CRITICAL,HIGH"
diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
new file mode 100644
index 00000000000..c1191412c10
--- /dev/null
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -0,0 +1,68 @@
+name: Build and Push Web Image on Tag
+
+on:
+  push:
+    tags:
+      - "*"
+
+env:
+  GarProjectID: ${{ vars.GCR_PROJECT_ID }}
+  GarImageName: prod-danswer-model-server-gke
+  GarRepo: mv-danswer
+  GarCacheRepo: mv-apps-container-cache
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Git repository
+        uses: actions/checkout@v4
+
+      - name: Authenticate to Google Cloud
+        id: auth
+        uses: google-github-actions/auth@v2
+        with:
+          token_format: access_token
+          workload_identity_provider: ${{ secrets.GCP_WIP }}
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v2
+
+      - name: Login to GAR
+        uses: docker/login-action@v3
+        with:
+          registry: us-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+
+      - uses: docker/metadata-action@v5
+        id: metadata
+        with:
+          images: |
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:${{ github.ref_name }}
+
+      - name: Web Image Docker Build and Push
+        uses: int128/kaniko-action@v1
+        with:
+          context: ./backend
+          file: ./backend/Dockerfile
+          push: true
+          cache: true
+          cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          kaniko-args: |
+            --snapshot-mode=redo
+            --cache-ttl=730h
+          tags: |
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:${{ github.ref_name }}
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:latest
+          build-args: |
+            DANSWER_VERSION=${{ github.ref_name }}
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: docker.io/danswer/danswer-web-server:${{ github.ref_name }}
+          severity: "CRITICAL,HIGH"
diff --git a/.github/workflows/gar-build-push-web-container-on-tag.yml b/.github/workflows/gar-build-push-web-container-on-tag.yml
new file mode 100644
index 00000000000..b9912478570
--- /dev/null
+++ b/.github/workflows/gar-build-push-web-container-on-tag.yml
@@ -0,0 +1,68 @@
+name: Build and Push Web Image on Tag
+
+on:
+  push:
+    tags:
+      - "*"
+
+env:
+  GarProjectID: ${{ vars.GCR_PROJECT_ID }}
+  GarImageName: prod-danswer-web-server-gke
+  GarRepo: mv-danswer
+  GarCacheRepo: mv-apps-container-cache
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Git repository
+        uses: actions/checkout@v4
+
+      - name: Authenticate to Google Cloud
+        id: auth
+        uses: google-github-actions/auth@v2
+        with:
+          token_format: access_token
+          workload_identity_provider: ${{ secrets.GCP_WIP }}
+          service_account: ${{ secrets.GCP_SA_EMAIL }}
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v2
+
+      - name: Login to GAR
+        uses: docker/login-action@v3
+        with:
+          registry: us-docker.pkg.dev
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+
+      - uses: docker/metadata-action@v5
+        id: metadata
+        with:
+          images: |
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:${{ github.ref_name }}
+
+      - name: Web Image Docker Build and Push
+        uses: int128/kaniko-action@v1
+        with:
+          context: ./web
+          file: ./web/Dockerfile
+          push: true
+          cache: true
+          cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          kaniko-args: |
+            --snapshot-mode=redo
+            --cache-ttl=730h
+          tags: |
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:${{ github.ref_name }}
+            us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:latest
+          build-args: |
+            DANSWER_VERSION=${{ github.ref_name }}
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: docker.io/danswer/danswer-web-server:${{ github.ref_name }}
+          severity: "CRITICAL,HIGH"

From d15c05aa9c57b1e3194ecf4f699cd9c656815487 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 25 Mar 2024 15:21:34 +0800
Subject: [PATCH 10/25] Rename workflow names (#2)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 .github/workflows/gar-build-push-backend-container-on-tag.yml   | 2 +-
 .../workflows/gar-build-push-model-server-container-on-tag.yml  | 2 +-
 .github/workflows/gar-build-push-web-container-on-tag.yml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gar-build-push-backend-container-on-tag.yml b/.github/workflows/gar-build-push-backend-container-on-tag.yml
index 538e4e9b902..eab356d89ea 100644
--- a/.github/workflows/gar-build-push-backend-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-backend-container-on-tag.yml
@@ -1,4 +1,4 @@
-name: Build and Push Web Image on Tag
+name: (GAR) Build and Push Web Image on Tag
 
 on:
   push:
diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
index c1191412c10..3087c31272c 100644
--- a/.github/workflows/gar-build-push-model-server-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -1,4 +1,4 @@
-name: Build and Push Web Image on Tag
+name: (GAR) Build and Push Web Image on Tag
 
 on:
   push:
diff --git a/.github/workflows/gar-build-push-web-container-on-tag.yml b/.github/workflows/gar-build-push-web-container-on-tag.yml
index b9912478570..40b9faefeb9 100644
--- a/.github/workflows/gar-build-push-web-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-web-container-on-tag.yml
@@ -1,4 +1,4 @@
-name: Build and Push Web Image on Tag
+name: (GAR) Build and Push Web Image on Tag
 
 on:
   push:

From d84f1ea20ab9255cf49b47fae384f6b60ef388ac Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 25 Mar 2024 15:41:00 +0800
Subject: [PATCH 11/25] Adding required permission for the jobs (#3)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 .github/workflows/gar-build-push-backend-container-on-tag.yml | 4 ++++
 .../gar-build-push-model-server-container-on-tag.yml          | 4 ++++
 .github/workflows/gar-build-push-web-container-on-tag.yml     | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/.github/workflows/gar-build-push-backend-container-on-tag.yml b/.github/workflows/gar-build-push-backend-container-on-tag.yml
index eab356d89ea..91cf5b0f80b 100644
--- a/.github/workflows/gar-build-push-backend-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-backend-container-on-tag.yml
@@ -13,6 +13,10 @@ env:
 
 jobs:
   build-and-push:
+    permissions:
+      contents: read
+      id-token: write
+
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
index 3087c31272c..67c4d373fd5 100644
--- a/.github/workflows/gar-build-push-model-server-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -13,6 +13,10 @@ env:
 
 jobs:
   build-and-push:
+    permissions:
+      contents: read
+      id-token: write
+
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/gar-build-push-web-container-on-tag.yml b/.github/workflows/gar-build-push-web-container-on-tag.yml
index 40b9faefeb9..3826335900c 100644
--- a/.github/workflows/gar-build-push-web-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-web-container-on-tag.yml
@@ -13,6 +13,10 @@ env:
 
 jobs:
   build-and-push:
+    permissions:
+      contents: read
+      id-token: write
+
     runs-on: ubuntu-latest
 
     steps:

From 12fe565a16b08e7d5afac1c10e0f16655930b9ec Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 25 Mar 2024 15:57:26 +0800
Subject: [PATCH 12/25] Fix the wrong parameter on the model server build
 workflow (#4)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 .../workflows/gar-build-push-model-server-container-on-tag.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
index 67c4d373fd5..9e9c18a6857 100644
--- a/.github/workflows/gar-build-push-model-server-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -51,7 +51,7 @@ jobs:
         uses: int128/kaniko-action@v1
         with:
           context: ./backend
-          file: ./backend/Dockerfile
+          file: ./backend/Dockerfile.model_server
           push: true
           cache: true
           cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}

From 2791fb79bd5c72f40509a20de7c9fcecd1b58c53 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Tue, 26 Mar 2024 14:18:41 +0800
Subject: [PATCH 13/25] Remove Trivy step since we are not using it (#5)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 .../workflows/gar-build-push-backend-container-on-tag.yml   | 6 ------
 .../gar-build-push-model-server-container-on-tag.yml        | 6 ------
 .github/workflows/gar-build-push-web-container-on-tag.yml   | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/.github/workflows/gar-build-push-backend-container-on-tag.yml b/.github/workflows/gar-build-push-backend-container-on-tag.yml
index 91cf5b0f80b..34741f886c6 100644
--- a/.github/workflows/gar-build-push-backend-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-backend-container-on-tag.yml
@@ -64,9 +64,3 @@ jobs:
             us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:latest
           build-args: |
             DANSWER_VERSION=${{ github.ref_name }}
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: docker.io/danswer/danswer-web-server:${{ github.ref_name }}
-          severity: "CRITICAL,HIGH"
diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
index 9e9c18a6857..dd2a51500b0 100644
--- a/.github/workflows/gar-build-push-model-server-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -64,9 +64,3 @@ jobs:
             us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:latest
           build-args: |
             DANSWER_VERSION=${{ github.ref_name }}
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: docker.io/danswer/danswer-web-server:${{ github.ref_name }}
-          severity: "CRITICAL,HIGH"
diff --git a/.github/workflows/gar-build-push-web-container-on-tag.yml b/.github/workflows/gar-build-push-web-container-on-tag.yml
index 3826335900c..64be9eca49a 100644
--- a/.github/workflows/gar-build-push-web-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-web-container-on-tag.yml
@@ -64,9 +64,3 @@ jobs:
             us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarRepo }}/${{ env.GarImageName }}:latest
           build-args: |
             DANSWER_VERSION=${{ github.ref_name }}
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: docker.io/danswer/danswer-web-server:${{ github.ref_name }}
-          severity: "CRITICAL,HIGH"

From 2ebb8b0a77d87892803e331e72d014d6cb7d8269 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Tue, 26 Mar 2024 14:40:49 +0800
Subject: [PATCH 14/25] build arm64 images (#6)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 .github/workflows/gar-build-push-backend-container-on-tag.yml    | 1 +
 .../workflows/gar-build-push-model-server-container-on-tag.yml   | 1 +
 .github/workflows/gar-build-push-web-container-on-tag.yml        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/gar-build-push-backend-container-on-tag.yml b/.github/workflows/gar-build-push-backend-container-on-tag.yml
index 34741f886c6..dc6a876e6bb 100644
--- a/.github/workflows/gar-build-push-backend-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-backend-container-on-tag.yml
@@ -57,6 +57,7 @@ jobs:
           cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
           labels: ${{ steps.metadata.outputs.labels }}
           kaniko-args: |
+            --custom-platform=linux/arm64
             --snapshot-mode=redo
             --cache-ttl=730h
           tags: |
diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
index dd2a51500b0..ec0d882da73 100644
--- a/.github/workflows/gar-build-push-model-server-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -57,6 +57,7 @@ jobs:
           cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
           labels: ${{ steps.metadata.outputs.labels }}
           kaniko-args: |
+            --custom-platform=linux/arm64
             --snapshot-mode=redo
             --cache-ttl=730h
           tags: |
diff --git a/.github/workflows/gar-build-push-web-container-on-tag.yml b/.github/workflows/gar-build-push-web-container-on-tag.yml
index 64be9eca49a..4f0a62c206a 100644
--- a/.github/workflows/gar-build-push-web-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-web-container-on-tag.yml
@@ -57,6 +57,7 @@ jobs:
           cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
           labels: ${{ steps.metadata.outputs.labels }}
           kaniko-args: |
+            --custom-platform=linux/arm64
             --snapshot-mode=redo
             --cache-ttl=730h
           tags: |

From 1cae579aec6b4531341a8231ff91863af9ea1644 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Tue, 26 Mar 2024 15:10:03 +0800
Subject: [PATCH 15/25] Revert "build arm64 images (#6)" (#7)

This reverts commit d78181dcc4648c7f39e1042927ff8d56bd2d2556.
---
 .github/workflows/gar-build-push-backend-container-on-tag.yml    | 1 -
 .../workflows/gar-build-push-model-server-container-on-tag.yml   | 1 -
 .github/workflows/gar-build-push-web-container-on-tag.yml        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.github/workflows/gar-build-push-backend-container-on-tag.yml b/.github/workflows/gar-build-push-backend-container-on-tag.yml
index dc6a876e6bb..34741f886c6 100644
--- a/.github/workflows/gar-build-push-backend-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-backend-container-on-tag.yml
@@ -57,7 +57,6 @@ jobs:
           cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
           labels: ${{ steps.metadata.outputs.labels }}
           kaniko-args: |
-            --custom-platform=linux/arm64
             --snapshot-mode=redo
             --cache-ttl=730h
           tags: |
diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
index ec0d882da73..dd2a51500b0 100644
--- a/.github/workflows/gar-build-push-model-server-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -57,7 +57,6 @@ jobs:
           cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
           labels: ${{ steps.metadata.outputs.labels }}
           kaniko-args: |
-            --custom-platform=linux/arm64
             --snapshot-mode=redo
             --cache-ttl=730h
           tags: |
diff --git a/.github/workflows/gar-build-push-web-container-on-tag.yml b/.github/workflows/gar-build-push-web-container-on-tag.yml
index 4f0a62c206a..64be9eca49a 100644
--- a/.github/workflows/gar-build-push-web-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-web-container-on-tag.yml
@@ -57,7 +57,6 @@ jobs:
           cache-repository: us-docker.pkg.dev/${{ env.GarProjectID }}/${{ env.GarCacheRepo }}/${{ env.GarImageName }}
           labels: ${{ steps.metadata.outputs.labels }}
           kaniko-args: |
-            --custom-platform=linux/arm64
             --snapshot-mode=redo
             --cache-ttl=730h
           tags: |

From 120f2fa2f0246be0243b78f1c9db3015e0cdbc8c Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Fri, 19 Apr 2024 20:20:47 +0800
Subject: [PATCH 16/25] Add API health check (#8)

* Add API health check

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* Change library

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* reformatted

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

---------

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/main.py          | 7 +++++++
 backend/requirements/default.txt | 1 +
 2 files changed, 8 insertions(+)

diff --git a/backend/danswer/main.py b/backend/danswer/main.py
index 8e27482ae07..115cc2a4e57 100644
--- a/backend/danswer/main.py
+++ b/backend/danswer/main.py
@@ -7,10 +7,12 @@
 import uvicorn
 from fastapi import APIRouter
 from fastapi import FastAPI
+ 
 from fastapi import Request
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
+from fastapi_health import health
 from httpx_oauth.clients.google import GoogleOAuth2
 from sqlalchemy.orm import Session
 
@@ -346,6 +348,11 @@ def get_application() -> FastAPI:
         RequestValidationError, validation_exception_handler
     )
 
+    def healthz_check():
+        return True
+ 
+    application.add_api_route("/healthz", health([healthz_check]))
+
     application.add_exception_handler(ValueError, value_error_handler)
 
     application.add_middleware(
diff --git a/backend/requirements/default.txt b/backend/requirements/default.txt
index eab0f89357a..b559d178cb6 100644
--- a/backend/requirements/default.txt
+++ b/backend/requirements/default.txt
@@ -9,6 +9,7 @@ dask==2023.8.1
 ddtrace==2.6.5
 distributed==2023.8.1
 fastapi==0.109.2
+fastapi-health==0.4.0
 fastapi-users==12.1.3
 fastapi-users-db-sqlalchemy==5.0.0
 filelock==3.12.0

From e3a77193ebc2ec5d9464bae0985f1e048f7026cc Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Sat, 20 Apr 2024 17:04:04 +0800
Subject: [PATCH 17/25] chore/debugging celery (#9)

* Enable debug logging for Celery

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* Renaming workflows

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

---------

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 .github/workflows/gar-build-push-backend-container-on-tag.yml | 2 +-
 .../gar-build-push-model-server-container-on-tag.yml          | 2 +-
 backend/supervisord.conf                                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gar-build-push-backend-container-on-tag.yml b/.github/workflows/gar-build-push-backend-container-on-tag.yml
index 34741f886c6..bd63a6c7487 100644
--- a/.github/workflows/gar-build-push-backend-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-backend-container-on-tag.yml
@@ -1,4 +1,4 @@
-name: (GAR) Build and Push Web Image on Tag
+name: (GAR) Build and Push Backend Image on Tag
 
 on:
   push:
diff --git a/.github/workflows/gar-build-push-model-server-container-on-tag.yml b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
index dd2a51500b0..2d6d8263ef0 100644
--- a/.github/workflows/gar-build-push-model-server-container-on-tag.yml
+++ b/.github/workflows/gar-build-push-model-server-container-on-tag.yml
@@ -1,4 +1,4 @@
-name: (GAR) Build and Push Web Image on Tag
+name: (GAR) Build and Push Model Server Image on Tag
 
 on:
   push:
diff --git a/backend/supervisord.conf b/backend/supervisord.conf
index c8d8274fc5c..91d13f3cbe0 100644
--- a/backend/supervisord.conf
+++ b/backend/supervisord.conf
@@ -25,7 +25,7 @@ autorestart=true
 # relatively compute-light (e.g. they tend to just make a bunch of requests to 
 # Vespa / Postgres)
 [program:celery_worker]
-command=celery -A danswer.background.celery worker --pool=threads --autoscale=3,10 --loglevel=INFO --logfile=/var/log/celery_worker.log
+command=celery -A danswer.background.celery worker --pool=threads --autoscale=3,10 --loglevel=DEBUG --logfile=/var/log/celery_worker.log
 stdout_logfile=/var/log/celery_worker_supervisor.log
 stdout_logfile_maxbytes=52428800
 redirect_stderr=true
@@ -33,7 +33,7 @@ autorestart=true
 
 # Job scheduler for periodic tasks
 [program:celery_beat]
-command=celery -A danswer.background.celery beat --loglevel=INFO --logfile=/var/log/celery_beat.log
+command=celery -A danswer.background.celery beat --loglevel=DEBUG --logfile=/var/log/celery_beat.log
 stdout_logfile=/var/log/celery_beat_supervisor.log
 stdout_logfile_maxbytes=52428800
 redirect_stderr=true

From 43cdee56991dd39eb6794ea7cfcf8c43e943ca0c Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Sat, 20 Apr 2024 17:51:50 +0800
Subject: [PATCH 18/25] Disable sslmode (#10)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/db/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/danswer/db/engine.py b/backend/danswer/db/engine.py
index 1be57179c70..0efffff59d6 100644
--- a/backend/danswer/db/engine.py
+++ b/backend/danswer/db/engine.py
@@ -52,7 +52,7 @@ def build_connection_string(
     port: str = POSTGRES_PORT,
     db: str = POSTGRES_DB,
 ) -> str:
-    return f"postgresql+{db_api}://{user}:{password}@{host}:{port}/{db}"
+    return f"postgresql+{db_api}://{user}:{password}@{host}:{port}/{db}?sslmode=disable"
 
 
 def get_sqlalchemy_engine() -> Engine:

From 01a9e04a68b2acca8cb8994351773a4667789c94 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Sat, 20 Apr 2024 18:29:45 +0800
Subject: [PATCH 19/25] Use proper sqlalchemy connection arguments (#11)

* Use proper sqlalchemy connection arguments

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* Format code

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

---------

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/db/engine.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/danswer/db/engine.py b/backend/danswer/db/engine.py
index 0efffff59d6..edb3efcac4e 100644
--- a/backend/danswer/db/engine.py
+++ b/backend/danswer/db/engine.py
@@ -52,22 +52,28 @@ def build_connection_string(
     port: str = POSTGRES_PORT,
     db: str = POSTGRES_DB,
 ) -> str:
-    return f"postgresql+{db_api}://{user}:{password}@{host}:{port}/{db}?sslmode=disable"
+    return f"postgresql+{db_api}://{user}:{password}@{host}:{port}/{db}"
 
 
 def get_sqlalchemy_engine() -> Engine:
+    connect_args = {"sslmode": "disable"}
     global _SYNC_ENGINE
     if _SYNC_ENGINE is None:
         connection_string = build_connection_string(db_api=SYNC_DB_API)
-        _SYNC_ENGINE = create_engine(connection_string, pool_size=50, max_overflow=25)
+        _SYNC_ENGINE = create_engine(
+            connection_string, pool_size=50, max_overflow=25, connect_args=connect_args
+        )
     return _SYNC_ENGINE
 
 
 def get_sqlalchemy_async_engine() -> AsyncEngine:
+    connect_args = {"sslmode": "disable"}
     global _ASYNC_ENGINE
     if _ASYNC_ENGINE is None:
         connection_string = build_connection_string()
-        _ASYNC_ENGINE = create_async_engine(connection_string)
+        _ASYNC_ENGINE = create_async_engine(
+            connection_string, connect_args=connect_args
+        )
     return _ASYNC_ENGINE
 
 

From e826e38fe6f7cc8eee9b541bfa877b0bd56fda75 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Sat, 20 Apr 2024 21:04:51 +0800
Subject: [PATCH 20/25] Use a different config args for aysnc db (#12)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/db/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/danswer/db/engine.py b/backend/danswer/db/engine.py
index edb3efcac4e..021982a9c86 100644
--- a/backend/danswer/db/engine.py
+++ b/backend/danswer/db/engine.py
@@ -67,7 +67,7 @@ def get_sqlalchemy_engine() -> Engine:
 
 
 def get_sqlalchemy_async_engine() -> AsyncEngine:
-    connect_args = {"sslmode": "disable"}
+    connect_args = {"ssl": "disable"}
     global _ASYNC_ENGINE
     if _ASYNC_ENGINE is None:
         connection_string = build_connection_string()

From ec8b8bf1880e061f9b52c855b2a8570ed10d277b Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 22 Apr 2024 10:20:29 +0800
Subject: [PATCH 21/25] Use redis as broker (#13)

* Use redis as broker

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* Fix code syntax

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

---------

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/background/celery/celery.py | 3 ++-
 backend/requirements/default.txt            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/danswer/background/celery/celery.py b/backend/danswer/background/celery/celery.py
index 408f12f3a0f..902aaac8ca8 100644
--- a/backend/danswer/background/celery/celery.py
+++ b/backend/danswer/background/celery/celery.py
@@ -37,7 +37,8 @@
 logger = setup_logger()
 
 connection_string = build_connection_string(db_api=SYNC_DB_API)
-celery_broker_url = f"sqla+{connection_string}"
+# celery_broker_url = f"sqla+{connection_string}"
+celery_broker_url = "redis://redis-server-service:6379/0"
 celery_backend_url = f"db+{connection_string}"
 celery_app = Celery(__name__, broker=celery_broker_url, backend=celery_backend_url)
 
diff --git a/backend/requirements/default.txt b/backend/requirements/default.txt
index b559d178cb6..b7f61e26057 100644
--- a/backend/requirements/default.txt
+++ b/backend/requirements/default.txt
@@ -3,7 +3,7 @@ alembic==1.10.4
 asyncpg==0.27.0
 atlassian-python-api==3.37.0
 beautifulsoup4==4.12.2
-celery==5.3.4
+celery[redis]==5.4.0
 chardet==5.2.0
 dask==2023.8.1
 ddtrace==2.6.5

From f0e8e7c75612491f9eb41531c28e6a729e0f7e00 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 22 Apr 2024 12:45:54 +0800
Subject: [PATCH 22/25] chore/use redis as broker (#15)

* Fix formatting

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* User older version of celery

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* Fix formatting

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

---------

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/main.py          | 19 +++++++++++--------
 backend/requirements/default.txt |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/danswer/main.py b/backend/danswer/main.py
index 115cc2a4e57..6da0847fc03 100644
--- a/backend/danswer/main.py
+++ b/backend/danswer/main.py
@@ -7,7 +7,6 @@
 import uvicorn
 from fastapi import APIRouter
 from fastapi import FastAPI
- 
 from fastapi import Request
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
@@ -224,9 +223,11 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
         logger.info("Verifying Document Index(s) is/are available.")
         document_index = get_default_document_index(
             primary_index_name=db_embedding_model.index_name,
-            secondary_index_name=secondary_db_embedding_model.index_name
-            if secondary_db_embedding_model
-            else None,
+            secondary_index_name=(
+                secondary_db_embedding_model.index_name
+                if secondary_db_embedding_model
+                else None
+            ),
         )
         # Vespa startup is a bit slow, so give it a few seconds
         wait_time = 5
@@ -234,9 +235,11 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
             try:
                 document_index.ensure_indices_exist(
                     index_embedding_dim=db_embedding_model.model_dim,
-                    secondary_index_embedding_dim=secondary_db_embedding_model.model_dim
-                    if secondary_db_embedding_model
-                    else None,
+                    secondary_index_embedding_dim=(
+                        secondary_db_embedding_model.model_dim
+                        if secondary_db_embedding_model
+                        else None
+                    ),
                 )
                 break
             except Exception:
@@ -350,7 +353,7 @@ def get_application() -> FastAPI:
 
     def healthz_check():
         return True
- 
+
     application.add_api_route("/healthz", health([healthz_check]))
 
     application.add_exception_handler(ValueError, value_error_handler)
diff --git a/backend/requirements/default.txt b/backend/requirements/default.txt
index b7f61e26057..8832eba4c01 100644
--- a/backend/requirements/default.txt
+++ b/backend/requirements/default.txt
@@ -3,7 +3,7 @@ alembic==1.10.4
 asyncpg==0.27.0
 atlassian-python-api==3.37.0
 beautifulsoup4==4.12.2
-celery[redis]==5.4.0
+celery[redis]==5.3.4
 chardet==5.2.0
 dask==2023.8.1
 ddtrace==2.6.5

From 0e5d823c460e97af17daf6085b196a68e5c6cd84 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 22 Apr 2024 13:06:29 +0800
Subject: [PATCH 23/25] Remove custom healthz endpoint (#16)

* Remove custom healthz endpoint

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* Removing unused import

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

---------

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/main.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/backend/danswer/main.py b/backend/danswer/main.py
index 6da0847fc03..f505cb448ff 100644
--- a/backend/danswer/main.py
+++ b/backend/danswer/main.py
@@ -11,7 +11,6 @@
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
-from fastapi_health import health
 from httpx_oauth.clients.google import GoogleOAuth2
 from sqlalchemy.orm import Session
 
@@ -351,11 +350,6 @@ def get_application() -> FastAPI:
         RequestValidationError, validation_exception_handler
     )
 
-    def healthz_check():
-        return True
-
-    application.add_api_route("/healthz", health([healthz_check]))
-
     application.add_exception_handler(ValueError, value_error_handler)
 
     application.add_middleware(

From 833c05a119513aff6a197e538170ddbe18a9cc35 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 22 Apr 2024 13:35:20 +0800
Subject: [PATCH 24/25] Disable autoscale in celery (#17)

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/supervisord.conf b/backend/supervisord.conf
index 91d13f3cbe0..b2792f83eed 100644
--- a/backend/supervisord.conf
+++ b/backend/supervisord.conf
@@ -25,7 +25,7 @@ autorestart=true
 # relatively compute-light (e.g. they tend to just make a bunch of requests to 
 # Vespa / Postgres)
 [program:celery_worker]
-command=celery -A danswer.background.celery worker --pool=threads --autoscale=3,10 --loglevel=DEBUG --logfile=/var/log/celery_worker.log
+command=celery -A danswer.background.celery worker --pool=threads --loglevel=DEBUG --logfile=/var/log/celery_worker.log
 stdout_logfile=/var/log/celery_worker_supervisor.log
 stdout_logfile_maxbytes=52428800
 redirect_stderr=true

From c6d7ee25b987ec1e71f405c16ce90ac2e8a51507 Mon Sep 17 00:00:00 2001
From: Alex Co <tuanclq@gmail.com>
Date: Mon, 22 Apr 2024 13:54:04 +0800
Subject: [PATCH 25/25] Disable sqlalchemy connection pooling (#18)

* Disable sqlalchemy connection pooling

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

* Formatting code

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>

---------

Signed-off-by: Alex Co <alex.tuan@mindvalley.com>
---
 backend/danswer/db/engine.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/danswer/db/engine.py b/backend/danswer/db/engine.py
index 021982a9c86..7d468048b62 100644
--- a/backend/danswer/db/engine.py
+++ b/backend/danswer/db/engine.py
@@ -12,6 +12,7 @@
 from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import sessionmaker
+from sqlalchemy.pool import NullPool
 
 from danswer.configs.app_configs import POSTGRES_DB
 from danswer.configs.app_configs import POSTGRES_HOST
@@ -61,7 +62,7 @@ def get_sqlalchemy_engine() -> Engine:
     if _SYNC_ENGINE is None:
         connection_string = build_connection_string(db_api=SYNC_DB_API)
         _SYNC_ENGINE = create_engine(
-            connection_string, pool_size=50, max_overflow=25, connect_args=connect_args
+            connection_string, poolclass=NullPool, connect_args=connect_args
         )
     return _SYNC_ENGINE