klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-06 05:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve rate limit and interrupt messages for user, admin

Browse Source
This commit is contained in:
Debanjum
2025-07-19 19:08:35 -05:00
parent de7668daec
commit 76ddf8645c
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/khoj/routers/helpers.py
View File

@@ -1909,7 +1909,7 @@ class ApiUserRateLimiter:
# Check if the user has exceeded the rate limit # Check if the user has exceeded the rate limit
if subscribed and count_requests >= self.subscribed_requests: if subscribed and count_requests >= self.subscribed_requests:
logger.info( logger.info(
f"Rate limit: {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for subscribed user: {user}." f"Rate limit ({self.slug}): {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for subscribed user: {user}."
) )
raise HTTPException( raise HTTPException(
status_code=429, status_code=429,
@@ -1918,7 +1918,7 @@ class ApiUserRateLimiter:
if not subscribed and count_requests >= self.requests: if not subscribed and count_requests >= self.requests:
if self.requests >= self.subscribed_requests: if self.requests >= self.subscribed_requests:
logger.info( logger.info(
f"Rate limit: {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for user: {user}." f"Rate limit ({self.slug}): {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for user: {user}."
) )
raise HTTPException( raise HTTPException(
status_code=429, status_code=429,
@@ -1926,7 +1926,7 @@ class ApiUserRateLimiter:
) )
logger.info( logger.info(
f"Rate limit: {count_requests}/{self.requests} requests not allowed in {self.window} seconds for user: {user}." f"Rate limit ({self.slug}): {count_requests}/{self.requests} requests not allowed in {self.window} seconds for user: {user}."
) )
raise HTTPException( raise HTTPException(
status_code=429, status_code=429,
@@ -1948,6 +1948,9 @@ class ApiUserRateLimiter:
user: KhojUser = websocket.scope["user"].object user: KhojUser = websocket.scope["user"].object
subscribed = has_required_scope(websocket, ["premium"]) subscribed = has_required_scope(websocket, ["premium"])
current_window = "today" if self.window == 60 * 60 * 24 else f"now"
next_window = "tomorrow" if self.window == 60 * 60 * 24 else f"in a bit"
common_message_prefix = f"I'm glad you're enjoying interacting with me! You've unfortunately exceeded your usage limit for {current_window}."
# Remove requests outside of the time window # Remove requests outside of the time window
cutoff = django_timezone.now() - timedelta(seconds=self.window) cutoff = django_timezone.now() - timedelta(seconds=self.window)
@@ -1956,28 +1959,28 @@ class ApiUserRateLimiter:
# Check if the user has exceeded the rate limit # Check if the user has exceeded the rate limit
if subscribed and count_requests >= self.subscribed_requests: if subscribed and count_requests >= self.subscribed_requests:
logger.info( logger.info(
f"Rate limit: {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for subscribed user: {user}." f"Rate limit ({self.slug}): {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for subscribed user: {user}."
) )
raise HTTPException( raise HTTPException(
status_code=429, status_code=429,
detail="I'm glad you're enjoying interacting with me! You've unfortunately exceeded your usage limit for today. But let's chat more tomorrow?", detail=f"{common_message_prefix} But let's chat more {next_window}?",
) )
if not subscribed and count_requests >= self.requests: if not subscribed and count_requests >= self.requests:
if self.requests >= self.subscribed_requests: if self.requests >= self.subscribed_requests:
logger.info( logger.info(
f"Rate limit: {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for user: {user}." f"Rate limit ({self.slug}): {count_requests}/{self.subscribed_requests} requests not allowed in {self.window} seconds for user: {user}."
) )
raise HTTPException( raise HTTPException(
status_code=429, status_code=429,
detail="I'm glad you're enjoying interacting with me! You've unfortunately exceeded your usage limit for today. But let's chat more tomorrow?", detail=f"{common_message_prefix} But let's chat more {next_window}?",
) )
logger.info( logger.info(
f"Rate limit: {count_requests}/{self.requests} requests not allowed in {self.window} seconds for user: {user}." f"Rate limit ({self.slug}): {count_requests}/{self.requests} requests not allowed in {self.window} seconds for user: {user}."
) )
raise HTTPException( raise HTTPException(
status_code=429, status_code=429,
detail="I'm glad you're enjoying interacting with me! You've unfortunately exceeded your usage limit for today. You can subscribe to increase your usage limit via [your settings](https://app.khoj.dev/settings) or we can continue our conversation tomorrow?", detail=f"{common_message_prefix} You can subscribe to increase your usage limit via [your settings](https://app.khoj.dev/settings) or we can continue our conversation {next_window}.",
) )
# Add the current request to the cache # Add the current request to the cache

2
src/khoj/routers/research.py
View File

@@ -253,7 +253,7 @@ async def research(
break break
# Add the interrupt query as a new user message to the research conversation history # Add the interrupt query as a new user message to the research conversation history
logger.info( logger.info(
f"Continuing research with the previous {len(previous_iterations)} iterations and new instruction: {interrupt_query}" f"Continuing research for user {user} with the previous {len(previous_iterations)} iterations and new instruction: {interrupt_query}"
) )
previous_iterations_history = construct_iteration_history( previous_iterations_history = construct_iteration_history(
previous_iterations, query, query_images, query_files previous_iterations, query, query_images, query_files