From 6734ab0ac47d523b6b0558a7f9e00c8b8b6d373d Mon Sep 17 00:00:00 2001 From: Evan Lohn Date: Wed, 26 Feb 2025 13:42:31 -0800 Subject: [PATCH] potential integration test fix --- backend/onyx/indexing/indexing_pipeline.py | 2 +- backend/onyx/server/manage/users.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/onyx/indexing/indexing_pipeline.py b/backend/onyx/indexing/indexing_pipeline.py index fe95f2a9b..afc72b025 100644 --- a/backend/onyx/indexing/indexing_pipeline.py +++ b/backend/onyx/indexing/indexing_pipeline.py @@ -221,7 +221,7 @@ def index_doc_batch_prepare( else documents ) if len(updatable_docs) != len(documents): - updatable_doc_ids = [doc.id for doc in updatable_docs] + updatable_doc_ids = {doc.id for doc in updatable_docs} skipped_doc_ids = [ doc.id for doc in documents if doc.id not in updatable_doc_ids ] diff --git a/backend/onyx/server/manage/users.py b/backend/onyx/server/manage/users.py index ad8f5098d..b674e481c 100644 --- a/backend/onyx/server/manage/users.py +++ b/backend/onyx/server/manage/users.py @@ -78,7 +78,7 @@ USERS_PAGE_SIZE = 10 @router.patch("/manage/set-user-role") def set_user_role( user_role_update_request: UserRoleUpdateRequest, - current_user: User = Depends(current_admin_user), + current_user: User | None = Depends(current_admin_user), db_session: Session = Depends(get_session), ) -> None: user_to_update = get_user_by_email( @@ -98,7 +98,7 @@ def set_user_role( current_role=current_role, ) - if user_to_update.id == current_user.id: + if current_user and user_to_update.id == current_user.id: raise HTTPException( status_code=400, detail="An admin cannot demote themselves from admin role!",