From 7029bdb291cb271ede150d2a32b0510798818796 Mon Sep 17 00:00:00 2001 From: Yuhong Sun Date: Sat, 13 Jan 2024 15:22:23 -0800 Subject: [PATCH] Remove unused doc endpoint (#942) --- .../server/query_and_chat/query_backend.py | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/backend/danswer/server/query_and_chat/query_backend.py b/backend/danswer/server/query_and_chat/query_backend.py index 278fcc06a..8d2c264b6 100644 --- a/backend/danswer/server/query_and_chat/query_backend.py +++ b/backend/danswer/server/query_and_chat/query_backend.py @@ -6,7 +6,6 @@ from sqlalchemy.orm import Session from danswer.auth.users import current_admin_user from danswer.auth.users import current_user -from danswer.configs.chat_configs import DISABLE_LLM_CHUNK_FILTER from danswer.configs.constants import DocumentSource from danswer.db.engine import get_session from danswer.db.models import User @@ -18,17 +17,12 @@ from danswer.one_shot_answer.models import DirectQARequest from danswer.search.access_filters import build_access_filters_for_user from danswer.search.danswer_helper import recommend_search_flow from danswer.search.models import IndexFilters -from danswer.search.models import SavedSearchDoc from danswer.search.models import SearchDoc -from danswer.search.models import SearchQuery -from danswer.search.models import SearchResponse from danswer.search.search_runner import chunks_to_search_docs -from danswer.search.search_runner import full_chunk_search from danswer.secondary_llm_flows.query_validation import get_query_answerability from danswer.secondary_llm_flows.query_validation import stream_query_answerability from danswer.server.query_and_chat.models import AdminSearchRequest from danswer.server.query_and_chat.models import AdminSearchResponse -from danswer.server.query_and_chat.models import DocumentSearchRequest from danswer.server.query_and_chat.models import HelperResponse from danswer.server.query_and_chat.models import QueryValidationResponse from danswer.server.query_and_chat.models import SimpleQueryRequest @@ -138,55 +132,6 @@ def stream_query_validation( ) -@basic_router.post("/document-search") -def handle_search_request( - search_request: DocumentSearchRequest, - user: User | None = Depends(current_user), - db_session: Session = Depends(get_session), - # Default to running LLM filter unless globally disabled - disable_llm_chunk_filter: bool = DISABLE_LLM_CHUNK_FILTER, -) -> SearchResponse: - """Simple search endpoint, does not create a new message or records in the DB""" - query = search_request.message - filters = search_request.retrieval_options.filters - - logger.info(f"Received document search query: {query}") - - user_acl_filters = build_access_filters_for_user(user, db_session) - final_filters = IndexFilters( - source_type=filters.source_type if filters else None, - document_set=filters.document_set if filters else None, - time_cutoff=filters.time_cutoff if filters else None, - access_control_list=user_acl_filters, - ) - - search_query = SearchQuery( - query=query, - search_type=search_request.search_type, - filters=final_filters, - recency_bias_multiplier=search_request.recency_bias_multiplier, - skip_rerank=search_request.skip_rerank, - skip_llm_chunk_filter=disable_llm_chunk_filter, - ) - - top_chunks, llm_selection = full_chunk_search( - query=search_query, - document_index=get_default_document_index(), - ) - - top_docs = chunks_to_search_docs(top_chunks) - llm_selection_indices = [ - index for index, value in enumerate(llm_selection) if value - ] - - # No need to save the docs for this API - fake_saved_docs = [SavedSearchDoc.from_search_doc(doc) for doc in top_docs] - - return SearchResponse( - top_documents=fake_saved_docs, llm_indices=llm_selection_indices - ) - - @basic_router.post("/stream-answer-with-quote") def get_answer_with_quote( query_request: DirectQARequest,