From 6ba774ace414cd04c5d3a2e0564c762fb13cd9ef Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 28 Mar 2024 09:17:12 -0700 Subject: [PATCH 1/6] (ui) use default teams --- ui/litellm-dashboard/src/components/create_key_button.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/litellm-dashboard/src/components/create_key_button.tsx b/ui/litellm-dashboard/src/components/create_key_button.tsx index 7ce84b1f5c..86ca6605f9 100644 --- a/ui/litellm-dashboard/src/components/create_key_button.tsx +++ b/ui/litellm-dashboard/src/components/create_key_button.tsx @@ -129,7 +129,7 @@ const CreateKey: React.FC = ({ @@ -181,7 +181,7 @@ const CreateKey: React.FC = ({ - + From 7f793246c21583240d65bb89bb030ec08aa7f2a9 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 28 Mar 2024 09:41:15 -0700 Subject: [PATCH 2/6] (feat) return team alias when hitting user/info --- litellm/proxy/proxy_server.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 73cbd55e43..be6c12db1e 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -5290,6 +5290,18 @@ async def user_info( key = key.dict() key.pop("token", None) + if ( + "team_id" in key + and key["team_id"] is not None + and key["team_id"] != "litellm-dashboard" + ): + team_info = await prisma_client.get_data( + team_id=key["team_id"], table_name="team" + ) + key["team_alias"] = team_info["team_alias"] + else: + key["team_alias"] = "None" + response_data = { "user_id": user_id, "user_info": user_info, From beb72f94e073a1a19f955d823117cb5c66098e17 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 28 Mar 2024 10:16:07 -0700 Subject: [PATCH 3/6] (feat) return team alias in keys --- litellm/proxy/proxy_server.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index be6c12db1e..2fe4a3523d 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -5282,6 +5282,7 @@ async def user_info( user_info = {"spend": spend} ## REMOVE HASHED TOKEN INFO before returning ## + returned_keys = [] for key in keys: try: key = key.model_dump() # noqa @@ -5298,14 +5299,16 @@ async def user_info( team_info = await prisma_client.get_data( team_id=key["team_id"], table_name="team" ) - key["team_alias"] = team_info["team_alias"] + team_alias = getattr(team_info, "team_alias", None) + key["team_alias"] = team_alias else: key["team_alias"] = "None" + returned_keys.append(key) response_data = { "user_id": user_id, "user_info": user_info, - "keys": keys, + "keys": returned_keys, "teams": team_list, } return response_data From b54e2f23a8c0cef019b46186199956b9a1e05fc4 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 28 Mar 2024 10:23:42 -0700 Subject: [PATCH 4/6] (ui) show team alias on ui --- ui/litellm-dashboard/src/components/view_key_table.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/litellm-dashboard/src/components/view_key_table.tsx b/ui/litellm-dashboard/src/components/view_key_table.tsx index d987e3462e..5136934304 100644 --- a/ui/litellm-dashboard/src/components/view_key_table.tsx +++ b/ui/litellm-dashboard/src/components/view_key_table.tsx @@ -141,7 +141,7 @@ const ViewKeyTable: React.FC = ({ /> - {item.team_id} + {item.team_alias && item.team_alias != "None" ? item.team_alias : item.team_id} {JSON.stringify(item.metadata).slice(0, 400)} From 9a3201a321d52b7865ecb469051fd3250371df56 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Thu, 28 Mar 2024 10:39:19 -0700 Subject: [PATCH 5/6] (feat) use team_id when creating keys --- .../src/components/create_key_button.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/litellm-dashboard/src/components/create_key_button.tsx b/ui/litellm-dashboard/src/components/create_key_button.tsx index 86ca6605f9..82ce56ed89 100644 --- a/ui/litellm-dashboard/src/components/create_key_button.tsx +++ b/ui/litellm-dashboard/src/components/create_key_button.tsx @@ -127,13 +127,15 @@ const CreateKey: React.FC = ({ - - + + +