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

remove configure from build

Browse source
This commit is contained in:
Xi Yan 2024-09-13 13:17:17 -07:00
parent d8b3fdbd54
commit 33772da8e0
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
llama_toolchain/core/build_conda_env.sh
View file

@ -118,4 +118,4 @@ ensure_conda_env_python310 "$env_name" "$pip_dependencies"
printf "${GREEN}Successfully setup conda environment. Configuring build...${NC}\n" printf "${GREEN}Successfully setup conda environment. Configuring build...${NC}\n"
$CONDA_PREFIX/bin/python3 -m llama_toolchain.cli.llama stack configure $config_file # $CONDA_PREFIX/bin/python3 -m llama_toolchain.cli.llama stack configure $config_file

4
llama_toolchain/core/build_container.sh
View file

@ -105,10 +105,10 @@ if [ -n "$LLAMA_MODELS_DIR" ]; then
mounts="$mounts -v $(readlink -f $LLAMA_MODELS_DIR):$models_mount" mounts="$mounts -v $(readlink -f $LLAMA_MODELS_DIR):$models_mount"
fi fi
set -x set -x
podman build -t $image_name -f "$TEMP_DIR/Dockerfile" "$REPO_DIR" $mounts podman build --network host -t $image_name -f "$TEMP_DIR/Dockerfile" "$REPO_DIR" $mounts
set +x set +x
printf "${GREEN}Succesfully setup Podman image. Configuring build...${NC}" printf "${GREEN}Succesfully setup Podman image. Configuring build...${NC}"
echo "You can run it with: podman run -p 8000:8000 $image_name" echo "You can run it with: podman run -p 8000:8000 $image_name"
$CONDA_PREFIX/bin/python3 -m llama_toolchain.cli.llama stack configure $config_file # $CONDA_PREFIX/bin/python3 -m llama_toolchain.cli.llama stack configure $config_file

58
llama_toolchain/core/package.py
View file

@ -78,37 +78,37 @@ def build_package(
stub_config[api.value] = {"provider_type": api_input.provider} stub_config[api.value] = {"provider_type": api_input.provider}
if package_file.exists(): # if package_file.exists():
cprint( # cprint(
f"Build `{package_name}` exists; will reconfigure", # f"Build `{package_name}` exists; will reconfigure",
color="yellow", # color="yellow",
) # )
c = PackageConfig(**yaml.safe_load(package_file.read_text())) # c = PackageConfig(**yaml.safe_load(package_file.read_text()))
for api_str, new_config in stub_config.items(): # for api_str, new_config in stub_config.items():
if api_str not in c.providers: # if api_str not in c.providers:
c.providers[api_str] = new_config # c.providers[api_str] = new_config
else: # else:
existing_config = c.providers[api_str] # existing_config = c.providers[api_str]
if existing_config["provider_type"] != new_config["provider_type"]: # if existing_config["provider_type"] != new_config["provider_type"]:
cprint( # cprint(
f"Provider `{api_str}` has changed from `{existing_config}` to `{new_config}`", # f"Provider `{api_str}` has changed from `{existing_config}` to `{new_config}`",
color="yellow", # color="yellow",
) # )
c.providers[api_str] = new_config # c.providers[api_str] = new_config
else: # else:
c = PackageConfig( # c = PackageConfig(
built_at=datetime.now(), # built_at=datetime.now(),
package_name=package_name, # package_name=package_name,
providers=stub_config, # providers=stub_config,
) # )
c.distribution_type = distribution_type # c.distribution_type = distribution_type
c.docker_image = package_name if image_type == ImageType.docker else None # c.docker_image = package_name if image_type == ImageType.docker else None
c.conda_env = package_name if image_type == ImageType.conda else None # c.conda_env = package_name if image_type == ImageType.conda else None
with open(package_file, "w") as f: # with open(package_file, "w") as f:
to_write = json.loads(json.dumps(c.dict(), cls=EnumEncoder)) # to_write = json.loads(json.dumps(c.dict(), cls=EnumEncoder))
f.write(yaml.dump(to_write, sort_keys=False)) # f.write(yaml.dump(to_write, sort_keys=False))
if image_type == ImageType.docker: if image_type == ImageType.docker:
script = pkg_resources.resource_filename( script = pkg_resources.resource_filename(