Skip to content

Commit

Permalink
fix: Missed TLS config logic from internal fork (#21)
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Hill <[email protected]>
Co-authored-by: Daniel Clark <[email protected]>
  • Loading branch information
njhill and declark1 authored May 3, 2024
1 parent 3bc3053 commit 7df0eb8
Showing 1 changed file with 23 additions and 1 deletion.
24 changes: 23 additions & 1 deletion vllm/tgis_utils/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,14 @@ def add_tgis_args(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
default=True) #TODO TBD
parser.add_argument('--grpc-port', type=int, default=8033)

#TODO check/add other args here including TLS related
# map to ssl_certfile
parser.add_argument('--tls-cert-path', type=str)
# map to ssl_keyfile
parser.add_argument('--tls-key-path', type=str)
# map to ssl_ca_certs
parser.add_argument('--tls-client-ca-cert-path', type=str)

# TODO check/add other args here

# revision, dtype, trust-remote-code already covered by llmengine args
return parser
Expand Down Expand Up @@ -119,4 +126,19 @@ def postprocess_tgis_args(args: argparse.Namespace) -> argparse.Namespace:
if not args.disable_log_requests:
args.disable_log_requests = True

if args.max_batch_size is not None:
# Existing MAX_BATCH_SIZE settings in TGIS configs may not necessarily
# be best for vLLM so we'll just log a warning for now
logger.warn(
f"max_batch_size is set to {args.max_batch_size} but will be "
f"ignored for now. max_num_seqs can be used if this is still "
f"needed.")

if args.tls_cert_path:
args.ssl_certfile = args.tls_cert_path
if args.tls_key_path:
args.ssl_keyfile = args.tls_key_path
if args.tls_client_ca_cert_path:
args.ssl_ca_certs = args.tls_client_ca_cert_path

return args

0 comments on commit 7df0eb8

Please sign in to comment.