Fix user count #4677
Merged
Fix user count #4677
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR modifies how user counts are calculated for billing purposes by switching to get_live_users_count, which provides a more accurate count by excluding API keys, external connector users, and invited users.
backend/onyx/db/auth.py: Introducesget_live_users_countfunction that filters out API keys and external permission users for accurate billingbackend/onyx/server/manage/users.py: Updates bulk invite and remove user endpoints to useget_live_users_countfor tenant billing updates- Potential edge case: Ensure billing system properly handles transition from old counting method to new one to avoid billing discrepancies
- Consider adding a migration plan to handle existing tenants' billing cycles
2 file(s) reviewed, no comment(s)
Edit PR Review Bot Settings | Greptile
rkuo-danswer
approved these changes
May 8, 2025
ferdinandl007
pushed a commit
to ferdinandl007/onyx
that referenced
this pull request
May 19, 2025
* Fix user count * Add helper + fix async function as well * fix mypy * Address RK comment
ZhipengHe
pushed a commit
to ZhipengHe/onyx
that referenced
this pull request
Jun 6, 2025
* Fix user count * Add helper + fix async function as well * fix mypy * Address RK comment
AnkitTukatek
pushed a commit
to TukaTek/onyx
that referenced
this pull request
Sep 23, 2025
* Fix user count * Add helper + fix async function as well * fix mypy * Address RK comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes https://linear.app/danswer/issue/DAN-1953/fix-user-count-for-billing
How Has This Been Tested?
👀
Backporting (check the box to trigger backport action)
Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.