From 139e0af41645568678bfa2d1083be423e8ef8634 Mon Sep 17 00:00:00 2001 From: Xi Yan Date: Tue, 17 Sep 2024 23:10:11 -0700 Subject: [PATCH] conda build path move --- llama_stack/cli/stack/build.py | 5 +---- llama_stack/cli/stack/configure.py | 6 ++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py index 4105f61cc..f7b6d357a 100644 --- a/llama_stack/cli/stack/build.py +++ b/llama_stack/cli/stack/build.py @@ -58,7 +58,7 @@ class StackBuild(Subcommand): llama_stack_path / "configs/distributions" / build_config.image_type ) else: - build_dir = DISTRIBS_BASE_DIR / build_config.image_type + build_dir = Path(os.getenv("CONDA_PREFIX")).parent os.makedirs(build_dir, exist_ok=True) build_file_path = build_dir / f"{build_config.name}-build.yaml" @@ -79,9 +79,6 @@ class StackBuild(Subcommand): from llama_stack.distribution.utils.prompt_for_config import prompt_for_config if not args.config: - # self.parser.error( - # "No config file specified. Please use `llama stack build /path/to/*-build.yaml`. Example config files can be found in llama_stack/distribution/example_configs" - # ) build_config = prompt_for_config(BuildConfig, None) self._run_stack_build_command_from_build_config(build_config) return diff --git a/llama_stack/cli/stack/configure.py b/llama_stack/cli/stack/configure.py index c184a1db5..23783a69e 100644 --- a/llama_stack/cli/stack/configure.py +++ b/llama_stack/cli/stack/configure.py @@ -9,12 +9,12 @@ import json from pathlib import Path import yaml -from termcolor import cprint from llama_stack.cli.subcommand import Subcommand from llama_stack.distribution.utils.config_dirs import BUILDS_BASE_DIR from llama_stack.distribution.utils.exec import run_with_pty +from termcolor import cprint from llama_stack.distribution.datatypes import * # noqa: F403 import os @@ -52,7 +52,9 @@ class StackConfigure(Subcommand): from llama_stack.distribution.build import ImageType docker_image = None - build_config_file = Path(args.config) + conda_dir = Path(os.getenv("CONDA_PREFIX")).parent + build_config_file = Path(conda_dir) / f"{args.config}-build.yaml" + if not build_config_file.exists(): cprint( f"Could not find {build_config_file}. Trying docker image name instead...",