mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-06-28 02:53:30 +00:00
Move function around
This commit is contained in:
Ashwin Bharambe
parent
a387ca22e2
commit
5bed6c276c
2 changed files with 97 additions and 97 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
exclude: 'build'
|
exclude: 'build/'
|
||||||
|
|
||||||
default_language_version:
|
default_language_version:
|
||||||
python: python3
|
python: python3
|
||||||
|
|
|
||||||
|
|
@ -78,102 +78,6 @@ class StackBuild(Subcommand):
|
||||||
choices=["conda", "docker"],
|
choices=["conda", "docker"],
|
||||||
)
|
)
|
||||||
|
|
||||||
def _get_build_config_from_name(self, args: argparse.Namespace) -> Optional[Path]:
|
|
||||||
if os.getenv("CONDA_PREFIX", ""):
|
|
||||||
conda_dir = (
|
|
||||||
Path(os.getenv("CONDA_PREFIX")).parent / f"llamastack-{args.name}"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
cprint(
|
|
||||||
"Cannot find CONDA_PREFIX. Trying default conda path ~/.conda/envs...",
|
|
||||||
color="green",
|
|
||||||
)
|
|
||||||
conda_dir = (
|
|
||||||
Path(os.path.expanduser("~/.conda/envs")) / f"llamastack-{args.name}"
|
|
||||||
)
|
|
||||||
build_config_file = Path(conda_dir) / f"{args.name}-build.yaml"
|
|
||||||
if build_config_file.exists():
|
|
||||||
return build_config_file
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
def _run_stack_build_command_from_build_config(
|
|
||||||
self, build_config: BuildConfig
|
|
||||||
) -> None:
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
|
|
||||||
import yaml
|
|
||||||
|
|
||||||
from llama_stack.distribution.build import build_image, ImageType
|
|
||||||
from llama_stack.distribution.utils.config_dirs import DISTRIBS_BASE_DIR
|
|
||||||
from llama_stack.distribution.utils.serialize import EnumEncoder
|
|
||||||
from termcolor import cprint
|
|
||||||
|
|
||||||
# save build.yaml spec for building same distribution again
|
|
||||||
if build_config.image_type == ImageType.docker.value:
|
|
||||||
# docker needs build file to be in the llama-stack repo dir to be able to copy over to the image
|
|
||||||
llama_stack_path = Path(
|
|
||||||
os.path.abspath(__file__)
|
|
||||||
).parent.parent.parent.parent
|
|
||||||
build_dir = llama_stack_path / "tmp/configs/"
|
|
||||||
else:
|
|
||||||
build_dir = DISTRIBS_BASE_DIR / f"llamastack-{build_config.name}"
|
|
||||||
|
|
||||||
os.makedirs(build_dir, exist_ok=True)
|
|
||||||
build_file_path = build_dir / f"{build_config.name}-build.yaml"
|
|
||||||
|
|
||||||
with open(build_file_path, "w") as f:
|
|
||||||
to_write = json.loads(json.dumps(build_config.dict(), cls=EnumEncoder))
|
|
||||||
f.write(yaml.dump(to_write, sort_keys=False))
|
|
||||||
|
|
||||||
return_code = build_image(build_config, build_file_path)
|
|
||||||
if return_code != 0:
|
|
||||||
return
|
|
||||||
|
|
||||||
configure_name = (
|
|
||||||
build_config.name
|
|
||||||
if build_config.image_type == "conda"
|
|
||||||
else (f"llamastack-{build_config.name}")
|
|
||||||
)
|
|
||||||
if build_config.image_type == "conda":
|
|
||||||
cprint(
|
|
||||||
f"You can now run `llama stack configure {configure_name}`",
|
|
||||||
color="green",
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
cprint(
|
|
||||||
f"You can now run `llama stack run {build_config.name}`",
|
|
||||||
color="green",
|
|
||||||
)
|
|
||||||
|
|
||||||
def _run_template_list_cmd(self, args: argparse.Namespace) -> None:
|
|
||||||
import json
|
|
||||||
|
|
||||||
from llama_stack.cli.table import print_table
|
|
||||||
|
|
||||||
# eventually, this should query a registry at llama.meta.com/llamastack/distributions
|
|
||||||
headers = [
|
|
||||||
"Template Name",
|
|
||||||
"Providers",
|
|
||||||
"Description",
|
|
||||||
]
|
|
||||||
|
|
||||||
rows = []
|
|
||||||
for spec in available_templates_specs():
|
|
||||||
rows.append(
|
|
||||||
[
|
|
||||||
spec.name,
|
|
||||||
json.dumps(spec.distribution_spec.providers, indent=2),
|
|
||||||
spec.distribution_spec.description,
|
|
||||||
]
|
|
||||||
)
|
|
||||||
print_table(
|
|
||||||
rows,
|
|
||||||
headers,
|
|
||||||
separate_rows=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
def _run_stack_build_command(self, args: argparse.Namespace) -> None:
|
def _run_stack_build_command(self, args: argparse.Namespace) -> None:
|
||||||
import textwrap
|
import textwrap
|
||||||
|
|
||||||
|
|
@ -297,3 +201,99 @@ class StackBuild(Subcommand):
|
||||||
self.parser.error(f"Could not parse config file {args.config}: {e}")
|
self.parser.error(f"Could not parse config file {args.config}: {e}")
|
||||||
return
|
return
|
||||||
self._run_stack_build_command_from_build_config(build_config)
|
self._run_stack_build_command_from_build_config(build_config)
|
||||||
|
def _get_build_config_from_name(self, args: argparse.Namespace) -> Optional[Path]:
|
||||||
|
if os.getenv("CONDA_PREFIX", ""):
|
||||||
|
conda_dir = (
|
||||||
|
Path(os.getenv("CONDA_PREFIX")).parent / f"llamastack-{args.name}"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
cprint(
|
||||||
|
"Cannot find CONDA_PREFIX. Trying default conda path ~/.conda/envs...",
|
||||||
|
color="green",
|
||||||
|
)
|
||||||
|
conda_dir = (
|
||||||
|
Path(os.path.expanduser("~/.conda/envs")) / f"llamastack-{args.name}"
|
||||||
|
)
|
||||||
|
build_config_file = Path(conda_dir) / f"{args.name}-build.yaml"
|
||||||
|
if build_config_file.exists():
|
||||||
|
return build_config_file
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _run_stack_build_command_from_build_config(
|
||||||
|
self, build_config: BuildConfig
|
||||||
|
) -> None:
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
import yaml
|
||||||
|
|
||||||
|
from llama_stack.distribution.build import build_image, ImageType
|
||||||
|
from llama_stack.distribution.utils.config_dirs import DISTRIBS_BASE_DIR
|
||||||
|
from llama_stack.distribution.utils.serialize import EnumEncoder
|
||||||
|
from termcolor import cprint
|
||||||
|
|
||||||
|
# save build.yaml spec for building same distribution again
|
||||||
|
if build_config.image_type == ImageType.docker.value:
|
||||||
|
# docker needs build file to be in the llama-stack repo dir to be able to copy over to the image
|
||||||
|
llama_stack_path = Path(
|
||||||
|
os.path.abspath(__file__)
|
||||||
|
).parent.parent.parent.parent
|
||||||
|
build_dir = llama_stack_path / "tmp/configs/"
|
||||||
|
else:
|
||||||
|
build_dir = DISTRIBS_BASE_DIR / f"llamastack-{build_config.name}"
|
||||||
|
|
||||||
|
os.makedirs(build_dir, exist_ok=True)
|
||||||
|
build_file_path = build_dir / f"{build_config.name}-build.yaml"
|
||||||
|
|
||||||
|
with open(build_file_path, "w") as f:
|
||||||
|
to_write = json.loads(json.dumps(build_config.dict(), cls=EnumEncoder))
|
||||||
|
f.write(yaml.dump(to_write, sort_keys=False))
|
||||||
|
|
||||||
|
return_code = build_image(build_config, build_file_path)
|
||||||
|
if return_code != 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
configure_name = (
|
||||||
|
build_config.name
|
||||||
|
if build_config.image_type == "conda"
|
||||||
|
else (f"llamastack-{build_config.name}")
|
||||||
|
)
|
||||||
|
if build_config.image_type == "conda":
|
||||||
|
cprint(
|
||||||
|
f"You can now run `llama stack configure {configure_name}`",
|
||||||
|
color="green",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
cprint(
|
||||||
|
f"You can now run `llama stack run {build_config.name}`",
|
||||||
|
color="green",
|
||||||
|
)
|
||||||
|
|
||||||
|
def _run_template_list_cmd(self, args: argparse.Namespace) -> None:
|
||||||
|
import json
|
||||||
|
|
||||||
|
from llama_stack.cli.table import print_table
|
||||||
|
|
||||||
|
# eventually, this should query a registry at llama.meta.com/llamastack/distributions
|
||||||
|
headers = [
|
||||||
|
"Template Name",
|
||||||
|
"Providers",
|
||||||
|
"Description",
|
||||||
|
]
|
||||||
|
|
||||||
|
rows = []
|
||||||
|
for spec in available_templates_specs():
|
||||||
|
rows.append(
|
||||||
|
[
|
||||||
|
spec.name,
|
||||||
|
json.dumps(spec.distribution_spec.providers, indent=2),
|
||||||
|
spec.distribution_spec.description,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
print_table(
|
||||||
|
rows,
|
||||||
|
headers,
|
||||||
|
separate_rows=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue