mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-17 09:34:48 +00:00
test(presidio): cover tool call arguments that are not a JSON object
Arguments that are not valid JSON are masked and restored as one text, a JSON string is rewritten as its decoded value, and a tool call without string arguments passes through untouched. The write-back helper no longer carries a branch it can never reach
This commit is contained in:
parent
1636c66a9f
commit
10ab70afab
2 changed files with 40 additions and 9 deletions
|
|
@ -282,13 +282,12 @@ def _tool_call_arguments(tool_call: _ToolCall) -> str | None:
|
|||
|
||||
|
||||
def _set_tool_call_arguments(tool_call: _ToolCall, arguments: str) -> None:
|
||||
match tool_call:
|
||||
case {"function": function}:
|
||||
function["arguments"] = arguments
|
||||
case ChatCompletionMessageToolCall(function=Function() as function):
|
||||
function.arguments = arguments
|
||||
case _:
|
||||
pass
|
||||
if isinstance(tool_call, ChatCompletionMessageToolCall):
|
||||
function: Final = tool_call.function
|
||||
function.arguments = arguments
|
||||
else:
|
||||
function_chunk: Final = tool_call["function"]
|
||||
function_chunk["arguments"] = arguments
|
||||
|
||||
|
||||
_JSON_VALUE: Final[TypeAdapter[JsonValue]] = TypeAdapter(JsonValue)
|
||||
|
|
@ -316,8 +315,6 @@ async def _rewritten_arguments(arguments: str, rewrite: Callable[[str], Awaitabl
|
|||
parsed: Final = _JSON_VALUE.validate_json(arguments)
|
||||
except ValidationError:
|
||||
return await rewrite(arguments)
|
||||
if not isinstance(parsed, (dict, list)):
|
||||
return await rewrite(arguments)
|
||||
rewritten: Final = await _rewritten_json_strings(parsed, rewrite)
|
||||
return arguments if rewritten == parsed else json.dumps(rewritten, ensure_ascii=False)
|
||||
|
||||
|
|
|
|||
|
|
@ -5207,6 +5207,40 @@ async def test_tool_call_arguments_without_pii_reach_the_model_byte_for_byte() -
|
|||
assert data["messages"][1]["tool_calls"][0]["function"]["arguments"] == arguments
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"arguments",
|
||||
[
|
||||
pytest.param("call Jane Doe back", id="not-json"),
|
||||
pytest.param('"Jane Doe"', id="json-string"),
|
||||
],
|
||||
)
|
||||
async def test_tool_call_arguments_that_are_not_a_json_object_are_still_masked_and_restored(arguments: str) -> None:
|
||||
async with _reversible_presidio_guardrail() as guardrail:
|
||||
data: Final = await _masked_chat_request(
|
||||
guardrail,
|
||||
[{"role": "assistant", "content": None, "tool_calls": [_function_tool_call("call_1", arguments)]}],
|
||||
)
|
||||
|
||||
masked: Final = data["messages"][0]["tool_calls"][0]["function"]["arguments"]
|
||||
assert "Jane Doe" not in masked, masked
|
||||
assert OPTIONAL_PresidioPIIMasking._unmask_pii_text(masked, data["metadata"]["pii_tokens"]) == arguments, masked
|
||||
|
||||
|
||||
async def test_a_tool_call_without_string_arguments_passes_through_beside_masked_text() -> None:
|
||||
tool_call: Final = {"id": "call_1", "type": "function", "function": {"name": "lookup"}}
|
||||
async with _reversible_presidio_guardrail() as guardrail:
|
||||
data: Final = await _masked_chat_request(
|
||||
guardrail,
|
||||
[
|
||||
{"role": "user", "content": "Book for Jane Doe."},
|
||||
{"role": "assistant", "content": None, "tool_calls": [tool_call]},
|
||||
],
|
||||
)
|
||||
|
||||
assert "Jane Doe" not in data["messages"][0]["content"], data["messages"][0]
|
||||
assert data["messages"][1]["tool_calls"] == [tool_call]
|
||||
|
||||
|
||||
async def test_apply_guardrail_restores_the_arguments_of_tool_call_objects() -> None:
|
||||
guardrail: Final = OPTIONAL_PresidioPIIMasking(
|
||||
event_hook="pre_call", default_on=True, output_parse_pii=True, mock_testing=True
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue