merge: resolve conflicts between main and litellm_oss_staging_03_11_2026

This commit is contained in:
Chesars
2026-03-12 09:38:31 -03:00
parent 8d2432b21b
commit 1be6b31e2f
205 changed files with 16204 additions and 10448 deletions
@@ -1300,11 +1300,9 @@ def test_logging_async_cache_hit_sync_call(turn_off_message_logging):
"redacted-by-litellm"
== standard_logging_object["messages"][0]["content"]
)
# response is a full ModelResponse dict (choices format) since d84e5e381acf
assert (
standard_logging_object["response"]["choices"][0]["message"]["content"]
== "redacted-by-litellm"
)
assert {"text": "redacted-by-litellm"} == standard_logging_object[
"response"
]
def test_logging_standard_payload_failure_call():