Co-authored-by: hnyls2002 <lsyincs@gmail.com>
This commit is contained in:
co-authored by
hnyls2002
parent
d6ac5f23cc
commit
85ab6a7f54
@@ -1,7 +1,5 @@
|
|||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
from sglang.cli.generate import generate
|
|
||||||
from sglang.cli.serve import serve
|
|
||||||
from sglang.cli.utils import get_git_commit_hash
|
from sglang.cli.utils import get_git_commit_hash
|
||||||
from sglang.version import __version__
|
from sglang.version import __version__
|
||||||
|
|
||||||
@@ -17,19 +15,17 @@ def main():
|
|||||||
# complex sub commands
|
# complex sub commands
|
||||||
subparsers = parser.add_subparsers(dest="subcommand", required=True)
|
subparsers = parser.add_subparsers(dest="subcommand", required=True)
|
||||||
|
|
||||||
serve_parser = subparsers.add_parser(
|
subparsers.add_parser(
|
||||||
"serve",
|
"serve",
|
||||||
help="Launch the SGLang server.",
|
help="Launch the SGLang server.",
|
||||||
add_help=False, # Defer help to the specific parser
|
add_help=False,
|
||||||
)
|
)
|
||||||
serve_parser.set_defaults(func=serve)
|
|
||||||
|
|
||||||
generate_parser = subparsers.add_parser(
|
subparsers.add_parser(
|
||||||
"generate",
|
"generate",
|
||||||
help="Run inference on a multimodal model.",
|
help="Run inference on a multimodal model.",
|
||||||
add_help=False, # Defer help to the specific parser
|
add_help=False,
|
||||||
)
|
)
|
||||||
generate_parser.set_defaults(func=generate)
|
|
||||||
|
|
||||||
# simple commands
|
# simple commands
|
||||||
version_parser = subparsers.add_parser(
|
version_parser = subparsers.add_parser(
|
||||||
@@ -39,4 +35,14 @@ def main():
|
|||||||
version_parser.set_defaults(func=version)
|
version_parser.set_defaults(func=version)
|
||||||
|
|
||||||
args, extra_argv = parser.parse_known_args()
|
args, extra_argv = parser.parse_known_args()
|
||||||
args.func(args, extra_argv)
|
|
||||||
|
if args.subcommand == "serve":
|
||||||
|
from sglang.cli.serve import serve
|
||||||
|
|
||||||
|
serve(args, extra_argv)
|
||||||
|
elif args.subcommand == "generate":
|
||||||
|
from sglang.cli.generate import generate
|
||||||
|
|
||||||
|
generate(args, extra_argv)
|
||||||
|
elif args.subcommand == "version":
|
||||||
|
version(args, extra_argv)
|
||||||
|
|||||||
@@ -111,8 +111,6 @@ def serve(args, extra_argv):
|
|||||||
from sglang.launch_server import run_server
|
from sglang.launch_server import run_server
|
||||||
from sglang.srt.server_args import prepare_server_args
|
from sglang.srt.server_args import prepare_server_args
|
||||||
|
|
||||||
# Add a dummy argument for the program name, expected by prepare_server_args
|
|
||||||
# as it typically processes sys.argv
|
|
||||||
server_args = prepare_server_args(dispatch_argv)
|
server_args = prepare_server_args(dispatch_argv)
|
||||||
|
|
||||||
run_server(server_args)
|
run_server(server_args)
|
||||||
|
|||||||
Reference in New Issue
Block a user