highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-14 18:10:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added search_doc_ids to the simple api to allow for skipping search (#2421)

Browse Source 
* Added search_doc_ids to the simple api to allow for skipping search

* comment

* fixed behaviour
This commit is contained in:
hagen-danswer 2024-09-12 16:22:41 -07:00 committed by GitHub
parent cb2169f2a3
commit e9a616e579
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,14 +259,22 @@ def handle_send_message_simple_with_history(
history_str=history_str, history_str=history_str,
) )
if req.retrieval_options is None and req.search_doc_ids is None:
retrieval_options: RetrievalDetails | None = RetrievalDetails(
run_search=OptionalSearchSetting.ALWAYS,
real_time=False,
)
else:
retrieval_options = req.retrieval_options
full_chat_msg_info = CreateChatMessageRequest( full_chat_msg_info = CreateChatMessageRequest(
chat_session_id=chat_session.id, chat_session_id=chat_session.id,
parent_message_id=chat_message.id, parent_message_id=chat_message.id,
message=query, message=query,
file_descriptors=[], file_descriptors=[],
prompt_id=req.prompt_id, prompt_id=req.prompt_id,
search_doc_ids=None, search_doc_ids=req.search_doc_ids,
retrieval_options=req.retrieval_options, retrieval_options=retrieval_options,
query_override=rephrased_query, query_override=rephrased_query,
chunks_above=0, chunks_above=0,
chunks_below=0, chunks_below=0,

4
backend/ee/danswer/server/query_and_chat/models.py
View File

@ -52,9 +52,11 @@ class BasicCreateChatMessageWithHistoryRequest(ChunkContext):
messages: list[ThreadMessage] messages: list[ThreadMessage]
prompt_id: int | None prompt_id: int | None
persona_id: int persona_id: int
retrieval_options: RetrievalDetails = Field(default_factory=RetrievalDetails) retrieval_options: RetrievalDetails | None = None
query_override: str | None = None query_override: str | None = None
skip_rerank: bool | None = None skip_rerank: bool | None = None
# If search_doc_ids provided, then retrieval options are unused
search_doc_ids: list[int] | None = None
class SimpleDoc(BaseModel): class SimpleDoc(BaseModel):