phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-06-28 02:53:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename the "package" word away

Browse source
This commit is contained in:
Ashwin Bharambe 2024-09-16 12:22:01 -07:00
parent 98c55b63b4
commit a36699cd11
3 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,8 +102,8 @@ class StackConfigure(Subcommand):
if output_dir:
builds_dir = Path(output_dir)
os.makedirs(builds_dir, exist_ok=True)
package_name = build_config.name.replace("::", "-")
package_file = builds_dir / f"{package_name}-run.yaml"
image_name = build_config.name.replace("::", "-")
run_config_file = builds_dir / f"{image_name}-run.yaml"
api2providers = build_config.distribution_spec.providers
@ -112,31 +112,31 @@ class StackConfigure(Subcommand):
for api_str, provider in api2providers.items()
}
if package_file.exists():
if run_config_file.exists():
cprint(
f"Configuration already exists for {build_config.name}. Will overwrite...",
"yellow",
attrs=["bold"],
)
config = PackageConfig(**yaml.safe_load(package_file.read_text()))
config = StackRunConfig(**yaml.safe_load(run_config_file.read_text()))
else:
config = PackageConfig(
config = StackRunConfig(
built_at=datetime.now(),
package_name=package_name,
image_name=image_name,
providers=stub_config,
)
config.providers = configure_api_providers(config.providers)
config.docker_image = (
package_name if build_config.image_type == "docker" else None
image_name if build_config.image_type == "docker" else None
)
config.conda_env = package_name if build_config.image_type == "conda" else None
config.conda_env = image_name if build_config.image_type == "conda" else None
with open(package_file, "w") as f:
with open(run_config_file, "w") as f:
to_write = json.loads(json.dumps(config.dict(), cls=EnumEncoder))
f.write(yaml.dump(to_write, sort_keys=False))
cprint(
f"> YAML configuration has been written to {package_file}",
f"> YAML configuration has been written to {run_config_file}",
color="blue",
)

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

@ -13,7 +13,6 @@ import yaml
from llama_toolchain.cli.subcommand import Subcommand
from llama_toolchain.core.datatypes import * # noqa: F403
from llama_toolchain.common.config_dirs import BUILDS_BASE_DIR
class StackRun(Subcommand):
@ -29,8 +28,6 @@ class StackRun(Subcommand):
self.parser.set_defaults(func=self._run_stack_run_cmd)
def _add_arguments(self):
from llama_toolchain.core.package import ImageType
self.parser.add_argument(
"config",
type=str,
@ -51,7 +48,6 @@ class StackRun(Subcommand):
def _run_stack_run_cmd(self, args: argparse.Namespace) -> None:
from llama_toolchain.common.exec import run_with_pty
from llama_toolchain.core.package import ImageType
if not args.config:
self.parser.error("Must specify a config file to run")
@ -67,7 +63,7 @@ class StackRun(Subcommand):
return
with open(config_file, "r") as f:
config = PackageConfig(**yaml.safe_load(f))
config = StackRunConfig(**yaml.safe_load(f))
if config.docker_image:
script = pkg_resources.resource_filename(

4
llama_toolchain/core/datatypes.py
View file

@ -163,10 +163,10 @@ class DistributionSpec(BaseModel):
@json_schema_type
class PackageConfig(BaseModel):
class StackRunConfig(BaseModel):
built_at: datetime
package_name: str = Field(
image_name: str = Field(
...,
description="""
Reference to the distribution this package refers to. For unregistered (adhoc) packages,