From 8f7bf3ad5217b8ce84849d614ed8ea5732ea0145 Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Thu, 18 Apr 2024 16:41:06 -0700
Subject: [PATCH 1/3] UI - show user_emails

---
 ui/litellm-dashboard/src/components/view_users.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/litellm-dashboard/src/components/view_users.tsx b/ui/litellm-dashboard/src/components/view_users.tsx
index 13446ae4311..815de35070e 100644
--- a/ui/litellm-dashboard/src/components/view_users.tsx
+++ b/ui/litellm-dashboard/src/components/view_users.tsx
@@ -158,6 +158,7 @@ const ViewUserDashboard: React.FC<ViewUserDashboardProps> = ({
                   <TableHead>
                     <TableRow>
                       <TableHeaderCell>User ID</TableHeaderCell>
+                      <TableHeaderCell>User Email</TableHeaderCell>
                       <TableHeaderCell>User Role</TableHeaderCell>
                       <TableHeaderCell>User Models</TableHeaderCell>
                       <TableHeaderCell>User Spend ($ USD)</TableHeaderCell>
@@ -168,8 +169,9 @@ const ViewUserDashboard: React.FC<ViewUserDashboardProps> = ({
                     {userData.map((user: any) => (
                       <TableRow key={user.user_id}>
                         <TableCell>{user.user_id}</TableCell>
+                        <TableCell>{user.user_email}</TableCell>
                         <TableCell>
-                          {user.user_role ? user.user_role : "app_owner"}
+                          {user.user_role ? user.user_role : ""}
                         </TableCell>
                         <TableCell>
                           {user.models && user.models.length > 0

From b669e2987b8ac6c3f2e9b9d9f58e783abfcd5ad0 Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Thu, 18 Apr 2024 17:16:52 -0700
Subject: [PATCH 2/3] fix return key aliases on /user/info

---
 litellm/proxy/utils.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py
index 3e50ba3ee55..5fafed69ad4 100644
--- a/litellm/proxy/utils.py
+++ b/litellm/proxy/utils.py
@@ -1055,9 +1055,20 @@ class PrismaClient:
                             },
                         )
                     else:
-                        response = await self.db.litellm_usertable.find_many(  # type: ignore
-                            order={"spend": "desc"}, take=limit, skip=offset
-                        )
+                        # return all users in the table, get their key aliases ordered by spend
+                        sql_query = """
+                        SELECT
+                            u.*,
+                            json_agg(v.key_alias) AS key_aliases
+                        FROM
+                            "LiteLLM_UserTable" u
+                        LEFT JOIN "LiteLLM_VerificationToken" v ON u.user_id = v.user_id
+                        GROUP BY
+                            u.user_id
+                        LIMIT $1
+                        OFFSET $2
+                        """
+                        response = await self.db.query_raw(sql_query, limit, offset)
                 return response
             elif table_name == "spend":
                 verbose_proxy_logger.debug(

From d9091dcf97f870bebb2597f17baf71130e750405 Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Thu, 18 Apr 2024 17:33:38 -0700
Subject: [PATCH 3/3] fix order by spend

---
 litellm/proxy/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py
index 5fafed69ad4..f54bbd95a78 100644
--- a/litellm/proxy/utils.py
+++ b/litellm/proxy/utils.py
@@ -1065,6 +1065,7 @@ class PrismaClient:
                         LEFT JOIN "LiteLLM_VerificationToken" v ON u.user_id = v.user_id
                         GROUP BY
                             u.user_id
+                        ORDER BY u.spend DESC
                         LIMIT $1
                         OFFSET $2
                         """