diff --git a/litellm/litellm_core_utils/redact_messages.py b/litellm/litellm_core_utils/redact_messages.py index 7f8a38cc8ec..fe5665ce82e 100644 --- a/litellm/litellm_core_utils/redact_messages.py +++ b/litellm/litellm_core_utils/redact_messages.py @@ -128,7 +128,8 @@ def _redact_streaming_response(streaming_response): elif isinstance(streaming_response, litellm.ResponsesAPIResponse): return perform_redaction({}, streaming_response) elif hasattr(streaming_response, "output"): - _redact_responses_api_output(streaming_response.output) + if streaming_response.output is not None: + _redact_responses_api_output(streaming_response.output) if hasattr(streaming_response, "reasoning") and streaming_response.reasoning is not None: streaming_response.reasoning = None return streaming_response @@ -217,8 +218,10 @@ def _redact_field_when_present(item: object, field: str) -> None: setattr(item, field, REDACTED_BY_LITELLM) -def _redact_responses_api_output(output_items): +def _redact_responses_api_output(output_items: Sequence[object] | None) -> None: """Helper to redact ResponsesAPIResponse output items.""" + if output_items is None: + return for output_item in output_items: output_type = stream_item_field(output_item, "type") if getattr(output_item, "text", None) is not None: @@ -295,7 +298,11 @@ def _redacted_responses_api_output_item(item: object, redacted_str: str) -> obje } -def _redact_responses_api_output_dict(output_items: Sequence[object], redacted_str: str) -> Sequence[object]: +def _redact_responses_api_output_dict( + output_items: Sequence[object] | None, redacted_str: str = REDACTED_BY_LITELLM +) -> Sequence[object] | None: + if output_items is None: + return None return [_redacted_responses_api_output_item(item, redacted_str) for item in output_items] @@ -309,9 +316,13 @@ def _redacted_responses_api_response( output: Final = response.get("output") redacted: Final = { **response, - "output": _redact_responses_api_output_dict(_RESPONSE_ITEMS.validate_python(output), REDACTED_BY_LITELLM) - if isinstance(output, list) - else output, + "output": ( + None + if output is None + else _redact_responses_api_output_dict(_RESPONSE_ITEMS.validate_python(output), REDACTED_BY_LITELLM) + if isinstance(output, list) + else output + ), } return _with_redacted_instructions(redacted) if redact_instructions else redacted @@ -531,7 +542,7 @@ def perform_redaction(model_call_details: dict, result, redact_streaming_respons elif isinstance(_result, dict) and "output" in _result: return _redacted_responses_api_response(_result, redact_instructions=redact_streaming_responses) elif isinstance(_result, litellm.ResponsesAPIResponse): - if hasattr(_result, "output"): + if hasattr(_result, "output") and _result.output is not None: _redact_responses_api_output(_result.output) # Redact reasoning field in ResponsesAPIResponse if hasattr(_result, "reasoning") and _result.reasoning is not None: diff --git a/tests/unit/litellm_core_utils/test_redact_messages.py b/tests/unit/litellm_core_utils/test_redact_messages.py index 6a734ca3b70..a45162723d4 100644 --- a/tests/unit/litellm_core_utils/test_redact_messages.py +++ b/tests/unit/litellm_core_utils/test_redact_messages.py @@ -29,6 +29,8 @@ from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler from litellm.litellm_core_utils.redact_messages import ( _redact_responses_api_output, + _redact_responses_api_output_dict, + _redact_streaming_response, _redacted_responses_api_response, perform_redaction, redacted_model_call_details_for_custom_logger, @@ -176,7 +178,11 @@ def test_redaction_hides_a_compaction_summary_in_responses_api_output(shape: str object="response", status="completed", output=[ - {"type": "compaction", "id": "cmp_1", "encrypted_content": json.dumps({"type": "compaction", "content": SECRET})} + { + "type": "compaction", + "id": "cmp_1", + "encrypted_content": json.dumps({"type": "compaction", "content": SECRET}), + } ], ) result: Final = response if shape == "object" else response.model_dump() @@ -920,6 +926,42 @@ class TestPerformRedaction: assert redacted.output[0].content[0].text == "redacted-by-litellm" assert response.output[0].content[0].text == "sensitive output" + def test_responses_api_redaction_handles_none_output(self): + # 1. _redact_responses_api_output(None) returns None without raising TypeError + assert _redact_responses_api_output(None) is None + + # 2. _redact_responses_api_output_dict(None) returns None without raising TypeError + assert _redact_responses_api_output_dict(None) is None + assert _redact_responses_api_output_dict(None, "redacted-by-litellm") is None + + # 3. Redacting a Responses API dictionary or object where output: None runs cleanly without exception + dict_response: Final = { + "id": "resp_none", + "model": "gpt-4o", + "output": None, + "instructions": "sensitive-instructions", + } + redacted_dict: Final = perform_redaction({}, dict_response) + assert redacted_dict["output"] is None + assert redacted_dict["instructions"] == "redacted-by-litellm" + + redacted_raw: Final = _redacted_responses_api_response({"output": None}) + assert redacted_raw["output"] is None + + streaming_obj = SimpleNamespace(output=None) + assert _redact_streaming_response(streaming_obj).output is None + + object_response = mock_responses_api_response("test output") + object_response.output = None + redacted_obj: Final = perform_redaction({}, object_response) + assert redacted_obj.output is None + + # 4. Normal list outputs continue to redact sensitive fields as expected + normal_response: Final = mock_responses_api_response("sensitive output") + redacted_normal: Final = perform_redaction({}, normal_response) + assert redacted_normal.output is not None + assert redacted_normal.output[0].content[0].text == "redacted-by-litellm" + def test_redacts_vertex_provider_metadata_in_standard_logging_response(self): details = { "standard_logging_object": {