scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-08 03:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 115

fix: align Bedrock tag eligibility

Browse source
This commit is contained in:
aiedwardyi 2026-08-26 11:57:47 +09:00
parent e673f4b48e
commit 7b24291f24
No known key found for this signature in database
2 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
litellm/proxy/guardrails/guardrail_hooks/bedrock_guardrails.py
View file

@ -704,14 +704,7 @@ class BedrockGuardrail(CustomGuardrail, BaseAWSLLM):
if isinstance(chain_tag_filtering, bool)
else getattr(router, "enable_tag_filtering", False)
)
router_settings_override: Final[object] = request_data.get("router_settings_override")
trusted_request_tag_filtering: Final[bool] = (
isinstance(router_settings_override, Mapping)
and router_settings_override.get("enable_tag_filtering") is True
)
tag_filtering_enabled: Final = (
trusted_request_tag_filtering or effective_tag_filtering is True
)
tag_filtering_enabled: Final = effective_tag_filtering is True
if not tag_filtering_enabled:
return deployments
@ -805,9 +798,6 @@ class BedrockGuardrail(CustomGuardrail, BaseAWSLLM):
def _get_trusted_router_request_kwargs(request_data: Mapping[str, object]) -> dict[str, object]:
router_kwargs: Final = dict(request_data)
router_kwargs.pop("enable_tag_filtering", None)
router_settings_override: Final[object] = request_data.get("router_settings_override")
if isinstance(router_settings_override, Mapping) and router_settings_override.get("enable_tag_filtering") is True:
router_kwargs["enable_tag_filtering"] = True
for metadata_name in ("metadata", "litellm_metadata"):
metadata: Final[object] = router_kwargs.get(metadata_name)
if isinstance(metadata, Mapping) and "routing_decision" in metadata:

24
tests/test_litellm/proxy/guardrails/guardrail_hooks/test_bedrock_guardrails.py
View file

@ -294,30 +294,6 @@ def test_bedrock_guardrail_ignores_client_tag_filtering_override(monkeypatch: py
)
def test_bedrock_guardrail_uses_trusted_tag_filtering_override(monkeypatch: pytest.MonkeyPatch):
from litellm.proxy import proxy_server
router = MagicMock()
router.enable_tag_filtering = False
router.get_model_list.return_value = [
{"litellm_params": {"custom_llm_provider": "openai", "tags": ["slow"]}, "model_info": {}},
{"litellm_params": {"custom_llm_provider": "bedrock", "tags": ["fast"]}, "model_info": {}},
]
monkeypatch.setattr(proxy_server, "llm_router", router)
assert (
BedrockGuardrail._get_bedrock_api_key(
{
"model": "shared-alias",
"api_key": "bedrock-key",
"router_settings_override": {"enable_tag_filtering": True},
"metadata": {"tags": ["fast"]},
}
)
== "bedrock-key"
)
@pytest.mark.asyncio
async def test_bedrock_guardrail_async_sync_strategy_uses_unfiltered_pool(monkeypatch: pytest.MonkeyPatch):
from litellm.proxy import proxy_server