mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-15 09:12:18 +00:00
fix(guardrails): let only the round set the choice index label
The label was read straight from request_data, so a caller could put guardrail_choice_index in the request body and have it logged as the choice a guardrail inspected. Drop any incoming value when a round starts, and restore the caller's own on the way out.
This commit is contained in:
parent
175ddd4faf
commit
e53c6fc8bf
2 changed files with 38 additions and 0 deletions
|
|
@ -682,6 +682,7 @@ class OpenAIChatCompletionsHandler(BaseTranslation):
|
|||
prior_response: Final = inspection_request_data.get("response", missing)
|
||||
prior_responses: Final = inspection_request_data.get("responses", missing)
|
||||
prior_choice_index: Final = inspection_request_data.get("guardrail_choice_index", missing)
|
||||
inspection_request_data.pop("guardrail_choice_index", None)
|
||||
undeliverable: UndeliverableStreamRewrite | None = None # rebind-ok: keeps the first failure
|
||||
try:
|
||||
for inspection_response in inspection_responses:
|
||||
|
|
@ -949,6 +950,7 @@ class OpenAIChatCompletionsHandler(BaseTranslation):
|
|||
prior_response: Final = resolved_request_data.get("response", missing)
|
||||
prior_responses: Final = resolved_request_data.get("responses", missing)
|
||||
prior_choice_index: Final = resolved_request_data.get("guardrail_choice_index", missing)
|
||||
resolved_request_data.pop("guardrail_choice_index", None)
|
||||
if "responses" not in resolved_request_data:
|
||||
resolved_request_data["responses"] = responses_so_far
|
||||
self.merge_user_api_key_metadata_into_request(resolved_request_data, user_api_key_dict)
|
||||
|
|
|
|||
|
|
@ -1669,6 +1669,42 @@ class TestOpenAIChatCompletionsHandlerStreamingOutput:
|
|||
assert sent is not None
|
||||
assert [c["function"]["arguments"] for c in sent] == ['{"city": "Paris"}', '{"city": "Rome"}']
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_a_caller_cannot_set_the_choice_index_label(self) -> None:
|
||||
"""The label says which choice the round inspected, so only the round may set it."""
|
||||
from litellm.llms.base_llm.guardrail_translation.base_translation import StreamTransformSink
|
||||
from litellm.types.utils import Delta, ModelResponseStream, StreamingChoices
|
||||
|
||||
class LabelReadingGuardrail(CustomGuardrail):
|
||||
seen: list[object] = []
|
||||
|
||||
async def apply_guardrail(
|
||||
self, inputs: GenericGuardrailAPIInputs, request_data: dict[str, object],
|
||||
input_type: Literal["request", "response"], logging_obj: object = None,
|
||||
) -> GenericGuardrailAPIInputs:
|
||||
type(self).seen.append(request_data.get("guardrail_choice_index"))
|
||||
return inputs
|
||||
|
||||
LabelReadingGuardrail.seen = []
|
||||
request_data: Final[dict[str, object]] = {"model": "gpt-4", "guardrail_choice_index": 7}
|
||||
chunks: Final = [ModelResponseStream(choices=[StreamingChoices(
|
||||
index=0,
|
||||
delta=Delta(content="looking", tool_calls=[
|
||||
{"index": 0, "id": "call_0", "type": "function",
|
||||
"function": {"name": "weather", "arguments": '{"city": "Paris"}'}},
|
||||
]),
|
||||
finish_reason="tool_calls",
|
||||
)])]
|
||||
await OpenAIChatCompletionsHandler().process_output_streaming_response(
|
||||
responses_so_far=chunks,
|
||||
guardrail_to_apply=LabelReadingGuardrail(guardrail_name="label"),
|
||||
litellm_logging_obj=None,
|
||||
request_data=request_data,
|
||||
stream_transform_sink=StreamTransformSink(),
|
||||
)
|
||||
assert LabelReadingGuardrail.seen == [None]
|
||||
assert request_data["guardrail_choice_index"] == 7
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_a_transform_round_leaves_the_callers_request_data_as_it_found_it(self) -> None:
|
||||
"""The round owns these keys only while it runs; what it leaves behind is read by later hooks."""
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue