highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-09-26 11:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added bool to disable chat_session_id check for search_docs for api

Browse Source
This commit is contained in:
hagen-danswer
2024-09-19 17:29:49 -07:00
committed by Chris Weaver
parent 9f179940f8
commit 16d1c19d9f
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/danswer/chat/process_message.py
View File

@@ -271,6 +271,7 @@ def stream_chat_message_objects(
use_existing_user_message: bool = False, use_existing_user_message: bool = False,
litellm_additional_headers: dict[str, str] | None = None, litellm_additional_headers: dict[str, str] | None = None,
is_connected: Callable[[], bool] | None = None, is_connected: Callable[[], bool] | None = None,
enforce_chat_session_id_for_search_docs: bool = True,
) -> ChatPacketStream: ) -> ChatPacketStream:
"""Streams in order: """Streams in order:
1. [conditional] Retrieved documents if a search needs to be run 1. [conditional] Retrieved documents if a search needs to be run
@@ -442,6 +443,7 @@ def stream_chat_message_objects(
chat_session=chat_session, chat_session=chat_session,
user_id=user_id, user_id=user_id,
db_session=db_session, db_session=db_session,
enforce_chat_session_id_for_search_docs=enforce_chat_session_id_for_search_docs,
) )
# Generates full documents currently # Generates full documents currently

4
backend/danswer/db/chat.py
View File

@@ -598,6 +598,7 @@ def get_doc_query_identifiers_from_model(
chat_session: ChatSession, chat_session: ChatSession,
user_id: UUID | None, user_id: UUID | None,
db_session: Session, db_session: Session,
enforce_chat_session_id_for_search_docs: bool,
) -> list[tuple[str, int]]: ) -> list[tuple[str, int]]:
"""Given a list of search_doc_ids""" """Given a list of search_doc_ids"""
search_docs = ( search_docs = (
@@ -617,7 +618,8 @@ def get_doc_query_identifiers_from_model(
for doc in search_docs for doc in search_docs
] ]
): ):
raise ValueError("Invalid reference doc, not from this chat session.") if enforce_chat_session_id_for_search_docs:
raise ValueError("Invalid reference doc, not from this chat session.")
except IndexError: except IndexError:
# This happens when the doc has no chat_messages associated with it. # This happens when the doc has no chat_messages associated with it.
# which happens as an edge case where the chat message failed to save # which happens as an edge case where the chat message failed to save

2
backend/ee/danswer/server/query_and_chat/chat_backend.py
View File

@@ -182,6 +182,7 @@ def handle_simplified_chat_message(
new_msg_req=full_chat_msg_info, new_msg_req=full_chat_msg_info,
user=user, user=user,
db_session=db_session, db_session=db_session,
enforce_chat_session_id_for_search_docs=False,
) )
return _convert_packet_stream_to_response(packets) return _convert_packet_stream_to_response(packets)
@@ -301,6 +302,7 @@ def handle_send_message_simple_with_history(
new_msg_req=full_chat_msg_info, new_msg_req=full_chat_msg_info,
user=user, user=user,
db_session=db_session, db_session=db_session,
enforce_chat_session_id_for_search_docs=False,
) )
return _convert_packet_stream_to_response(packets) return _convert_packet_stream_to_response(packets)