diff --git a/ui/litellm-dashboard/src/components/view_key_table.tsx b/ui/litellm-dashboard/src/components/view_key_table.tsx index 144e716d361..9d7ad00a98f 100644 --- a/ui/litellm-dashboard/src/components/view_key_table.tsx +++ b/ui/litellm-dashboard/src/components/view_key_table.tsx @@ -27,6 +27,7 @@ import { Textarea, } from "@tremor/react"; import { InfoCircleOutlined } from '@ant-design/icons'; +import { fetchAvailableModelsForTeamOrKey, getModelDisplayName } from "./key_team_helpers/fetch_available_models_team_key"; import { Select as Select3, SelectItem, MultiSelect, MultiSelectItem } from "@tremor/react"; import { Button as Button2, @@ -121,7 +122,7 @@ const ViewKeyTable: React.FC = ({ const [editModalVisible, setEditModalVisible] = useState(false); const [infoDialogVisible, setInfoDialogVisible] = useState(false); const [selectedToken, setSelectedToken] = useState(null); - const [userModels, setUserModels] = useState([]); + const [userModels, setUserModels] = useState([]); const initialKnownTeamIDs: Set = new Set(); const [modelLimitModalVisible, setModelLimitModalVisible] = useState(false); const [regenerateDialogVisible, setRegenerateDialogVisible] = useState(false); @@ -238,17 +239,13 @@ const ViewKeyTable: React.FC = ({ useEffect(() => { const fetchUserModels = async () => { try { - if (userID === null) { + if (userID === null || userRole === null || accessToken === null) { return; } - if (accessToken !== null && userRole !== null) { - const model_available = await modelAvailableCall(accessToken, userID, userRole); - let available_model_names = model_available["data"].map( - (element: { id: string }) => element.id - ); - console.log("available_model_names:", available_model_names); - setUserModels(available_model_names); + const models = await fetchAvailableModelsForTeamOrKey(userID, userRole, accessToken); + if (models) { + setUserModels(models); } } catch (error) { console.error("Error fetching user models:", error); @@ -424,20 +421,20 @@ const ViewKeyTable: React.FC = ({ keyTeam.models.includes("all-proxy-models") ? ( userModels.filter(model => model !== "all-proxy-models").map((model: string) => ( )) ) : ( keyTeam.models.map((model: string) => ( )) ) ) : ( userModels.map((model: string) => ( )) )} @@ -1095,7 +1092,7 @@ const handleEditSubmit = async (formValues: Record) => { ) : ( - {model.length > 30 ? `${model.slice(0, 30)}...` : model} + {model.length > 30 ? `${getModelDisplayName(model).slice(0, 30)}...` : getModelDisplayName(model)} ) )) @@ -1118,7 +1115,7 @@ const handleEditSubmit = async (formValues: Record) => { ) : ( - {model.length > 30 ? `${model.slice(0, 30)}...` : model} + {model.length > 30 ? `${getModelDisplayName(model).slice(0, 30)}...` : getModelDisplayName(model)} ) ))