Fix bench serving base-url-only runs (#28617)
Co-authored-by: shuwenn <47200617+alphabetc1@users.noreply.github.com>
This commit is contained in:
co-authored by
shuwenn
parent
9b10821c8e
commit
59001267c3
@@ -48,7 +48,7 @@ from sglang.benchmark.utils import (
|
|||||||
set_ulimit,
|
set_ulimit,
|
||||||
)
|
)
|
||||||
from sglang.srt.disaggregation.utils import FAKE_BOOTSTRAP_HOST
|
from sglang.srt.disaggregation.utils import FAKE_BOOTSTRAP_HOST
|
||||||
from sglang.srt.utils.network import NetworkAddress, resolve_base_url
|
from sglang.srt.utils.network import resolve_base_url, resolve_host_port
|
||||||
|
|
||||||
_ROUTING_KEY_HEADER = "X-SMG-Routing-Key"
|
_ROUTING_KEY_HEADER = "X-SMG-Routing-Key"
|
||||||
|
|
||||||
@@ -1941,15 +1941,14 @@ def run_benchmark(args_: argparse.Namespace):
|
|||||||
}.get(args.backend, 30000)
|
}.get(args.backend, 30000)
|
||||||
|
|
||||||
# Base URL the client sends to: --base-url if given, else http://host:port
|
# Base URL the client sends to: --base-url if given, else http://host:port
|
||||||
# (IPv6-correct). NetworkAddress is also kept for gserver's host:port form.
|
# (IPv6-correct). gserver uses the scheme-less host:port form instead.
|
||||||
base_url = resolve_base_url(args.base_url, args.host, args.port)
|
base_url = resolve_base_url(args.base_url, args.host, args.port)
|
||||||
_na = NetworkAddress(args.host, args.port)
|
|
||||||
|
|
||||||
model_url = f"{base_url}/v1/models"
|
model_url = f"{base_url}/v1/models"
|
||||||
|
|
||||||
if args.backend == "gserver":
|
if args.backend == "gserver":
|
||||||
# gRPC server takes a bare host:port, not an http URL.
|
# gRPC server takes a bare host:port, not an http URL.
|
||||||
api_url = args.base_url if args.base_url else _na.to_host_port_str()
|
api_url = resolve_host_port(args.base_url, args.host, args.port)
|
||||||
args.model = args.model or "default"
|
args.model = args.model or "default"
|
||||||
else:
|
else:
|
||||||
api_url = f"{base_url}{_BACKEND_API_PATHS[args.backend]}"
|
api_url = f"{base_url}{_BACKEND_API_PATHS[args.backend]}"
|
||||||
|
|||||||
@@ -551,3 +551,12 @@ def resolve_base_url(base_url: str, host: str, port: int) -> str:
|
|||||||
if base_url:
|
if base_url:
|
||||||
return base_url
|
return base_url
|
||||||
return NetworkAddress(host, port).to_url()
|
return NetworkAddress(host, port).to_url()
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_host_port(base_url: str, host: str, port: int) -> str:
|
||||||
|
"""Like :func:`resolve_base_url` but returns the scheme-less ``host:port``
|
||||||
|
form (for gRPC-style endpoints): ``base_url`` if set, else ``host:port``
|
||||||
|
(IPv6-correct via :class:`NetworkAddress`)."""
|
||||||
|
if base_url:
|
||||||
|
return base_url
|
||||||
|
return NetworkAddress(host, port).to_host_port_str()
|
||||||
|
|||||||
Reference in New Issue
Block a user