mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-11 22:51:28 +00:00
fix: repair cherry-pick breakages from PR #24823
- Add LITELLM_UI_SESSION_DURATION to constants.py (exists in main but not stable branch) - Add user_api_key_dict parameter to _get_user_info_for_proxy_admin and update caller - Fix return statement to use admin_user_id/admin_user_info instead of None Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
8b9f12e552
commit
5fafc6be5a
2 changed files with 5 additions and 4 deletions
|
|
@ -1461,3 +1461,4 @@ MICROSOFT_USER_FIRST_NAME_ATTRIBUTE = str(
|
|||
MICROSOFT_USER_LAST_NAME_ATTRIBUTE = str(
|
||||
os.getenv("MICROSOFT_USER_LAST_NAME_ATTRIBUTE", "surname")
|
||||
)
|
||||
LITELLM_UI_SESSION_DURATION = str(os.getenv("LITELLM_UI_SESSION_DURATION", "24hr"))
|
||||
|
|
|
|||
|
|
@ -630,7 +630,7 @@ async def user_info(
|
|||
user_id is None
|
||||
and user_api_key_dict.user_role == LitellmUserRoles.PROXY_ADMIN
|
||||
):
|
||||
return await _get_user_info_for_proxy_admin()
|
||||
return await _get_user_info_for_proxy_admin(user_api_key_dict=user_api_key_dict)
|
||||
elif user_id is None:
|
||||
user_id = user_api_key_dict.user_id
|
||||
## GET USER ROW ##
|
||||
|
|
@ -732,7 +732,7 @@ async def user_info(
|
|||
raise handle_exception_on_proxy(e)
|
||||
|
||||
|
||||
async def _get_user_info_for_proxy_admin():
|
||||
async def _get_user_info_for_proxy_admin(user_api_key_dict: UserAPIKeyAuth):
|
||||
"""
|
||||
Admin UI Endpoint - Returns All Teams and Keys when Proxy Admin is querying
|
||||
|
||||
|
|
@ -790,8 +790,8 @@ async def _get_user_info_for_proxy_admin():
|
|||
|
||||
|
||||
return UserInfoResponse(
|
||||
user_id=None,
|
||||
user_info=None,
|
||||
user_id=admin_user_id,
|
||||
user_info=admin_user_info,
|
||||
keys=returned_keys,
|
||||
teams=_teams_in_db,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue