mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-10 03:28:53 +00:00
feat: implement ParallelRequestLimiter hook to manage rate limits for proxy requests
This commit is contained in:
parent
1af7a403c6
commit
1442667e95
1 changed files with 15 additions and 3 deletions
|
|
@ -407,6 +407,10 @@ class _PROXY_MaxParallelRequestsHandler(CustomLogger):
|
|||
if user_rpm_limit is None:
|
||||
user_rpm_limit = sys.maxsize
|
||||
|
||||
user_max_parallel_requests = user_api_key_dict.max_parallel_requests
|
||||
if user_max_parallel_requests is None:
|
||||
user_max_parallel_requests = sys.maxsize
|
||||
|
||||
request_count_api_key = f"{user_id}::{precise_minute}::request_count"
|
||||
# print(f"Checking if {request_count_api_key} is allowed to make request for minute {precise_minute}")
|
||||
await self.check_key_in_limits(
|
||||
|
|
@ -414,7 +418,7 @@ class _PROXY_MaxParallelRequestsHandler(CustomLogger):
|
|||
cache=cache,
|
||||
data=data,
|
||||
call_type=call_type,
|
||||
max_parallel_requests=sys.maxsize, # TODO: Support max parallel requests for a user
|
||||
max_parallel_requests=user_max_parallel_requests, #TODO:Support max parallel requests for a user(has been implemented)
|
||||
current=cache_objects["request_count_user_id"],
|
||||
request_count_api_key=request_count_api_key,
|
||||
tpm_limit=user_tpm_limit,
|
||||
|
|
@ -435,6 +439,10 @@ class _PROXY_MaxParallelRequestsHandler(CustomLogger):
|
|||
if team_rpm_limit is None:
|
||||
team_rpm_limit = sys.maxsize
|
||||
|
||||
team_max_parallel_requests = getattr(user_api_key_dict, "team_max_parallel_requests", sys.maxsize)
|
||||
if team_max_parallel_requests is None:
|
||||
team_max_parallel_requests = sys.maxsize
|
||||
|
||||
request_count_api_key = f"{team_id}::{precise_minute}::request_count"
|
||||
# print(f"Checking if {request_count_api_key} is allowed to make request for minute {precise_minute}")
|
||||
await self.check_key_in_limits(
|
||||
|
|
@ -442,7 +450,7 @@ class _PROXY_MaxParallelRequestsHandler(CustomLogger):
|
|||
cache=cache,
|
||||
data=data,
|
||||
call_type=call_type,
|
||||
max_parallel_requests=sys.maxsize, # TODO: Support max parallel requests for a team
|
||||
max_parallel_requests=team_max_parallel_requests, # TODO: Support max parallel requests for a team(has been implemented)
|
||||
current=cache_objects["request_count_team_id"],
|
||||
request_count_api_key=request_count_api_key,
|
||||
tpm_limit=team_tpm_limit,
|
||||
|
|
@ -462,6 +470,10 @@ class _PROXY_MaxParallelRequestsHandler(CustomLogger):
|
|||
if end_user_rpm_limit is None:
|
||||
end_user_rpm_limit = sys.maxsize
|
||||
|
||||
end_user_max_parallel_requests = getattr(user_api_key_dict, "end_user_max_parallel_requests", sys.maxsize)
|
||||
if end_user_max_parallel_requests is None:
|
||||
end_user_max_parallel_requests = sys.maxsize
|
||||
|
||||
# now do the same tpm/rpm checks
|
||||
request_count_api_key = f"{user_api_key_dict.end_user_id}::{precise_minute}::request_count"
|
||||
|
||||
|
|
@ -471,7 +483,7 @@ class _PROXY_MaxParallelRequestsHandler(CustomLogger):
|
|||
cache=cache,
|
||||
data=data,
|
||||
call_type=call_type,
|
||||
max_parallel_requests=sys.maxsize, # TODO: Support max parallel requests for an End-User
|
||||
max_parallel_requests=end_user_max_parallel_requests, # TODO: Support max parallel requests for an End-User(has been implemented)
|
||||
request_count_api_key=request_count_api_key,
|
||||
current=cache_objects["request_count_end_user_id"],
|
||||
tpm_limit=end_user_tpm_limit,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue