phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-06-27 18:50:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure llama stack build --config <> --image-type <> works (#879)

Browse source 
Fix the issues brought up in
https://github.com/meta-llama/llama-stack/issues/870

Test all combinations of (conda, container) vs. (template, config)
combos.
This commit is contained in:
Ashwin Bharambe 2025-01-25 11:13:36 -08:00 • committed by GitHub
parent 7de46e40f9
commit 891bf704eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 66 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

28
llama_stack/cli/stack/_build.py
View file

@ -115,6 +115,8 @@ def run_stack_build_command(
f"Using conda environment {image_name}",
color="green",
)
else:
image_name = f"llamastack-{name}"
cprint(
textwrap.dedent(
@ -171,11 +173,22 @@ def run_stack_build_command(
)
return
_run_stack_build_command_from_build_config(build_config, image_name=image_name)
if build_config.image_type == ImageType.container.value and not args.image_name:
cprint(
"Please specify --image-name when building a container from a config file",
color="red",
)
return
_run_stack_build_command_from_build_config(
build_config, image_name=image_name, config_path=args.config
)
def _generate_run_config(
build_config: BuildConfig, build_dir: Path, image_name: str
build_config: BuildConfig,
build_dir: Path,
image_name: str,
) -> None:
"""
Generate a run.yaml template file for user to edit from a build.yaml file
@ -227,8 +240,9 @@ def _generate_run_config(
to_write = json.loads(run_config.model_dump_json())
f.write(yaml.dump(to_write, sort_keys=False))
# this path is only invoked when no template is provided
cprint(
f"You can now edit {run_config_file} and run `llama stack run {image_name}`",
f"You can now run your stack with `llama stack run {run_config_file}`",
color="green",
)
@ -237,6 +251,7 @@ def _run_stack_build_command_from_build_config(
build_config: BuildConfig,
image_name: Optional[str] = None,
template_name: Optional[str] = None,
config_path: Optional[str] = None,
) -> None:
if build_config.image_type == ImageType.container.value:
if template_name:
@ -263,7 +278,10 @@ def _run_stack_build_command_from_build_config(
f.write(yaml.dump(to_write, sort_keys=False))
return_code = build_image(
build_config, build_file_path, image_name, template_name=template_name
build_config,
build_file_path,
image_name,
template_or_config=template_name or config_path,
)
if return_code != 0:
return
@ -277,7 +295,7 @@ def _run_stack_build_command_from_build_config(
with importlib.resources.as_file(template_path) as path:
run_config_file = build_dir / f"{template_name}-run.yaml"
shutil.copy(path, run_config_file)
# Find all ${env.VARIABLE} patterns
cprint("Build Successful!", color="green")
else:
_generate_run_config(build_config, build_dir, image_name)