Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Misc] Adding API Key to the benchmark #11384

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Misc] Adding API Key to the benchmark #11384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea41f0e
Adding API Key
bjb19 Dec 20, 2024
bf9fe8e
adding back
bjb19 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions benchmarks/backend_request_func.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class RequestFuncInput:
extra_body: Optional[dict] = None
multi_modal_content: Optional[dict] = None
ignore_eos: bool = False
api_key: Optional[str] = None


@dataclass
Expand Down Expand Up @@ -246,9 +247,9 @@ async def async_request_openai_completions(
}
if request_func_input.extra_body:
payload.update(request_func_input.extra_body)
headers = {
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}"
}
api_key = (request_func_input.api_key if request_func_input.api_key
else os.environ.get('OPENAI_API_KEY'))
headers = {"Authorization": f"Bearer {api_key}"}

output = RequestFuncOutput()
output.prompt_len = request_func_input.prompt_len
Expand Down Expand Up @@ -342,9 +343,11 @@ async def async_request_openai_chat_completions(
}
if request_func_input.extra_body:
payload.update(request_func_input.extra_body)
api_key = (request_func_input.api_key if request_func_input.api_key
else os.environ.get('OPENAI_API_KEY'))
headers = {
"Content-Type": "application/json",
"Authorization": f"Bearer {os.environ.get('OPENAI_API_KEY')}",
"Authorization": f"Bearer {api_key}",
}

output = RequestFuncOutput()
Expand Down
55 changes: 31 additions & 24 deletions benchmarks/benchmark_serving.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
r"""Benchmark online serving throughput.

""""
On the server side, run one of the following commands:
vLLM OpenAI API server
vllm serve <your_model> \
Expand Down Expand Up @@ -538,6 +537,7 @@ async def benchmark(
ignore_eos: bool,
gootput_config_dict: Dict[str, float],
max_concurrency: Optional[int],
api_key: Optional[str],
):
if backend in ASYNC_REQUEST_FUNCS:
request_func = ASYNC_REQUEST_FUNCS[backend]
Expand All @@ -551,17 +551,16 @@ async def benchmark(
# multi-modal benchmark is only available on OpenAI Chat backend.
raise ValueError(
"Multi-modal content is only supported on 'openai-chat' backend.")
test_input = RequestFuncInput(
model=model_id,
prompt=test_prompt,
api_url=api_url,
prompt_len=test_prompt_len,
output_len=test_output_len,
logprobs=logprobs,
best_of=best_of,
multi_modal_content=test_mm_content,
ignore_eos=ignore_eos,
)
test_input = RequestFuncInput(model=model_id,
prompt=test_prompt,
api_url=api_url,
prompt_len=test_prompt_len,
output_len=test_output_len,
logprobs=logprobs,
best_of=best_of,
multi_modal_content=test_mm_content,
ignore_eos=ignore_eos,
api_key=api_key)
test_output = await request_func(request_func_input=test_input)
if not test_output.success:
raise ValueError(
Expand All @@ -580,7 +579,8 @@ async def benchmark(
logprobs=logprobs,
best_of=best_of,
multi_modal_content=test_mm_content,
ignore_eos=ignore_eos)
ignore_eos=ignore_eos,
api_key=api_key)
profile_output = await request_func(request_func_input=profile_input)
if profile_output.success:
print("Profiler started")
Expand Down Expand Up @@ -623,7 +623,8 @@ async def limited_request_func(request_func_input, pbar):
logprobs=logprobs,
best_of=best_of,
multi_modal_content=mm_content,
ignore_eos=ignore_eos)
ignore_eos=ignore_eos,
api_key=api_key)
tasks.append(
asyncio.create_task(
limited_request_func(request_func_input=request_func_input,
Expand All @@ -632,15 +633,14 @@ async def limited_request_func(request_func_input, pbar):

if profile:
print("Stopping profiler...")
profile_input = RequestFuncInput(
model=model_id,
prompt=test_prompt,
api_url=base_url + "/stop_profile",
prompt_len=test_prompt_len,
output_len=test_output_len,
logprobs=logprobs,
best_of=best_of,
)
profile_input = RequestFuncInput(model=model_id,
prompt=test_prompt,
api_url=base_url + "/stop_profile",
prompt_len=test_prompt_len,
output_len=test_output_len,
logprobs=logprobs,
best_of=best_of,
api_key=api_key)
profile_output = await request_func(request_func_input=profile_input)
if profile_output.success:
print("Profiler stopped")
Expand Down Expand Up @@ -892,6 +892,7 @@ def main(args: argparse.Namespace):
ignore_eos=args.ignore_eos,
gootput_config_dict=gootput_config_dict,
max_concurrency=args.max_concurrency,
api_key=args.api_key,
))

# Save config and results to json
Expand Down Expand Up @@ -1001,6 +1002,12 @@ def main(args: argparse.Namespace):
required=True,
help="Name of the model.",
)
parser.add_argument(
"--api-key",
type=str,
help="API key for the server",
)

parser.add_argument(
"--tokenizer",
type=str,
Expand Down
Loading