This commit is contained in:
ishaan-j-berri 2026-11-02 22:35:58 +00:00 • committed by GitHub
commit 666955be3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
46 changed files with 1545 additions and 87 deletions

View file

@ -0,0 +1,4 @@
SET LOCAL lock_timeout = '10s';
ALTER TABLE "LiteLLM_TeamTable" ADD COLUMN IF NOT EXISTS "team_member_budget_limits" JSONB;
ALTER TABLE "LiteLLM_TeamMembership" ADD COLUMN IF NOT EXISTS "budget_limits" JSONB;

View file

@ -179,6 +179,7 @@ model LiteLLM_ModelTable {
// Assign prod keys to groups, not individuals
model LiteLLM_TeamTable {
team_member_budget_limits Json?
team_id String @id @default(uuid())
team_alias String?
organization_id String?
@ -799,6 +800,7 @@ model LiteLLM_UserNotifications {
}
model LiteLLM_TeamMembership {
budget_limits Json?
// Use this table to track the Internal User's Spend within a Team + Set Budgets, rpm limits for the user within the team
user_id String
team_id String

View file

@ -6,11 +6,12 @@ budget-window value types and the team-model alias table). Re-exported from
``litellm.proxy._types`` for backwards compatibility.
"""
import enum
import json
from datetime import datetime
from typing import Final, Literal, Optional
from typing import Annotated, Final, Literal, Optional, TypeAlias
from pydantic import BaseModel, ConfigDict, Field, model_validator
from pydantic import AfterValidator, BaseModel, ConfigDict, Field, model_validator
from litellm.models.object_permission import LiteLLM_ObjectPermissionTable
from litellm.types.llms.base import LiteLLMPydanticObjectBase
@ -50,6 +51,34 @@ class BudgetLimitEntry(LiteLLMPydanticObjectBase):
reset_at: datetime | None = None
class TeamMemberBudgetDuration(str, enum.Enum):
HOURLY = "1h"
DAILY = "24h"
WEEKLY = "7d"
MONTHLY = "30d"
class TeamMemberBudgetWindow(LiteLLMPydanticObjectBase):
model_config = ConfigDict(frozen=True)
budget_duration: TeamMemberBudgetDuration
max_budget: float = Field(ge=0, allow_inf_nan=False)
def _validate_member_budget_windows(
windows: tuple[TeamMemberBudgetWindow, ...],
) -> tuple[TeamMemberBudgetWindow, ...]:
durations: Final = frozenset(window.budget_duration for window in windows)
if len(durations) != len(windows):
raise ValueError("Each member budget duration must be unique")
return windows
TeamMemberBudgetWindows: TypeAlias = Annotated[
tuple[TeamMemberBudgetWindow, ...], AfterValidator(_validate_member_budget_windows)
]
class LiteLLM_ModelTable(LiteLLMPydanticObjectBase):
id: int | None = None
model_aliases: str | dict | None = None
@ -75,6 +104,7 @@ class TeamBase(LiteLLMPydanticObjectBase):
max_budget: float | None = None
soft_budget: float | None = None
budget_duration: str | None = None
team_member_budget_limits: TeamMemberBudgetWindows | None = None
budget_limits: list[BudgetLimitEntry] | None = None
models: list[str] = []
blocked: bool = False
@ -114,6 +144,7 @@ class LiteLLM_TeamTable(TeamBase):
"model_aliases",
"router_settings",
"budget_limits",
"team_member_budget_limits",
]
if isinstance(values, BaseModel):

View file

@ -5,18 +5,29 @@ Canonical definition for ``litellm_teammembership``. Re-exported from
``litellm.proxy._types`` for backwards compatibility.
"""
import json
from pydantic import field_validator
from litellm.models.budget import LiteLLM_BudgetTable, LiteLLM_BudgetTableFull
from litellm.models.team import TeamMemberBudgetWindows
from litellm.types.llms.base import LiteLLMPydanticObjectBase
class LiteLLM_TeamMembership(LiteLLMPydanticObjectBase):
user_id: str
team_id: str
budget_limits: TeamMemberBudgetWindows | None = None
budget_id: str | None = None
spend: float | None = 0.0
total_spend: float | None = 0.0
litellm_budget_table: LiteLLM_BudgetTableFull | LiteLLM_BudgetTable | None = None
@field_validator("budget_limits", mode="before")
@classmethod
def parse_budget_limits(cls, value: object) -> object:
return json.loads(value) if isinstance(value, str) else value
def safe_get_team_member_rpm_limit(self) -> int | None:
if self.litellm_budget_table is not None:
return self.litellm_budget_table.rpm_limit

View file

@ -1882,6 +1882,7 @@ class OrgMember(MemberBase):
from litellm.models.team import TeamBase as TeamBase # noqa: E402
from litellm.models.team import TeamMemberBudgetWindows
RouterSettingsDict = Annotated[
dict[str, object],
@ -1986,6 +1987,7 @@ class UpdateTeamRequest(LiteLLMPydanticObjectBase):
object_permission: LiteLLM_ObjectPermissionBase | None = None
disable_global_guardrails: bool | None = None
require_trace_id: bool | None = None
team_member_budget_limits: TeamMemberBudgetWindows | None = None
team_member_budget: float | None = None
team_member_budget_duration: str | None = None
team_member_model_max_budget: GenericBudgetConfigType | None = None
@ -4260,6 +4262,7 @@ class TeamMemberAddRequest(MemberAddRequest):
"""
team_id: str = Field(description="The ID of the team to add the member to")
budget_limits: TeamMemberBudgetWindows | None = None
max_budget_in_team: float | None = Field(
default=None,
description="Maximum budget allocated to this user within the team. If not set, user has unlimited budget within team limits",
@ -4279,6 +4282,7 @@ class TeamMemberDeleteRequest(MemberDeleteRequest):
class TeamMemberUpdateRequest(TeamMemberDeleteRequest):
budget_limits: TeamMemberBudgetWindows | None = None
max_budget_in_team: float | None = None
role: Literal["admin", "user"] | None = None
tpm_limit: int | None = Field(default=None, description="Tokens per minute limit for this team member")
@ -4318,6 +4322,7 @@ class TeamMemberUpdateRequest(TeamMemberDeleteRequest):
class TeamMemberUpdateResponse(MemberUpdateResponse):
budget_limits: TeamMemberBudgetWindows | None = None
team_id: str
max_budget_in_team: float | None = None
tpm_limit: int | None = None

View file

@ -7069,6 +7069,35 @@ async def _check_team_member_budget(
proxy_logging_obj=proxy_logging_obj,
)
loaded_membership = team_membership
from litellm.proxy.common_utils.team_member_budget import MemberBudgetCounter, get_team_member_budget_windows
from litellm.proxy.proxy_server import ensure_window_spend_counter_initialized, get_current_spend
for window in get_team_member_budget_windows(team_object, loaded_membership):
counter = MemberBudgetCounter.for_member(valid_token.user_id, team_object.team_id, window.budget_duration)
await ensure_window_spend_counter_initialized(
counter_key=counter.key,
entity_type="TeamMember",
entity_id=counter.entity_id,
window_duration=counter.duration.value,
window_start=counter.start,
)
spend = await get_current_spend(
counter_key=counter.key,
fallback_spend=0.0,
max_budget=window.max_budget,
window_entity_type="TeamMember",
window_entity_id=counter.entity_id,
window_duration=counter.duration.value,
window_start=counter.start,
)
if spend >= window.max_budget:
raise litellm.BudgetExceededError(
current_cost=spend,
max_budget=window.max_budget,
message=f"User={valid_token.user_id} in Team={team_object.team_id} exceeded {window.budget_duration.value} budget",
entity_type=Litellm_EntityType.TEAM_MEMBER.value,
entity_id=counter.entity_id,
)
# Per-member override wins; otherwise fall back to the team-level
# default configured via team.metadata["team_member_budget_id"].

View file

@ -0,0 +1,61 @@
"""Concurrent budget windows scoped to one user within one team."""
from collections.abc import Sequence
from dataclasses import dataclass
from datetime import datetime, timezone
from typing import Final
from pydantic import TypeAdapter
from litellm.litellm_core_utils.duration_parser import get_budget_window_start, get_next_standardized_reset_time
from litellm.models.team import LiteLLM_TeamTable, TeamMemberBudgetDuration, TeamMemberBudgetWindow
from litellm.models.team_membership import LiteLLM_TeamMembership
from litellm.proxy.common_utils.timezone_utils import get_budget_reset_settings
_MEMBER_ID: Final = TypeAdapter(tuple[str, str])
def member_window_entity_id(user_id: str, team_id: str) -> str:
return _MEMBER_ID.dump_json((user_id, team_id)).decode()
def parse_member_window_entity_id(entity_id: str) -> tuple[str, str]:
return _MEMBER_ID.validate_json(entity_id)
def get_team_member_budget_windows(
team: LiteLLM_TeamTable, membership: LiteLLM_TeamMembership | None
) -> Sequence[TeamMemberBudgetWindow]:
if membership is not None and membership.budget_limits:
return membership.budget_limits
return team.team_member_budget_limits or ()
@dataclass(frozen=True, slots=True)
class MemberBudgetCounter:
entity_id: str
duration: TeamMemberBudgetDuration
start: datetime
reset_at: datetime
@property
def key(self) -> str:
return f"spend:team_member_window:{self.entity_id}:{self.duration.value}:{int(self.start.timestamp())}"
@classmethod
def for_member(
cls, user_id: str, team_id: str, duration: TeamMemberBudgetDuration, now: datetime | None = None
) -> "MemberBudgetCounter":
settings: Final = get_budget_reset_settings()
reset_at: Final = get_next_standardized_reset_time(
duration=duration.value,
current_time=now if now is not None else datetime.now(timezone.utc),
timezone_str=settings.timezone,
reset_time_of_day=settings.reset_time_of_day,
)
return cls(
entity_id=member_window_entity_id(user_id, team_id),
duration=duration,
start=get_budget_window_start(duration.value, reset_at),
reset_at=reset_at,
)

View file

@ -31,7 +31,10 @@ from litellm.proxy.db.db_transaction_queue.window_spend_update_queue import (
)
if TYPE_CHECKING:
from prisma import models as prisma_models
from litellm.proxy.utils import PrismaClient
from litellm.repositories.prisma_protocols import TableActions
_SELECT_EXISTING_ROWS_SQL: Final = (
@ -133,6 +136,9 @@ class _UpsertBatchManager(Protocol):
class _UpsertTransaction(Protocol):
@property
def litellm_budgetwindowspend(self) -> "TableActions[prisma_models.LiteLLM_BudgetWindowSpend]": ...
def batch_(self) -> _UpsertBatchManager: ...
@ -204,6 +210,26 @@ async def spend_logs_seed_totals(
counts everything: that can only over-count once, which enforcement
tolerates, whereas under-counting is a budget bypass.
"""
if entity_type == Litellm_EntityType.TEAM_MEMBER.value:
from litellm.proxy.db.spend_counter_reseed import SpendCounterReseed
total: Final = await SpendCounterReseed.window_from_spend_logs(
prisma_client=prisma_client, entity_type="TeamMember", entity_id=entity_id, window_start=window_start
)
before: Final = (
total
if batch_started_at is None
else await SpendCounterReseed.window_from_spend_logs(
prisma_client=prisma_client,
entity_type="TeamMember",
entity_id=entity_id,
window_start=window_start,
window_end=_exclusion_upper_bound(batch_started_at),
)
)
if total is None or before is None:
return None
return WindowSeedTotals(total=total, before_batch=before)
if entity_type == Litellm_EntityType.KEY.value:
bounded_sql, unbounded_sql = _SEED_FROM_SPEND_LOGS_KEY_SQL, _SEED_FROM_SPEND_LOGS_KEY_UNBOUNDED_SQL
elif entity_type == Litellm_EntityType.TEAM.value:
@ -342,10 +368,31 @@ async def commit_window_spend_updates(
if not transactions:
return
ordered: Final = tuple(sorted(transactions, key=window_spend_group_key))
existing_primary_keys: Final = await _existing_primary_keys(
prisma_client=prisma_client,
transactions=ordered,
member_transactions: Final = tuple(
sorted(
(t for t in transactions if t["entity_type"] == Litellm_EntityType.TEAM_MEMBER.value),
key=window_spend_group_key,
)
)
member_seed_bases: Final = tuple(
[
await _member_window_seed_base(prisma_client, transaction, spend_logs_aggregate)
for transaction in member_transactions
]
)
ordered: Final = tuple(
sorted(
(t for t in transactions if t["entity_type"] != Litellm_EntityType.TEAM_MEMBER.value),
key=window_spend_group_key,
)
)
existing_primary_keys: Final[frozenset[tuple[str, str, str]]] = (
await _existing_primary_keys(
prisma_client=prisma_client,
transactions=ordered,
)
if ordered
else frozenset()
)
seed_bases: Final = tuple(
[
@ -368,13 +415,71 @@ async def commit_window_spend_updates(
async with (
db_span("commit_window_spend_updates", "LiteLLM_BudgetWindowSpend"),
_upsert_transaction(prisma_client) as db_transaction,
db_transaction.batch_() as batcher,
):
for transaction, seed_base in zip(ordered, seed_bases):
batcher.execute_raw(
_UPSERT_WINDOW_SPEND_SQL,
*_upsert_params(transaction=transaction, seed_base=seed_base, now=now),
)
for transaction, seed_base in zip(member_transactions, member_seed_bases):
await _write_member_window_spend(db_transaction.litellm_budgetwindowspend, transaction, seed_base)
async with db_transaction.batch_() as batcher:
for transaction, seed_base in zip(ordered, seed_bases):
batcher.execute_raw(
_UPSERT_WINDOW_SPEND_SQL,
*_upsert_params(transaction=transaction, seed_base=seed_base, now=now),
)
async def _member_window_seed_base(
prisma_client: "PrismaClient",
transaction: WindowSpendTransaction,
spend_logs_aggregate: WindowSpendLogsAggregate,
) -> float:
from litellm.repositories.table_repositories import BudgetWindowSpendRepository
existing: Final = await BudgetWindowSpendRepository(prisma_client).table.find_unique(
where={
"entity_type_entity_id_window_duration": {
"entity_type": transaction["entity_type"],
"entity_id": transaction["entity_id"],
"window_duration": transaction["window_duration"],
}
}
)
if existing is not None:
return 0.0
totals: Final = await spend_logs_aggregate(
prisma_client=prisma_client,
entity_type=transaction["entity_type"],
entity_id=transaction["entity_id"],
window_start=datetime.fromisoformat(transaction["window_start"]).replace(tzinfo=timezone.utc),
batch_started_at=_transaction_started_at(transaction),
)
if totals is None:
return 0.0
return _seed_base(totals, transaction["spend"])
async def _write_member_window_spend(
table: "TableActions[prisma_models.LiteLLM_BudgetWindowSpend]",
transaction: WindowSpendTransaction,
seed: float,
) -> None:
key: Final = {
"entity_type": transaction["entity_type"],
"entity_id": transaction["entity_id"],
"window_duration": transaction["window_duration"],
}
start: Final = datetime.fromisoformat(transaction["window_start"])
# Keep this row locked until the entire flush commits, including key/team windows.
await table.upsert(
where={"entity_type_entity_id_window_duration": key},
data={"create": {**key, "window_start": start, "spend": seed}, "update": {"spend": {"increment": 0.0}}},
)
await table.update_many(
where={**key, "window_start": {"lt": start}},
data={"window_start": start, "spend": seed},
)
await table.update(
where={"entity_type_entity_id_window_duration": key},
data={"spend": {"increment": transaction["spend"]}},
)
async def roll_window_spend_row(

View file

@ -55,6 +55,7 @@ _WINDOW_SPEND_ENTITY_TYPES: Final[Mapping[str, str]] = MappingProxyType(
{
"Key": Litellm_EntityType.KEY.value,
"Team": Litellm_EntityType.TEAM.value,
"TeamMember": Litellm_EntityType.TEAM_MEMBER.value,
}
)
@ -68,6 +69,18 @@ _WINDOW_SPEND_LOG_FIELDS: Final[Mapping[str, str]] = MappingProxyType(
)
def _window_spend_log_identity(entity_type: str, entity_id: str) -> Mapping[str, str] | None:
if entity_type == "TeamMember":
from litellm.proxy.common_utils.team_member_budget import parse_member_window_entity_id
user_id, team_id = parse_member_window_entity_id(entity_id)
return {"user": user_id, "team_id": team_id}
group_field: Final = _WINDOW_SPEND_LOG_FIELDS.get(entity_type)
if group_field is None:
return None
return {group_field: entity_id}
def _as_utc(value: datetime) -> datetime:
return value if value.tzinfo is not None else value.replace(tzinfo=timezone.utc)
@ -388,21 +401,20 @@ class SpendCounterReseed:
entity_type: str,
entity_id: str,
window_start: datetime,
window_end: datetime | None = None,
) -> float | None:
if prisma_client is None:
return None
group_field: Final = _WINDOW_SPEND_LOG_FIELDS.get(entity_type)
if group_field is None:
identity: Final = _window_spend_log_identity(entity_type, entity_id)
if identity is None:
return None
where: Final = {
group_field: entity_id,
"startTime": {"gte": window_start},
}
group_fields: Final = list(identity)
period: Final = {"gte": window_start, **({"lt": window_end} if window_end is not None else {})}
where: Final = {**identity, "startTime": period}
try:
response: Final = await SpendLogsRepository(prisma_client).table.group_by(
by=[group_field],
by=group_fields,
where=where,
sum={"spend": True},
)

View file

@ -1,6 +1,6 @@
import json
import math
from collections.abc import Mapping
from collections.abc import Mapping, Sequence
from types import MappingProxyType
from typing import TYPE_CHECKING, Any, Final, Optional, Union
@ -44,6 +44,8 @@ def validate_budget_duration(budget_duration: str | None, status_code: int = 400
from litellm._logging import verbose_proxy_logger
from litellm.caching import DualCache
from litellm.models.team import TeamMemberBudgetWindow
from litellm.models.team_membership import LiteLLM_TeamMembership
from litellm.proxy._types import ( # re-exported
CommonProxyErrors,
KeyRequestBase,
@ -69,8 +71,11 @@ from litellm.repositories.team_repository import TeamRepository
from litellm.types.utils import BudgetConfig
if TYPE_CHECKING:
from prisma import models as prisma_models
from litellm.proxy._types import NewProjectRequest, UpdateProjectRequest
from litellm.proxy.utils import PrismaClient, ProxyLogging
from litellm.repositories.prisma_protocols import TableActions
_user_has_admin_view: Final = user_api_key_has_admin_view
@ -625,6 +630,24 @@ def _has_meaningful_budget_limit(budget_values: Mapping[str, object]) -> bool:
return any(_is_set_budget_value(budget_values.get(field)) for field in _TEAM_MEMBER_BUDGET_LIMIT_FIELDS)
async def upsert_team_member_budget_windows(
table: "TableActions[prisma_models.LiteLLM_TeamMembership]",
team_id: str,
user_id: str,
windows: Sequence[TeamMemberBudgetWindow],
) -> LiteLLM_TeamMembership:
payload: Final = "[" + ",".join(window.model_dump_json() for window in windows) + "]"
membership: Final = await table.upsert(
where={"user_id_team_id": {"user_id": user_id, "team_id": team_id}},
data={
"create": {"user_id": user_id, "team_id": team_id, "budget_limits": payload},
"update": {"budget_limits": payload},
},
include={"litellm_budget_table": True},
)
return LiteLLM_TeamMembership.model_validate(membership.model_dump())
async def upsert_budget_and_membership(
tx,
*,

View file

@ -8074,7 +8074,7 @@ async def block_key(
--header "Authorization: Bearer $LITELLM_MASTER_KEY" \
--header 'Content-Type: application/json' \
--data '{
"key": "sk-Fn8Ej39NxjAXrvpUGKghGw"
"key": "<VIRTUAL_KEY>"
}'
```
@ -8188,7 +8188,7 @@ async def unblock_key(
--header "Authorization: Bearer $LITELLM_MASTER_KEY" \
--header 'Content-Type: application/json' \
--data '{
"key": "sk-Fn8Ej39NxjAXrvpUGKghGw"
"key": "<VIRTUAL_KEY>"
}'
```

View file

@ -48,6 +48,7 @@ SUPPORTED_TEAM_ADMIN_EDITABLE_TEAM_FIELDS: Final[frozenset[str]] = frozenset(
"metadata",
"team_member_budget",
"team_member_budget_duration",
"team_member_budget_limits",
"team_member_tpm_limit",
"team_member_rpm_limit",
}

View file

@ -171,6 +171,7 @@ from litellm.proxy.management_endpoints.common_utils import ( # noqa: F401 # l
team_member_has_permission,
update_metadata_fields,
upsert_budget_and_membership,
upsert_team_member_budget_windows,
user_api_key_has_admin_view,
validate_budget_duration,
validate_team_model_max_budget,
@ -533,7 +534,14 @@ def _team_tx_db(tx: "Prisma") -> "TableActions[prisma_models.LiteLLM_TeamTable]"
)
def _team_membership_db(prisma_client: PrismaClient | None) -> "TableActions[prisma_models.LiteLLM_TeamMembership]":
def _team_membership_db(
prisma_client: PrismaClient | None,
tx: "MemberWriteTx | Prisma | None" = None,
) -> "TableActions[prisma_models.LiteLLM_TeamMembership]":
if tx is not None:
return cast( # cast-ok: Prisma JSON writes are strings; TableActions widens inputs at the transaction boundary
"TableActions[prisma_models.LiteLLM_TeamMembership]", tx.litellm_teammembership
)
return TeamMembershipRepository(prisma_client).table
@ -1658,6 +1666,7 @@ async def new_team(
- object_permission: Optional[LiteLLM_ObjectPermissionBase] - team-specific object permission. Example - {"vector_stores": ["vector_store_1", "vector_store_2"], "agents": ["agent_1", "agent_2"], "agent_access_groups": ["dev_group"]}. IF null or {} then no object permission.
- team_member_budget: Optional[float] - The maximum budget allocated to an individual team member.
- team_member_budget_duration: Optional[str] - The duration of the budget for the team member. Doc [here](https://docs.litellm.ai/docs/proxy/team_budgets)
- team_member_budget_limits: Optional[list] - Default concurrent spending caps for each member, e.g. [{"budget_duration": "24h", "max_budget": 20}, {"budget_duration": "30d", "max_budget": 200}]. Each window resets independently at its UTC calendar boundary. A member override replaces these defaults; an empty list disables the defaults.
- team_member_model_max_budget: Optional[dict] - Per-model budgets shared by team members without an override.
- team_member_rpm_limit: Optional[int] - The RPM (Requests Per Minute) limit for individual team members.
- team_member_tpm_limit: Optional[int] - The TPM (Tokens Per Minute) limit for individual team members.
@ -1961,10 +1970,7 @@ async def new_team(
)
## ADD TO TEAM TABLE
complete_team_data: Final = LiteLLM_TeamTable(
**data_json,
model_id=_model_id,
)
complete_team_data: Final = LiteLLM_TeamTable.model_validate({**data_json, "model_id": _model_id})
# Set Management Endpoint Metadata Fields
for field in LiteLLM_ManagementEndpoint_MetadataFields_Premium:
@ -2436,6 +2442,7 @@ async def update_team(
- object_permission: Optional[LiteLLM_ObjectPermissionBase] - team-specific object permission. Example - {"vector_stores": ["vector_store_1", "vector_store_2"], "agents": ["agent_1", "agent_2"], "agent_access_groups": ["dev_group"]}. IF null or {} then no object permission.
- team_member_budget: Optional[float] - The maximum budget allocated to an individual team member.
- team_member_budget_duration: Optional[str] - The duration of the budget for the team member. Doc [here](https://docs.litellm.ai/docs/proxy/team_budgets)
- team_member_budget_limits: Optional[list] - Default concurrent spending caps for each member, e.g. [{"budget_duration": "24h", "max_budget": 20}, {"budget_duration": "30d", "max_budget": 200}]. Each window resets independently at its UTC calendar boundary. A member override replaces these defaults; an empty list disables the defaults.
- team_member_model_max_budget: Optional[dict] - Per-model budgets shared by team members without an override.
- team_member_rpm_limit: Optional[int] - The RPM (Requests Per Minute) limit for individual team members.
- team_member_tpm_limit: Optional[int] - The TPM (Tokens Per Minute) limit for individual team members.
@ -3147,6 +3154,8 @@ async def _validate_team_member_add_permissions(
# budget and model controls stay admin-only. Reject them here so a
# self-joining non-admin cannot set their own cap, reset window, or model
# scope via the bypass.
if data.budget_limits is not None:
raise HTTPException(status_code=403, detail="Only admins may set member budget windows")
if data.max_budget_in_team is not None or data.budget_duration is not None or data.allowed_models is not None:
raise HTTPException(
status_code=403,
@ -3238,6 +3247,13 @@ async def _process_team_members(
status_code=500,
detail={"error": f"Unable to add user - {m}, to team - {data.team_id}, for reason - {e}"},
)
if data.budget_limits is not None:
updated_tm = await upsert_team_member_budget_windows(
table=_team_membership_db(prisma_client, tx),
team_id=data.team_id,
user_id=updated_user.user_id,
windows=data.budget_limits,
)
updated_users.append(updated_user)
if updated_tm is not None:
updated_team_memberships.append(updated_tm)
@ -3710,6 +3726,8 @@ async def team_member_add(
If user doesn't exist, new user row will also be added to User Table
Only proxy_admin or admin of team, allowed to access this endpoint.
- budget_limits: Optional[list] - Concurrent caps for the added member, using budget_duration (1h, 24h, 7d, or 30d) and max_budget. Omit or send [] to inherit team defaults.
```
curl -X POST 'http://0.0.0.0:4000/team/member_add' \
@ -4119,6 +4137,8 @@ async def team_member_update(
[BETA]
Update team member budgets and team member role
- budget_limits: Optional[list] - Replace this member's concurrent spending caps. Each entry has budget_duration (1h, 24h, 7d, or 30d) and max_budget. Omit to preserve the override; send [] to restore team defaults.
"""
from litellm.proxy.proxy_server import (
litellm_proxy_admin_name,
@ -4233,7 +4253,14 @@ async def team_member_update(
budget_patch=budget_patch,
team_default_budget_id=team_default_budget_id,
)
if budget_patch:
if data.budget_limits is not None:
await upsert_team_member_budget_windows(
table=_team_membership_db(prisma_client, tx),
team_id=data.team_id,
user_id=received_user_id,
windows=data.budget_limits,
)
if budget_patch or data.budget_limits is not None:
await invalidate_team_member_spend_state(
user_id=received_user_id,
team_id=data.team_id,
@ -4257,6 +4284,7 @@ async def team_member_update(
user_id=received_user_id,
user_email=data.user_email,
max_budget_in_team=data.max_budget_in_team,
budget_limits=data.budget_limits,
tpm_limit=data.tpm_limit,
rpm_limit=data.rpm_limit,
budget_duration=data.budget_duration,
@ -5185,6 +5213,7 @@ def _transform_teams_to_deleted_records(
"litellm_model_table",
"object_permission",
"id",
"team_member_budget_limits",
"budget_limits", # not in LiteLLM_DeletedTeamTable schema
"default_team_member_models", # not in LiteLLM_DeletedTeamTable schema
):

View file

@ -3797,15 +3797,67 @@ async def _increment_spend_counters_batched(
scope_user_id: str, scope_team_id: str
) -> tuple[PendingSpendIncrement | BaseException, ...]:
team_member_counter_key: Final = f"spend:team_member:{scope_user_id}:{scope_team_id}"
if team_member_counter_key in reserved_counter_keys:
return ()
return (
await _prepare_spend_counter_increment(
counter_key=team_member_counter_key,
source_cache_key=f"team_membership:{scope_user_id}:{scope_team_id}",
increment=cost,
),
primary_pending: Final = (
()
if team_member_counter_key in reserved_counter_keys
else (
await _prepare_spend_counter_increment(
counter_key=team_member_counter_key,
source_cache_key=f"team_membership:{scope_user_id}:{scope_team_id}",
increment=cost,
),
)
)
if prisma_client is None:
return primary_pending
from litellm.models.team import TeamMemberBudgetWindow
from litellm.proxy.auth.auth_checks import TeamNotFoundError, get_team_membership, get_team_object
from litellm.proxy.common_utils.team_member_budget import MemberBudgetCounter, get_team_member_budget_windows
try:
team: Final = await get_team_object(
team_id=scope_team_id, prisma_client=prisma_client, user_api_key_cache=user_api_key_cache
)
except TeamNotFoundError:
# A team deleted during an in-flight request has no window settings to apply.
return primary_pending
membership: Final = await get_team_membership(
user_id=scope_user_id,
team_id=scope_team_id,
prisma_client=prisma_client,
user_api_key_cache=user_api_key_cache,
)
async def member_window_increment(window: TeamMemberBudgetWindow) -> PendingSpendIncrement | None:
counter: Final = MemberBudgetCounter.for_member(scope_user_id, scope_team_id, window.budget_duration)
pending: Final = (
await _prepare_window_spend_counter_increment(
counter_key=counter.key,
entity_type="TeamMember",
entity_id=counter.entity_id,
window_duration=counter.duration.value,
window_start=counter.start,
increment=cost,
)
if counter.key not in reserved_counter_keys
else None
)
await _enqueue_window_spend_row_update(
entity_type=Litellm_EntityType.TEAM_MEMBER,
entity_id=counter.entity_id,
reset_at=counter.reset_at,
window_duration=counter.duration.value,
window_start=counter.start,
increment=cost,
request_started_at=request_started_at,
)
return pending
window_pending: Final = await asyncio.gather(
*(member_window_increment(window) for window in get_team_member_budget_windows(team, membership)),
return_exceptions=True,
)
return primary_pending + tuple(item for item in window_pending if item is not None)
async def _user_scope(scope_user_id: str) -> tuple[PendingSpendIncrement | BaseException, ...]:
user_counter_key: Final = f"spend:user:{scope_user_id}"

View file

@ -179,6 +179,7 @@ model LiteLLM_ModelTable {
// Assign prod keys to groups, not individuals
model LiteLLM_TeamTable {
team_member_budget_limits Json?
team_id String @id @default(uuid())
team_alias String?
organization_id String?
@ -799,6 +800,7 @@ model LiteLLM_UserNotifications {
}
model LiteLLM_TeamMembership {
budget_limits Json?
// Use this table to track the Internal User's Spend within a Team + Set Budgets, rpm limits for the user within the team
user_id String
team_id String

View file

@ -582,6 +582,24 @@ async def _get_budget_counters(
)
if team_member_counter is not None:
counters.append(team_member_counter)
if team_object is not None and valid_token.user_id is not None:
from litellm.proxy.common_utils.team_member_budget import MemberBudgetCounter, get_team_member_budget_windows
membership: Final = await _cached_team_membership(valid_token.user_id, team_object.team_id, user_api_key_cache)
for window in get_team_member_budget_windows(team_object, membership):
counter = MemberBudgetCounter.for_member(valid_token.user_id, team_object.team_id, window.budget_duration)
counters.append(
_BudgetCounter(
counter_key=counter.key,
max_budget=window.max_budget,
fallback_spend=0.0,
entity_type="TeamMember",
entity_id=counter.entity_id,
spend_log_entity_id=counter.entity_id,
window_duration=counter.duration.value,
window_start=counter.start,
)
)
org_counter: Final = await _get_org_budget_counter(
valid_token=valid_token,
@ -726,6 +744,21 @@ def _dedupe_tags(tags: list[str]) -> list[str]:
@with_service_target(AUTH_OBJECTS_TARGET)
async def _cached_team_membership(
user_id: str, team_id: str, user_api_key_cache: UserApiKeyCache
) -> LiteLLM_TeamMembership | None:
cached: Final = _CACHED_VALUE.validate_python(
await user_api_key_cache.async_get_cache(
key=team_membership_reservation_cache_key(user_id=user_id, team_id=team_id)
)
)
if isinstance(cached, LiteLLM_TeamMembership):
return cached
if isinstance(cached, dict):
return LiteLLM_TeamMembership.model_validate(cached)
return None
async def _get_team_member_budget_counter(
valid_token: UserAPIKeyAuth,
team_object: LiteLLM_TeamTable | None,
@ -738,14 +771,7 @@ async def _get_team_member_budget_counter(
membership_cache_key: Final = team_membership_reservation_cache_key(
user_id=valid_token.user_id, team_id=team_object.team_id
)
cached_team_membership: Final = _CACHED_VALUE.validate_python(
await user_api_key_cache.async_get_cache(key=membership_cache_key)
)
team_membership: LiteLLM_TeamMembership | None = None
if isinstance(cached_team_membership, LiteLLM_TeamMembership):
team_membership = cached_team_membership
elif isinstance(cached_team_membership, dict):
team_membership = LiteLLM_TeamMembership(**cached_team_membership)
team_membership: Final = await _cached_team_membership(valid_token.user_id, team_object.team_id, user_api_key_cache)
member_budget_row: Final = team_membership.litellm_budget_table if team_membership is not None else None
now: Final = datetime.now(timezone.utc)

View file

@ -6393,12 +6393,11 @@ class PrismaClient:
raise e
def jsonify_team_object(self, db_data: Mapping[str, object]) -> dict[str, object]:
db_data = self.jsonify_object(data=db_data)
if db_data.get("members_with_roles", None) is not None and isinstance(db_data["members_with_roles"], list):
db_data["members_with_roles"] = json.dumps(db_data["members_with_roles"])
if db_data.get("budget_limits", None) is not None and isinstance(db_data["budget_limits"], list):
db_data["budget_limits"] = json.dumps(db_data["budget_limits"])
return db_data
serialized: Final = self.jsonify_object(data=db_data)
for column in ("members_with_roles", "budget_limits", "team_member_budget_limits"):
if isinstance(serialized.get(column), (list, tuple)):
serialized[column] = json.dumps(serialized[column])
return serialized
# Define a retrying strategy with exponential backoff
@backoff.on_exception(

View file

@ -82,6 +82,7 @@ _JSON_ENCODED_TEAM_FIELDS: Final = (
"model_max_budget",
"router_settings",
"budget_limits",
"team_member_budget_limits",
"members_with_roles",
)

View file

@ -179,6 +179,7 @@ model LiteLLM_ModelTable {
// Assign prod keys to groups, not individuals
model LiteLLM_TeamTable {
team_member_budget_limits Json?
team_id String @id @default(uuid())
team_alias String?
organization_id String?
@ -799,6 +800,7 @@ model LiteLLM_UserNotifications {
}
model LiteLLM_TeamMembership {
budget_limits Json?
// Use this table to track the Internal User's Spend within a Team + Set Budgets, rpm limits for the user within the team
user_id String
team_id String

View file

@ -0,0 +1,59 @@
"""A retried flush must not charge a member again after a sibling write fails."""
import json
import os
import uuid
from datetime import datetime, timezone
import psycopg
import pytest
from psycopg import sql
from prisma.errors import RawQueryError
from integration._support.prisma_clients import connected_proxy_prisma
from litellm.proxy.db.budget_window_spend_writer import commit_window_spend_updates
from litellm.proxy.db.db_transaction_queue.window_spend_update_queue import build_window_spend_transaction
@pytest.mark.asyncio
async def test_failed_key_window_rolls_back_member_spend_before_retry() -> None:
marker = uuid.uuid4().hex
member_id = json.dumps(["member-" + marker, "team-" + marker], separators=(",", ":"))
key_id = "key-" + marker
constraint = "window_fault_" + marker
start = datetime(2026, 10, 1, tzinfo=timezone.utc)
transactions = [
build_window_spend_transaction("team_member", member_id, "30d", start, 0.06, start),
build_window_spend_transaction("key", key_id, "30d", start, 0.06, start),
]
with psycopg.connect(os.environ["DATABASE_URL"], autocommit=True) as control:
control.execute(
sql.SQL('ALTER TABLE "LiteLLM_BudgetWindowSpend" ADD CONSTRAINT {} CHECK (entity_id <> {})').format(
sql.Identifier(constraint),
sql.Literal(key_id),
)
)
try:
async with connected_proxy_prisma() as client:
with pytest.raises(RawQueryError, match=constraint):
await commit_window_spend_updates(client, transactions)
assert (
await client.db.litellm_budgetwindowspend.find_many(
where={"entity_id": {"in": [member_id, key_id]}}
)
== []
)
finally:
control.execute(
sql.SQL('ALTER TABLE "LiteLLM_BudgetWindowSpend" DROP CONSTRAINT {}').format(sql.Identifier(constraint))
)
try:
async with connected_proxy_prisma() as client:
await commit_window_spend_updates(client, transactions)
rows = await client.db.litellm_budgetwindowspend.find_many(
where={"entity_id": {"in": [member_id, key_id]}}
)
assert len(rows) == 2
assert all(row.spend == pytest.approx(0.06) for row in rows)
finally:
control.execute('DELETE FROM "LiteLLM_BudgetWindowSpend" WHERE entity_id = ANY(%s)', ([member_id, key_id],))

View file

@ -0,0 +1,162 @@
"""Real proxy, database and Redis: concurrent budgets belong to a member/team pair."""
import uuid
from typing import Final
import pytest
from integration._support.client import Gateway, eventually
pytestmark: Final = pytest.mark.shares_worker_state
CALL_COST: Final = 20 * 0.001 + 20 * 0.002
def test_member_windows_persist_enforce_and_restore_inheritance(gateway: Gateway) -> None:
with gateway.scenario() as scenario:
model = scenario.model(input_cost_per_token=0.001, output_cost_per_token=0.002)
defaults = [{"budget_duration": "24h", "max_budget": 0.05}, {"budget_duration": "30d", "max_budget": 0.5}]
team = scenario.team(models=[model], team_member_budget_limits=defaults)
alice = scenario.user(auto_create_key=False)
bob = scenario.user(auto_create_key=False)
for user in (alice, bob):
gateway.post(
"/team/member_add",
{
"team_id": team,
"member": {"user_id": user, "role": "user"},
**({"max_budget_in_team": 10, "budget_duration": "30d"} if user == alice else {}),
},
)
alice_key = scenario.key(team_id=team, user_id=alice)
bob_key = scenario.key(team_id=team, user_id=bob)
saved = gateway.get("/team/info", {"team_id": team})
assert saved["team_info"]["team_member_budget_limits"] == defaults
def chat(key: str):
return gateway.request(
"POST",
"/v1/chat/completions",
{
"model": model,
"messages": [{"role": "user", "content": uuid.uuid4().hex}],
"max_tokens": 1,
},
key=key,
)
first = chat(alice_key)
assert first.status_code == 200, first.text
assert float(first.headers["x-litellm-response-cost"]) == pytest.approx(CALL_COST)
eventually(
lambda: gateway.rows(
'SELECT spend FROM "LiteLLM_BudgetWindowSpend" WHERE entity_type = %s AND entity_id = %s',
("team_member", f'["{alice}","{team}"]'),
),
lambda rows: len(rows) == 2 and all(row["spend"] == pytest.approx(CALL_COST) for row in rows),
seconds=70,
)
capped = chat(alice_key)
assert capped.status_code == 422 and "24h" in capped.text, capped.text
assert chat(bob_key).status_code == 200
other_team = scenario.team(models=[model], team_member_budget_limits=defaults)
gateway.post("/team/member_add", {"team_id": other_team, "member": {"user_id": alice, "role": "user"}})
other_key = scenario.key(team_id=other_team, user_id=alice)
assert chat(other_key).status_code == 200
custom = [{"budget_duration": "24h", "max_budget": 1}, {"budget_duration": "30d", "max_budget": 0.05}]
gateway.post("/team/member_update", {"team_id": team, "user_id": alice, "budget_limits": custom})
saved_member = gateway.get("/team/info", {"team_id": team})
alice_membership = next(m for m in saved_member["team_memberships"] if m["user_id"] == alice)
assert alice_membership["budget_limits"] == custom
assert alice_membership["litellm_budget_table"]["max_budget"] == 10
assert alice_membership["litellm_budget_table"]["budget_duration"] == "30d"
monthly = chat(alice_key)
assert monthly.status_code == 422 and "30d" in monthly.text, monthly.text
gateway.post("/team/member_update", {"team_id": team, "user_id": alice, "budget_limits": []})
inherited = chat(alice_key)
assert inherited.status_code == 422 and "24h" in inherited.text, inherited.text
gateway.post("/team/update", {"team_id": team, "team_member_budget_limits": []})
assert chat(alice_key).status_code == 200
@pytest.mark.asyncio
async def test_expired_daily_window_resets_without_resetting_monthly_spend(gateway: Gateway) -> None:
import json
from datetime import datetime, timedelta, timezone
from integration._support.prisma_clients import connected_prisma
with gateway.scenario() as scenario:
model = scenario.model(input_cost_per_token=0.001, output_cost_per_token=0.002)
defaults = [{"budget_duration": "24h", "max_budget": 0.05}, {"budget_duration": "30d", "max_budget": 0.1}]
team = scenario.team(models=[model], team_member_budget_limits=defaults)
member = scenario.user(auto_create_key=False)
gateway.post("/team/member_add", {"team_id": team, "member": {"user_id": member, "role": "user"}})
key = scenario.key(team_id=team, user_id=member)
today = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
identity = json.dumps([member, team], separators=(",", ":"))
async with connected_prisma() as db:
await db.litellm_budgetwindowspend.create(
data={
"entity_type": "team_member",
"entity_id": identity,
"window_duration": "24h",
"window_start": today - timedelta(days=1),
"spend": 10.0,
}
)
await db.litellm_budgetwindowspend.create(
data={
"entity_type": "team_member",
"entity_id": identity,
"window_duration": "30d",
"window_start": today.replace(day=1),
"spend": 0.2,
}
)
def chat():
return gateway.request(
"POST",
"/v1/chat/completions",
{
"model": model,
"messages": [{"role": "user", "content": uuid.uuid4().hex}],
"max_tokens": 1,
},
key=key,
)
monthly = chat()
assert monthly.status_code == 422 and "30d" in monthly.text, monthly.text
gateway.post(
"/team/update",
{
"team_id": team,
"team_member_budget_limits": [
defaults[0],
{"budget_duration": "30d", "max_budget": 1},
],
},
)
renewed = chat()
assert renewed.status_code == 200, renewed.text
eventually(
lambda: gateway.rows(
'SELECT window_duration, spend FROM "LiteLLM_BudgetWindowSpend" WHERE entity_type = %s AND entity_id = %s',
("team_member", identity),
),
lambda rows: (
{row["window_duration"]: row["spend"] for row in rows}
== {
"24h": pytest.approx(CALL_COST),
"30d": pytest.approx(0.2 + CALL_COST),
}
),
seconds=70,
)
daily = chat()
assert daily.status_code == 422 and "24h" in daily.text, daily.text

View file

@ -469,21 +469,56 @@ def test_resolve_effective_team_member_budget_preserves_member_and_default_prece
assert resolve_effective_team_member_budget(member_budget, None, now) == 110
assert resolve_effective_team_member_budget(expired_member_budget, None, now) == 100
assert resolve_effective_team_member_budget(
active_inherited_increase,
LiteLLM_BudgetTable(max_budget=50),
now,
) == 60
assert resolve_effective_team_member_budget(
expired_inherited_increase,
LiteLLM_BudgetTable(max_budget=50),
now,
) == 50
assert resolve_effective_team_member_budget(
LiteLLM_BudgetTable(max_budget=0),
LiteLLM_BudgetTable(max_budget=50),
now,
) == 0
assert (
resolve_effective_team_member_budget(
active_inherited_increase,
LiteLLM_BudgetTable(max_budget=50),
now,
)
== 60
)
assert (
resolve_effective_team_member_budget(
expired_inherited_increase,
LiteLLM_BudgetTable(max_budget=50),
now,
)
== 50
)
assert (
resolve_effective_team_member_budget(
LiteLLM_BudgetTable(max_budget=0),
LiteLLM_BudgetTable(max_budget=50),
now,
)
== 0
)
assert resolve_effective_team_member_budget(None, LiteLLM_BudgetTable(max_budget=50), now) == 50
assert resolve_effective_team_member_budget(None, LiteLLM_BudgetTable(max_budget=0), now) is None
assert resolve_effective_team_member_budget(None, None, now) is None
@pytest.mark.asyncio
async def test_jwt_member_without_user_row_still_enforces_default_windows() -> None:
from litellm.models.team import TeamMemberBudgetDuration, TeamMemberBudgetWindow
from litellm.proxy.auth.auth_checks import _check_team_member_budget
from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
from litellm.proxy.utils import ProxyLogging
cache = UserApiKeyCache()
team = LiteLLM_TeamTable(
team_id="jwt-member-budget-team",
team_member_budget_limits=(
TeamMemberBudgetWindow(budget_duration=TeamMemberBudgetDuration.DAILY, max_budget=0),
),
)
with pytest.raises(litellm.BudgetExceededError, match="24h"):
await _check_team_member_budget(
team_object=team,
user_object=None,
valid_token=UserAPIKeyAuth(user_id="jwt-member-only", team_id=team.team_id),
prisma_client=None,
user_api_key_cache=cache,
proxy_logging_obj=ProxyLogging(user_api_key_cache=cache),
team_membership_loaded=True,
)

View file

@ -0,0 +1,85 @@
from datetime import datetime, timezone
import pytest
from pydantic import ValidationError
from litellm.models.team import LiteLLM_TeamTable, TeamMemberBudgetDuration, TeamMemberBudgetWindow
from litellm.models.team_membership import LiteLLM_TeamMembership
from litellm.proxy._types import NewTeamRequest, TeamMemberAddRequest, TeamMemberUpdateRequest, UpdateTeamRequest
from litellm.proxy.common_utils.team_member_budget import (
MemberBudgetCounter,
get_team_member_budget_windows,
member_window_entity_id,
parse_member_window_entity_id,
)
@pytest.mark.parametrize("amount", [-1, float("inf"), float("nan")])
def test_rejects_invalid_caps(amount: float) -> None:
with pytest.raises(ValidationError):
TeamMemberBudgetWindow(budget_duration=TeamMemberBudgetDuration.DAILY, max_budget=amount)
@pytest.mark.parametrize(
"request_type, fields, field",
[
(NewTeamRequest, {}, "team_member_budget_limits"),
(UpdateTeamRequest, {"team_id": "team"}, "team_member_budget_limits"),
(TeamMemberAddRequest, {"team_id": "team", "member": {"user_id": "member", "role": "user"}}, "budget_limits"),
(TeamMemberUpdateRequest, {"team_id": "team", "user_id": "member"}, "budget_limits"),
],
)
def test_rejects_duplicate_windows(request_type: type, fields: dict, field: str) -> None:
duplicate = [{"budget_duration": "24h", "max_budget": 20}] * 2
with pytest.raises(ValidationError, match="unique"):
request_type(**fields, **{field: duplicate})
def test_override_and_clear_preserve_team_inheritance() -> None:
defaults = [TeamMemberBudgetWindow(budget_duration=TeamMemberBudgetDuration.DAILY, max_budget=20)]
custom = [TeamMemberBudgetWindow(budget_duration=TeamMemberBudgetDuration.DAILY, max_budget=0)]
team = LiteLLM_TeamTable(team_id="team", team_member_budget_limits=defaults)
member = LiteLLM_TeamMembership(user_id="member", team_id="team", budget_limits=custom)
assert get_team_member_budget_windows(team, member) == tuple(custom)
member.budget_limits = []
assert get_team_member_budget_windows(team, member) == tuple(defaults)
assert get_team_member_budget_windows(team, None) == tuple(defaults)
assert get_team_member_budget_windows(LiteLLM_TeamTable(team_id="off"), None) == ()
def test_reset_boundaries_are_independent() -> None:
before = datetime(2026, 10, 10, 23, 59, tzinfo=timezone.utc)
after = datetime(2026, 10, 11, 0, 1, tzinfo=timezone.utc)
daily = MemberBudgetCounter.for_member("member", "team", TeamMemberBudgetDuration.DAILY, before)
monthly = MemberBudgetCounter.for_member("member", "team", TeamMemberBudgetDuration.MONTHLY, before)
assert MemberBudgetCounter.for_member("member", "team", daily.duration, after).key != daily.key
assert MemberBudgetCounter.for_member("member", "team", monthly.duration, after).key == monthly.key
assert MemberBudgetCounter.for_member("other", "team", daily.duration, before).key != daily.key
assert MemberBudgetCounter.for_member("member", "other", daily.duration, before).key != daily.key
def test_member_identity_cannot_collide_at_a_separator() -> None:
first = member_window_entity_id("user:other", "team")
second = member_window_entity_id("user", "other:team")
assert first != second
assert parse_member_window_entity_id(first) == ("user:other", "team")
@pytest.mark.parametrize("request_type", [NewTeamRequest, UpdateTeamRequest])
def test_default_windows_round_trip_through_prisma_json(request_type: type) -> None:
import json
from litellm.proxy.utils import PrismaClient
data = request_type(
team_id="team",
team_member_budget_limits=[
{"budget_duration": "24h", "max_budget": 20},
{"budget_duration": "30d", "max_budget": 200},
],
)
client = object.__new__(PrismaClient)
serialized = client.jsonify_team_object(data.model_dump(exclude_none=True))
windows = json.loads(serialized["team_member_budget_limits"])
assert windows == [{"budget_duration": "24h", "max_budget": 20}, {"budget_duration": "30d", "max_budget": 200}]
restored = LiteLLM_TeamTable(team_id="team", team_member_budget_limits=serialized["team_member_budget_limits"])
assert restored.team_member_budget_limits == data.team_member_budget_limits

View file

@ -1,4 +1,4 @@
import { fireEvent, screen, waitFor } from "@testing-library/react";
import { act, fireEvent, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { renderWithProviders, testQueryClient } from "../../tests/test-utils";
@ -47,6 +47,35 @@ afterEach(() => {
});
describe("Teams creation integration", () => {
it("should preserve default member budget windows when additional settings are collapsed", async () => {
const user = userEvent.setup({ delay: null });
renderWithProviders(<Teams accessToken="sk-session-test" userID="test-admin" userRole="Admin" premiumUser />);
await user.click(screen.getAllByRole("button", { name: /create team/i })[0]);
await screen.findByLabelText(/team name/i);
await user.click(screen.getByText("Additional Settings"));
await user.click(screen.getByRole("switch", { name: "Enable budget windows" }));
await act(async () => {
fireEvent.change(screen.getByRole("spinbutton", { name: "Window 1 budget (USD)" }), { target: { value: "20" } });
});
await user.click(screen.getByRole("button", { name: /Add Budget Window/i }));
await user.click(screen.getByRole("combobox", { name: "Window 2 duration" }));
await user.click(await screen.findByRole("option", { name: "Monthly" }));
await act(async () => {
fireEvent.change(screen.getByRole("spinbutton", { name: "Window 2 budget (USD)" }), { target: { value: "200" } });
fireEvent.change(screen.getByLabelText(/team name/i), { target: { value: "Budget Team" } });
});
await user.click(screen.getByText("Additional Settings"));
await user.click(screen.getAllByRole("button", { name: /create team/i }).at(-1)!);
await waitFor(() =>
expect(vi.mocked(fetch).mock.calls.some(([input]) => String(input).includes("/team/new"))).toBe(true),
);
const request = vi.mocked(fetch).mock.calls.find(([input]) => String(input).includes("/team/new"));
expect(JSON.parse(String(request?.[1]?.body)).team_member_budget_limits).toEqual([
{ budget_duration: "24h", max_budget: 20 },
{ budget_duration: "30d", max_budget: 200 },
]);
});
it("sends a configured default member per-model budget", async () => {
const user = userEvent.setup({ delay: null });
renderWithProviders(<Teams accessToken="sk-session-test" userID="test-admin" userRole="Admin" premiumUser />);

View file

@ -1,3 +1,5 @@
import { MemberBudgetWindows } from "./team/MemberBudgetWindows";
import { memberBudgetWindowsSchema } from "./team/memberBudgetWindowSchema";
import { Page, PageTabs, PageTabsList, PageTabsTrigger } from "@/components/shared/Page";
import { useOrganizations } from "@/app/(dashboard)/hooks/organizations/useOrganizations";
import useCan from "@/app/(dashboard)/hooks/useCan";
@ -86,6 +88,7 @@ const teamCreateFieldsSchema = z.object({
metadata: metadataPairsSchema.optional(),
team_id: z.string().optional(),
team_member_budget: z.number().optional(),
team_member_budget_limits: memberBudgetWindowsSchema.optional(),
team_member_key_duration: z.string().optional(),
team_member_rpm_limit: numericInputSchema,
team_member_tpm_limit: numericInputSchema,
@ -124,6 +127,7 @@ const EMPTY_TEAM_CREATE_VALUES: TeamCreateFormValues = {
metadata: [],
team_id: undefined,
team_member_budget: undefined,
team_member_budget_limits: [],
team_member_key_duration: undefined,
team_member_rpm_limit: undefined,
team_member_tpm_limit: undefined,
@ -553,10 +557,15 @@ const Teams: React.FC<TeamProps> = ({ accessToken, userID, userRole, isViewOnly
}
}
const { require_trace_id: requireTraceId, ...teamCreateValues } = formValues;
const {
require_trace_id: requireTraceId,
team_member_budget_limits: memberBudgetWindows,
...teamCreateValues
} = formValues;
const teamMemberModelBudgets = modelMaxBudgetUpdate(teamMemberModelMaxBudget, {});
await teamCreateCall(accessToken, {
...teamCreateValues,
...(memberBudgetWindows?.length ? { team_member_budget_limits: memberBudgetWindows } : {}),
...(requireTraceId === undefined ? {} : { require_trace_id: requireTraceId }),
...(teamMemberModelBudgets !== undefined ? { team_member_model_max_budget: teamMemberModelBudgets } : {}),
models: normalizeTeamModelSelection(formValues.models),
@ -895,6 +904,13 @@ const Teams: React.FC<TeamProps> = ({ accessToken, userID, userRole, isViewOnly
>
{({ ref, value, ...field }) => <UIInput {...field} ref={ref} value={value ?? ""} />}
</FormField>
<FormField
control={form.control}
name="team_member_budget_limits"
label="Default member budget windows"
>
{({ value, onChange }) => <MemberBudgetWindows value={value ?? []} onChange={onChange} />}
</FormField>
<FormField
control={form.control}
name="team_member_budget"

View file

@ -85,10 +85,18 @@ describe("UserSearchModal submit payload", () => {
vi.mocked(userFilterUICall).mockResolvedValue([{ user_id: "u-1", user_email: "picked@example.com" }] as never);
});
const setup = () => {
const setup = (defaultBudgetWindows?: Array<{ budget_duration: string; max_budget: number }>) => {
const user = userEvent.setup();
const onSubmit = vi.fn();
render(<UserSearchModal isVisible onCancel={vi.fn()} onSubmit={onSubmit} accessToken="sk-test" />);
render(
<UserSearchModal
isVisible
onCancel={vi.fn()}
onSubmit={onSubmit}
accessToken="sk-test"
defaultBudgetWindows={defaultBudgetWindows}
/>,
);
return { user, onSubmit };
};
@ -130,6 +138,25 @@ describe("UserSearchModal submit payload", () => {
});
});
it("should submit custom windows and reset to team defaults for the next member", async () => {
const windows = [
{ budget_duration: "24h", max_budget: 20 },
{ budget_duration: "30d", max_budget: 200 },
];
const { user, onSubmit } = setup(windows);
await user.click(screen.getByRole("switch", { name: "Custom budget windows" }));
await act(async () => {
fireEvent.change(screen.getByRole("spinbutton", { name: "Window 1 budget (USD)" }), { target: { value: "5" } });
});
await searchByEmail(user, "pick");
await user.click(save());
await waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1));
expect(onSubmit.mock.calls[0][0].budget_limits).toEqual([{ ...windows[0], max_budget: 5 }, windows[1]]);
expect(screen.getByRole("switch", { name: "Custom budget windows" })).not.toBeChecked();
expect(screen.getByText("$20 daily, $200 monthly")).toBeInTheDocument();
expect(save()).toBeDisabled();
});
it("carries a role changed off its default into the payload", async () => {
const { onSubmit } = setup();
const user = userEvent.setup({ pointerEventsCheck: PointerEventsCheckLevel.Never });

View file

@ -11,6 +11,9 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/u
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { UiLoadingSpinner } from "@/components/ui/ui-loading-spinner";
import type { BudgetWindowEntry } from "../key_team_helpers/BudgetWindowsEditor";
import { MemberBudgetWindows } from "../team/MemberBudgetWindows";
import { memberBudgetWindowsSchema } from "../team/memberBudgetWindowSchema";
interface User {
user_id: string;
@ -31,12 +34,14 @@ interface Role {
}
interface FormValues {
budget_limits?: BudgetWindowEntry[];
user_email: string | null | undefined;
user_id: string | null | undefined;
role: string;
}
interface UserSearchModalProps {
defaultBudgetWindows?: BudgetWindowEntry[];
isVisible: boolean;
onCancel: () => void;
onSubmit: (values: FormValues) => void | Promise<void>;
@ -63,8 +68,14 @@ const UserSearchModal: React.FC<UserSearchModalProps> = ({
],
defaultRole = "user",
teamId,
defaultBudgetWindows,
}) => {
const emptyValues: FormValues = { user_email: undefined, user_id: undefined, role: defaultRole };
const emptyValues: FormValues = {
user_email: undefined,
user_id: undefined,
role: defaultRole,
...(defaultBudgetWindows !== undefined ? { budget_limits: [] } : {}),
};
const form = useForm<FormValues>({ defaultValues: emptyValues });
const selectedUserId = form.watch("user_id");
const selectedUserEmail = form.watch("user_email");
@ -124,9 +135,17 @@ const UserSearchModal: React.FC<UserSearchModalProps> = ({
};
const handleSubmit = async (values: FormValues): Promise<void> => {
if (values.budget_limits !== undefined) {
const validation = memberBudgetWindowsSchema.safeParse(values.budget_limits);
if (!validation.success) {
form.setError("budget_limits", { type: "validate", message: validation.error.issues[0]?.message });
return;
}
}
setIsSubmitting(true);
try {
await onSubmit(values);
form.reset(emptyValues);
} finally {
setIsSubmitting(false);
}
@ -235,6 +254,17 @@ const UserSearchModal: React.FC<UserSearchModalProps> = ({
</Select>
)}
</FormField>
{defaultBudgetWindows !== undefined && (
<FormField control={form.control} name="budget_limits" label="Budget windows">
{({ value, onChange }) => (
<MemberBudgetWindows
value={value ?? []}
onChange={onChange}
defaultWindows={defaultBudgetWindows}
/>
)}
</FormField>
)}
</FieldGroup>
<div className="mt-4 text-right">

View file

@ -46,7 +46,7 @@ export function BudgetWindowsEditor({ value, onChange }: BudgetWindowsEditorProp
value={window.budget_duration}
onValueChange={(v: string | null) => v && updateWindow(idx, "budget_duration", v)}
>
<SelectTrigger className="w-[130px]">
<SelectTrigger className="w-[130px]" aria-label={`Window ${idx + 1} duration`}>
<SelectValue />
</SelectTrigger>
<SelectContent>
@ -62,6 +62,7 @@ export function BudgetWindowsEditor({ value, onChange }: BudgetWindowsEditorProp
<InputGroupText>$</InputGroupText>
</InputGroupAddon>
<InputGroupInput
aria-label={`Window ${idx + 1} budget (USD)`}
type="number"
step={0.01}
min={0}
@ -80,6 +81,8 @@ export function BudgetWindowsEditor({ value, onChange }: BudgetWindowsEditorProp
/>
</InputGroup>
<Button
type="button"
aria-label={`Remove budget window ${idx + 1}`}
variant="ghost"
size="sm"
className="px-1 text-destructive hover:text-destructive/80"
@ -93,6 +96,7 @@ export function BudgetWindowsEditor({ value, onChange }: BudgetWindowsEditorProp
);
})}
<Button
type="button"
variant="outline"
size="sm"
onClick={(e) => {

View file

@ -3,6 +3,50 @@ import { clearTokenCookies } from "@/utils/cookieUtils";
import * as Networking from "./networking";
import { uiHref } from "@/utils/uiHref";
describe("member budget window requests", () => {
const windows = [
{ budget_duration: "24h", max_budget: 20 },
{ budget_duration: "30d", max_budget: 200 },
];
afterEach(() => vi.unstubAllGlobals());
it("should send member windows beside the member when adding a member", async () => {
const fetchMock = vi.fn().mockResolvedValue(Response.json({}));
vi.stubGlobal("fetch", fetchMock);
await Networking.teamMemberAddCall("test-session", "team", {
user_id: "member",
role: "user",
budget_limits: windows,
});
expect(JSON.parse(fetchMock.mock.calls[0][1].body)).toEqual({
team_id: "team",
member: { user_id: "member", role: "user" },
budget_limits: windows,
});
});
it.each([windows, []])("should send configured or cleared member windows on update", async (budget_limits) => {
const fetchMock = vi.fn().mockResolvedValue(Response.json({}));
vi.stubGlobal("fetch", fetchMock);
await Networking.teamMemberUpdateCall("test-session", "team", { user_id: "member", role: "user", budget_limits });
const expected = {
team_id: "team",
user_id: "member",
role: "user",
budget_limits,
};
expect(JSON.parse(fetchMock.mock.calls[0][1].body)).toEqual(expected);
});
it("should omit windows when an older caller does not supply them", async () => {
const fetchMock = vi.fn().mockResolvedValue(Response.json({}));
vi.stubGlobal("fetch", fetchMock);
await Networking.teamMemberUpdateCall("test-session", "team", { user_id: "member", role: "user" });
expect(JSON.parse(fetchMock.mock.calls[0][1].body)).toEqual({ team_id: "team", user_id: "member", role: "user" });
});
});
vi.mock("@/utils/cookieUtils", () => ({
clearTokenCookies: vi.fn(),
getCookie: vi.fn(),

View file

@ -1,3 +1,4 @@
import type { BudgetWindowEntry } from "./key_team_helpers/BudgetWindowsEditor";
// Shared date formatter for daily activity endpoints
export const formatDate = (date: Date) => {
const year = date.getFullYear();
@ -2611,6 +2612,7 @@ export const modelPatchUpdateCall = async (
};
export interface Member {
budget_limits?: BudgetWindowEntry[];
role: string;
user_id: string | null;
user_email?: string | null;
@ -2627,6 +2629,7 @@ export interface Member {
export const teamMemberAddCall = async (accessToken: string, teamId: string, formValues: Member) => {
try {
const { budget_limits, ...member } = formValues;
const url = proxyBaseUrl ? `${proxyBaseUrl}/team/member_add` : `/team/member_add`;
const response = await fetch(url, {
@ -2637,7 +2640,8 @@ export const teamMemberAddCall = async (accessToken: string, teamId: string, for
},
body: JSON.stringify({
team_id: teamId,
member: formValues,
member,
...(budget_limits !== undefined ? { budget_limits } : {}),
}),
});
@ -2737,6 +2741,9 @@ export const teamMemberUpdateCall = async (
role: formValues.role,
user_id: formValues.user_id,
};
if (formValues.budget_limits !== undefined) {
requestBody.budget_limits = formValues.budget_limits;
}
const orNull = (value: unknown) => (value === undefined || value === null || value === "" ? null : value);
if (formValues.user_email !== undefined) {

View file

@ -26,6 +26,8 @@ import {
type MemberFormValues,
} from "./memberFormValues";
import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { MemberBudgetWindows } from "./MemberBudgetWindows";
import { isMemberBudgetWindows, memberBudgetWindowsSchema } from "./memberBudgetWindowSchema";
dayjs.extend(utc);
@ -65,6 +67,7 @@ const buildMemberSchema = (config: ModalConfig): z.ZodType<MemberFormValues, Mem
user_id: z.string().nullish(),
role: z.string({ error: ROLE_REQUIRED_MESSAGE }).min(1, ROLE_REQUIRED_MESSAGE),
...Object.fromEntries((config.additionalFields ?? []).map((field) => [field.name, memberFieldSchema])),
budget_limits: config.showBudgetWindows ? memberBudgetWindowsSchema.optional() : z.undefined().optional(),
};
return z.object(shape).superRefine((values, ctx) => {
@ -164,7 +167,7 @@ const MemberModal = <T extends BaseMember>({
return (
<MultiSelect
options={field.options ?? []}
value={Array.isArray(value) ? value : []}
value={Array.isArray(value) ? value.filter((item): item is string => typeof item === "string") : []}
onValueChange={onChange}
placeholder={field.placeholder || "Select options"}
/>
@ -277,6 +280,17 @@ const MemberModal = <T extends BaseMember>({
</FormField>
{config.additionalFields?.map((field) => renderField(field, field.name))}
{config.showBudgetWindows && (
<FormField control={form.control} name="budget_limits" label="Budget windows">
{({ value, onChange }) => (
<MemberBudgetWindows
value={isMemberBudgetWindows(value) ? value : []}
onChange={onChange}
defaultWindows={config.defaultBudgetWindows ?? []}
/>
)}
</FormField>
)}
</FieldGroup>
<div className="mt-6 text-right">

View file

@ -0,0 +1,98 @@
import { act, fireEvent, screen, waitFor } from "@testing-library/react";
import { describe, expect, it, vi } from "vitest";
import { renderWithProviders } from "../../../tests/test-utils";
import MemberModal from "./EditMembership";
const windows = [
{ budget_duration: "24h", max_budget: 20 },
{ budget_duration: "30d", max_budget: 200 },
];
function renderMember(budget_limits = windows, defaultBudgetWindows = windows) {
const onSubmit = vi.fn();
renderWithProviders(
<MemberModal
visible
mode="edit"
initialData={{ user_id: "member", role: "user", budget_limits, max_budget_in_team: 50 }}
onCancel={vi.fn()}
onSubmit={onSubmit}
config={{
title: "Edit Member",
roleOptions: [{ label: "User", value: "user" }],
showUserId: true,
showBudgetWindows: true,
defaultBudgetWindows,
additionalFields: [{ name: "max_budget_in_team", label: "Single budget", type: "numerical" }],
}}
/>,
);
return onSubmit;
}
describe("member budget windows form", () => {
it("should render both configured windows", () => {
renderMember();
expect(screen.getByRole("spinbutton", { name: "Window 1 budget (USD)" })).toHaveValue(20);
expect(screen.getByRole("spinbutton", { name: "Window 2 budget (USD)" })).toHaveValue(200);
expect(screen.getByRole("switch", { name: "Custom budget windows" })).toBeChecked();
});
it("should keep windows off and save an unrelated member edit without requiring a budget", async () => {
const onSubmit = renderMember([], []);
expect(screen.getByRole("switch", { name: "Custom budget windows" })).not.toBeChecked();
expect(screen.getByRole("img", { name: /20 dollar daily cap/ })).toBeInTheDocument();
expect(screen.queryByRole("spinbutton", { name: "Window 1 budget (USD)" })).not.toBeInTheDocument();
await act(async () => {
fireEvent.click(screen.getByRole("button", { name: "Save Changes" }));
});
await waitFor(() => expect(onSubmit).toHaveBeenCalledWith(expect.objectContaining({ budget_limits: [] })));
});
it("should inherit team defaults, then save a custom zero-dollar cap without changing the single budget", async () => {
const onSubmit = renderMember([]);
expect(screen.getByText("$20 daily, $200 monthly")).toBeInTheDocument();
expect(screen.queryByRole("spinbutton", { name: "Window 1 budget (USD)" })).not.toBeInTheDocument();
await act(async () => {
fireEvent.click(screen.getByRole("switch", { name: "Custom budget windows" }));
});
await act(async () => {
fireEvent.change(screen.getByRole("spinbutton", { name: "Window 1 budget (USD)" }), { target: { value: "0" } });
fireEvent.click(screen.getByRole("button", { name: "Save Changes" }));
});
const expected = {
user_id: "member",
role: "user",
max_budget_in_team: 50,
budget_limits: [{ ...windows[0], max_budget: 0 }, windows[1]],
};
await waitFor(() => expect(onSubmit).toHaveBeenCalledWith(expected));
});
it("should send an empty override to restore inheritance", async () => {
const onSubmit = renderMember();
await act(async () => {
fireEvent.click(screen.getByRole("switch", { name: "Custom budget windows" }));
fireEvent.click(screen.getByRole("button", { name: "Save Changes" }));
});
await waitFor(() => expect(onSubmit).toHaveBeenCalledWith(expect.objectContaining({ budget_limits: [] })));
});
it("should explain an incomplete custom window and prevent saving it", async () => {
const onSubmit = renderMember([], []);
await act(async () => {
fireEvent.click(screen.getByRole("switch", { name: "Custom budget windows" }));
fireEvent.click(screen.getByRole("button", { name: "Save Changes" }));
});
expect(await screen.findByText("Enter a budget")).toBeInTheDocument();
expect(onSubmit).not.toHaveBeenCalled();
});
it("should explain duplicate durations and prevent saving them", async () => {
const onSubmit = renderMember([windows[0], windows[0]]);
await act(async () => {
fireEvent.click(screen.getByRole("button", { name: "Save Changes" }));
});
expect(await screen.findByText("Use each budget duration only once")).toBeInTheDocument();
expect(onSubmit).not.toHaveBeenCalled();
});
});

View file

@ -0,0 +1,116 @@
import { useId } from "react";
import { CalendarRange } from "lucide-react";
import { BudgetWindowsEditor, type BudgetWindowEntry } from "../key_team_helpers/BudgetWindowsEditor";
import { getBudgetDurationLabel } from "../common_components/budget_duration_dropdown";
import { Label } from "@/components/ui/label";
import { Switch } from "@/components/ui/switch";
interface MemberBudgetWindowsProps {
value: BudgetWindowEntry[];
onChange: (windows: BudgetWindowEntry[]) => void;
defaultWindows?: BudgetWindowEntry[];
}
export function MemberBudgetWindows({ value, onChange, defaultWindows }: MemberBudgetWindowsProps) {
const id = useId();
const enabled = value.length > 0;
const isMember = defaultWindows !== undefined;
const inherits = isMember && !enabled && defaultWindows.length > 0;
const label = isMember ? "Custom budget windows" : "Enable budget windows";
const description = enabled
? "Apply multiple spending caps at the same time."
: "Optional. Leave off to keep your existing budget settings.";
const toggleWindows = (checked: boolean) => {
if (!checked) {
onChange([]);
return;
}
if (defaultWindows?.length) {
onChange(defaultWindows.map((window) => ({ ...window })));
return;
}
onChange([{ budget_duration: "24h", max_budget: null }]);
};
return (
<div className="space-y-4 rounded-lg border border-border bg-muted/20 p-4">
<div className="flex items-start justify-between gap-4">
<div className="flex items-start gap-3">
<CalendarRange className="mt-0.5 size-5 shrink-0 text-muted-foreground" aria-hidden="true" />
<div className="space-y-1">
<Label htmlFor={id}>{label}</Label>
<p className="text-xs text-muted-foreground">
{inherits ? "Off uses the team defaults below." : description}
</p>
</div>
</div>
<Switch id={id} checked={enabled} onCheckedChange={toggleWindows} />
</div>
{!enabled && !inherits && (
<div className="space-y-3">
<p className="text-sm text-muted-foreground">
Add a daily cap to stop a runaway session and a monthly cap to control total spend for each member in this
team.
</p>
<div
role="img"
aria-label="Example: a 20 dollar daily cap and a 200 dollar monthly cap both apply"
className="flex items-center gap-2 text-sm"
>
<div className="min-w-0 flex-1 rounded-md border border-border bg-background p-2.5">
<div className="text-xs text-muted-foreground">Daily cap</div>
<div className="mt-1 font-medium">
$20 <span className="text-xs font-normal text-muted-foreground">/ day</span>
</div>
<div className="mt-2 h-1 rounded-full bg-info/15">
<div className="h-1 w-1/3 rounded-full bg-info" />
</div>
</div>
<span aria-hidden="true" className="text-muted-foreground">
+
</span>
<div className="min-w-0 flex-1 rounded-md border border-border bg-background p-2.5">
<div className="text-xs text-muted-foreground">Monthly cap</div>
<div className="mt-1 font-medium">
$200 <span className="text-xs font-normal text-muted-foreground">/ month</span>
</div>
<div className="mt-2 h-1 rounded-full bg-info/15">
<div className="h-1 w-2/3 rounded-full bg-info" />
</div>
</div>
</div>
<p className="text-xs text-muted-foreground">
Example only. Both caps apply together. Each resets on its own schedule.
</p>
</div>
)}
{inherits && (
<div className="rounded-md bg-background p-3 text-sm">
<p className="font-medium">Using team defaults</p>
<p className="mt-1 text-muted-foreground">
{defaultWindows
.map((window) => `$${window.max_budget} ${getBudgetDurationLabel(window.budget_duration)}`)
.join(", ")}
</p>
<p className="mt-2 text-xs text-muted-foreground">
Turn on custom windows to replace these limits for this member.
</p>
</div>
)}
{enabled && (
<div className="space-y-3">
<BudgetWindowsEditor value={value} onChange={onChange} />
<p className="text-xs text-muted-foreground">
Spending pauses when any cap is reached. Each window resets independently. Existing single-budget limits
also apply.
</p>
</div>
)}
</div>
);
}

View file

@ -1,7 +1,7 @@
import { describe, expect, it, vi } from "vitest";
import userEvent from "@testing-library/user-event";
import { chooseSelectOption, fireEvent, renderWithProviders, screen, waitFor } from "@/../tests/test-utils";
import { act, chooseSelectOption, fireEvent, renderWithProviders, screen, waitFor } from "@/../tests/test-utils";
import TeamAdminSettingsForm, { type TeamAdminMetadataSettings } from "./TeamAdminSettingsForm";
@ -301,3 +301,24 @@ describe("TeamAdminSettingsForm", () => {
});
});
});
describe("team admin budget windows form", () => {
it("should configure windows with the same optional editor when permitted", async () => {
const user = userEvent.setup();
const { onSave } = renderForm(new Set(["team_member_budget_limits"]));
const toggle = screen.getByRole("switch", { name: "Enable budget windows" });
expect(toggle).not.toBeChecked();
await user.click(toggle);
act(() =>
fireEvent.change(screen.getByRole("spinbutton", { name: "Window 1 budget (USD)" }), { target: { value: "20" } }),
);
await user.click(screen.getByRole("button", { name: /save changes/i }));
await waitFor(() =>
expect(onSave).toHaveBeenCalledWith({ team_member_budget_limits: [{ budget_duration: "24h", max_budget: 20 }] }),
);
});
it("should hide windows when the proxy has not granted permission", () => {
renderForm(new Set(["tpm_limit"]));
expect(screen.queryByRole("switch", { name: "Enable budget windows" })).not.toBeInTheDocument();
});
});

View file

@ -19,6 +19,8 @@ import MetadataKeyValueFields, {
metadataPairsSchema,
} from "../common_components/MetadataKeyValueFields";
import NumericalInput from "../shared/numerical_input";
import { MemberBudgetWindows } from "./MemberBudgetWindows";
import { isMemberBudgetWindows, memberBudgetWindowsSchema } from "./memberBudgetWindowSchema";
import {
isTeamAdminDurationSettingsField,
TEAM_ADMIN_METADATA_FIELD,
@ -42,6 +44,7 @@ const teamAdminSettingsShape = {
soft_budget: numericInputSchema,
team_member_budget: numericInputSchema,
team_member_budget_duration: z.string().nullish(),
team_member_budget_limits: memberBudgetWindowsSchema.optional(),
team_member_tpm_limit: numericInputSchema,
team_member_rpm_limit: numericInputSchema,
};
@ -128,7 +131,16 @@ function TeamAdminSettingsFormFields({
const form = useZodForm(schema, { defaultValues: { ...initialValues, metadata: [...(metadata?.pairs ?? [])] } });
const draft = useWatch({ control: form.control });
const changesFrom = (values: typeof draft): TeamAdminSettingsChanges => ({
...teamAdminSettingsChanges(values, initialValues, editableFields),
...teamAdminSettingsChanges(
{
...values,
team_member_budget_limits: isMemberBudgetWindows(values.team_member_budget_limits)
? values.team_member_budget_limits
: undefined,
},
initialValues,
editableFields,
),
...(editsMetadata ? teamAdminMetadataChange(values.metadata, metadata.context) : {}),
});
const hasChanges = Object.keys(changesFrom(draft)).length > 0;
@ -170,6 +182,15 @@ function TeamAdminSettingsFormFields({
}
</FormField>
))}
{editableFields.has("team_member_budget_limits") && (
<FormField
control={form.control}
name="team_member_budget_limits"
label={teamAdminFieldLabel("team_member_budget_limits")}
>
{({ value, onChange }) => <MemberBudgetWindows value={value ?? []} onChange={onChange} />}
</FormField>
)}
{editsMetadata && (
<Field>
<FieldLabel>{teamAdminFieldLabel(TEAM_ADMIN_METADATA_FIELD)}</FieldLabel>

View file

@ -415,6 +415,28 @@ describe("TeamInfoView - member budget reset prompt", () => {
return await screen.findByLabelText("Default Budget (USD)");
};
it("should submit cleared default member windows after their section is collapsed", async () => {
const user = userEvent.setup({ delay: null });
const data = createMockTeamData({
team_member_budget_limits: [
{ budget_duration: "24h", max_budget: 20 },
{ budget_duration: "30d", max_budget: 200 },
],
});
vi.mocked(networking.teamInfoCall).mockResolvedValue(data);
vi.mocked(networking.teamUpdateCall).mockResolvedValue({ data: savedTeam, team_id: "123" });
renderWithProviders(<TeamInfoView {...props} />);
await user.click(await screen.findByRole("tab", { name: "Settings" }));
await user.click(await screen.findByRole("button", { name: /edit settings/i }));
await user.click(screen.getByText("Team Member Settings"));
await user.click(screen.getByRole("button", { name: "Remove budget window 2" }));
await user.click(screen.getByRole("button", { name: "Remove budget window 1" }));
await user.click(screen.getByText("Team Member Settings"));
await user.click(screen.getByRole("button", { name: /save changes/i }));
await waitFor(() => expect(networking.teamUpdateCall).toHaveBeenCalled());
expect(vi.mocked(networking.teamUpdateCall).mock.calls[0][1].team_member_budget_limits).toEqual([]);
});
const submitNewDefault = async (user: ReturnType<typeof userEvent.setup>, input: HTMLElement, value: string) => {
fireEvent.change(input, { target: { value } });
await user.click(screen.getByRole("button", { name: /save changes/i }));

View file

@ -1,3 +1,11 @@
import type { BudgetWindowEntry } from "../key_team_helpers/BudgetWindowsEditor";
import { MemberBudgetWindows } from "./MemberBudgetWindows";
import {
memberBudgetWindowsSchema,
memberBudgetWindowsUpdate,
type MemberBudgetWindow,
} from "./memberBudgetWindowSchema";
import { getBudgetDurationLabel } from "../common_components/budget_duration_dropdown";
import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
import type { components } from "@/lib/http/schema";
import useCan from "@/app/(dashboard)/hooks/useCan";
@ -277,6 +285,7 @@ export const mcpUnresolvableSaveError = (reason: string): string =>
export type TeamMemberBudgetSource = components["schemas"]["TeamMemberResetBudgetResponse"]["budget_source"];
export interface TeamMembership {
budget_limits?: BudgetWindowEntry[] | null;
user_id: string;
team_id: string;
budget_id: string | null;
@ -302,6 +311,7 @@ export interface TeamMembership {
export interface TeamData {
team_id: string;
team_info: {
team_member_budget_limits?: MemberBudgetWindow[] | null;
team_alias: string;
team_id: string;
organization_id: string | null;
@ -376,6 +386,7 @@ const teamUpdateFieldsSchema = z.object({
soft_budget_alerting_emails: z.union([z.string(), z.array(z.string())]).optional(),
default_team_member_models: z.array(z.string()).optional(),
team_member_budget: numericInputSchema,
team_member_budget_limits: memberBudgetWindowsSchema.optional(),
team_member_budget_duration: z.string().nullish(),
team_member_key_duration: z.string().optional(),
team_member_tpm_limit: numericInputSchema,
@ -472,6 +483,7 @@ const EMPTY_TEAM_UPDATE_VALUES: TeamUpdateFormValues = {
soft_budget_alerting_emails: "",
default_team_member_models: [],
team_member_budget: undefined,
team_member_budget_limits: [],
team_member_budget_duration: undefined,
team_member_key_duration: undefined,
team_member_tpm_limit: undefined,
@ -524,6 +536,7 @@ const toTeamFormValues = (info: TeamInfoRecord, effectiveGuardrails: string[]):
: "",
default_team_member_models: info.default_team_member_models || [],
team_member_budget: info.team_member_budget_table?.max_budget,
team_member_budget_limits: info.team_member_budget_limits ?? [],
team_member_budget_duration: info.team_member_budget_table?.budget_duration,
team_member_key_duration: info.metadata?.team_member_key_duration,
team_member_tpm_limit: info.team_member_budget_table?.tpm_limit,
@ -828,6 +841,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
user_email: values.user_email,
user_id: values.user_id,
role: values.role,
budget_limits: memberBudgetWindowsUpdate(values.budget_limits),
};
await teamMemberAddCall(accessToken, teamId, member);
@ -867,6 +881,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
user_email: values.user_email,
user_id: values.user_id,
role: values.role,
budget_limits: memberBudgetWindowsUpdate(values.budget_limits, selectedEditMember?.budget_limits),
max_budget_in_team: values.max_budget_in_team,
tpm_limit: values.tpm_limit,
rpm_limit: values.rpm_limit,
@ -1101,6 +1116,12 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
};
updateData.team_member_budget_duration = values.team_member_budget_duration;
if (
values.team_member_budget_limits !== undefined &&
(form.getFieldState("team_member_budget_limits").isDirty || info.team_member_budget_limits != null)
) {
updateData.team_member_budget_limits = values.team_member_budget_limits;
}
const newTeamMemberBudget =
values.team_member_budget !== undefined ? numberOrNull(values.team_member_budget) : undefined;
@ -1313,6 +1334,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
soft_budget: info.soft_budget,
team_member_budget: info.team_member_budget_table?.max_budget,
team_member_budget_duration: info.team_member_budget_table?.budget_duration,
team_member_budget_limits: info.team_member_budget_limits ?? [],
team_member_tpm_limit: info.team_member_budget_table?.tpm_limit,
team_member_rpm_limit: info.team_member_budget_table?.rpm_limit,
}}
@ -1689,6 +1711,13 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
/>
)}
</FormField>
<FormField
control={form.control}
name="team_member_budget_limits"
label="Default member budget windows"
>
{({ value, onChange }) => <MemberBudgetWindows value={value ?? []} onChange={onChange} />}
</FormField>
<FormField
control={form.control}
name="team_member_budget"
@ -2413,6 +2442,14 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
<Info className="ml-1 inline size-3.5 align-text-bottom" />
</SimpleTooltip>
</p>
{Boolean(info.team_member_budget_limits?.length) && (
<div>
Default member budget windows:{" "}
{(info.team_member_budget_limits ?? [])
.map((window) => `$${window.max_budget} ${getBudgetDurationLabel(window.budget_duration)}`)
.join(", ")}
</div>
)}
<div>Max Budget: {info.team_member_budget_table?.max_budget ?? "No Limit"}</div>
<div>Budget Duration: {info.team_member_budget_table?.budget_duration || "No Limit"}</div>
{modelMaxBudgetToEntries(
@ -2571,6 +2608,8 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
mode="edit"
config={{
title: "Edit Member",
showBudgetWindows: true,
defaultBudgetWindows: info.team_member_budget_limits ?? [],
showEmail: true,
showUserId: true,
roleOptions: [
@ -2700,6 +2739,7 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
onSubmit={handleMemberCreate}
accessToken={accessToken}
teamId={teamId}
defaultBudgetWindows={info.team_member_budget_limits ?? []}
/>
{/* Delete Member Confirmation Modal */}

View file

@ -136,6 +136,7 @@ describe("TeamMembersComponent", () => {
);
expect(screen.getByRole("table")).toBeInTheDocument();
expect(screen.queryByRole("columnheader", { name: "Budget windows" })).not.toBeInTheDocument();
});
it("should render team members table with headers", () => {
@ -158,6 +159,37 @@ describe("TeamMembersComponent", () => {
expect(screen.getByRole("columnheader", { name: /actions/i })).toBeInTheDocument();
});
it("should show member overrides separately from inherited team windows", () => {
const original = createMockTeamData();
const teamData: TeamData = {
...original,
team_info: {
...original.team_info,
team_member_budget_limits: [{ budget_duration: "30d", max_budget: 200 }],
},
team_memberships: original.team_memberships.map((membership) => ({
...membership,
budget_limits: [{ budget_duration: "24h", max_budget: 5 }],
})),
};
renderWithProviders(
<TeamMembersComponent
teamData={teamData}
canEditTeam={false}
handleMemberDelete={mockHandleMemberDelete}
onMemberSpendReset={mockOnMemberSpendReset}
onMemberBudgetReset={mockOnMemberBudgetReset}
setSelectedEditMember={mockSetSelectedEditMember}
setIsEditMemberModalVisible={mockSetIsEditMemberModalVisible}
setIsAddMemberModalVisible={mockSetIsAddMemberModalVisible}
/>,
);
expect(screen.getByText("$5.00 daily")).toBeInTheDocument();
expect(screen.getByText("Member override")).toBeInTheDocument();
expect(screen.getByText("$200.00 monthly")).toBeInTheDocument();
expect(screen.getByText("Team default")).toBeInTheDocument();
});
it("should render team members data", () => {
renderWithProviders(
<TeamMembersComponent

View file

@ -18,6 +18,8 @@ import { isProxyAdminRole, isUserTeamAdminForSingleTeam } from "@/utils/roles";
import { CircleHelp } from "lucide-react";
import { useMemo, useState, type ComponentProps } from "react";
import { TeamData, TeamMemberBudgetSource, TeamMembership } from "./TeamInfo";
import { effectiveMemberBudgetWindows } from "./memberBudgetWindowSchema";
import { getBudgetDurationLabel } from "../common_components/budget_duration_dropdown";
const BUDGET_SOURCE_LABELS: Record<Exclude<TeamMemberBudgetSource, "none">, string> = {
team_default: "Team default",
@ -167,7 +169,37 @@ export default function TeamMemberTab({
);
};
const showBudgetWindows =
Boolean(teamData.team_info.team_member_budget_limits?.length) ||
teamData.team_memberships.some((membership) => Boolean(membership.budget_limits?.length));
const extraColumns: NonNullable<ComponentProps<typeof MemberTable>["extraColumns"]> = [
...(showBudgetWindows
? [
{
title: "Budget windows",
key: "budget_windows",
render: (record: Member) => {
const override = findMembership(record.user_id)?.budget_limits;
const windows = effectiveMemberBudgetWindows(teamData.team_info.team_member_budget_limits, override);
if (!windows.length) return <span className="text-muted-foreground">Not set</span>;
return (
<div className="space-y-1">
{windows.map((window) => (
<div key={window.budget_duration}>
${formatNumberWithCommas(window.max_budget ?? 0, 2)}{" "}
{getBudgetDurationLabel(window.budget_duration)}
</div>
))}
<div className="text-xs text-muted-foreground">
{override?.length ? "Member override" : "Team default"}
</div>
</div>
);
},
},
]
: []),
{
title: (
<span className="flex items-center gap-1">
@ -334,7 +366,7 @@ export default function TeamMemberTab({
const membership = findMembership(record.user_id);
setSelectedEditMember(
seedMemberBudgetFields(
record,
{ ...record, budget_limits: membership?.budget_limits ?? [] },
membership?.litellm_budget_table,
teamData.team_info.team_member_budget_table?.model_max_budget,
),

View file

@ -0,0 +1,46 @@
import { describe, expect, it } from "vitest";
import {
effectiveMemberBudgetWindows,
memberBudgetWindowsSchema,
memberBudgetWindowsUpdate,
} from "./memberBudgetWindowSchema";
const windows = [
{ budget_duration: "24h", max_budget: 20 },
{ budget_duration: "30d", max_budget: 200 },
];
describe("member budget windows", () => {
it("should accept simultaneous daily and monthly limits and preserve zero-dollar caps", () => {
expect(memberBudgetWindowsSchema.parse(windows)).toEqual(windows);
expect(memberBudgetWindowsSchema.parse([{ ...windows[0], max_budget: 0 }])).toEqual([
{ ...windows[0], max_budget: 0 },
]);
});
it.each([null, -1, Infinity, NaN])("should reject an invalid budget of %s", (max_budget) => {
expect(memberBudgetWindowsSchema.safeParse([{ ...windows[0], max_budget }]).success).toBe(false);
});
it("should reject duplicate and unsupported durations", () => {
expect(memberBudgetWindowsSchema.safeParse([windows[0], windows[0]]).success).toBe(false);
expect(memberBudgetWindowsSchema.safeParse([{ budget_duration: "tomorrow", max_budget: 20 }]).success).toBe(false);
});
it("should inherit defaults when no override is configured or an override is cleared", () => {
expect(effectiveMemberBudgetWindows(windows, undefined)).toEqual(windows);
expect(effectiveMemberBudgetWindows(windows, [])).toEqual(windows);
expect(effectiveMemberBudgetWindows(undefined, undefined)).toEqual([]);
});
it("should replace all default windows with the member override", () => {
const override = [{ budget_duration: "24h", max_budget: 5 }];
expect(effectiveMemberBudgetWindows(windows, override)).toEqual(override);
});
it("should omit unused windows and send an empty list only when clearing an existing override", () => {
expect(memberBudgetWindowsUpdate(undefined)).toBeUndefined();
expect(memberBudgetWindowsUpdate([])).toBeUndefined();
expect(memberBudgetWindowsUpdate([], windows)).toEqual([]);
expect(memberBudgetWindowsUpdate(windows)).toEqual(windows);
});
});

View file

@ -0,0 +1,44 @@
import { z } from "zod";
import type { BudgetWindowEntry } from "../key_team_helpers/BudgetWindowsEditor";
const budgetWindowEntriesSchema = z.array(
z.object({
budget_duration: z.enum(["1h", "24h", "7d", "30d"]),
max_budget: z.number().nullable(),
}),
);
export const memberBudgetWindowsSchema = budgetWindowEntriesSchema.superRefine((windows, context) => {
windows.forEach((window, index) => {
if (window.max_budget === null) {
context.addIssue({ code: "custom", message: "Enter a budget" });
} else if (window.max_budget < 0) {
context.addIssue({ code: "custom", message: "Enter a non-negative budget" });
}
if (windows.slice(0, index).some((other) => other.budget_duration === window.budget_duration)) {
context.addIssue({
code: "custom",
message: "Use each budget duration only once",
});
}
});
});
export const isMemberBudgetWindows = (value: unknown): value is MemberBudgetWindow[] =>
budgetWindowEntriesSchema.safeParse(value).success;
export type MemberBudgetWindow = z.infer<typeof memberBudgetWindowsSchema>[number];
export const effectiveMemberBudgetWindows = (
defaults: BudgetWindowEntry[] | null | undefined,
override: BudgetWindowEntry[] | null | undefined,
): BudgetWindowEntry[] => (override?.length ? override : defaults ?? []);
export const memberBudgetWindowsUpdate = (
windows: BudgetWindowEntry[] | undefined,
previous?: BudgetWindowEntry[] | null,
): BudgetWindowEntry[] | undefined => {
if (windows?.length) return windows;
if (previous?.length) return [];
return undefined;
};

View file

@ -3,8 +3,10 @@ import {
modelMaxBudgetToEntries,
type ModelMaxBudget,
} from "../key_team_helpers/ModelMaxBudgetEditor";
import type { BudgetWindowEntry } from "../key_team_helpers/BudgetWindowsEditor";
import { isMemberBudgetWindows } from "./memberBudgetWindowSchema";
export type MemberFieldValue = string | number | null | undefined | string[] | ModelMaxBudget;
export type MemberFieldValue = string | number | null | undefined | string[] | ModelMaxBudget | BudgetWindowEntry[];
export type MemberFormValues = Record<string, MemberFieldValue>;
@ -30,6 +32,8 @@ export interface MemberAdditionalField {
}
export interface MemberFieldsConfig {
showBudgetWindows?: boolean;
defaultBudgetWindows?: BudgetWindowEntry[];
roleOptions: Array<{ label: string; value: string }>;
defaultRole?: string;
showEmail?: boolean;
@ -62,6 +66,7 @@ export const memberFieldNames = (config: MemberFieldsConfig): string[] => [
...(config.showEmail ? ["user_email"] : []),
...(config.showUserId ? ["user_id"] : []),
"role",
...(config.showBudgetWindows ? ["budget_limits"] : []),
...(config.additionalFields ?? []).map((field) => field.name),
];
@ -76,6 +81,7 @@ export const buildMemberFormValues = (
if (mode === "edit" && initialData) {
const seeded: MemberFormValues = {
...initialData,
budget_limits: isMemberBudgetWindows(initialData.budget_limits) ? initialData.budget_limits : [],
role: (initialData.role as string) || config.defaultRole,
max_budget_in_team: initialData.max_budget_in_team ?? null,
tpm_limit: initialData.tpm_limit ?? null,
@ -92,7 +98,7 @@ export const buildMemberFormValues = (
return pickFieldNames(config, seeded);
}
return pickFieldNames(config, { role: config.defaultRole || config.roleOptions[0]?.value });
return pickFieldNames(config, { role: config.defaultRole || config.roleOptions[0]?.value, budget_limits: [] });
};
const emptyValueForType = (type: MemberFieldType | undefined): MemberFieldValue => {
@ -112,7 +118,12 @@ const emptyValueForType = (type: MemberFieldType | undefined): MemberFieldValue
export const emptyMemberFormValues = (config: MemberFieldsConfig): MemberFormValues => {
const typeByName = new Map((config.additionalFields ?? []).map((field) => [field.name, field.type]));
return Object.fromEntries(memberFieldNames(config).map((name) => [name, emptyValueForType(typeByName.get(name))]));
return Object.fromEntries(
memberFieldNames(config).map((name) => [
name,
name === "budget_limits" ? [] : emptyValueForType(typeByName.get(name)),
]),
);
};
export const buildMemberFormData = (values: MemberFormValues): MemberFormValues =>

View file

@ -1,4 +1,5 @@
import { describe, expect, it } from "vitest";
import type { MemberBudgetWindow } from "./memberBudgetWindowSchema";
import {
type TeamAdminMetadataContext,
@ -365,3 +366,21 @@ describe("teamAdminDeclaredFields", () => {
]);
});
});
describe("team admin budget windows", () => {
const windows: MemberBudgetWindow[] = [{ budget_duration: "24h", max_budget: 20 }];
it("should send configured windows only when the proxy permits editing them", () => {
const values = { team_member_budget_limits: windows };
const initial = { team_member_budget_limits: [] };
expect(teamAdminSettingsChanges(values, initial, new Set(["team_member_budget_limits"]))).toEqual(values);
expect(teamAdminSettingsChanges(values, initial, new Set())).toEqual({});
});
it("should clear configured defaults without resending unchanged windows", () => {
const initial = { team_member_budget_limits: windows };
const permitted = new Set(["team_member_budget_limits"]);
expect(teamAdminSettingsChanges({ team_member_budget_limits: [] }, initial, permitted)).toEqual({
team_member_budget_limits: [],
});
expect(teamAdminSettingsChanges(initial, initial, permitted)).toEqual({});
});
});

View file

@ -1,4 +1,5 @@
import { z } from "zod";
import type { MemberBudgetWindow } from "./memberBudgetWindowSchema";
import { numberOrNull } from "@/lib/forms/numberOrNull";
import {
@ -93,6 +94,7 @@ const TEAM_ADMIN_FIELD_LABELS: ReadonlyMap<string, string> = new Map([
["soft_budget", "Soft Budget (USD)"],
["team_member_budget", "Member Default Budget (USD)"],
["team_member_budget_duration", "Member Default Budget Duration"],
["team_member_budget_limits", "Default member budget windows"],
["team_member_tpm_limit", "Member Default TPM Limit"],
["team_member_rpm_limit", "Member Default RPM Limit"],
[TEAM_ADMIN_RAISE_MAX_BUDGET_PERMISSION, "Raise the team's max budget"],
@ -105,11 +107,11 @@ export const teamAdminFieldLabel = (field: string): string => TEAM_ADMIN_FIELD_L
export type TeamAdminSettingsValues = { readonly [F in TeamAdminNumericSettingsField]?: string | number | null } & {
readonly [F in TeamAdminDurationSettingsField]?: string | null;
};
} & { readonly team_member_budget_limits?: MemberBudgetWindow[] };
export type TeamAdminSettingsChanges = { readonly [F in TeamAdminNumericSettingsField]?: number | null } & {
readonly [F in TeamAdminDurationSettingsField]?: string | null;
} & { readonly metadata?: Record<string, unknown> };
} & { readonly metadata?: Record<string, unknown>; readonly team_member_budget_limits?: MemberBudgetWindow[] };
const durationOrNull = (value: string | number | null | undefined): string | null =>
typeof value === "string" && value !== "" ? value : null;
@ -132,13 +134,19 @@ export const teamAdminSettingsChanges = (
values: TeamAdminSettingsValues,
initialValues: TeamAdminSettingsValues,
editableFields: ReadonlySet<string>,
): TeamAdminSettingsChanges =>
Object.fromEntries(
): TeamAdminSettingsChanges => {
const changes = Object.fromEntries(
TEAM_ADMIN_SETTINGS_FIELDS.flatMap((field) => {
const change = editableFields.has(field) ? changedValue(field, values[field], initialValues[field]) : null;
return change === null ? [] : [change];
}),
);
if (!editableFields.has("team_member_budget_limits")) return changes;
const windows = values.team_member_budget_limits;
if (windows === undefined) return changes;
if (JSON.stringify(windows) === JSON.stringify(initialValues.team_member_budget_limits ?? [])) return changes;
return { ...changes, team_member_budget_limits: windows };
};
export const parseTeamEditAccess = (callerEditAccess: unknown): TeamEditAccess => {
const parsed = callerEditAccessSchema.safeParse(callerEditAccess);

View file

@ -999,7 +999,7 @@ describe("KeyEditView", () => {
/>,
);
const deleteWindowButton = await screen.findByRole("button", { name: "✕" });
const deleteWindowButton = await screen.findByRole("button", { name: "Remove budget window 1" });
await userEvent.click(deleteWindowButton);
const submitButton = screen.getByRole("button", { name: /save changes/i });

View file

@ -8401,7 +8401,7 @@ export interface paths {
* Example:
* ```bash
* curl --location 'http://0.0.0.0:4000/key/block' --header "Authorization: Bearer $LITELLM_MASTER_KEY" --header 'Content-Type: application/json' --data '{
* "key": "sk-Fn8Ej39NxjAXrvpUGKghGw"
* "key": "<VIRTUAL_KEY>"
* }'
* ```
*
@ -8960,7 +8960,7 @@ export interface paths {
* Example:
* ```bash
* curl --location 'http://0.0.0.0:4000/key/unblock' --header "Authorization: Bearer $LITELLM_MASTER_KEY" --header 'Content-Type: application/json' --data '{
* "key": "sk-Fn8Ej39NxjAXrvpUGKghGw"
* "key": "<VIRTUAL_KEY>"
* }'
* ```
*
@ -17067,6 +17067,8 @@ export interface paths {
* If user doesn't exist, new user row will also be added to User Table
*
* Only proxy_admin or admin of team, allowed to access this endpoint.
*
* - budget_limits: Optional[list] - Concurrent caps for the added member, using budget_duration (1h, 24h, 7d, or 30d) and max_budget. Omit or send [] to inherit team defaults.
* ```
*
* curl -X POST 'http://0.0.0.0:4000/team/member_add' -H "Authorization: Bearer $LITELLM_MASTER_KEY" -H 'Content-Type: application/json' -d '{"team_id": "45e3e396-ee08-4a61-a88e-16b3ce7e0849", "member": {"role": "user", "user_id": "krrish247652@berri.ai"}}'
@ -17127,6 +17129,8 @@ export interface paths {
* @description [BETA]
*
* Update team member budgets and team member role
*
* - budget_limits: Optional[list] - Replace this member's concurrent spending caps. Each entry has budget_duration (1h, 24h, 7d, or 30d) and max_budget. Omit to preserve the override; send [] to restore team defaults.
*/
post: operations["team_member_update_team_member_update_post"];
delete?: never;
@ -17274,6 +17278,7 @@ export interface paths {
* - object_permission: Optional[LiteLLM_ObjectPermissionBase] - team-specific object permission. Example - {"vector_stores": ["vector_store_1", "vector_store_2"], "agents": ["agent_1", "agent_2"], "agent_access_groups": ["dev_group"]}. IF null or {} then no object permission.
* - team_member_budget: Optional[float] - The maximum budget allocated to an individual team member.
* - team_member_budget_duration: Optional[str] - The duration of the budget for the team member. Doc [here](https://docs.litellm.ai/docs/proxy/team_budgets)
* - team_member_budget_limits: Optional[list] - Default concurrent spending caps for each member, e.g. [{"budget_duration": "24h", "max_budget": 20}, {"budget_duration": "30d", "max_budget": 200}]. Each window resets independently at its UTC calendar boundary. A member override replaces these defaults; an empty list disables the defaults.
* - team_member_model_max_budget: Optional[dict] - Per-model budgets shared by team members without an override.
* - team_member_rpm_limit: Optional[int] - The RPM (Requests Per Minute) limit for individual team members.
* - team_member_tpm_limit: Optional[int] - The TPM (Tokens Per Minute) limit for individual team members.
@ -17504,6 +17509,7 @@ export interface paths {
* - object_permission: Optional[LiteLLM_ObjectPermissionBase] - team-specific object permission. Example - {"vector_stores": ["vector_store_1", "vector_store_2"], "agents": ["agent_1", "agent_2"], "agent_access_groups": ["dev_group"]}. IF null or {} then no object permission.
* - team_member_budget: Optional[float] - The maximum budget allocated to an individual team member.
* - team_member_budget_duration: Optional[str] - The duration of the budget for the team member. Doc [here](https://docs.litellm.ai/docs/proxy/team_budgets)
* - team_member_budget_limits: Optional[list] - Default concurrent spending caps for each member, e.g. [{"budget_duration": "24h", "max_budget": 20}, {"budget_duration": "30d", "max_budget": 200}]. Each window resets independently at its UTC calendar boundary. A member override replaces these defaults; an empty list disables the defaults.
* - team_member_model_max_budget: Optional[dict] - Per-model budgets shared by team members without an override.
* - team_member_rpm_limit: Optional[int] - The RPM (Requests Per Minute) limit for individual team members.
* - team_member_tpm_limit: Optional[int] - The TPM (Tokens Per Minute) limit for individual team members.
@ -34811,6 +34817,8 @@ export interface components {
team_alias?: string | null;
/** Team Id */
team_id: string;
/** Team Member Budget Limits */
team_member_budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Team Member Permissions */
team_member_permissions?: string[] | null;
/** Tpd Limit */
@ -36327,6 +36335,8 @@ export interface components {
LiteLLM_TeamMembership: {
/** Budget Id */
budget_id?: string | null;
/** Budget Limits */
budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Litellm Budget Table */
litellm_budget_table?: components["schemas"]["LiteLLM_BudgetTableFull"] | components["schemas"]["LiteLLM_BudgetTable"] | null;
/**
@ -36434,6 +36444,8 @@ export interface components {
team_alias?: string | null;
/** Team Id */
team_id: string;
/** Team Member Budget Limits */
team_member_budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Team Member Permissions */
team_member_permissions?: string[] | null;
/** Tpd Limit */
@ -39826,6 +39838,8 @@ export interface components {
team_member_budget?: number | null;
/** Team Member Budget Duration */
team_member_budget_duration?: string | null;
/** Team Member Budget Limits */
team_member_budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Team Member Key Duration */
team_member_key_duration?: string | null;
/** Team Member Model Max Budget */
@ -41116,6 +41130,8 @@ export interface components {
team_member_budget?: number | null;
/** Team Member Budget Duration */
team_member_budget_duration?: string | null;
/** Team Member Budget Limits */
team_member_budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Team Member Key Duration */
team_member_key_duration?: string | null;
/** Team Member Model Max Budget */
@ -46887,6 +46903,8 @@ export interface components {
team_alias?: string | null;
/** Team Id */
team_id: string;
/** Team Member Budget Limits */
team_member_budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Team Member Permissions */
team_member_permissions?: string[] | null;
/** Tpd Limit */
@ -47047,6 +47065,8 @@ export interface components {
team_alias?: string | null;
/** Team Id */
team_id: string;
/** Team Member Budget Limits */
team_member_budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Team Member Permissions */
team_member_permissions?: string[] | null;
/** Tpd Limit */
@ -47113,6 +47133,8 @@ export interface components {
* @description Duration after which this team member's budget resets (e.g. '1h', '24h', '7d', '30d'). If not set, the budget never resets.
*/
budget_duration?: string | null;
/** Budget Limits */
budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/**
* Max Budget In Team
* @description Maximum budget allocated to this user within the team. If not set, user has unlimited budget within team limits
@ -47151,6 +47173,11 @@ export interface components {
/** User Id */
user_id?: string | null;
};
/**
* TeamMemberBudgetDuration
* @enum {string}
*/
TeamMemberBudgetDuration: "1h" | "24h" | "7d" | "30d";
/**
* TeamMemberBudgetPatch
* @description One member's per-member limits, merge-patch style: a field left out of the row is
@ -47202,6 +47229,12 @@ export interface components {
/** User Id */
user_id?: string | null;
};
/** TeamMemberBudgetWindow */
TeamMemberBudgetWindow: {
budget_duration: components["schemas"]["TeamMemberBudgetDuration"];
/** Max Budget */
max_budget: number;
};
/** TeamMemberDeleteRequest */
TeamMemberDeleteRequest: {
/** Team Id */
@ -47232,6 +47265,8 @@ export interface components {
TeamMemberInfoResponse: {
/** Budget Id */
budget_id?: string | null;
/** Budget Limits */
budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Litellm Budget Table */
litellm_budget_table?: components["schemas"]["LiteLLM_BudgetTableFull"] | components["schemas"]["LiteLLM_BudgetTable"] | null;
/** Role */
@ -47293,6 +47328,8 @@ export interface components {
* @description Duration after which this team member's budget resets (e.g. '1h', '24h', '7d', '30d'). If not set, the budget never resets.
*/
budget_duration?: string | null;
/** Budget Limits */
budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Max Budget In Team */
max_budget_in_team?: number | null;
/**
@ -47337,6 +47374,8 @@ export interface components {
allowed_models?: string[] | null;
/** Budget Duration */
budget_duration?: string | null;
/** Budget Limits */
budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Max Budget In Team */
max_budget_in_team?: number | null;
/** Model Max Budget */
@ -49433,6 +49472,8 @@ export interface components {
team_member_budget?: number | null;
/** Team Member Budget Duration */
team_member_budget_duration?: string | null;
/** Team Member Budget Limits */
team_member_budget_limits?: components["schemas"]["TeamMemberBudgetWindow"][] | null;
/** Team Member Key Duration */
team_member_key_duration?: string | null;
/** Team Member Model Max Budget */