UX clarity + minor new features (#2136)

backend/ee/danswer/server/auth_check.py

@@ -8,6 +8,7 @@ EE_PUBLIC_ENDPOINT_SPECS = PUBLIC_ENDPOINT_SPECS + [
     # needs to be accessible prior to user login
     ("/enterprise-settings", {"GET"}),
     ("/enterprise-settings/logo", {"GET"}),
+    ("/enterprise-settings/logotype", {"GET"}),
     ("/enterprise-settings/custom-analytics-script", {"GET"}),
     # oidc
     ("/auth/oidc/authorize", {"GET"}),

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

@@ -12,6 +12,7 @@ from danswer.file_store.file_store import get_default_file_store
 from ee.danswer.server.enterprise_settings.models import AnalyticsScriptUpload
 from ee.danswer.server.enterprise_settings.models import EnterpriseSettings
 from ee.danswer.server.enterprise_settings.store import _LOGO_FILENAME
+from ee.danswer.server.enterprise_settings.store import _LOGOTYPE_FILENAME
 from ee.danswer.server.enterprise_settings.store import load_analytics_script
 from ee.danswer.server.enterprise_settings.store import load_settings
 from ee.danswer.server.enterprise_settings.store import store_analytics_script
@@ -41,22 +42,38 @@ def fetch_settings() -> EnterpriseSettings:
 @admin_router.put("/logo")
 def put_logo(
     file: UploadFile,
+    is_logotype: bool = False,
     db_session: Session = Depends(get_session),
     _: User | None = Depends(current_admin_user),
 ) -> None:
-    upload_logo(file=file, db_session=db_session)
+    upload_logo(file=file, db_session=db_session, is_logotype=is_logotype)
 
 
-@basic_router.get("/logo")
-def fetch_logo(db_session: Session = Depends(get_session)) -> Response:
+def fetch_logo_or_logotype(is_logotype: bool, db_session: Session) -> Response:
     try:
         file_store = get_default_file_store(db_session)
-        file_io = file_store.read_file(_LOGO_FILENAME, mode="b")
+        filename = _LOGOTYPE_FILENAME if is_logotype else _LOGO_FILENAME
+        file_io = file_store.read_file(filename, mode="b")
         # NOTE: specifying "image/jpeg" here, but it still works for pngs
         # TODO: do this properly
         return Response(content=file_io.read(), media_type="image/jpeg")
     except Exception:
-        raise HTTPException(status_code=404, detail="No logo file found")
+        raise HTTPException(
+            status_code=404,
+            detail=f"No {'logotype' if is_logotype else 'logo'} file found",
+        )
+
+
+@basic_router.get("/logotype")
+def fetch_logotype(db_session: Session = Depends(get_session)) -> Response:
+    return fetch_logo_or_logotype(is_logotype=True, db_session=db_session)
+
+
+@basic_router.get("/logo")
+def fetch_logo(
+    is_logotype: bool = False, db_session: Session = Depends(get_session)
+) -> Response:
+    return fetch_logo_or_logotype(is_logotype=is_logotype, db_session=db_session)
 
 
 @admin_router.put("/custom-analytics-script")

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

@@ -8,8 +8,10 @@ class EnterpriseSettings(BaseModel):
 
     application_name: str | None = None
     use_custom_logo: bool = False
+    use_custom_logotype: bool = False
 
     # custom Chat components
+    custom_lower_disclaimer_content: str | None = None
     custom_header_content: str | None = None
     custom_popup_header: str | None = None
     custom_popup_content: str | None = None

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

@@ -63,6 +63,7 @@ def store_analytics_script(analytics_script_upload: AnalyticsScriptUpload) -> No
 
 
 _LOGO_FILENAME = "__logo__"
+_LOGOTYPE_FILENAME = "__logotype__"
 
 
 def is_valid_file_type(filename: str) -> bool:
@@ -79,8 +80,7 @@ def guess_file_type(filename: str) -> str:
 
 
 def upload_logo(
-    db_session: Session,
-    file: UploadFile | str,
+    db_session: Session, file: UploadFile | str, is_logotype: bool = False
 ) -> bool:
     content: IO[Any]
 
@@ -111,7 +111,7 @@ def upload_logo(
 
     file_store = get_default_file_store(db_session)
     file_store.save_file(
-        file_name=_LOGO_FILENAME,
+        file_name=_LOGOTYPE_FILENAME if is_logotype else _LOGO_FILENAME,
         content=content,
         display_name=display_name,
         file_origin=FileOrigin.OTHER,