From 08133c4d1a9e3c13aa42c3fb83aa7c987e79289f Mon Sep 17 00:00:00 2001 From: Harry Mellor <19981378+HMellor@users.noreply.github.com> Date: Mon, 18 Dec 2023 02:56:23 +0000 Subject: [PATCH] Add SSL arguments to API servers (#2109) --- vllm/entrypoints/api_server.py | 6 +++++- vllm/entrypoints/openai/api_server.py | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/vllm/entrypoints/api_server.py b/vllm/entrypoints/api_server.py index fb29837da8cf0..6910b3265dfd2 100644 --- a/vllm/entrypoints/api_server.py +++ b/vllm/entrypoints/api_server.py @@ -73,6 +73,8 @@ async def stream_results() -> AsyncGenerator[bytes, None]: parser = argparse.ArgumentParser() parser.add_argument("--host", type=str, default=None) parser.add_argument("--port", type=int, default=8000) + parser.add_argument("--ssl-keyfile", type=str, default=None) + parser.add_argument("--ssl-certfile", type=str, default=None) parser = AsyncEngineArgs.add_cli_args(parser) args = parser.parse_args() @@ -83,4 +85,6 @@ async def stream_results() -> AsyncGenerator[bytes, None]: host=args.host, port=args.port, log_level="debug", - timeout_keep_alive=TIMEOUT_KEEP_ALIVE) + timeout_keep_alive=TIMEOUT_KEEP_ALIVE, + ssl_keyfile=args.ssl_keyfile, + ssl_certfile=args.ssl_certfile) diff --git a/vllm/entrypoints/openai/api_server.py b/vllm/entrypoints/openai/api_server.py index 0f131ce6f4dc0..be5f4190e633f 100644 --- a/vllm/entrypoints/openai/api_server.py +++ b/vllm/entrypoints/openai/api_server.py @@ -80,6 +80,14 @@ def parse_args(): default="assistant", help="The role name to return if " "`request.add_generation_prompt=true`.") + parser.add_argument("--ssl-keyfile", + type=str, + default=None, + help="The file path to the SSL key file") + parser.add_argument("--ssl-certfile", + type=str, + default=None, + help="The file path to the SSL cert file") parser = AsyncEngineArgs.add_cli_args(parser) return parser.parse_args() @@ -744,4 +752,6 @@ async def fake_stream_generator() -> AsyncGenerator[str, None]: host=args.host, port=args.port, log_level="info", - timeout_keep_alive=TIMEOUT_KEEP_ALIVE) + timeout_keep_alive=TIMEOUT_KEEP_ALIVE, + ssl_keyfile=args.ssl_keyfile, + ssl_certfile=args.ssl_certfile)