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 91

fix(guardrails): warn when agent 365 yaml still carries the removed override keys

Browse source 
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
yucheng 2026-09-27 00:58:26 +00:00
parent 7ca548379e
commit a16073b2aa
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
litellm/proxy/guardrails/guardrail_hooks/agent_365/__init__.py
View file

@ -1,5 +1,6 @@
from typing import TYPE_CHECKING, Final
from litellm._logging import verbose_proxy_logger
from litellm.types.guardrails import SupportedGuardrailIntegrations
from .agent_365 import Agent365Guardrail
@ -31,6 +32,24 @@ def initialize_guardrail(litellm_params: "LitellmParams", guardrail: "Guardrail"
if not guardrail_name:
raise ValueError("Microsoft Agent 365: guardrail_name is required")
extras: Final = litellm_params.model_extra or {}
ignored_overrides: Final = tuple(
key
for key, value in (
("api_base", litellm_params.api_base),
("resource_app_id", extras.get("resource_app_id")),
("agent_id", extras.get("agent_id")),
)
if value is not None
)
if ignored_overrides:
verbose_proxy_logger.warning(
"Microsoft Agent 365 (%s): ignoring %s; evaluations always go to the production Agent 365 endpoint "
"and the agent identity is the caller's key alias",
guardrail_name,
", ".join(ignored_overrides),
)
agent_365_guardrail: Final = Agent365Guardrail(
guardrail_name=guardrail_name,
tenant_id=tenant_id,

26
tests/test_litellm/proxy/guardrails/guardrail_hooks/test_agent_365.py
View file

@ -244,8 +244,30 @@ class TestInitializeGuardrail:
assert set(fields) == {"tenant_id", "client_id", "client_secret", "unreachable_fallback"}
assert fields["unreachable_fallback"]["default_value"] == "fail_closed"
def test_config_model_has_no_endpoint_or_identity_overrides(self):
assert not {"api_base", "resource_app_id", "agent_id"} & set(Agent365GuardrailConfigModel.model_fields)
@pytest.mark.asyncio
async def test_stale_yaml_overrides_are_ignored_and_logged(self, caplog):
params: Final = LitellmParams(
guardrail="agent_365",
mode="pre_mcp_call",
tenant_id="tenant-abc",
client_id="client-xyz",
client_secret="secret-123",
default_on=True,
api_base="https://agent365.example.test",
resource_app_id="00000000-0000-0000-0000-000000000000",
agent_id="yaml-agent",
)
with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
guardrail: Final = initialize_guardrail(params, {"guardrail_name": "a365-stale"})
assert "ignoring api_base, resource_app_id, agent_id" in caplog.text
handler: Final = FakeHandler([_token_response(), _allow_response()])
guardrail.async_handler = handler
await _run(guardrail, _mcp_data())
token_call, evaluate_call = handler.calls
assert token_call.url == TOKEN_URL
assert token_call.data["scope"] == f"{AGENT_365_PROD_RESOURCE_APP_ID}/ThreatProtection.Evaluate.All"
assert evaluate_call.url == EVALUATE_URL
assert evaluate_call.json["agentId"] == "my-agent-key"
def test_explicit_params_win(self, monkeypatch):
monkeypatch.setenv("AGENT365_TENANT_ID", "env-tenant")