From 754a8ca9426080a652377b556d466cadb5c3468f Mon Sep 17 00:00:00 2001 From: Zack Yu Date: Sat, 31 Jan 2026 23:35:09 -0800 Subject: [PATCH] fix: only include Authorization header when OPENAI_API_KEY is set (#33488) Signed-off-by: zack041 --- vllm/benchmarks/lib/endpoint_request_func.py | 43 ++++++++------------ 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/vllm/benchmarks/lib/endpoint_request_func.py b/vllm/benchmarks/lib/endpoint_request_func.py index d2127f83fa..987e8a5fd3 100644 --- a/vllm/benchmarks/lib/endpoint_request_func.py +++ b/vllm/benchmarks/lib/endpoint_request_func.py @@ -138,6 +138,16 @@ def _update_headers_common( headers["x-request-id"] = request_func_input.request_id +def _get_headers(content_type: str | None = None) -> dict[str, str]: + headers = {} + if content_type: + headers["Content-Type"] = content_type + api_key = os.environ.get("OPENAI_API_KEY") + if api_key: + headers["Authorization"] = f"Bearer {api_key}" + return headers + + async def async_request_openai_completions( request_func_input: RequestFuncInput, session: aiohttp.ClientSession, @@ -170,9 +180,7 @@ async def async_request_openai_completions( } _update_payload_common(payload, request_func_input) - headers = { - "Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}", - } + headers = _get_headers() _update_headers_common(headers, request_func_input) output = RequestFuncOutput() @@ -301,10 +309,7 @@ async def async_request_openai_chat_completions( } _update_payload_common(payload, request_func_input) - headers = { - "Content-Type": "application/json", - "Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}", - } + headers = _get_headers("application/json") _update_headers_common(headers, request_func_input) output = RequestFuncOutput() @@ -396,9 +401,7 @@ async def async_request_openai_audio( } _update_payload_common(payload, request_func_input) - headers = { - "Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}", - } + headers = _get_headers() _update_headers_common(headers, request_func_input) # Send audio file @@ -537,10 +540,7 @@ async def async_request_openai_embeddings( } _update_payload_common(payload, request_func_input) - headers = { - "Content-Type": "application/json", - "Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}", - } + headers = _get_headers("application/json") _update_headers_common(headers, request_func_input) return await _run_pooling_request( @@ -576,10 +576,7 @@ async def async_request_vllm_rerank( "truncate_prompt_tokens": -1, } - headers = { - "Content-Type": "application/json", - "Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}", - } + headers = _get_headers("application/json") _update_headers_common(headers, request_func_input) return await _run_pooling_request( @@ -615,10 +612,7 @@ async def async_request_openai_embeddings_chat( } _update_payload_common(payload, request_func_input) - headers = { - "Content-Type": "application/json", - "Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}", - } + headers = _get_headers("application/json") _update_headers_common(headers, request_func_input) return await _run_pooling_request( @@ -721,10 +715,7 @@ async def async_request_infinity_embeddings( _update_payload_common(payload, request_func_input) - headers = { - "Content-Type": "application/json", - "Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}", - } + headers = _get_headers("application/json") _update_headers_common(headers, request_func_input) return await _run_pooling_request(