phoenix/litellm
1
0
Fork 0
forked from phoenix/litellm-mirror
Code Pull requests Activity

[ Proxy - User Management]: If user assigned to a team don't show Default Team (#5791)

Browse source 
* rename endpoint to ui_settings

* ui allow DEFAULT_TEAM_DISABLED

* fix logic

* docs Set `default_team_disabled: true` on your litellm config.yaml
This commit is contained in:
Ishaan Jaff 2024-09-19 17:13:58 -07:00 • committed by GitHub
parent 91e58d9049
commit e6018a464f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ui/litellm-dashboard/src/components/dashboard_default_team.tsx
View file

@ -1,10 +1,12 @@
import React, { useState, useEffect } from "react";
import { Select, SelectItem, Text, Title } from "@tremor/react";
import { ProxySettings } from "./user_dashboard";
interface DashboardTeamProps {
teams: Object[] | null;
setSelectedTeam: React.Dispatch<React.SetStateAction<any | null>>;
userRole: string | null;
proxySettings: ProxySettings | null;
}
type TeamInterface = {
@ -17,6 +19,7 @@ const DashboardTeam: React.FC<DashboardTeamProps> = ({
teams,
setSelectedTeam,
userRole,
proxySettings,
}) => {
const defaultTeam: TeamInterface = {
models: [],
@ -31,6 +34,8 @@ const DashboardTeam: React.FC<DashboardTeamProps> = ({
if (userRole === "App User") {
// Non-Admin SSO users should only see their own team - they should not see "Default Team"
updatedTeams = teams;
} else if (proxySettings && proxySettings.DEFAULT_TEAM_DISABLED === true) {
updatedTeams = teams ? [...teams] : [defaultTeam];
} else {
updatedTeams = teams ? [...teams, defaultTeam] : [defaultTeam];
}

4
ui/litellm-dashboard/src/components/networking.tsx
View file

@ -2752,8 +2752,8 @@ export const getProxyBaseUrlAndLogoutUrl = async (
*/
try {
let url = proxyBaseUrl
? `${proxyBaseUrl}/sso/get/logout_url`
: `/sso/get/logout_url`;
? `${proxyBaseUrl}/sso/get/ui_settings`
: `sso/get/ui_settings`;
//message.info("Requesting model data");
const response = await fetch(url, {

14
ui/litellm-dashboard/src/components/user_dashboard.tsx
View file

@ -28,6 +28,12 @@ type UserSpendData = {
max_budget?: number | null;
};
export interface ProxySettings {
PROXY_BASE_URL: string | null;
PROXY_LOGOUT_URL: string | null;
DEFAULT_TEAM_DISABLED: boolean;
}
function getCookie(name: string) {
console.log("COOKIES", document.cookie)
const cookieValue = document.cookie
@ -46,8 +52,6 @@ interface UserDashboardProps {
setUserEmail: React.Dispatch<React.SetStateAction<string | null>>;
setTeams: React.Dispatch<React.SetStateAction<Object[] | null>>;
setKeys: React.Dispatch<React.SetStateAction<Object[] | null>>;
setProxySettings: React.Dispatch<React.SetStateAction<any>>;
proxySettings: any;
premiumUser: boolean;
}
@ -67,8 +71,6 @@ const UserDashboard: React.FC<UserDashboardProps> = ({
setUserEmail,
setTeams,
setKeys,
setProxySettings,
proxySettings,
premiumUser,
}) => {
const [userSpendData, setUserSpendData] = useState<UserSpendData | null>(
@ -87,6 +89,7 @@ const UserDashboard: React.FC<UserDashboardProps> = ({
const [accessToken, setAccessToken] = useState<string | null>(null);
const [teamSpend, setTeamSpend] = useState<number | null>(null);
const [userModels, setUserModels] = useState<string[]>([]);
const [proxySettings, setProxySettings] = useState<ProxySettings | null>(null);
const defaultTeam: TeamInterface = {
models: [],
team_alias: "Default Team",
@ -166,7 +169,7 @@ const UserDashboard: React.FC<UserDashboardProps> = ({
} else {
const fetchData = async () => {
try {
const proxy_settings = await getProxyBaseUrlAndLogoutUrl(accessToken);
const proxy_settings: ProxySettings = await getProxyBaseUrlAndLogoutUrl(accessToken);
setProxySettings(proxy_settings);
const response = await userInfoCall(
@ -347,6 +350,7 @@ const UserDashboard: React.FC<UserDashboardProps> = ({
teams={teams}
setSelectedTeam={setSelectedTeam}
userRole={userRole}
proxySettings={proxySettings}
/>
</Col>
</Grid>