phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-25 18:54:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Litellm user daily activity allow non admin usage (#9695)

Browse source 
* feat(internal_user_endpoints.py): allow non-admin to view their own usage via `/user/daily/activity` route

* fix(leftnav.tsx): allow users to view their own usage via new_usage.tsx

allows internal users to see their usage via new api

Handles 1m+ spend logs scenario

* fix(leftnav.tsx): allow all users to see new usage tab
This commit is contained in:
Krish Dholakia 2025-04-01 22:27:26 -07:00 • committed by GitHub
parent 4f9805c9aa
commit 5a3eab0247
3 changed files with 68 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
litellm/proxy/_types.py
View file

@ -432,6 +432,7 @@ class LiteLLMRoutes(enum.Enum):
"/model/new",
"/model/update",
"/model/delete",
"/user/daily/activity",
] # routes that manage their own allowed/disallowed logic
## Org Admin Routes ##

8
litellm/proxy/management_endpoints/internal_user_endpoints.py
View file

@ -1480,6 +1480,14 @@ async def get_user_daily_activity(
if api_key:
where_conditions["api_key"] = api_key
if (
user_api_key_dict.user_role != LitellmUserRoles.PROXY_ADMIN
and user_api_key_dict.user_role != LitellmUserRoles.PROXY_ADMIN_VIEW_ONLY
):
where_conditions[
"user_id"
] = user_api_key_dict.user_id # only allow access to own data
# Get total count for pagination
total_count = await prisma_client.db.litellm_dailyuserspend.count(
where=where_conditions

35
ui/litellm-dashboard/src/components/leftnav.tsx
View file

@ -23,7 +23,7 @@ import {
LockOutlined,
ToolOutlined,
} from '@ant-design/icons';
import { old_admin_roles, v2_admin_role_names, all_admin_roles, rolesAllowedToSeeUsage, rolesWithWriteAccess } from '../utils/roles';
import { old_admin_roles, v2_admin_role_names, all_admin_roles, rolesAllowedToSeeUsage, rolesWithWriteAccess, internalUserRoles } from '../utils/roles';
const { Sider } = Layout;
@ -44,6 +44,13 @@ interface MenuItem {
icon?: React.ReactNode;
}
const Sidebar: React.FC<SidebarProps> = ({
setPage,
userRole,
defaultSelectedKey,
}) => {
// Note: If a menu item does not have a role, it is visible to all roles.
const menuItems: MenuItem[] = [
{ key: "1", page: "api-keys", label: "Virtual Keys", icon: <KeyOutlined /> },
@ -64,12 +71,11 @@ const menuItems: MenuItem[] = [
page: "experimental",
label: "Experimental",
icon: <ExperimentOutlined />,
roles: all_admin_roles,
children: [
{ key: "9", page: "caching", label: "Caching", icon: <DatabaseOutlined />, roles: all_admin_roles },
{ key: "10", page: "budgets", label: "Budgets", icon: <BankOutlined />, roles: all_admin_roles },
{ key: "11", page: "guardrails", label: "Guardrails", icon: <SafetyOutlined />, roles: all_admin_roles },
{ key: "12", page: "new_usage", label: "New Usage", icon: <BarChartOutlined />, roles: all_admin_roles },
{ key: "12", page: "new_usage", label: "New Usage", icon: <BarChartOutlined />, roles: [...all_admin_roles, ...internalUserRoles] },
{ key: "18", page: "mcp-tools", label: "MCP Tools", icon: <ToolOutlined />, roles: all_admin_roles },
]
},
@ -87,12 +93,6 @@ const menuItems: MenuItem[] = [
]
}
];
const Sidebar: React.FC<SidebarProps> = ({
setPage,
userRole,
defaultSelectedKey,
}) => {
// Find the menu item that matches the default page, including in submenus
const findMenuItemKey = (page: string): string => {
// Check top-level items
@ -111,9 +111,22 @@ const Sidebar: React.FC<SidebarProps> = ({
const selectedMenuKey = findMenuItemKey(defaultSelectedKey);
const filteredMenuItems = menuItems.filter(item =>
!item.roles || item.roles.includes(userRole)
const filteredMenuItems = menuItems.filter(item => {
// Check if parent item has roles and user has access
const hasParentAccess = !item.roles || item.roles.includes(userRole);
if (!hasParentAccess) return false;
// Filter children if they exist
if (item.children) {
item.children = item.children.filter(child =>
!child.roles || child.roles.includes(userRole)
);
}
return true;
});
return (
<Layout style={{ minHeight: "100vh" }}>