Skip to content

Fix user count #4677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 9, 2025
Merged

Fix user count #4677

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfd0638
Fix user count
Weves May 8, 2025
d705d85
Add helper + fix async function as well
Weves May 8, 2025
bac3e3e
fix mypy
Weves May 8, 2025
6e6f6c9
Address RK comment
Weves May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions backend/onyx/db/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from sqlalchemy.future import select
from sqlalchemy.orm import Session

from onyx.auth.invited_users import get_invited_users
from onyx.auth.schemas import UserRole
from onyx.db.api_key import get_api_key_email_pattern
from onyx.db.engine import get_async_session
Expand All @@ -37,10 +36,11 @@ def get_default_admin_user_emails() -> list[str]:
return get_default_admin_user_emails_fn()


def get_total_users_count(db_session: Session) -> int:
def get_live_users_count(db_session: Session) -> int:
"""
Returns the total number of users in the system.
This is the sum of users and invited users.
Returns the number of users in the system.
This does NOT include invited users, "users" pulled in
from external connectors, or API keys.
"""
user_count = (
db_session.query(User)
Expand All @@ -50,8 +50,7 @@ def get_total_users_count(db_session: Session) -> int:
)
.count()
)
invited_users = len(get_invited_users())
return user_count + invited_users
return user_count


async def get_user_count(only_admin_users: bool = False) -> int:
Expand Down
6 changes: 3 additions & 3 deletions backend/onyx/server/manage/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
from onyx.configs.constants import AuthType
from onyx.configs.constants import FASTAPI_USERS_AUTH_COOKIE_NAME
from onyx.db.api_key import is_api_key_email_address
from onyx.db.auth import get_total_users_count
from onyx.db.auth import get_live_users_count
from onyx.db.engine import get_session
from onyx.db.models import AccessToken
from onyx.db.models import User
Expand Down Expand Up @@ -343,7 +343,7 @@ def bulk_invite_users(
logger.info("Registering tenant users")
fetch_ee_implementation_or_noop(
"onyx.server.tenants.billing", "register_tenant_users", None
)(tenant_id, get_total_users_count(db_session))
)(tenant_id, get_live_users_count(db_session))

return number_of_invited_users
except Exception as e:
Expand Down Expand Up @@ -379,7 +379,7 @@ def remove_invited_user(
if MULTI_TENANT and not DEV_MODE:
fetch_ee_implementation_or_noop(
"onyx.server.tenants.billing", "register_tenant_users", None
)(tenant_id, get_total_users_count(db_session))
)(tenant_id, get_live_users_count(db_session))
except Exception:
logger.error(
"Request to update number of seats taken in control plane failed. "
Expand Down
Loading