fix(guardrails): walk Responses-API text taxonomy in shared content helpers - #32542
Conversation
…elpers
Every guardrail sharing litellm/proxy/guardrails/_content_utils.py silently
drops all text on the /v1/responses path. AIM turns it into a loud 422 (
{"error":"No messages in the request"}); every other guardrail (Lakera v2,
Cato, Lasso, Repello, IBM, Azure Content Safety, enterprise secret
detection) scans an empty payload and lets the request through unscanned.
Three defects, all in _content_utils.py:
1. _iter_text_parts_in_content recognised only part.type == "text", but the
Responses API uses input_text (request) and output_text (assistant).
2. _coerce_input_to_messages gated on "every item has a role key"; any
Responses input list containing a function_call or function_call_output
item failed the check and was wrapped as one opaque blob.
3. build_inspection_messages forwarded any role through, including a bare
tool role missing tool_call_id, which validators like AIM's /fw/v1/analyze
reject with a schema error.
Fix walks the actual Responses item taxonomy (message, function_call,
function_call_output, bare content parts and strings), recognises
{text, input_text, output_text} everywhere, and coerces any role outside
{system, user, assistant} to user in the outbound inspection payload.
Greptile SummaryThis PR fixes a Responses API bypass where shared guardrail content helpers silently skipped almost all
Confidence Score: 5/5The change is safe to merge: the new taxonomy walking is consistent between the read path and the write path, all previously-supported shapes remain covered, and targeted regression tests confirm both extraction and in-place redaction on the new Responses API paths. All three modified helpers are updated consistently, the AIM-local role coercion is correctly isolated so the shared helper remains role-faithful for other guardrails, no existing tests are weakened, and the three CI failures are confirmed unrelated to this PR. No files require special attention; the core change in _content_utils.py is well-scoped and the AIM integration follows naturally.
|
| Filename | Overview |
|---|---|
| litellm/proxy/guardrails/_content_utils.py | Core fix: adds TEXT_PART_TYPES frozenset, rewrites _coerce_input_to_messages and the walk_user_text list branch to properly walk the Responses API taxonomy. |
| litellm/proxy/guardrails/guardrail_hooks/aim/aim.py | Moves AIM-specific role coercion into _build_aim_inspection_messages, keeping the shared build_inspection_messages role-faithful. |
| tests/test_litellm/proxy/guardrails/test_content_utils.py | Adds targeted regression tests for input_text/output_text extraction, mixed tool-call taxonomy walking, and function_call_output redaction. |
| tests/test_litellm/proxy/guardrails/guardrail_hooks/test_aim.py | New unit tests for _build_aim_inspection_messages covering role coercion and safe-role pass-through. |
Reviews (4): Last reviewed commit: "refactor(guardrails): preserve role fide..." | Re-trigger Greptile
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
Merging this PR will degrade performance by 12.1%
Warning Please fix the performance issues or acknowledge them on CodSpeed. Performance Changes
Tip Investigate this regression by commenting Comparing |
…h in new docstring
Avoids ever materialising a schema-invalid bare tool message. The downstream role-safety coercion in build_inspection_messages still guards genuinely caller-supplied non-standard roles (developer, function, custom values); add a regression test covering that path so the coercion has real coverage after this simplification.
|
@greptileai please re-review — pushed two follow-up commits since the last score:
Both changes are mutation-verified to fail on the pre-patch base branch. 35 tests pass locally, ruff format + ruff check clean. |
|
bugbot run |
| continue | ||
| role = message.get("role", "user") or "user" | ||
| if role not in _INSPECTION_SAFE_ROLES: | ||
| role = "user" |
There was a problem hiding this comment.
so basically if its not a role we recognize then we say its user role instead, do i have that right?
can you give an example of this happening? ive never seen this but i could imagine it being the case
There was a problem hiding this comment.
{"role":"tool","tool_call_id":"c1","content":"sunny"} gets flattened to {"role":"tool","content":"sunny"}, which AIM rejects because tool_call_id is missing, so we coerce it to {"role":"user","content":"sunny"} to keep it valid
There was a problem hiding this comment.
✅ Bugbot reviewed your changes and found no new issues!
Comment @cursor review or bugbot run to trigger another review on this PR
Reviewed by Cursor Bugbot for commit 7e42d65. Configure here.
…spection_messages
Ryan's review flagged that several test docstrings assert AIM's /fw/v1/analyze validates + rejects specific schema violations. That behavior is customer-reported in the LIT-4294 writeup, not directly verified by us. Rephrase to attribute the AIM 422 to the customer's writeup and describe the underlying constraint as the OpenAI chat schema; any downstream API that validates against that schema rejects the same shape.
The generic coercion in build_inspection_messages collapsed any role
outside {system, user, assistant} to user for every caller of the
helper. Combined with the pre-existing apply_redacted_messages_back
write-back behavior in Lakera/AIM/Cato, that turned a loud OpenAI 400
on chat-completions tool-message masking into a silent semantic
corruption of the outbound request (role tool with tool_call_id got
rewritten to bare role user, dropping the assistant + tool_calls
sibling).
AIM specifically requires the coercion because its /fw/v1/analyze
validates the payload against the OpenAI chat schema; other guardrails
either do not validate roles or do their own reconstruction. Move the
coercion to AimGuardrail._build_aim_inspection_messages so the shared
helper keeps caller roles intact and no new cross-guardrail role
corruption is introduced. The pre-existing apply_redacted_messages_back
structural flatten remains as separate follow-up work.
function_call_output items still synthesise role user in the shared
helper because they have no natural role field, which is a different
concern from coercing a caller-supplied role.
|
@greptileai please re-review — pushed a5bfcc4 which changes approach after QA + reviewer feedback: The generic unsupported-role coercion in Shift:
QA Path F re-run: shared helper now preserves 37 tests pass locally, ruff format + check clean. |
Shared inspection helpers should extract text and preserve semantic role signals; role coercion for third-party schema safety stays inside the guardrail that needs it (AIM). Three shared-helper changes: - Bare content-part dicts (input_text/output_text) with an explicit role keep it; only role-less parts default to user. - Responses message items already had their role preserved; the behavior is now covered by an explicit test. - function_call_output items default to role tool (semantic equivalent of the chat-completions tool message shape) instead of role user, so Responses and chat completions produce symmetric inspection payloads. A caller-supplied role on the item is still preserved. AIM's schema-safe coercion in _build_aim_inspection_messages already handles the resulting role tool: it collapses to user before the POST to /fw/v1/analyze so AIM's OpenAI-schema validator does not reject the bare tool message (no tool_call_id can survive the flatten). Added a regression test in test_aim.py covering that path.
|
@greptileai please re-review — pushed 18d3a6f to tighten the role-handling logic in the shared helper. Preserve role fidelity whenever the source item provides one, only synthesise when the source shape genuinely has none:
AIM's local coercion in Also ran a 42-check acceptance matrix against HEAD covering (a) every old supported case (chat completions strings, multimodal text parts, raw 41 unit tests pass locally (34 shared + 7 AIM-specific). Ruff format + check clean. The 3 failing CI checks are the current Chainguard |
|
bugbot run |
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes using default effort and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 18d3a6f. Configure here.
| elif "content" in item: | ||
| messages.append({"role": item.get("role") or "user", "content": item["content"]}) | ||
| elif item.get("type") == "function_call_output" and "output" in item: | ||
| messages.append({"role": item.get("role") or "tool", "content": item["output"]}) |
There was a problem hiding this comment.
Cato analyze missing role coercion
Medium Severity
build_inspection_messages now emits role: "tool" for Responses function_call_output and no longer collapses non-chat roles, while Cato still POSTs that payload to /fw/v1/analyze without the AIM-local coercion. That can reproduce the bare-tool 422 AIM avoids on tool-calling /v1/responses requests.
Additional Locations (1)
Reviewed by Cursor Bugbot for commit 18d3a6f. Configure here.
There was a problem hiding this comment.
this is not a regression, Cato skipped check before.
e84a19a
into
litellm_internal_staging
…42-90x chore(release): backport #32542 to stable/1.90.x and cut 1.90.4
…elpers (#32542) * fix(guardrails): walk Responses-API text taxonomy in shared content helpers Every guardrail sharing litellm/proxy/guardrails/_content_utils.py silently drops all text on the /v1/responses path. AIM turns it into a loud 422 ( {"error":"No messages in the request"}); every other guardrail (Lakera v2, Cato, Lasso, Repello, IBM, Azure Content Safety, enterprise secret detection) scans an empty payload and lets the request through unscanned. Three defects, all in _content_utils.py: 1. _iter_text_parts_in_content recognised only part.type == "text", but the Responses API uses input_text (request) and output_text (assistant). 2. _coerce_input_to_messages gated on "every item has a role key"; any Responses input list containing a function_call or function_call_output item failed the check and was wrapped as one opaque blob. 3. build_inspection_messages forwarded any role through, including a bare tool role missing tool_call_id, which validators like AIM's /fw/v1/analyze reject with a schema error. Fix walks the actual Responses item taxonomy (message, function_call, function_call_output, bare content parts and strings), recognises {text, input_text, output_text} everywhere, and coerces any role outside {system, user, assistant} to user in the outbound inspection payload. * style: ruff-format changed guardrail files * test(guardrails): cover function_call_output string form; drop em-dash in new docstring * fix(guardrails): map function_call_output straight to user role Avoids ever materialising a schema-invalid bare tool message. The downstream role-safety coercion in build_inspection_messages still guards genuinely caller-supplied non-standard roles (developer, function, custom values); add a regression test covering that path so the coercion has real coverage after this simplification. * test(guardrails): pin chat-completions tool-role coercion in build_inspection_messages * docs(test): soften AIM-specific claims in LIT-4294 test docstrings Ryan's review flagged that several test docstrings assert AIM's /fw/v1/analyze validates + rejects specific schema violations. That behavior is customer-reported in the LIT-4294 writeup, not directly verified by us. Rephrase to attribute the AIM 422 to the customer's writeup and describe the underlying constraint as the OpenAI chat schema; any downstream API that validates against that schema rejects the same shape. * refactor(guardrails): move unsupported-role coercion into AIM only The generic coercion in build_inspection_messages collapsed any role outside {system, user, assistant} to user for every caller of the helper. Combined with the pre-existing apply_redacted_messages_back write-back behavior in Lakera/AIM/Cato, that turned a loud OpenAI 400 on chat-completions tool-message masking into a silent semantic corruption of the outbound request (role tool with tool_call_id got rewritten to bare role user, dropping the assistant + tool_calls sibling). AIM specifically requires the coercion because its /fw/v1/analyze validates the payload against the OpenAI chat schema; other guardrails either do not validate roles or do their own reconstruction. Move the coercion to AimGuardrail._build_aim_inspection_messages so the shared helper keeps caller roles intact and no new cross-guardrail role corruption is introduced. The pre-existing apply_redacted_messages_back structural flatten remains as separate follow-up work. function_call_output items still synthesise role user in the shared helper because they have no natural role field, which is a different concern from coercing a caller-supplied role. * refactor(guardrails): preserve role fidelity in shared _content_utils Shared inspection helpers should extract text and preserve semantic role signals; role coercion for third-party schema safety stays inside the guardrail that needs it (AIM). Three shared-helper changes: - Bare content-part dicts (input_text/output_text) with an explicit role keep it; only role-less parts default to user. - Responses message items already had their role preserved; the behavior is now covered by an explicit test. - function_call_output items default to role tool (semantic equivalent of the chat-completions tool message shape) instead of role user, so Responses and chat completions produce symmetric inspection payloads. A caller-supplied role on the item is still preserved. AIM's schema-safe coercion in _build_aim_inspection_messages already handles the resulting role tool: it collapses to user before the POST to /fw/v1/analyze so AIM's OpenAI-schema validator does not reject the bare tool message (no tool_call_id can survive the flatten). Added a regression test in test_aim.py covering that path. (cherry picked from commit e84a19a)
…1.92.0 stable cut (#32959) * fix(utils): resolve bedrock regional inference profiles to regional pricing in get_model_info (LIT-4056) (#32389) * fix(utils): resolve bedrock regional inference profiles to regional pricing in get_model_info (LIT-4056) * test(register_model): use a triple provider prefix as the unresolvable-key fixture get_model_info now resolves bedrock/bedrock/... like a routing prefix, so the double-prefix fixture stopped exercising the register_model fallback path. Lock the new double-prefix resolution in as a model-info regression test (cherry picked from commit 734fd29) * fix(guardrails): walk Responses-API text taxonomy in shared content helpers (#32542) * fix(guardrails): walk Responses-API text taxonomy in shared content helpers Every guardrail sharing litellm/proxy/guardrails/_content_utils.py silently drops all text on the /v1/responses path. AIM turns it into a loud 422 ( {"error":"No messages in the request"}); every other guardrail (Lakera v2, Cato, Lasso, Repello, IBM, Azure Content Safety, enterprise secret detection) scans an empty payload and lets the request through unscanned. Three defects, all in _content_utils.py: 1. _iter_text_parts_in_content recognised only part.type == "text", but the Responses API uses input_text (request) and output_text (assistant). 2. _coerce_input_to_messages gated on "every item has a role key"; any Responses input list containing a function_call or function_call_output item failed the check and was wrapped as one opaque blob. 3. build_inspection_messages forwarded any role through, including a bare tool role missing tool_call_id, which validators like AIM's /fw/v1/analyze reject with a schema error. Fix walks the actual Responses item taxonomy (message, function_call, function_call_output, bare content parts and strings), recognises {text, input_text, output_text} everywhere, and coerces any role outside {system, user, assistant} to user in the outbound inspection payload. * style: ruff-format changed guardrail files * test(guardrails): cover function_call_output string form; drop em-dash in new docstring * fix(guardrails): map function_call_output straight to user role Avoids ever materialising a schema-invalid bare tool message. The downstream role-safety coercion in build_inspection_messages still guards genuinely caller-supplied non-standard roles (developer, function, custom values); add a regression test covering that path so the coercion has real coverage after this simplification. * test(guardrails): pin chat-completions tool-role coercion in build_inspection_messages * docs(test): soften AIM-specific claims in LIT-4294 test docstrings Ryan's review flagged that several test docstrings assert AIM's /fw/v1/analyze validates + rejects specific schema violations. That behavior is customer-reported in the LIT-4294 writeup, not directly verified by us. Rephrase to attribute the AIM 422 to the customer's writeup and describe the underlying constraint as the OpenAI chat schema; any downstream API that validates against that schema rejects the same shape. * refactor(guardrails): move unsupported-role coercion into AIM only The generic coercion in build_inspection_messages collapsed any role outside {system, user, assistant} to user for every caller of the helper. Combined with the pre-existing apply_redacted_messages_back write-back behavior in Lakera/AIM/Cato, that turned a loud OpenAI 400 on chat-completions tool-message masking into a silent semantic corruption of the outbound request (role tool with tool_call_id got rewritten to bare role user, dropping the assistant + tool_calls sibling). AIM specifically requires the coercion because its /fw/v1/analyze validates the payload against the OpenAI chat schema; other guardrails either do not validate roles or do their own reconstruction. Move the coercion to AimGuardrail._build_aim_inspection_messages so the shared helper keeps caller roles intact and no new cross-guardrail role corruption is introduced. The pre-existing apply_redacted_messages_back structural flatten remains as separate follow-up work. function_call_output items still synthesise role user in the shared helper because they have no natural role field, which is a different concern from coercing a caller-supplied role. * refactor(guardrails): preserve role fidelity in shared _content_utils Shared inspection helpers should extract text and preserve semantic role signals; role coercion for third-party schema safety stays inside the guardrail that needs it (AIM). Three shared-helper changes: - Bare content-part dicts (input_text/output_text) with an explicit role keep it; only role-less parts default to user. - Responses message items already had their role preserved; the behavior is now covered by an explicit test. - function_call_output items default to role tool (semantic equivalent of the chat-completions tool message shape) instead of role user, so Responses and chat completions produce symmetric inspection payloads. A caller-supplied role on the item is still preserved. AIM's schema-safe coercion in _build_aim_inspection_messages already handles the resulting role tool: it collapses to user before the POST to /fw/v1/analyze so AIM's OpenAI-schema validator does not reject the bare tool message (no tool_call_id can survive the flatten). Added a regression test in test_aim.py covering that path. (cherry picked from commit e84a19a) * feat: add Meta Model API provider and muse-spark-1.1 (day-0) (#32701) (cherry picked from commit d82645d) * fix(bedrock): keep mid-conversation system messages in place for Claude Invoke (#32578) Hoisting every role system entry into the top-level system field mutates the cache prefix whenever a client such as Claude Code appends a new mid-conversation system message, invalidating the prompt cache for the entire message history on Bedrock Invoke. Bedrock only rejects a system entry at messages.0, so hoist just the leading run and forward the rest in place (cherry picked from commit cc36d54) * feat(otel): emit the gen_ai.client.operation.exception event on failed LLM calls (#32655) * feat(otel): emit the gen_ai.client.operation.exception event on failed LLM calls The GenAI semantic conventions record failures of a GenAI client operation as a log-based event named gen_ai.client.operation.exception, carrying the exception.type / exception.message / exception.stacktrace trio at severity WARN and correlated to the failed span. OTel v2 never emitted it: a failed LLM call produced only the deprecated error.* span attributes, a generic exception span event without a stacktrace, and the stacktrace under the vendor key litellm.provider.error.stack_trace. Build the logs pipeline (LoggerProvider + console/OTLP log exporters mirroring the metrics plumbing) and record the event behind the enable_events flag, which until now was defined but consumed nowhere. An operator-configured LoggerProvider global is reused so the events ride their existing logs pipeline; an explicit NoOpLoggerProvider global is honored as an opt-out and builds no recorder at all. The existing span-side error surface (error.type, error.message, the exception span event, and the litellm.provider.error.* detail keys) is untouched for backwards compatibility. * fix(otel): always ride the semconv-required exception pair on the GenAI event Filtering the event attributes on truthiness conflated "absent" with "empty", so an empty exception.type or exception.message would have been dropped, leaving an event with neither semconv-required field. Build the attributes so the pair is unconditional and only the recommended stacktrace is omitted when the payload carries none. * docs(otel): document the events plumbing module in the package README * test(otel): cover the log exporter selection and logs endpoint normalization The new logs plumbing had no coverage for exporter-kind selection, the console fallback for an unrecognized kind, the /v1/logs signal-path rewriting that lets one OTEL_ENDPOINT serve every signal, or the simple-vs-batch processor split. (cherry picked from commit 99b4c5e) * fix(bedrock): gate in-place system role messages on model support for Claude Invoke (#32831) * fix(bedrock): gate in-place system role messages on model support for Claude Invoke * feat(bedrock): default unmapped Claude 4.8+ to in-place system role handling via fallback rule (cherry picked from commit 5e23a5a) * fix(anthropic): translate adaptive thinking/effort to pre-4.6 model support (#32867) * fix(anthropic): translate adaptive thinking/effort to pre-4.6 model support AnthropicMessagesConfig now reshapes the 4.6+ adaptive-thinking interface (thinking:{type:adaptive} + output_config:{effort:...}) to whatever the routed model supports. Thinking-capable non-adaptive models (e.g. Haiku 4.5, Sonnet 4.5) get the effort translated to a legacy thinking budget_tokens. Models with no reasoning support have thinking/effort dropped under drop_params. And because adaptive thinking carries no budget while the legacy form must satisfy Anthropic's max_tokens > budget_tokens rule, the translated budget is capped below max_tokens, dropping thinking when max_tokens can't fit the minimum budget. 4.6+ models pass through untouched. This matters because clients like Claude Code speak native Anthropic /v1/messages and send the adaptive interface unconditionally, regardless of the routed model. The native passthrough previously only capability-gated the OpenAI-style reasoning_effort alias and forwarded native output_config/adaptive thinking raw, so a pre-4.6 model rejected it with "This model does not support the effort parameter" and the request failed. Claude Code already gets drop_params auto-set, so its requests now succeed. * test(anthropic): gate undersized-max_tokens thinking drop on drop_params; add edge tests Addresses review feedback on the max_tokens-too-small branch. Previously a thinking-capable model whose max_tokens could not fit the minimum thinking budget had thinking silently dropped regardless of drop_params, while a residual output_config field in the same call still raised when drop_params was off. Gate both consistently on drop_params: raise a clear error (naming max_tokens for the undersized case) when drop_params is off, drop otherwise. Claude Code gets drop_params auto-set, so it still succeeds. Adds tests for the undersized-max_tokens raise, the residual output_config raise, and the no-adaptive-interface passthrough on a non-adaptive model. * fix(anthropic): make adaptive-effort translation silent to avoid breaking provider strip contracts The previous raise-when-not-drop_params behavior broke existing bedrock and vertex messages tests: those providers already silently strip unsupported output_config for pre-4.6 models (issue #22797) with no drop_params required, and the shared parent transform raising pre-empted that. It also conflicted with the goal of keeping requests working rather than failing them. Make the reshape silent: translate effort to legacy thinking for thinking-capable models, drop thinking for non-reasoning models, and remove only the consumed effort key from output_config, leaving any residual (e.g. format) for provider subclasses (bedrock/vertex) to handle. No raise, no drop_params gating. This also resolves the review note about inconsistent drop_params handling by making every path uniform. Updates the tests to assert the silent behavior and residual output_config preservation. * fix(anthropic): handle output_config-capable but non-adaptive models (Opus 4.5) Greptile caught a real bug: the early-return guard treated supports_output_config as equivalent to supporting adaptive thinking. Claude Opus 4.5 advertises supports_output_config (it accepts output_config.effort) but is not adaptive, so it rejects thinking:{type:adaptive} with "adaptive thinking is not supported on this model". The guard early-returned for Opus 4.5 and forwarded the adaptive thinking block raw, reproducing the exact failure the fix is meant to prevent. thinking:{type:adaptive} and output_config.effort are independent capabilities. Only early-return for adaptive-thinking models. For a model that supports output_config.effort but is not adaptive, keep the native effort and drop only the unsupported adaptive thinking block. Verified live against Opus 4.5: the Claude Code payload now returns 200 instead of 400. Adds regression tests for Opus 4.5 with and without adaptive thinking. * fix(anthropic): translate adaptive thinking for effort-capable pre-4.6 models Claude Opus 4.5 advertises supports_output_config but not adaptive thinking, so the early-return guard forwarded thinking.type=adaptive raw and Anthropic rejected it. The guard now only skips true adaptive models; effort-only requests on effort-capable models still pass through untouched. The _map_reasoning_effort call is wrapped to surface unrecognized effort values as a clean 400, matching _translate_reasoning_effort_to_anthropic * fix(anthropic): fall back to legacy thinking when effort level unsupported Opus 4.5 accepts output_config.effort but only low/medium/high; Claude Code defaults to xhigh on newer models, so preserving that level raw gets rejected by Anthropic. Gate the native-effort passthrough on _validate_effort_for_model and fall through to the budget translation for unsupported levels * fix(anthropic): keep effort-only requests untouched for provider normalization The xhigh fall-through consumed effort-only requests on effort-capable models, breaking bedrock invoke's own normalization which clamps xhigh to the model's ceiling after the base transform runs (test_bedrock_messages_normalizes_output_config_effort_for_opus). Restrict the fall-through to requests that carry adaptive thinking; effort-only requests pass through so provider subclasses keep owning level clamping --------- Co-authored-by: Abhimanyu Kapur <38531241+akapur99@users.noreply.github.com> (cherry picked from commit 3a62e54) * fix(bedrock): flag mapped Claude 4.8+ entries with supports_mid_conversation_system (#32882) Exact cost-map hits resolve before fallback-generalization rules, so the mapped Sonnet 5, Fable 5 and jp Opus 4.8 Bedrock entries bypassed the bedrock-anthropic-claude-mid-conversation-system rule and hoisted mid-conversation system messages, invalidating the prompt cache. (cherry picked from commit c15891f) * Merge pull request #32873 from BerriAI/litellm_fallback_rules_routing_split refactor(fallback-generalizations): split rules into routing and provider-neutral capability kinds (cherry picked from commit 45d3644) * Merge pull request #32874 from BerriAI/litellm_thread_provider_capability_probes fix(anthropic): thread real provider through capability probes instead of pinning anthropic (cherry picked from commit ead7ad3) * test: add /v1/messages to supported_endpoints schema enum (#32739) (cherry picked from commit bf02a4a) --------- Co-authored-by: Mateo Wang <277851410+mateo-berri@users.noreply.github.com> Co-authored-by: yucheng-berri <yucheng@berri.ai> Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Yassin Kortam <yassin@berri.ai> Co-authored-by: Abhimanyu Kapur <38531241+akapur99@users.noreply.github.com> Co-authored-by: tin-berri <tin@berri.ai>
…elpers (BerriAI#32542) * fix(guardrails): walk Responses-API text taxonomy in shared content helpers Every guardrail sharing litellm/proxy/guardrails/_content_utils.py silently drops all text on the /v1/responses path. AIM turns it into a loud 422 ( {"error":"No messages in the request"}); every other guardrail (Lakera v2, Cato, Lasso, Repello, IBM, Azure Content Safety, enterprise secret detection) scans an empty payload and lets the request through unscanned. Three defects, all in _content_utils.py: 1. _iter_text_parts_in_content recognised only part.type == "text", but the Responses API uses input_text (request) and output_text (assistant). 2. _coerce_input_to_messages gated on "every item has a role key"; any Responses input list containing a function_call or function_call_output item failed the check and was wrapped as one opaque blob. 3. build_inspection_messages forwarded any role through, including a bare tool role missing tool_call_id, which validators like AIM's /fw/v1/analyze reject with a schema error. Fix walks the actual Responses item taxonomy (message, function_call, function_call_output, bare content parts and strings), recognises {text, input_text, output_text} everywhere, and coerces any role outside {system, user, assistant} to user in the outbound inspection payload. * style: ruff-format changed guardrail files * test(guardrails): cover function_call_output string form; drop em-dash in new docstring * fix(guardrails): map function_call_output straight to user role Avoids ever materialising a schema-invalid bare tool message. The downstream role-safety coercion in build_inspection_messages still guards genuinely caller-supplied non-standard roles (developer, function, custom values); add a regression test covering that path so the coercion has real coverage after this simplification. * test(guardrails): pin chat-completions tool-role coercion in build_inspection_messages * docs(test): soften AIM-specific claims in LIT-4294 test docstrings Ryan's review flagged that several test docstrings assert AIM's /fw/v1/analyze validates + rejects specific schema violations. That behavior is customer-reported in the LIT-4294 writeup, not directly verified by us. Rephrase to attribute the AIM 422 to the customer's writeup and describe the underlying constraint as the OpenAI chat schema; any downstream API that validates against that schema rejects the same shape. * refactor(guardrails): move unsupported-role coercion into AIM only The generic coercion in build_inspection_messages collapsed any role outside {system, user, assistant} to user for every caller of the helper. Combined with the pre-existing apply_redacted_messages_back write-back behavior in Lakera/AIM/Cato, that turned a loud OpenAI 400 on chat-completions tool-message masking into a silent semantic corruption of the outbound request (role tool with tool_call_id got rewritten to bare role user, dropping the assistant + tool_calls sibling). AIM specifically requires the coercion because its /fw/v1/analyze validates the payload against the OpenAI chat schema; other guardrails either do not validate roles or do their own reconstruction. Move the coercion to AimGuardrail._build_aim_inspection_messages so the shared helper keeps caller roles intact and no new cross-guardrail role corruption is introduced. The pre-existing apply_redacted_messages_back structural flatten remains as separate follow-up work. function_call_output items still synthesise role user in the shared helper because they have no natural role field, which is a different concern from coercing a caller-supplied role. * refactor(guardrails): preserve role fidelity in shared _content_utils Shared inspection helpers should extract text and preserve semantic role signals; role coercion for third-party schema safety stays inside the guardrail that needs it (AIM). Three shared-helper changes: - Bare content-part dicts (input_text/output_text) with an explicit role keep it; only role-less parts default to user. - Responses message items already had their role preserved; the behavior is now covered by an explicit test. - function_call_output items default to role tool (semantic equivalent of the chat-completions tool message shape) instead of role user, so Responses and chat completions produce symmetric inspection payloads. A caller-supplied role on the item is still preserved. AIM's schema-safe coercion in _build_aim_inspection_messages already handles the resulting role tool: it collapses to user before the POST to /fw/v1/analyze so AIM's OpenAI-schema validator does not reject the bare tool message (no tool_call_id can survive the flatten). Added a regression test in test_aim.py covering that path.


Relevant issues
Linear ticket
Resolves LIT-4294
Pre-Submission checklist
Screenshots / Proof of Fix
Live proxy repro on both
/v1/responsesand/v1/chat/completions. The Responses request body is the shape a chat-to-Responses bridge (e.g. Google ADK) POSTs; the guardrail is a custompre_callhook that logs what_content_utilsextracted and callswalk_user_textto redactAKIAEXAMPLEBefore (unfixed, HEAD 0f1e29b)
proxy log:
outbound POST body to OpenAI carries the unredacted keys; every text guardrail is a no-op on this path.
/v1/chat/completionson the same proxy seesfragments_seen=1and redacts correctly, so the bypass is Responses-API-onlyAfter (this PR, HEAD 18d3a6f)
Same curl:
outbound POST body to
https://api.openai.com/v1/responses:Both user text and tool-output text are redacted end-to-end;
function_callmetadata is preserved. The inspection payload keeps role fidelity (function_call_outputsurfaces asrole: "tool"for downstream guardrails to consume). AIM's schema-validating POST to/fw/v1/analyzecollapsestooltouserlocally right before the POST, keeping AIM schema-safe without imposing that coercion on other guardrailsType
🐛 Bug Fix
Changes
Two fixes in
litellm/proxy/guardrails/_content_utils.pyand one AIM-local fix inlitellm/proxy/guardrails/guardrail_hooks/aim/aim.py._iter_text_parts_in_contentand the list branch ofwalk_user_textnow recognise{text, input_text, output_text}as text-carrying part types via a newTEXT_PART_TYPESfrozenset. The Responses API usesinput_texton request messages andoutput_texton assistant messages; the previous single-value check made every text guardrail a no-op on/v1/responses_coerce_input_to_messagesand the list branch ofwalk_user_textnow walk the actual Responsesinputtaxonomy (message items,function_call,function_call_output, bare content-part dicts, bare strings) instead of theall(item has role)gate. That gate returnedFalsefor any tool-calling turn (function_callandfunction_call_outputhave norole), which caused the whole list to collapse to a single-message blob whose content was never walked.function_callitems are dropped from the inspection view since they carry no free-form text (arguments walking is LIT-4304 scope);function_call_outputmaps torole: toolby default, preserving the caller-supplied role when present. Role fidelity is otherwise preserved throughout: message items, bare parts, and content items pass through their original role/fw/v1/analyzeneeds{system, user, assistant}-only roles because the flatten dropstool_call_idandname. That coercion lives in a privateAimGuardrail._build_aim_inspection_messageshelper right before the POST rather than in the shared helper, so other guardrails (Lakera, Cato, Lasso, Repello, IBM, Azure, secret detection) see the caller's original role fidelity on their inspection payloadsRegression tests:
tests/test_litellm/proxy/guardrails/test_content_utils.pycovers the Responses taxonomy walk,input_text/output_textextraction and redaction,function_call_output.outputlist + string form, role preservation on bare parts and message items, and thefunction_call_output→role: tooldefault.tests/test_litellm/proxy/guardrails/guardrail_hooks/test_aim.pycovers the AIM-local role coercion. 41 tests pass; every new test fails on unfixed codeQA verification
Two layers: live proxy hitting real OpenAI, and unit-level checks directly against the helpers.
Live proxy (cases 1-9, 16): custom
pre_callguardrail hook logs BEFORE/AFTER snapshots ofdata["messages"]anddata["input"], theiter_message_textfragment list, and thebuild_inspection_messagesrole list. Proxy launched withPYTHONPATHpinned at the PR worktree so the exercised code is the PR source, not an installed package. One curl per case; eachAFTERsnapshot changed only leaf text values, every structural field (role,type,call_id,tool_call_id,tool_calls,name,arguments,annotations) byte-for-byte identical toBEFORE. OpenAI responses confirmed noAKIAEXAMPLEmarker reached the model.Unit-level (cases 9-15): import script that calls
build_inspection_messages,iter_message_text,walk_user_text,apply_redacted_messages_back, andAimGuardrail._build_aim_inspection_messagesdirectly with hand-constructed payloads. Usescopy.deepcopybetween assertions. Covers shapes OpenAI's API rejects (bareinput_text/output_textparts,developerrole, exact AIM-payload role values).Regression gate (case 17): ran the suite on the PR tip → 41 pass. Restored staging HEAD for
_content_utils.pyandaim.pywhile keeping the PR's tests checked out; the 4 AIM tests and 8 content-utils tests failed. Those 12 are exactly the behaviors this PR fixes.Before-baseline: second proxy on staging HEAD, same curl →
fragments=[],walk_visited=0, OpenAI response echoed the rawAKIAEXAMPLEback. Confirmed the bug on unfixed code before verifying the fix.Case-by-case verdict on
18d3a6fe5b:inputinput_textoutput_textfunction_call_outputstring outputinput_text/output_textparts18d3a6fe5b; 12 fail on staging HEAD)Caveat
The
apply_redacted_messages_backhelper writes the flat[{role, content}]inspection payload back overdata["messages"], which drops siblingassistant.tool_callsand anytool_call_idon a chat-completions tool-message masking path. That's a pre-existing structural flatten limitation, not introduced by this PR; verified case 14 does not corrupt the shape further. Fix belongs to a separate ticket.Known follow-up scope
The reviewer surfaced three related silent-bypass paths on the Responses-API surface that this PR deliberately leaves for follow-up commits so the change stays scoped to the customer's original repro. Tickets filed:
custom_tool_call_outputitems share theoutputshape withfunction_call_outputand still bypass the helper.reasoning.summary_textitems replayed asinput(ADK bridge, LangGraph-style loops) carry chain-of-thought text that guardrails do not currently walk.function_call.argumentsand its chat-completions siblingmessage.tool_calls[i].function.argumentsare JSON strings that can carry user-supplied secrets; the shared helper does not walk them today. Pre-existing gap on both APIs, best fixed together.Note
Medium Risk
Changes shared proxy guardrail parsing/redaction on the security-critical pre-call path; behavior shifts for all hooks using
_content_utils, though scope is limited to Responses API shapes and extensive tests were added.Overview
Fixes a Responses API bypass where text guardrails saw zero fragments on
/v1/responses(including tool-calling turns), while chat completions kept working.Shared
_content_utilsnow treatstext/input_text/output_textas text parts and walks mixedinputlists item-by-item (messages, bare strings/parts,function_call_output.output) instead of collapsing the list when some items lackrole.walk_user_textandbuild_inspection_messagesfollow the same rules so scan, redact, and remote inspection payloads stay aligned;function_call_outputdefaults torole: toolin the shared flatten.AIM alone maps non-
{system,user,assistant}roles touserbefore/fw/v1/analyze, avoiding 422s without changing other hooks’ role fidelity.Regression coverage added in
test_content_utils.pyandtest_aim.py.Reviewed by Cursor Bugbot for commit 18d3a6f. Bugbot is set up for automated code reviews on this repo. Configure here.