From c40f6f04379b1ee51edff2d97b9a5ef713403989 Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Thu, 5 Sep 2024 15:31:41 -0700
Subject: [PATCH 1/2] fix on /user/info show all keys - even expired ones

---
 litellm/proxy/management_endpoints/internal_user_endpoints.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/litellm/proxy/management_endpoints/internal_user_endpoints.py b/litellm/proxy/management_endpoints/internal_user_endpoints.py
index 2a359f92e01..87741362728 100644
--- a/litellm/proxy/management_endpoints/internal_user_endpoints.py
+++ b/litellm/proxy/management_endpoints/internal_user_endpoints.py
@@ -392,7 +392,6 @@ async def user_info(
             user_id=user_id,
             table_name="key",
             query_type="find_all",
-            expires=datetime.now(),
         )
 
         if user_info is None:

From 304a31ec8c5a0f54a627948fd9d1aa3ac3af4dd1 Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Thu, 5 Sep 2024 15:57:52 -0700
Subject: [PATCH 2/2] ui show when key expires

---
 ui/litellm-dashboard/src/components/view_key_table.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ui/litellm-dashboard/src/components/view_key_table.tsx b/ui/litellm-dashboard/src/components/view_key_table.tsx
index d54fb1386ad..70e8c520459 100644
--- a/ui/litellm-dashboard/src/components/view_key_table.tsx
+++ b/ui/litellm-dashboard/src/components/view_key_table.tsx
@@ -722,6 +722,7 @@ const ViewKeyTable: React.FC<ViewKeyTableProps> = ({
           <TableRow>
             <TableHeaderCell>Key Alias</TableHeaderCell>
             <TableHeaderCell>Secret Key</TableHeaderCell>
+            <TableHeaderCell>Expires</TableHeaderCell>
             <TableHeaderCell>Spend (USD)</TableHeaderCell>
             <TableHeaderCell>Budget (USD)</TableHeaderCell>
             <TableHeaderCell>Budget Reset</TableHeaderCell>
@@ -762,6 +763,15 @@ const ViewKeyTable: React.FC<ViewKeyTableProps> = ({
                 <TableCell>
                   <Text>{item.key_name}</Text>
                 </TableCell>
+                <TableCell>
+                {item.expires != null ? (
+                  <div>
+                    <p style={{ fontSize: '0.70rem' }}>{new Date(item.expires).toLocaleString()}</p>
+                  </div>
+                ) : (
+                  <p style={{ fontSize: '0.70rem' }}>Never</p>
+                )}
+              </TableCell>
                 <TableCell>
                   <Text>
                     {(() => {