Skip to content
This repository was archived by the owner on Dec 11, 2024. It is now read-only.

Commit e9a616e

Browse files
Added search_doc_ids to the simple api to allow for skipping search (onyx-dot-app#2421)
* Added search_doc_ids to the simple api to allow for skipping search * comment * fixed behaviour
1 parent cb2169f commit e9a616e

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

backend/ee/danswer/server/query_and_chat/chat_backend.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,14 +259,22 @@ def handle_send_message_simple_with_history(
259259
history_str=history_str,
260260
)
261261

262+
if req.retrieval_options is None and req.search_doc_ids is None:
263+
retrieval_options: RetrievalDetails | None = RetrievalDetails(
264+
run_search=OptionalSearchSetting.ALWAYS,
265+
real_time=False,
266+
)
267+
else:
268+
retrieval_options = req.retrieval_options
269+
262270
full_chat_msg_info = CreateChatMessageRequest(
263271
chat_session_id=chat_session.id,
264272
parent_message_id=chat_message.id,
265273
message=query,
266274
file_descriptors=[],
267275
prompt_id=req.prompt_id,
268-
search_doc_ids=None,
269-
retrieval_options=req.retrieval_options,
276+
search_doc_ids=req.search_doc_ids,
277+
retrieval_options=retrieval_options,
270278
query_override=rephrased_query,
271279
chunks_above=0,
272280
chunks_below=0,

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ class BasicCreateChatMessageWithHistoryRequest(ChunkContext):
5252
messages: list[ThreadMessage]
5353
prompt_id: int | None
5454
persona_id: int
55-
retrieval_options: RetrievalDetails = Field(default_factory=RetrievalDetails)
55+
retrieval_options: RetrievalDetails | None = None
5656
query_override: str | None = None
5757
skip_rerank: bool | None = None
58+
# If search_doc_ids provided, then retrieval options are unused
59+
search_doc_ids: list[int] | None = None
5860

5961

6062
class SimpleDoc(BaseModel):

0 commit comments

Comments
 (0)