scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-01 02:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 92

refactor(scim): share the human patch preview with scoped provisioning

Browse source
This commit is contained in:
Joshua Valluru 2026-09-26 12:17:32 -07:00
parent 5ce0b051a2
commit acb0bcdd63
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
litellm/proxy/management_endpoints/scim/scim_v2.py
View file

@ -2133,7 +2133,7 @@ def _handle_generic_metadata(path: str, op_type: str, value: object, metadata: d
metadata[path] = value
def _apply_patch_ops(
def apply_scim_user_patch(
existing_user: LiteLLM_UserTable,
patch_ops: SCIMPatchOp,
) -> tuple[dict[str, object], set[str]]:
@ -2347,7 +2347,7 @@ async def patch_user(
prev_active: Final = _user_scim_active(existing_user)
update_data, final_team_set = _apply_patch_ops(
update_data, final_team_set = apply_scim_user_patch(
existing_user=existing_user,
patch_ops=patch_ops,
)

24
tests/test_litellm/proxy/management_endpoints/scim/test_scim_patch_user.py
View file

@ -4,7 +4,7 @@ import pytest
from fastapi import HTTPException
from litellm.proxy._types import LiteLLM_UserTable
from litellm.proxy.management_endpoints.scim.scim_v2 import _apply_patch_ops, patch_user
from litellm.proxy.management_endpoints.scim.scim_v2 import apply_scim_user_patch, patch_user
from litellm.types.proxy.management_endpoints.scim_v2 import (
SCIMPatchOp,
SCIMPatchOperation,
@ -355,7 +355,7 @@ def test_apply_patch_ops_replace_entitlements_writes_canonical_key():
]
)
update_data, _ = _apply_patch_ops(
update_data, _ = apply_scim_user_patch(
existing_user=_user_with_metadata({}), patch_ops=patch_ops
)
@ -373,7 +373,7 @@ def test_apply_patch_ops_add_roles_appends_to_existing():
]
)
update_data, _ = _apply_patch_ops(
update_data, _ = apply_scim_user_patch(
existing_user=_user_with_metadata({"scim_roles": [{"value": "viewer"}]}),
patch_ops=patch_ops,
)
@ -389,7 +389,7 @@ def test_apply_patch_ops_remove_entitlements_clears_canonical_key():
Operations=[SCIMPatchOperation(op="remove", path="entitlements")]
)
update_data, _ = _apply_patch_ops(
update_data, _ = apply_scim_user_patch(
existing_user=_user_with_metadata(
{"scim_entitlements": [{"value": "jira-software"}]}
),
@ -409,7 +409,7 @@ def test_apply_patch_ops_pathless_value_dict_handles_roles():
]
)
update_data, _ = _apply_patch_ops(
update_data, _ = apply_scim_user_patch(
existing_user=_user_with_metadata({}), patch_ops=patch_ops
)
@ -428,7 +428,7 @@ def test_apply_patch_ops_invalid_entitlements_value_raises_400():
)
with pytest.raises(HTTPException) as exc_info:
_apply_patch_ops(existing_user=_user_with_metadata({}), patch_ops=patch_ops)
apply_scim_user_patch(existing_user=_user_with_metadata({}), patch_ops=patch_ops)
assert exc_info.value.status_code == 400
@ -442,7 +442,7 @@ def test_apply_patch_ops_replace_entitlements_without_value_member_is_stored_as_
]
)
update_data, _ = _apply_patch_ops(
update_data, _ = apply_scim_user_patch(
existing_user=_user_with_metadata({}), patch_ops=patch_ops
)
@ -455,7 +455,7 @@ def test_apply_patch_ops_add_without_value_raises_400_naming_value_member():
)
with pytest.raises(HTTPException) as exc_info:
_apply_patch_ops(existing_user=_user_with_metadata({}), patch_ops=patch_ops)
apply_scim_user_patch(existing_user=_user_with_metadata({}), patch_ops=patch_ops)
assert exc_info.value.status_code == 400
assert "value" in str(exc_info.value.detail)
@ -473,7 +473,7 @@ def test_apply_patch_ops_filtered_path_raises_400_instead_of_junk_metadata():
)
with pytest.raises(HTTPException) as exc_info:
_apply_patch_ops(
apply_scim_user_patch(
existing_user=_user_with_metadata(
{"scim_roles": [{"value": "engineering-admin"}]}
),
@ -496,7 +496,7 @@ def test_apply_patch_ops_remove_group_filtered_path_without_value():
Operations=[SCIMPatchOperation(op="remove", path='groups[value eq "team-1"]')]
)
_, final_team_set = _apply_patch_ops(existing_user=user, patch_ops=patch_ops)
_, final_team_set = apply_scim_user_patch(existing_user=user, patch_ops=patch_ops)
assert final_team_set == {"team-2"}
@ -513,7 +513,7 @@ def test_apply_patch_ops_add_group_filtered_path_without_value():
Operations=[SCIMPatchOperation(op="add", path="groups[value eq 'team-3']")]
)
_, final_team_set = _apply_patch_ops(existing_user=user, patch_ops=patch_ops)
_, final_team_set = apply_scim_user_patch(existing_user=user, patch_ops=patch_ops)
assert final_team_set == {"team-1", "team-3"}
@ -533,6 +533,6 @@ def test_apply_patch_ops_replace_groups_empty_value_does_not_use_path_filter():
]
)
_, final_team_set = _apply_patch_ops(existing_user=user, patch_ops=patch_ops)
_, final_team_set = apply_scim_user_patch(existing_user=user, patch_ops=patch_ops)
assert final_team_set == set()