phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-27 11:43:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Feat] Add Error Handling for /key/list endpoint (#5787)

Browse source 
* raise error from unsupported param

* add testing for key list endpoint

* add testing for key list error handling

* fix key list test
This commit is contained in:
Ishaan Jaff 2024-09-19 17:14:12 -07:00 • committed by GitHub
parent 36018a8e59
commit 9aa027a509
2 changed files with 125 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
litellm/proxy/management_endpoints/key_management_endpoints.py
View file

@ -1134,6 +1134,7 @@ async def regenerate_key_fn(
)
@management_endpoint_wrapper
async def list_keys(
request: Request,
user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth),
page: int = Query(1, description="Page number", ge=1),
size: int = Query(10, description="Page size", ge=1, le=100),
@ -1152,13 +1153,24 @@ async def list_keys(
logging.error("Database not connected")
raise Exception("Database not connected")
# Check for unsupported parameters
supported_params = {"page", "size", "user_id", "team_id", "key_alias"}
unsupported_params = set(request.query_params.keys()) - supported_params
if unsupported_params:
raise ProxyException(
message=f"Unsupported parameter(s): {', '.join(unsupported_params)}. Supported parameters: {', '.join(supported_params)}",
type=ProxyErrorTypes.bad_request_error,
param=", ".join(unsupported_params),
code=status.HTTP_400_BAD_REQUEST,
)
# Prepare filter conditions
where = {}
if user_id:
if user_id and isinstance(user_id, str):
where["user_id"] = user_id
if team_id:
if team_id and isinstance(team_id, str):
where["team_id"] = team_id
if key_alias:
if key_alias and isinstance(key_alias, str):
where["key_alias"] = key_alias
logging.debug(f"Filter conditions: {where}")
@ -1206,9 +1218,18 @@ async def list_keys(
return response
except Exception as e:
if isinstance(e, HTTPException):
raise ProxyException(
message=getattr(e, "detail", f"error({str(e)})"),
type=ProxyErrorTypes.internal_server_error,
param=getattr(e, "param", "None"),
code=getattr(e, "status_code", status.HTTP_500_INTERNAL_SERVER_ERROR),
)
elif isinstance(e, ProxyException):
raise e
raise ProxyException(
message=f"Error listing keys: {str(e)}",
type=ProxyErrorTypes.internal_server_error, # Use the enum value
param=None,
message="Authentication Error, " + str(e),
type=ProxyErrorTypes.internal_server_error,
param=getattr(e, "param", "None"),
code=status.HTTP_500_INTERNAL_SERVER_ERROR,
)