New Assistants + Chat UX

backend/alembic/versions/aeda5f2df4f6_add_pinned_assistants.py

@@ -0,0 +1,26 @@
+"""add pinned assistants
+
+Revision ID: aeda5f2df4f6
+Revises: 2955778aa44c
+Create Date: 2025-01-09 16:04:10.770636
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "aeda5f2df4f6"
+down_revision = "2955778aa44c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "user", sa.Column("pinned_assistants", postgresql.JSONB(), nullable=True)
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("user", "pinned_assistants")

backend/onyx/db/models.py

@@ -162,6 +162,9 @@ class User(SQLAlchemyBaseUserTableUUID, Base):
     recent_assistants: Mapped[list[dict]] = mapped_column(
         postgresql.JSONB(), nullable=False, default=list, server_default="[]"
     )
+    pinned_assistants: Mapped[list[int] | None] = mapped_column(
+        postgresql.JSONB(), nullable=True, default=None
+    )
 
     oidc_expiry: Mapped[datetime.datetime] = mapped_column(
         TIMESTAMPAware(timezone=True), nullable=True

backend/onyx/document_index/vespa/shared_utils/utils.py

@@ -69,3 +69,6 @@ def get_vespa_http_client(no_timeout: bool = False, http2: bool = True) -> httpx
         timeout=None if no_timeout else VESPA_REQUEST_TIMEOUT,
         http2=http2,
     )
+
+
+# from onyx.document_index.vespa.shared_utils.utils import get_vespa_http_client

backend/onyx/server/documents/document.py

@@ -90,6 +90,7 @@ def get_chunk_info(
         min_chunk_ind=chunk_id,
         max_chunk_ind=chunk_id,
     )
+
     inference_chunks = document_index.id_based_retrieval(
         chunk_requests=[chunk_request],
         filters=IndexFilters(access_control_list=user_acl_filters),

backend/onyx/server/manage/models.py

@@ -47,6 +47,7 @@ class UserPreferences(BaseModel):
     recent_assistants: list[int] | None = None
     default_model: str | None = None
     auto_scroll: bool | None = None
+    pinned_assistants: list[int] | None = None
 
 
 class UserInfo(BaseModel):

backend/onyx/server/manage/users.py

@@ -673,6 +673,47 @@ def update_user_default_model(
     db_session.commit()
 
 
+class PinnedAssistantsRequest(BaseModel):
+    assistant_id: int
+
+
+@router.patch("/user/pinned-assistants/{assistant_id}")
+def update_user_pinned_assistants(
+    assistant_id: int,
+    pinned: bool,
+    user: User | None = Depends(current_user),
+    db_session: Session = Depends(get_session),
+) -> None:
+    if user is None:
+        if AUTH_TYPE == AuthType.DISABLED:
+            store = get_kv_store()
+            no_auth_user = fetch_no_auth_user(store)
+            pinned_assistants = no_auth_user.preferences.pinned_assistants or []
+            if pinned and assistant_id not in pinned_assistants:
+                pinned_assistants.append(assistant_id)
+            elif not pinned and assistant_id in pinned_assistants:
+                pinned_assistants.remove(assistant_id)
+            no_auth_user.preferences.pinned_assistants = pinned_assistants
+            set_no_auth_user_preferences(store, no_auth_user.preferences)
+            return
+        else:
+            raise RuntimeError("This should never happen")
+
+    pinned_assistants = UserInfo.from_model(user).preferences.pinned_assistants or []
+    if pinned:
+        if assistant_id not in pinned_assistants:
+            pinned_assistants.append(assistant_id)
+    else:
+        if assistant_id in pinned_assistants:
+            pinned_assistants.remove(assistant_id)
+    db_session.execute(
+        update(User)
+        .where(User.id == user.id)  # type: ignore
+        .values(pinned_assistants=pinned_assistants)
+    )
+    db_session.commit()
+
+
 class ChosenAssistantsRequest(BaseModel):
     chosen_assistants: list[int]
 

package.json

@@ -0,0 +1,8 @@
+{
+  "dependencies": {
+    "react-datepicker": "^7.6.0"
+  },
+  "devDependencies": {
+    "@types/react-datepicker": "^6.2.0"
+  }
+}

web/next.config.js

@@ -13,7 +13,6 @@ const cspHeader = `
     object-src 'none';
     base-uri 'self';
     form-action 'self';
-    frame-ancestors 'none';
     ${
       process.env.NEXT_PUBLIC_CLOUD_ENABLED === "true"
         ? "upgrade-insecure-requests;"
@@ -27,6 +26,17 @@ const nextConfig = {
   publicRuntimeConfig: {
     version,
   },
+  images: {
+    // Used to fetch favicons
+    remotePatterns: [
+      {
+        protocol: "https",
+        hostname: "www.google.com",
+        port: "",
+        pathname: "/s2/favicons/**",
+      },
+    ],
+  },
   async headers() {
     return [
       {
@@ -44,17 +54,12 @@ const nextConfig = {
             key: "Referrer-Policy",
             value: "strict-origin-when-cross-origin",
           },
-          {
-            key: "X-Frame-Options",
-            value: "DENY",
-          },
           {
             key: "X-Content-Type-Options",
             value: "nosniff",
           },
           {
             key: "Permissions-Policy",
-            // Deny all permissions by default
             value:
               "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), cross-origin-isolated=(), display-capture=(), document-domain=(), encrypted-media=(), execution-while-not-rendered=(), execution-while-out-of-viewport=(), fullscreen=(), geolocation=(), gyroscope=(), keyboard-map=(), magnetometer=(), microphone=(), midi=(), navigation-override=(), payment=(), picture-in-picture=(), publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=(), usb=(), web-share=(), xr-spatial-tracking=()",
           },