phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-08-01 16:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix together build

Browse source
This commit is contained in:
Xi Yan 2024-11-18 22:06:10 -08:00
parent e6ae344eb4
commit d25cae3995
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
llama_stack/cli/stack/build.py
View file

@ -9,9 +9,12 @@ import argparse
from llama_stack.cli.subcommand import Subcommand from llama_stack.cli.subcommand import Subcommand
from llama_stack.distribution.datatypes import * # noqa: F403 from llama_stack.distribution.datatypes import * # noqa: F403
import os import os
import shutil
from functools import lru_cache from functools import lru_cache
from pathlib import Path from pathlib import Path
import pkg_resources
from llama_stack.distribution.distribution import get_provider_registry from llama_stack.distribution.distribution import get_provider_registry
from llama_stack.distribution.utils.dynamic import instantiate_class_type from llama_stack.distribution.utils.dynamic import instantiate_class_type
@ -99,7 +102,9 @@ class StackBuild(Subcommand):
self.parser.error( self.parser.error(
f"Please specify a image-type (docker | conda) for {args.template}" f"Please specify a image-type (docker | conda) for {args.template}"
) )
self._run_stack_build_command_from_build_config(build_config) self._run_stack_build_command_from_build_config(
build_config, template_name=args.template
)
return return
self.parser.error( self.parser.error(
@ -248,12 +253,13 @@ class StackBuild(Subcommand):
) )
def _run_stack_build_command_from_build_config( def _run_stack_build_command_from_build_config(
self, build_config: BuildConfig self, build_config: BuildConfig, template_name: Optional[str] = None
) -> None: ) -> None:
import json import json
import os import os
import yaml import yaml
from termcolor import cprint
from llama_stack.distribution.build import build_image from llama_stack.distribution.build import build_image
from llama_stack.distribution.utils.config_dirs import DISTRIBS_BASE_DIR from llama_stack.distribution.utils.config_dirs import DISTRIBS_BASE_DIR
@ -271,7 +277,20 @@ class StackBuild(Subcommand):
if return_code != 0: if return_code != 0:
return return
self._generate_run_config(build_config, build_dir) if template_name:
# copy run.yaml from template to build_dir instead of generating it again
template_path = pkg_resources.resource_filename(
"llama_stack", f"templates/{template_name}/run.yaml"
)
os.makedirs(build_dir, exist_ok=True)
run_config_file = build_dir / f"{build_config.name}-run.yaml"
shutil.copy(template_path, run_config_file)
cprint(
f"You can now edit {run_config_file} and run `llama stack run {run_config_file}`",
color="green",
)
else:
self._generate_run_config(build_config, build_dir)
def _run_template_list_cmd(self, args: argparse.Namespace) -> None: def _run_template_list_cmd(self, args: argparse.Namespace) -> None:
import json import json