phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-07-29 15:23:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix run-config/config-file to config

Browse source
This commit is contained in:
Xi Yan 2024-09-10 12:21:51 -07:00
parent ace3953926
commit 6c97e84372
4 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/cli_reference.md
View file

@ -318,7 +318,7 @@ Build spec configuration saved at /home/xiyan/.llama/distributions/local/conda/8
You can re-build package based on build config You can re-build package based on build config
``` ```
$ llama stack build --config-file ~/.llama/distributions/local/conda/8b-instruct-build.yaml $ llama stack build --config ~/.llama/distributions/local/conda/8b-instruct-build.yaml
Successfully setup conda environment. Configuring build... Successfully setup conda environment. Configuring build...
@ -334,7 +334,7 @@ Build spec configuration saved at /home/xiyan/.llama/distributions/local/conda/8
You can re-configure this distribution by running: You can re-configure this distribution by running:
``` ```
llama stack configure --config-file ~/.llama/distributions/local/conda/8b-instruct-build.yaml llama stack configure --config ~/.llama/distributions/local/conda/8b-instruct-build.yaml
``` ```
or or
@ -386,12 +386,12 @@ Now let’s start Llama Stack Distribution Server.
You need the YAML configuration file which was written out at the end by the `llama stack build` step. You need the YAML configuration file which was written out at the end by the `llama stack build` step.
``` ```
llama stack run --run-config ~/.llama/builds/local/conda/8b-instruct.yaml --port 5000 llama stack run --config ~/.llama/builds/local/conda/8b-instruct.yaml --port 5000
``` ```
You should see the Stack server start and print the APIs that it is supporting, You should see the Stack server start and print the APIs that it is supporting,
``` ```
$ llama stack run --run-config ~/.llama/builds/local/conda/8b-instruct.yaml --port 5000 $ llama stack run --config ~/.llama/builds/local/conda/8b-instruct.yaml --port 5000
> initializing model parallel with size 1 > initializing model parallel with size 1
> initializing ddp with size 1 > initializing ddp with size 1

10
llama_toolchain/cli/stack/build.py
View file

@ -85,7 +85,7 @@ class StackBuild(Subcommand):
choices=[v.value for v in BuildType], choices=[v.value for v in BuildType],
) )
self.parser.add_argument( self.parser.add_argument(
"--config-file", "--config",
type=str, type=str,
help="Path to a config file to use for the build", help="Path to a config file to use for the build",
) )
@ -170,14 +170,12 @@ class StackBuild(Subcommand):
) )
def _run_stack_build_command(self, args: argparse.Namespace) -> None: def _run_stack_build_command(self, args: argparse.Namespace) -> None:
if args.config_file: if args.config:
with open(args.config_file, "r") as f: with open(args.config, "r") as f:
try: try:
build_config = BuildConfig(**yaml.safe_load(f)) build_config = BuildConfig(**yaml.safe_load(f))
except Exception as e: except Exception as e:
self.parser.error( self.parser.error(f"Could not parse config file {args.config}: {e}")
f"Could not parse config file {args.config_file}: {e}"
)
return return
self._run_stack_build_command_from_build_config(build_config) self._run_stack_build_command_from_build_config(build_config)
return return

6
llama_toolchain/cli/stack/configure.py
View file

@ -54,7 +54,7 @@ class StackConfigure(Subcommand):
choices=[v.value for v in BuildType], choices=[v.value for v in BuildType],
) )
self.parser.add_argument( self.parser.add_argument(
"--config-file", "--config",
type=str, type=str,
help="Path to a config file to use for the build", help="Path to a config file to use for the build",
) )
@ -62,8 +62,8 @@ class StackConfigure(Subcommand):
def _run_stack_configure_cmd(self, args: argparse.Namespace) -> None: def _run_stack_configure_cmd(self, args: argparse.Namespace) -> None:
from llama_toolchain.core.package import BuildType from llama_toolchain.core.package import BuildType
if args.config_file: if args.config:
with open(args.config_file, "r") as f: with open(args.config, "r") as f:
build_config = BuildConfig(**yaml.safe_load(f)) build_config = BuildConfig(**yaml.safe_load(f))
build_type = BuildType(build_config.package_type) build_type = BuildType(build_config.package_type)
distribution = build_config.distribution distribution = build_config.distribution

6
llama_toolchain/cli/stack/run.py
View file

@ -60,7 +60,7 @@ class StackRun(Subcommand):
default=False, default=False,
) )
self.parser.add_argument( self.parser.add_argument(
"--run-config", "--config",
type=str, type=str,
help="Path to config file to use for the run", help="Path to config file to use for the run",
) )
@ -69,8 +69,8 @@ class StackRun(Subcommand):
from llama_toolchain.common.exec import run_with_pty from llama_toolchain.common.exec import run_with_pty
from llama_toolchain.core.package import BuildType from llama_toolchain.core.package import BuildType
if args.run_config: if args.config:
path = args.run_config path = args.config
else: else:
build_type = BuildType(args.type) build_type = BuildType(args.type)
build_dir = BUILDS_BASE_DIR / args.distribution / build_type.descriptor() build_dir = BUILDS_BASE_DIR / args.distribution / build_type.descriptor()