highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-09-18 11:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix extra __init__ file + allow adding API keys to user groups

Browse Source
This commit is contained in:
Weves
2025-02-04 16:41:46 -08:00
committed by Chris Weaver
parent 49fd76b336
commit 1c12ab31f9
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
backend/alembic/__init__.py
View File

3
backend/onyx/server/manage/users.py
View File

@@ -171,13 +171,14 @@ def list_all_users(
accepted_page: int | None = None,
slack_users_page: int | None = None,
invited_page: int | None = None,
include_api_keys: bool = False,
_: User | None = Depends(current_curator_or_admin_user),
db_session: Session = Depends(get_session),
) -> AllUsersResponse:
users = [
user
for user in get_all_users(db_session, email_filter_string=q)
if not is_api_key_email_address(user.email)
if (include_api_keys or not is_api_key_email_address(user.email))
]
slack_users = [user for user in users if user.role == UserRole.SLACK_USER]