update models

backend/danswer/configs/app_configs.py

@@ -135,7 +135,7 @@
     os.environ.get("POSTGRES_PASSWORD") or "password"
 )
 POSTGRES_HOST = os.environ.get("POSTGRES_HOST") or "localhost"
-POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5432"
+POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5433"
 POSTGRES_DB = os.environ.get("POSTGRES_DB") or "postgres"
 
 # defaults to False

backend/danswer/db/chat.py

@@ -276,11 +276,13 @@ def update_chat_session(
 
 
 def delete_all_chat_sessions_for_user(
-    user: User, session_type: SessionType, db_session: Session
+    user: User | None, session_type: SessionType, db_session: Session
 ) -> None:
     user_id = user.id if user is not None else None
     query = db_session.query(ChatSession).filter(ChatSession.user_id == user_id)
 
+    if session_type == SessionType.SLACK:
+        raise ValueError("Slack sessions cannot be deleted en masse")
     if session_type == SessionType.CHAT:
         query = query.filter(ChatSession.one_shot.is_(False))  # type: ignore
     elif session_type == SessionType.SEARCH:

backend/danswer/server/query_and_chat/models.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from enum import Enum
 from typing import Any
 
 from pydantic import BaseModel
@@ -9,6 +8,7 @@
 from danswer.configs.constants import DocumentSource
 from danswer.configs.constants import MessageType
 from danswer.configs.constants import SearchFeedbackType
+from danswer.configs.constants import SessionType
 from danswer.db.enums import ChatSessionSharedStatus
 from danswer.file_store.models import FileDescriptor
 from danswer.llm.override_models import LLMOverride
@@ -130,11 +130,6 @@ class ChatSessionUpdateRequest(BaseModel):
     sharing_status: ChatSessionSharedStatus
 
 
-class SessionType(str, Enum):
-    CHAT = "chat"
-    SEARCH = "search"
-
-
 class DeleteAllSessionsRequest(BaseModel):
     session_type: SessionType
 

deployment/docker_compose/docker-compose.dev.yml

@@ -293,7 +293,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5432:5432"
+      - "5433:5432"
     volumes:
       - db_volume:/var/lib/postgresql/data
 

deployment/docker_compose/docker-compose.gpu-dev.yml

@@ -303,7 +303,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5432:5432"
+      - "5433:5432"
     volumes:
       - db_volume:/var/lib/postgresql/data
 

deployment/docker_compose/docker-compose.search-testing.yml

@@ -154,7 +154,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5432"
+      - "5433"
     volumes:
       - db_volume:/var/lib/postgresql/data