rename LLAMASTACK_PORT to LLAMA_STACK_PORT for consistency with other env vars (#744)

# What does this PR do?

Rename environment var for consistency

## Test Plan

No regressions

## Sources

## Before submitting

- [X] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [X] Ran pre-commit to handle lint / formatting issues.
- [X] Read the [contributor
guideline](https://github.com/meta-llama/llama-stack/blob/main/CONTRIBUTING.md),
Pull Request section?
- [X] Updated relevant documentation.
- [ ] Wrote necessary unit or integration tests.

---------

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
Co-authored-by: Yuan Tang <terrytangyuan@gmail.com>
This commit is contained in:
raghotham 2025-01-10 11:09:49 -08:00 committed by GitHub
parent 8af6951106
commit ff182ff6de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 26 additions and 26 deletions

View file

@ -85,7 +85,7 @@ services:
- SQLITE_STORE_DIR=${SQLITE_STORE_DIR:-$HOME/.llama/distributions/remote-vllm}
- SAFETY_MODEL=${SAFETY_MODEL:-meta-llama/Llama-Guard-3-1B}
ports:
- "${LLAMASTACK_PORT:-5001}:${LLAMASTACK_PORT:-5001}"
- "${LLAMA_STACK_PORT:-5001}:${LLAMA_STACK_PORT:-5001}"
# Hack: wait for vLLM server to start before starting docker
entrypoint: bash -c "sleep 60; python -m llama_stack.distribution.server.server --yaml_config /root/llamastack-run-remote-vllm.yaml --port 5001"
deploy:

View file

@ -27,7 +27,7 @@ The `llamastack/distribution-bedrock` distribution consists of the following pro
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
### Models

View file

@ -16,7 +16,7 @@ The `llamastack/distribution-cerebras` distribution consists of the following pr
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `CEREBRAS_API_KEY`: Cerebras API Key (default: ``)
### Models

View file

@ -29,7 +29,7 @@ The `llamastack/distribution-fireworks` distribution consists of the following p
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `FIREWORKS_API_KEY`: Fireworks.AI API Key (default: ``)
### Models

View file

@ -31,7 +31,7 @@ Note that you need access to nvidia GPUs to run this distribution. This distribu
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `INFERENCE_MODEL`: Inference model loaded into the Meta Reference server (default: `meta-llama/Llama-3.2-3B-Instruct`)
- `INFERENCE_CHECKPOINT_DIR`: Directory containing the Meta Reference model checkpoint (default: `null`)
- `SAFETY_MODEL`: Name of the safety (Llama-Guard) model to use (default: `meta-llama/Llama-Guard-3-1B`)

View file

@ -33,7 +33,7 @@ Note that you need access to nvidia GPUs to run this distribution. This distribu
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `INFERENCE_MODEL`: Inference model loaded into the Meta Reference server (default: `meta-llama/Llama-3.2-3B-Instruct`)
- `INFERENCE_CHECKPOINT_DIR`: Directory containing the Meta Reference model checkpoint (default: `null`)

View file

@ -29,7 +29,7 @@ You should use this distribution if you have a regular desktop machine without v
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `OLLAMA_URL`: URL of the Ollama server (default: `http://127.0.0.1:11434`)
- `INFERENCE_MODEL`: Inference model loaded into the Ollama server (default: `meta-llama/Llama-3.2-3B-Instruct`)
- `SAFETY_MODEL`: Safety model loaded into the Ollama server (default: `meta-llama/Llama-Guard-3-1B`)

View file

@ -27,7 +27,7 @@ You can use this distribution if you have GPUs and want to run an independent vL
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `INFERENCE_MODEL`: Inference model loaded into the vLLM server (default: `meta-llama/Llama-3.2-3B-Instruct`)
- `VLLM_URL`: URL of the vLLM server with the main inference model (default: `http://host.docker.internal:5100/v1`)
- `MAX_TOKENS`: Maximum number of tokens for generation (default: `4096`)

View file

@ -32,7 +32,7 @@ You can use this distribution if you have GPUs and want to run an independent TG
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `INFERENCE_MODEL`: Inference model loaded into the TGI server (default: `meta-llama/Llama-3.2-3B-Instruct`)
- `TGI_URL`: URL of the TGI server with the main inference model (default: `http://127.0.0.1:8080}/v1`)
- `TGI_SAFETY_URL`: URL of the TGI server with the safety model (default: `http://127.0.0.1:8081/v1`)

View file

@ -29,7 +29,7 @@ The `llamastack/distribution-together` distribution consists of the following pr
The following environment variables can be configured:
- `LLAMASTACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `LLAMA_STACK_PORT`: Port for the Llama Stack distribution server (default: `5001`)
- `TOGETHER_API_KEY`: Together.AI API Key (default: ``)
### Models

View file

@ -89,7 +89,7 @@ If you're looking for more specific topics, we have a [Zero to Hero Guide](#next
```
...
Build Successful! Next steps:
1. Set the environment variables: LLAMASTACK_PORT, OLLAMA_URL, INFERENCE_MODEL, SAFETY_MODEL
1. Set the environment variables: LLAMA_STACK_PORT, OLLAMA_URL, INFERENCE_MODEL, SAFETY_MODEL
2. `llama stack run /Users/<username>/.llama/distributions/llamastack-ollama/ollama-run.yaml
```

View file

@ -35,7 +35,7 @@ class StackRun(Subcommand):
"--port",
type=int,
help="Port to run the server on. Defaults to 5000",
default=int(os.getenv("LLAMASTACK_PORT", 5000)),
default=int(os.getenv("LLAMA_STACK_PORT", 5000)),
)
self.parser.add_argument(
"--disable-ipv6",

View file

@ -290,7 +290,7 @@ def main():
parser.add_argument(
"--port",
type=int,
default=int(os.getenv("LLAMASTACK_PORT", 5000)),
default=int(os.getenv("LLAMA_STACK_PORT", 5000)),
help="Port to listen on",
)
parser.add_argument(

View file

@ -90,6 +90,6 @@ $DOCKER_BINARY run $DOCKER_OPTS -it \
$env_vars \
-v "$yaml_config:/app/config.yaml" \
$mounts \
--env LLAMASTACK_PORT=$port \
--env LLAMA_STACK_PORT=$port \
--entrypoint='["python", "-m", "llama_stack.distribution.server.server", "--yaml-config", "/app/config.yaml"]' \
$docker_image:$version_tag

View file

@ -84,7 +84,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -102,7 +102,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -114,7 +114,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -126,7 +126,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -126,7 +126,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -132,7 +132,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -99,7 +99,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -120,7 +120,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -125,7 +125,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -127,7 +127,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -112,7 +112,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),

View file

@ -99,7 +99,7 @@ def get_distribution_template() -> DistributionTemplate:
),
},
run_config_env_vars={
"LLAMASTACK_PORT": (
"LLAMA_STACK_PORT": (
"5001",
"Port for the Llama Stack distribution server",
),