diff --git a/litellm/llms/anthropic/chat/guardrail_translation/handler.py b/litellm/llms/anthropic/chat/guardrail_translation/handler.py index 7d0435976b6..56a09d655a5 100644 --- a/litellm/llms/anthropic/chat/guardrail_translation/handler.py +++ b/litellm/llms/anthropic/chat/guardrail_translation/handler.py @@ -258,25 +258,37 @@ def _with_original_name(tool: ChatCompletionToolParam, original_names: Mapping[s return {**tool, "function": {**function, "name": original}} -def _request_deferrals(request: Mapping[str, object]) -> Mapping[str, object]: +def _request_deferral(tool: Mapping[str, object]) -> Mapping[str, object] | None: + if "defer_loading" in tool: + return {"defer_loading": tool["defer_loading"]} + match tool.get("custom"): + case {"defer_loading": bool() as wrapped}: + return {"custom": {"defer_loading": wrapped}} + case _: + return None + + +def _request_deferrals(request: Mapping[str, object]) -> Mapping[str, Mapping[str, object]]: tools: Final = tuple( fields for tool in list_field(request, "tools") if (fields := as_str_mapping(tool)) is not None ) return MappingProxyType( { - name: tool["defer_loading"] + name: deferral for tool in tools - if isinstance(name := tool.get("name"), str) and "defer_loading" in tool + if isinstance(name := tool.get("name"), str) and (deferral := _request_deferral(tool)) is not None } ) -def _with_request_deferral(tool: AllAnthropicToolsValues, deferrals: Mapping[str, object]) -> Mapping[str, object]: +def _with_request_deferral( + tool: AllAnthropicToolsValues, deferrals: Mapping[str, Mapping[str, object]] +) -> Mapping[str, object]: fields: Final = as_str_mapping(tool) or {} name: Final = fields.get("name") - if "defer_loading" in fields or not isinstance(name, str) or name not in deferrals: + if "defer_loading" in fields or "custom" in fields or not isinstance(name, str) or name not in deferrals: return fields - return {**fields, "defer_loading": deferrals[name]} + return {**fields, **deferrals[name]} def _write_back_system_block(system: object, block_idx: int, response: str) -> None: diff --git a/tests/unit/llms/anthropic/chat/guardrail_translation/test_anthropic_guardrail_handler.py b/tests/unit/llms/anthropic/chat/guardrail_translation/test_anthropic_guardrail_handler.py index 6d40173034c..7457e42fe93 100644 --- a/tests/unit/llms/anthropic/chat/guardrail_translation/test_anthropic_guardrail_handler.py +++ b/tests/unit/llms/anthropic/chat/guardrail_translation/test_anthropic_guardrail_handler.py @@ -661,16 +661,18 @@ class TestAnthropicMessagesHandlerInputProcessing: {"name": "get_stock", "input_schema": {"type": "object", "properties": {}}, "defer_loading": True}, {"name": "get_weather", "input_schema": {"type": "object", "properties": {}}, "defer_loading": False}, {"name": "get_time", "input_schema": {"type": "object", "properties": {}}}, + {"name": "get_quote", "input_schema": {"type": "object", "properties": {}}, "custom": {"defer_loading": True}}, ], } await handler.process_input_messages(data=data, guardrail_to_apply=guardrail) - assert [(tool["name"], tool.get("defer_loading")) for tool in data["tools"]] == [ - ("tool_search_tool_regex", None), - ("get_stock", True), - ("get_weather", False), - ("get_time", None), + assert [(tool["name"], tool.get("defer_loading"), tool.get("custom")) for tool in data["tools"]] == [ + ("tool_search_tool_regex", None, None), + ("get_stock", True, None), + ("get_weather", False, None), + ("get_time", None, None), + ("get_quote", None, {"defer_loading": True}), ] @pytest.mark.asyncio