From 5fafc6be5a730eacaad1c44d34ae1f29a38df1d8 Mon Sep 17 00:00:00 2001 From: shivam Date: Mon, 20 Apr 2026 17:47:50 -0700 Subject: [PATCH] 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 --- litellm/constants.py | 1 + .../proxy/management_endpoints/internal_user_endpoints.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/litellm/constants.py b/litellm/constants.py index c5d9b04311d..7dcf6f7ed77 100644 --- a/litellm/constants.py +++ b/litellm/constants.py @@ -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")) diff --git a/litellm/proxy/management_endpoints/internal_user_endpoints.py b/litellm/proxy/management_endpoints/internal_user_endpoints.py index 9f79c44ae47..6818c456b0a 100644 --- a/litellm/proxy/management_endpoints/internal_user_endpoints.py +++ b/litellm/proxy/management_endpoints/internal_user_endpoints.py @@ -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, )