Skip to content
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

Jump to bottom

Enforce subscription state on the chat API access #569

Merged
merged 14 commits into from Nov 28, 2023
Merged

Enforce subscription state on the chat API access #569

merged 14 commits into from Nov 28, 2023

Conversation

sabaimran
Copy link
Collaborator

  • 69c8f45: Use scopes to represent whether the user is subscribed. If billing is turned off, by default all users are subscribed.
  • e5b1350: Enforce limits to the chat endpoint based on state.billing_enabled
  • 771f9bc: If the user's subscription state was created over 7 days ago, consider their state expired. Eventually, we should assign their trial validity dynamically based on how they signed up.

@sabaimran
Fix to use user rather than user_with_token in authenticated credentials
48b9116
@sabaimran
Use userwithtoken.user when authenticating with an API key
dd1bada
@sabaimran
Add support for rate limiting the amount of data indexed
b2afbaa 
- Add a dependency on the indexer API endpoint that rounds up the amount of data indexed and uses that to determine whether the next set of data should be processed
- Delete any files that are being removed for adminstering the calculation
- Show current amount of data indexed in the config page
@sabaimran
Explicitly set billing to off in the test for being able to index a l…
73e38fc 
…arge set of data
@sabaimran
Indicate in the desktop if the user gets rate limited for indexing
52b88de
@sabaimran
Merge branch 'master' of github.com:khoj-ai/khoj into features/enforc…
6233a95 
…e-subscription-status
@sabaimran
Add additional unit tests to verify behavior of unsubscribed/subscrib…
e438853 
…ed users
@sabaimran
Resolve merge conflicts for rendering chat response
6e1ba11
@sabaimran
Change subscribed scope to premium
eb5e309
debanjum
debanjum approved these changes Nov 27, 2023
View reviewed changes
Copy link
Member

@debanjum debanjum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

debanjum
debanjum reviewed Nov 27, 2023
View reviewed changes
tests/test_client.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding unit tests for these!

@sabaimran sabaimran merged commit 24b5aae into master Nov 28, 2023
10 checks passed
@sabaimran sabaimran deleted the features/enforce-subscription-status branch November 28, 2023 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@debanjum debanjum debanjum approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sabaimran @debanjum