mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-18 09:45:23 +00:00
Merge f2217072e9 into 3b8ad37296
This commit is contained in:
commit
00bb2b88da
2 changed files with 44 additions and 2 deletions
|
|
@ -7079,7 +7079,7 @@ class StandardLoggingPayloadSetup:
|
|||
return None
|
||||
user_agent_tags: list[str] | None = None
|
||||
headers: Final = proxy_server_request.get("headers", {})
|
||||
if headers is not None and isinstance(headers, dict):
|
||||
if headers is not None and isinstance(headers, Mapping):
|
||||
request_headers: Final = cast( # cast-ok: request headers are untyped framework data
|
||||
dict[str, str | None], headers
|
||||
)
|
||||
|
|
@ -7106,7 +7106,7 @@ class StandardLoggingPayloadSetup:
|
|||
return None
|
||||
|
||||
headers: Final = proxy_server_request.get("headers", {})
|
||||
if not isinstance(headers, dict):
|
||||
if not isinstance(headers, Mapping):
|
||||
return None
|
||||
request_headers: Final = cast( # cast-ok: request headers are untyped framework data
|
||||
dict[str, str], headers
|
||||
|
|
|
|||
|
|
@ -3672,6 +3672,48 @@ def test_get_extra_header_tags():
|
|||
delattr(litellm, "extra_spend_tag_headers")
|
||||
|
||||
|
||||
|
||||
def test_header_derived_spend_tags_accept_starlette_headers_mapping(monkeypatch):
|
||||
"""Pass-through stores Starlette Headers (a Mapping, not dict); tags must still extract.
|
||||
|
||||
Regression for https://github.com/BerriAI/litellm/issues/44032
|
||||
"""
|
||||
import litellm
|
||||
from starlette.datastructures import Headers
|
||||
|
||||
from litellm.litellm_core_utils.litellm_logging import StandardLoggingPayloadSetup
|
||||
|
||||
monkeypatch.setattr(litellm, "disable_add_user_agent_to_request_tags", False)
|
||||
monkeypatch.setattr(
|
||||
litellm, "extra_spend_tag_headers", ["x-custom-header"], raising=False
|
||||
)
|
||||
proxy_server_request = {
|
||||
"headers": Headers(
|
||||
{
|
||||
"user-agent": "curl/8.0.0",
|
||||
"x-custom-header": "tenant-a",
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
ua_tags = StandardLoggingPayloadSetup._get_user_agent_tags(proxy_server_request)
|
||||
assert ua_tags is not None
|
||||
assert "User-Agent: curl" in ua_tags
|
||||
assert "User-Agent: curl/8.0.0" in ua_tags
|
||||
|
||||
extra_tags = StandardLoggingPayloadSetup._get_extra_header_tags(proxy_server_request)
|
||||
assert extra_tags is not None
|
||||
assert "x-custom-header: tenant-a" in extra_tags
|
||||
|
||||
request_tags = StandardLoggingPayloadSetup._get_request_tags(
|
||||
litellm_params={},
|
||||
proxy_server_request=proxy_server_request,
|
||||
)
|
||||
assert "User-Agent: curl" in request_tags
|
||||
assert "x-custom-header: tenant-a" in request_tags
|
||||
|
||||
|
||||
|
||||
def test_response_cost_calculator_with_response_cost_in_hidden_params(logging_obj):
|
||||
from litellm import Router
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue