diff --git a/litellm-proxy-extras/litellm_proxy_extras/schema.prisma b/litellm-proxy-extras/litellm_proxy_extras/schema.prisma index 15b1c4b791..2a0faee280 100644 --- a/litellm-proxy-extras/litellm_proxy_extras/schema.prisma +++ b/litellm-proxy-extras/litellm_proxy_extras/schema.prisma @@ -128,7 +128,7 @@ model LiteLLM_TeamTable { model_max_budget Json @default("{}") router_settings Json? @default("{}") team_member_permissions String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) policies String[] @default([]) model_id Int? @unique // id for LiteLLM_ModelTable -> stores team-level model aliases allow_team_guardrail_config Boolean @default(false) // if true, team admin can configure guardrails for this team @@ -162,7 +162,7 @@ model LiteLLM_DeletedTeamTable { model_max_budget Json @default("{}") router_settings Json? @default("{}") team_member_permissions String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) policies String[] @default([]) model_id Int? // id for LiteLLM_ModelTable -> stores team-level model aliases allow_team_guardrail_config Boolean @default(false) @@ -295,7 +295,7 @@ model LiteLLM_VerificationToken { allowed_cache_controls String[] @default([]) allowed_routes String[] @default([]) policies String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) model_spend Json @default("{}") model_max_budget Json @default("{}") budget_id String? @@ -351,7 +351,7 @@ model LiteLLM_DeletedVerificationToken { allowed_cache_controls String[] @default([]) allowed_routes String[] @default([]) policies String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) model_spend Json @default("{}") model_max_budget Json @default("{}") router_settings Json? @default("{}") @@ -926,7 +926,7 @@ model LiteLLM_PolicyAttachmentTable { } //Unified Access Groups table for storing unified access groups -model LiteLLM_UnifiedAccessGroup { +model LiteLLM_AccessGroupTable { access_group_id String @id @default(uuid()) access_group_name String @unique description String? diff --git a/litellm/proxy/management_endpoints/unified_access_groups_endpoints.py b/litellm/proxy/management_endpoints/access_groups_endpoints.py similarity index 92% rename from litellm/proxy/management_endpoints/unified_access_groups_endpoints.py rename to litellm/proxy/management_endpoints/access_groups_endpoints.py index 46408f9362..d03d5a3588 100644 --- a/litellm/proxy/management_endpoints/unified_access_groups_endpoints.py +++ b/litellm/proxy/management_endpoints/access_groups_endpoints.py @@ -5,7 +5,7 @@ from fastapi import APIRouter, Depends, HTTPException, status from litellm.proxy._types import CommonProxyErrors, LitellmUserRoles, UserAPIKeyAuth from litellm.proxy.auth.user_api_key_auth import user_api_key_auth from litellm.proxy.utils import get_prisma_client_or_throw -from litellm.types.unified_access_group import ( +from litellm.types.access_group import ( AccessGroupCreateRequest, AccessGroupResponse, AccessGroupUpdateRequest, @@ -43,11 +43,11 @@ def _record_to_response(record) -> AccessGroupResponse: @router.post( - "/v1/unified_access_group", + "/v1/access_group", response_model=AccessGroupResponse, status_code=status.HTTP_201_CREATED, ) -async def create_unified_access_group( +async def create_access_group( data: AccessGroupCreateRequest, user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth), ) -> AccessGroupResponse: @@ -80,10 +80,10 @@ async def create_unified_access_group( @router.get( - "/v1/unified_access_group", + "/v1/access_group", response_model=List[AccessGroupResponse], ) -async def list_unified_access_groups( +async def list_access_groups( user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth), ) -> List[AccessGroupResponse]: _require_proxy_admin(user_api_key_dict) @@ -96,10 +96,10 @@ async def list_unified_access_groups( @router.get( - "/v1/unified_access_group/{access_group_id}", + "/v1/access_group/{access_group_id}", response_model=AccessGroupResponse, ) -async def get_unified_access_group( +async def get_access_group( access_group_id: str, user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth), ) -> AccessGroupResponse: @@ -118,10 +118,10 @@ async def get_unified_access_group( @router.put( - "/v1/unified_access_group/{access_group_id}", + "/v1/access_group/{access_group_id}", response_model=AccessGroupResponse, ) -async def update_unified_access_group( +async def update_access_group( access_group_id: str, data: AccessGroupUpdateRequest, user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth), @@ -150,10 +150,10 @@ async def update_unified_access_group( @router.delete( - "/v1/unified_access_group/{access_group_id}", + "/v1/access_group/{access_group_id}", status_code=status.HTTP_204_NO_CONTENT, ) -async def delete_unified_access_group( +async def delete_access_group( access_group_id: str, user_api_key_dict: UserAPIKeyAuth = Depends(user_api_key_auth), ) -> None: diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 74218c6522..436e7eaa4e 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -393,8 +393,8 @@ from litellm.proxy.management_endpoints.tag_management_endpoints import ( from litellm.proxy.management_endpoints.team_callback_endpoints import ( router as team_callback_router, ) -from litellm.proxy.management_endpoints.unified_access_groups_endpoints import ( - router as unified_access_group_router, +from litellm.proxy.management_endpoints.access_groups_endpoints import ( + router as access_group_router, ) from litellm.proxy.management_endpoints.team_endpoints import router as team_router from litellm.proxy.management_endpoints.team_endpoints import ( @@ -11835,7 +11835,7 @@ app.include_router(enterprise_router) app.include_router(ui_discovery_endpoints_router) app.include_router(agent_endpoints_router) app.include_router(a2a_router) -app.include_router(unified_access_group_router) +app.include_router(access_group_router) ######################################################## # MCP Server ######################################################## diff --git a/litellm/proxy/schema.prisma b/litellm/proxy/schema.prisma index 575d34b407..b3caa46147 100644 --- a/litellm/proxy/schema.prisma +++ b/litellm/proxy/schema.prisma @@ -128,7 +128,7 @@ model LiteLLM_TeamTable { model_max_budget Json @default("{}") router_settings Json? @default("{}") team_member_permissions String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) policies String[] @default([]) model_id Int? @unique // id for LiteLLM_ModelTable -> stores team-level model aliases litellm_organization_table LiteLLM_OrganizationTable? @relation(fields: [organization_id], references: [organization_id]) @@ -161,7 +161,7 @@ model LiteLLM_DeletedTeamTable { model_max_budget Json @default("{}") router_settings Json? @default("{}") team_member_permissions String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) policies String[] @default([]) model_id Int? // id for LiteLLM_ModelTable -> stores team-level model aliases @@ -293,7 +293,7 @@ model LiteLLM_VerificationToken { allowed_cache_controls String[] @default([]) allowed_routes String[] @default([]) policies String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) model_spend Json @default("{}") model_max_budget Json @default("{}") budget_id String? @@ -349,7 +349,7 @@ model LiteLLM_DeletedVerificationToken { allowed_cache_controls String[] @default([]) allowed_routes String[] @default([]) policies String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) model_spend Json @default("{}") model_max_budget Json @default("{}") router_settings Json? @default("{}") @@ -923,7 +923,7 @@ model LiteLLM_PolicyAttachmentTable { } //Unified Access Groups table for storing unified access groups -model LiteLLM_UnifiedAccessGroup { +model LiteLLM_AccessGroupTable { access_group_id String @id @default(uuid()) access_group_name String @unique description String? diff --git a/litellm/types/unified_access_group.py b/litellm/types/access_group.py similarity index 100% rename from litellm/types/unified_access_group.py rename to litellm/types/access_group.py diff --git a/schema.prisma b/schema.prisma index e43ea7eaef..2a11d0028f 100644 --- a/schema.prisma +++ b/schema.prisma @@ -128,7 +128,7 @@ model LiteLLM_TeamTable { model_max_budget Json @default("{}") router_settings Json? @default("{}") team_member_permissions String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) policies String[] @default([]) model_id Int? @unique // id for LiteLLM_ModelTable -> stores team-level model aliases allow_team_guardrail_config Boolean @default(false) // if true, team admin can configure guardrails for this team @@ -162,7 +162,7 @@ model LiteLLM_DeletedTeamTable { model_max_budget Json @default("{}") router_settings Json? @default("{}") team_member_permissions String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) policies String[] @default([]) model_id Int? // id for LiteLLM_ModelTable -> stores team-level model aliases allow_team_guardrail_config Boolean @default(false) @@ -295,7 +295,7 @@ model LiteLLM_VerificationToken { allowed_cache_controls String[] @default([]) allowed_routes String[] @default([]) policies String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) model_spend Json @default("{}") model_max_budget Json @default("{}") budget_id String? @@ -351,7 +351,7 @@ model LiteLLM_DeletedVerificationToken { allowed_cache_controls String[] @default([]) allowed_routes String[] @default([]) policies String[] @default([]) - unified_access_group_ids String[] @default([]) + access_group_ids String[] @default([]) model_spend Json @default("{}") model_max_budget Json @default("{}") router_settings Json? @default("{}") @@ -924,7 +924,7 @@ model LiteLLM_PolicyAttachmentTable { } //Unified Access Groups table for storing unified access groups -model LiteLLM_UnifiedAccessGroup { +model LiteLLM_AccessGroupTable { access_group_id String @id @default(uuid()) access_group_name String @unique description String?