From bd0d6bce0f6ff01b36d320241452771242165c45 Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Mon, 22 Apr 2024 16:31:47 -0700
Subject: [PATCH 1/2] fix models displayed when logging in

---
 litellm/model_prices_and_context_window_backup.json     | 7 +++++++
 ui/litellm-dashboard/src/components/view_user_spend.tsx | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index 113f9413fd..c2c172bfe8 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -1535,6 +1535,13 @@
         "litellm_provider": "openrouter",
         "mode": "chat"
     },
+    "openrouter/meta-llama/llama-3-70b-instruct": {
+        "max_tokens": 8192,
+        "input_cost_per_token": 0.0000008,
+        "output_cost_per_token": 0.0000008,
+        "litellm_provider": "openrouter",
+        "mode": "chat"
+    },
     "j2-ultra": {
         "max_tokens": 8192,
         "max_input_tokens": 8192,
diff --git a/ui/litellm-dashboard/src/components/view_user_spend.tsx b/ui/litellm-dashboard/src/components/view_user_spend.tsx
index eed5efe57d..d74dcaecf2 100644
--- a/ui/litellm-dashboard/src/components/view_user_spend.tsx
+++ b/ui/litellm-dashboard/src/components/view_user_spend.tsx
@@ -109,6 +109,10 @@ const ViewUserSpend: React.FC<ViewUserSpendProps> = ({ userID, userRole, accessT
     if (modelsToDisplay && modelsToDisplay.includes("all-proxy-models")) {
         console.log("user models:", userModels);
         modelsToDisplay = userModels;
+    } else if (modelsToDisplay && modelsToDisplay.includes("all-team-models")) {
+        modelsToDisplay = selectedTeam.models;
+    } else if (modelsToDisplay && modelsToDisplay.length === 0) {
+      modelsToDisplay = userModels;
     }
 
 
@@ -129,7 +133,7 @@ const ViewUserSpend: React.FC<ViewUserSpendProps> = ({ userID, userRole, accessT
         </div>
         <div className="ml-auto">
           <Accordion>
-            <AccordionHeader>Models</AccordionHeader>
+            <AccordionHeader><Text>Team Models</Text></AccordionHeader>
             <AccordionBody className="absolute right-0 z-10 bg-white p-2 shadow-lg max-w-xs">
               <List>
                 {modelsToDisplay.map((model: string) => (

From 9250f61a4c15e636d7264125a87ddbdc14864b1b Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Mon, 22 Apr 2024 17:57:47 -0700
Subject: [PATCH 2/2] fix - sso login for non admins

---
 litellm/proxy/proxy_server.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index 171ab6e647..be45a61f12 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -8146,6 +8146,7 @@ async def auth_callback(request: Request):
         "user_id": user_id,
         "user_email": user_email,
     }
+    _user_id_from_sso = user_id
     try:
         user_role = None
         if prisma_client is not None:
@@ -8169,7 +8170,7 @@ async def auth_callback(request: Request):
             if user_info is not None:
                 user_defined_values = {
                     "models": getattr(user_info, "models", user_id_models),
-                    "user_id": getattr(user_info, "user_id", user_id),
+                    "user_id": user_id,
                     "user_email": getattr(user_info, "user_id", user_email),
                     "user_role": getattr(user_info, "user_role", None),
                 }
@@ -8200,6 +8201,10 @@ async def auth_callback(request: Request):
     )
     key = response["token"]  # type: ignore
     user_id = response["user_id"]  # type: ignore
+
+    # This should always be true
+    # User_id on SSO == user_id in the LiteLLM_VerificationToken Table
+    assert user_id == _user_id_from_sso
     litellm_dashboard_ui = "/ui/"
     user_role = user_role or "app_owner"
     if (