diff --git a/backend/onyx/document_index/vespa/shared_utils/vespa_request_builders.py b/backend/onyx/document_index/vespa/shared_utils/vespa_request_builders.py index dda75c85337..71875cb951e 100644 --- a/backend/onyx/document_index/vespa/shared_utils/vespa_request_builders.py +++ b/backend/onyx/document_index/vespa/shared_utils/vespa_request_builders.py @@ -15,6 +15,7 @@ from onyx.document_index.vespa_constants import SOURCE_TYPE from onyx.document_index.vespa_constants import TENANT_ID from onyx.utils.logger import setup_logger +from shared_configs.configs import MULTI_TENANT logger = setup_logger() @@ -59,7 +60,8 @@ def _build_time_filter( filter_str = f"!({HIDDEN}=true) and " if not include_hidden else "" - if filters.tenant_id: + # If running in multi-tenant mode, we may want to filter by tenant_id + if filters.tenant_id and MULTI_TENANT: filter_str += f'({TENANT_ID} contains "{filters.tenant_id}") and ' # CAREFUL touching this one, currently there is no second ACL double-check post retrieval diff --git a/backend/onyx/server/query_and_chat/query_backend.py b/backend/onyx/server/query_and_chat/query_backend.py index 1c589a7756c..97316662000 100644 --- a/backend/onyx/server/query_and_chat/query_backend.py +++ b/backend/onyx/server/query_and_chat/query_backend.py @@ -54,6 +54,7 @@ def admin_search( query = question.query logger.notice(f"Received admin search query: {query}") user_acl_filters = build_access_filters_for_user(user, db_session) + final_filters = IndexFilters( source_type=question.filters.source_type, document_set=question.filters.document_set,