diff --git a/litellm/llms/openai_like/embedding/handler.py b/litellm/llms/openai_like/embedding/handler.py index 8212a7415aa..0a20bce0086 100644 --- a/litellm/llms/openai_like/embedding/handler.py +++ b/litellm/llms/openai_like/embedding/handler.py @@ -24,7 +24,19 @@ from ..common_utils import OpenAILikeBase, OpenAILikeError _KEY_HEADERS_ADAPTER: Final = TypeAdapter(Mapping[str, str]) _EXTRA_HEADERS_ADAPTER: Final = TypeAdapter(Mapping[str, object]) -_TRANSPORT_HEADER_NAMES: Final = frozenset({"host", "content-length", "transfer-encoding"}) +_TRANSPORT_HEADER_NAMES: Final = frozenset( + { + "host", + "content-length", + "transfer-encoding", + "connection", + "keep-alive", + "proxy-connection", + "te", + "trailer", + "upgrade", + } +) _HEADER_NAME: Final = re.compile(r"[!#$%&'*+\-.^_`|~0-9A-Za-z]+") _HEADER_VALUE: Final = re.compile(r"[\t\x20-\x7e]*") @@ -34,7 +46,7 @@ def _header_text(name: str, value: object) -> str | None: return None if _HEADER_NAME.fullmatch(name) is None: return None - return str(value).strip(" \t") + return str(value).strip(" \t\r\n") def _extra_headers_as_text(extra_headers: Mapping[str, object], model: str, drop_params: bool) -> Mapping[str, str]: @@ -54,7 +66,9 @@ def _extra_headers_as_text(extra_headers: Mapping[str, object], model: str, drop unsendable: Final = sorted(name for name, text in named.items() if _HEADER_VALUE.fullmatch(text) is None) if unsendable: verbose_logger.warning( - "extra_headers %s dropped, since a header value must be printable ASCII on one line", unsendable + "extra_headers %s dropped for model %s, since a header value must be printable ASCII on one line", + unsendable, + model, ) return MappingProxyType({name: text for name, text in named.items() if name not in unsendable}) diff --git a/tests/unit/llms/openai_like/test_hostinger_router_provider.py b/tests/unit/llms/openai_like/test_hostinger_router_provider.py index 13597d6dd92..75da1fafe22 100644 --- a/tests/unit/llms/openai_like/test_hostinger_router_provider.py +++ b/tests/unit/llms/openai_like/test_hostinger_router_provider.py @@ -300,7 +300,17 @@ def test_hostinger_router_embeddings_drop_non_text_extra_headers_under_drop_para assert set(json.loads(request.content)) == {"model", "input"} -TRANSPORT_EXTRA_HEADERS: Final = [("Host", "other.example"), ("content-length", "1"), ("Transfer-Encoding", "chunked")] +TRANSPORT_EXTRA_HEADERS: Final = [ + ("Host", "other.example"), + ("content-length", "1"), + ("Transfer-Encoding", "chunked"), + ("Connection", "close"), + ("Keep-Alive", "timeout=5"), + ("Proxy-Connection", "close"), + ("TE", "gzip"), + ("Trailer", "X-Checksum"), + ("Upgrade", "websocket"), +] @pytest.mark.parametrize(("name", "configured"), TRANSPORT_EXTRA_HEADERS) @@ -318,6 +328,7 @@ def test_hostinger_router_embeddings_ignore_transport_extra_headers(name: str, c assert request.headers.get_list("host") == ["router.hostinger.com"] assert request.headers.get_list("content-length") == [str(len(request.content))] assert "transfer-encoding" not in request.headers + assert configured not in request.headers.get_list(name) assert request.headers.get_list("x-trace-id") == ["trace-1"] @@ -376,8 +387,11 @@ def test_hostinger_router_embeddings_drop_extra_header_values_http_cannot_carry( assert "x-litellm-user_api_key_alias" not in request.headers -@pytest.mark.parametrize(("configured", "sent"), [(" x ", "x"), ("\t", ""), (" a\tb ", "a\tb")]) -def test_hostinger_router_embeddings_trim_spaces_around_extra_header_values(configured: str, sent: str): +@pytest.mark.parametrize( + ("configured", "sent"), + [(" x ", "x"), ("\t", ""), (" a\tb ", "a\tb"), ("env-secret\n", "env-secret"), ("\r\n x \r\n", "x")], +) +def test_hostinger_router_embeddings_trim_whitespace_around_extra_header_values(configured: str, sent: str): with respx.mock() as upstream: route: Final = upstream.post("https://router.hostinger.com/v1/embeddings").respond(200, json=EMBEDDING_RESPONSE) litellm.embedding(