diff --git a/backend/danswer/background/update.py b/backend/danswer/background/update.py index 1633fe63d..8504c3cb0 100755 --- a/backend/danswer/background/update.py +++ b/backend/danswer/background/update.py @@ -415,8 +415,6 @@ def update_loop( for tenant_id in tenants: try: logger.debug(f"Processing tenant: {tenant_id}") - - # Existing Dask clients with Session(get_sqlalchemy_engine(schema=tenant_id)) as db_session: try: check_index_swap(db_session) diff --git a/backend/danswer/search/enums.py b/backend/danswer/search/enums.py index 99f6db7ca..c0166c80c 100644 --- a/backend/danswer/search/enums.py +++ b/backend/danswer/search/enums.py @@ -10,8 +10,6 @@ class RecencyBiasSetting(str, Enum): NO_DECAY = "no_decay" # Determine based on query if to use base_decay or favor_recent AUTO = "auto" - auto = "auto" - class OptionalSearchSetting(str, Enum): ALWAYS = "always" diff --git a/backend/danswer/search/models.py b/backend/danswer/search/models.py index 80fcbf7f9..aa53bdada 100644 --- a/backend/danswer/search/models.py +++ b/backend/danswer/search/models.py @@ -166,7 +166,7 @@ class SearchQuery(ChunkContext): num_hits: int = NUM_RETURNED_HITS offset: int = 0 model_config = ConfigDict(frozen=True) - + class RetrievalDetails(ChunkContext): # Use LLM to determine whether to do a retrieval or only rely on existing history diff --git a/backend/danswer/search/preprocessing/preprocessing.py b/backend/danswer/search/preprocessing/preprocessing.py index 96b2d6b71..3ba771f12 100644 --- a/backend/danswer/search/preprocessing/preprocessing.py +++ b/backend/danswer/search/preprocessing/preprocessing.py @@ -152,6 +152,7 @@ def retrieval_preprocessing( user_acl_filters = ( None if bypass_acl else build_access_filters_for_user(user, db_session) ) + final_filters = IndexFilters( source_type=preset_filters.source_type or predicted_source_filters, document_set=preset_filters.document_set, diff --git a/backend/danswer/server/query_and_chat/query_backend.py b/backend/danswer/server/query_and_chat/query_backend.py index f05f8ab10..fa3d2e64d 100644 --- a/backend/danswer/server/query_and_chat/query_backend.py +++ b/backend/danswer/server/query_and_chat/query_backend.py @@ -40,6 +40,7 @@ from danswer.server.query_and_chat.models import SourceTag from danswer.server.query_and_chat.models import TagResponse from danswer.server.query_and_chat.token_limit import check_token_rate_limits from danswer.utils.logger import setup_logger +from danswer.db.engine import get_current_tenant_id logger = setup_logger() @@ -52,6 +53,7 @@ def admin_search( question: AdminSearchRequest, user: User | None = Depends(current_curator_or_admin_user), db_session: Session = Depends(get_session), + tenant_id: str | None = Depends(get_current_tenant_id), ) -> AdminSearchResponse: query = question.query logger.notice(f"Received admin search query: {query}") @@ -62,6 +64,7 @@ def admin_search( time_cutoff=question.filters.time_cutoff, tags=question.filters.tags, access_control_list=user_acl_filters, + tenant_id=tenant_id, ) search_settings = get_current_search_settings(db_session) document_index = get_default_document_index( diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx index 95cf51fb6..d97b6c72e 100644 --- a/web/src/app/layout.tsx +++ b/web/src/app/layout.tsx @@ -100,6 +100,7 @@ export default async function RootLayout({