Unverified Commit 754a8ca9 authored by Zack Yu's avatar Zack Yu Committed by GitHub
Browse files

fix: only include Authorization header when OPENAI_API_KEY is set (#33488)


Signed-off-by: default avatarzack041 <zackyu041@gmail.com>
parent 302ecf64
...@@ -138,6 +138,16 @@ def _update_headers_common( ...@@ -138,6 +138,16 @@ def _update_headers_common(
headers["x-request-id"] = request_func_input.request_id 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( async def async_request_openai_completions(
request_func_input: RequestFuncInput, request_func_input: RequestFuncInput,
session: aiohttp.ClientSession, session: aiohttp.ClientSession,
...@@ -170,9 +180,7 @@ async def async_request_openai_completions( ...@@ -170,9 +180,7 @@ async def async_request_openai_completions(
} }
_update_payload_common(payload, request_func_input) _update_payload_common(payload, request_func_input)
headers = { headers = _get_headers()
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
}
_update_headers_common(headers, request_func_input) _update_headers_common(headers, request_func_input)
output = RequestFuncOutput() output = RequestFuncOutput()
...@@ -301,10 +309,7 @@ async def async_request_openai_chat_completions( ...@@ -301,10 +309,7 @@ async def async_request_openai_chat_completions(
} }
_update_payload_common(payload, request_func_input) _update_payload_common(payload, request_func_input)
headers = { headers = _get_headers("application/json")
"Content-Type": "application/json",
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
}
_update_headers_common(headers, request_func_input) _update_headers_common(headers, request_func_input)
output = RequestFuncOutput() output = RequestFuncOutput()
...@@ -396,9 +401,7 @@ async def async_request_openai_audio( ...@@ -396,9 +401,7 @@ async def async_request_openai_audio(
} }
_update_payload_common(payload, request_func_input) _update_payload_common(payload, request_func_input)
headers = { headers = _get_headers()
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
}
_update_headers_common(headers, request_func_input) _update_headers_common(headers, request_func_input)
# Send audio file # Send audio file
...@@ -537,10 +540,7 @@ async def async_request_openai_embeddings( ...@@ -537,10 +540,7 @@ async def async_request_openai_embeddings(
} }
_update_payload_common(payload, request_func_input) _update_payload_common(payload, request_func_input)
headers = { headers = _get_headers("application/json")
"Content-Type": "application/json",
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
}
_update_headers_common(headers, request_func_input) _update_headers_common(headers, request_func_input)
return await _run_pooling_request( return await _run_pooling_request(
...@@ -576,10 +576,7 @@ async def async_request_vllm_rerank( ...@@ -576,10 +576,7 @@ async def async_request_vllm_rerank(
"truncate_prompt_tokens": -1, "truncate_prompt_tokens": -1,
} }
headers = { headers = _get_headers("application/json")
"Content-Type": "application/json",
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
}
_update_headers_common(headers, request_func_input) _update_headers_common(headers, request_func_input)
return await _run_pooling_request( return await _run_pooling_request(
...@@ -615,10 +612,7 @@ async def async_request_openai_embeddings_chat( ...@@ -615,10 +612,7 @@ async def async_request_openai_embeddings_chat(
} }
_update_payload_common(payload, request_func_input) _update_payload_common(payload, request_func_input)
headers = { headers = _get_headers("application/json")
"Content-Type": "application/json",
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
}
_update_headers_common(headers, request_func_input) _update_headers_common(headers, request_func_input)
return await _run_pooling_request( return await _run_pooling_request(
...@@ -721,10 +715,7 @@ async def async_request_infinity_embeddings( ...@@ -721,10 +715,7 @@ async def async_request_infinity_embeddings(
_update_payload_common(payload, request_func_input) _update_payload_common(payload, request_func_input)
headers = { headers = _get_headers("application/json")
"Content-Type": "application/json",
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
}
_update_headers_common(headers, request_func_input) _update_headers_common(headers, request_func_input)
return await _run_pooling_request( return await _run_pooling_request(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment