alembic changes

danswer-ai · Sep 6, 2023 · 77c9d33 · 77c9d33
1 parent d3f3a60
commit 77c9d33
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/backend/alembic/versions/5809c0787398_add_chat_sessions.py b/backend/alembic/versions/5809c0787398_add_chat_sessions.py
@@ -58,6 +58,7 @@ def upgrade() -> None:
             "message_type",
             sa.Enum("SYSTEM", "USER", "ASSISTANT", "DANSWER", name="messagetype"),
             nullable=False,
+            native_enum=False,
         ),
         sa.Column(
             "time_sent",

diff --git a/backend/alembic/versions/d929f0c1c6af_feedback_feature.py b/backend/alembic/versions/d929f0c1c6af_feedback_feature.py
@@ -24,13 +24,13 @@ def upgrade() -> None:
         sa.Column("query", sa.String(), nullable=False),
         sa.Column(
             "selected_search_flow",
-            sa.Enum("KEYWORD", "SEMANTIC", name="searchtype"),
+            sa.Enum("KEYWORD", "SEMANTIC", name="searchtype", native_enum=False),
             nullable=True,
         ),
         sa.Column("llm_answer", sa.String(), nullable=True),
         sa.Column(
             "feedback",
-            sa.Enum("LIKE", "DISLIKE", name="qafeedbacktype"),
+            sa.Enum("LIKE", "DISLIKE", name="qafeedbacktype", native_enum=False),
             nullable=True,
         ),
         sa.Column(
@@ -65,6 +65,7 @@ def upgrade() -> None:
                 "HIDE",
                 "UNHIDE",
                 name="searchfeedbacktype",
+                native_enum=False,
             ),
             nullable=True,
         ),

diff --git a/backend/danswer/db/models.py b/backend/danswer/db/models.py
@@ -408,6 +408,6 @@ class ChatMessage(Base):
     message_type: Mapped[MessageType] = mapped_column(Enum(MessageType))
     time_sent: Mapped[datetime.datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now()
-    )  # Assuming a chat history has a timestamp for when the message was sent
+    )
 
     chat_session: Mapped[ChatSession] = relationship("ChatSession")
diff --git a/backend/danswer/server/chat_backend.py b/backend/danswer/server/chat_backend.py
@@ -65,7 +65,10 @@ def get_chat_session_messages(
 ) -> ChatSessionDetailResponse:
     user_id = user.id if user is not None else None
 
-    session = fetch_chat_session_by_id(session_id, db_session)
+    try:
+        session = fetch_chat_session_by_id(session_id, db_session)
+    except ValueError:
+        raise ValueError("Chat Session has been deleted")
 
     if session.deleted:
         raise ValueError("Chat Session has been deleted")