diff --git a/docs/source/distributions/building_distro.md b/docs/source/distributions/building_distro.md index a5c223219..d9b73c910 100644 --- a/docs/source/distributions/building_distro.md +++ b/docs/source/distributions/building_distro.md @@ -271,7 +271,7 @@ Now, let's start the Llama Stack Distribution Server. You will need the YAML con ``` llama stack run -h -usage: llama stack run [-h] [--port PORT] [--image-name IMAGE_NAME] [--disable-ipv6] [--env KEY=VALUE] [--tls-keyfile TLS_KEYFILE] [--tls-certfile TLS_CERTFILE] +usage: llama stack run [-h] [--port PORT] [--image-name IMAGE_NAME] [--env KEY=VALUE] [--tls-keyfile TLS_KEYFILE] [--tls-certfile TLS_CERTFILE] [--image-type {conda,container,venv}] config @@ -285,7 +285,6 @@ options: --port PORT Port to run the server on. It can also be passed via the env var LLAMA_STACK_PORT. (default: 8321) --image-name IMAGE_NAME Name of the image to run. Defaults to the current environment (default: None) - --disable-ipv6 Disable IPv6 support (default: False) --env KEY=VALUE Environment variables to pass to the server in KEY=VALUE format. Can be specified multiple times. (default: []) --tls-keyfile TLS_KEYFILE Path to TLS key file for HTTPS (default: None) diff --git a/llama_stack/distribution/datatypes.py b/llama_stack/distribution/datatypes.py index 7b5465e0a..783a48de3 100644 --- a/llama_stack/distribution/datatypes.py +++ b/llama_stack/distribution/datatypes.py @@ -258,9 +258,9 @@ class ServerConfig(BaseModel): default=None, description="Authentication configuration for the server", ) - disable_ipv6: bool = Field( - default=False, - description="Disable IPv6 support", + host: str | None = Field( + default=None, + description="The host the server should listen on", ) diff --git a/llama_stack/distribution/server/server.py b/llama_stack/distribution/server/server.py index f4d323607..ff0775dd6 100644 --- a/llama_stack/distribution/server/server.py +++ b/llama_stack/distribution/server/server.py @@ -358,7 +358,6 @@ def main(args: argparse.Namespace | None = None): default=int(os.getenv("LLAMA_STACK_PORT", 8321)), help="Port to listen on", ) - parser.add_argument("--disable-ipv6", action="store_true", help="Whether to disable IPv6 support") parser.add_argument( "--env", action="append", @@ -514,7 +513,7 @@ def main(args: argparse.Namespace | None = None): else: logger.info(f"HTTPS enabled with certificates:\n Key: {keyfile}\n Cert: {certfile}") - listen_host = ["::", "0.0.0.0"] if not config.server.disable_ipv6 else "0.0.0.0" + listen_host = config.server.host or ["::", "0.0.0.0"] logger.info(f"Listening on {listen_host}:{port}") uvicorn_config = { diff --git a/llama_stack/templates/bedrock/run.yaml b/llama_stack/templates/bedrock/run.yaml index 6db905b4e..30599a6c0 100644 --- a/llama_stack/templates/bedrock/run.yaml +++ b/llama_stack/templates/bedrock/run.yaml @@ -139,4 +139,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/cerebras/run.yaml b/llama_stack/templates/cerebras/run.yaml index f33ea7e04..0731b1df9 100644 --- a/llama_stack/templates/cerebras/run.yaml +++ b/llama_stack/templates/cerebras/run.yaml @@ -137,4 +137,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/ci-tests/run.yaml b/llama_stack/templates/ci-tests/run.yaml index a323f602b..d9ee5b3cf 100644 --- a/llama_stack/templates/ci-tests/run.yaml +++ b/llama_stack/templates/ci-tests/run.yaml @@ -235,4 +235,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/dell/run-with-safety.yaml b/llama_stack/templates/dell/run-with-safety.yaml index cc6aeea4b..24c515112 100644 --- a/llama_stack/templates/dell/run-with-safety.yaml +++ b/llama_stack/templates/dell/run-with-safety.yaml @@ -126,4 +126,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/dell/run.yaml b/llama_stack/templates/dell/run.yaml index 921a170df..fdece894f 100644 --- a/llama_stack/templates/dell/run.yaml +++ b/llama_stack/templates/dell/run.yaml @@ -117,4 +117,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/fireworks/run-with-safety.yaml b/llama_stack/templates/fireworks/run-with-safety.yaml index c58d323b2..0ab07613e 100644 --- a/llama_stack/templates/fireworks/run-with-safety.yaml +++ b/llama_stack/templates/fireworks/run-with-safety.yaml @@ -254,4 +254,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/fireworks/run.yaml b/llama_stack/templates/fireworks/run.yaml index 8b3939f99..81c293a46 100644 --- a/llama_stack/templates/fireworks/run.yaml +++ b/llama_stack/templates/fireworks/run.yaml @@ -244,4 +244,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/groq/run.yaml b/llama_stack/templates/groq/run.yaml index 3a4ea2a0e..79c350c73 100644 --- a/llama_stack/templates/groq/run.yaml +++ b/llama_stack/templates/groq/run.yaml @@ -202,4 +202,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/hf-endpoint/run-with-safety.yaml b/llama_stack/templates/hf-endpoint/run-with-safety.yaml index eb4f02221..82bcaa3cf 100644 --- a/llama_stack/templates/hf-endpoint/run-with-safety.yaml +++ b/llama_stack/templates/hf-endpoint/run-with-safety.yaml @@ -134,4 +134,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/hf-endpoint/run.yaml b/llama_stack/templates/hf-endpoint/run.yaml index b8331e0de..ec7c55032 100644 --- a/llama_stack/templates/hf-endpoint/run.yaml +++ b/llama_stack/templates/hf-endpoint/run.yaml @@ -124,4 +124,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/hf-serverless/run-with-safety.yaml b/llama_stack/templates/hf-serverless/run-with-safety.yaml index acc46b8f6..320976e2c 100644 --- a/llama_stack/templates/hf-serverless/run-with-safety.yaml +++ b/llama_stack/templates/hf-serverless/run-with-safety.yaml @@ -134,4 +134,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/hf-serverless/run.yaml b/llama_stack/templates/hf-serverless/run.yaml index 7b1fd5e42..2b22b20c6 100644 --- a/llama_stack/templates/hf-serverless/run.yaml +++ b/llama_stack/templates/hf-serverless/run.yaml @@ -124,4 +124,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/llama_api/run.yaml b/llama_stack/templates/llama_api/run.yaml index 658d58102..a879482d7 100644 --- a/llama_stack/templates/llama_api/run.yaml +++ b/llama_stack/templates/llama_api/run.yaml @@ -160,4 +160,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml b/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml index 0c8450dcd..180d44e0f 100644 --- a/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml +++ b/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml @@ -144,4 +144,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/meta-reference-gpu/run.yaml b/llama_stack/templates/meta-reference-gpu/run.yaml index bf5e0a944..d879667e0 100644 --- a/llama_stack/templates/meta-reference-gpu/run.yaml +++ b/llama_stack/templates/meta-reference-gpu/run.yaml @@ -129,4 +129,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/nvidia/run-with-safety.yaml b/llama_stack/templates/nvidia/run-with-safety.yaml index c8a988bab..3cdb8e3d2 100644 --- a/llama_stack/templates/nvidia/run-with-safety.yaml +++ b/llama_stack/templates/nvidia/run-with-safety.yaml @@ -113,4 +113,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/nvidia/run.yaml b/llama_stack/templates/nvidia/run.yaml index a4e09a365..3337b7942 100644 --- a/llama_stack/templates/nvidia/run.yaml +++ b/llama_stack/templates/nvidia/run.yaml @@ -219,4 +219,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/ollama/run-with-safety.yaml b/llama_stack/templates/ollama/run-with-safety.yaml index 9f3f2a505..651d58117 100644 --- a/llama_stack/templates/ollama/run-with-safety.yaml +++ b/llama_stack/templates/ollama/run-with-safety.yaml @@ -137,4 +137,3 @@ tool_groups: provider_id: wolfram-alpha server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/ollama/run.yaml b/llama_stack/templates/ollama/run.yaml index 66b0d77d7..1372486fe 100644 --- a/llama_stack/templates/ollama/run.yaml +++ b/llama_stack/templates/ollama/run.yaml @@ -127,4 +127,3 @@ tool_groups: provider_id: wolfram-alpha server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/open-benchmark/run.yaml b/llama_stack/templates/open-benchmark/run.yaml index d1e669743..30a27cbd8 100644 --- a/llama_stack/templates/open-benchmark/run.yaml +++ b/llama_stack/templates/open-benchmark/run.yaml @@ -241,4 +241,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/passthrough/run-with-safety.yaml b/llama_stack/templates/passthrough/run-with-safety.yaml index 8c8232353..a91b9fc92 100644 --- a/llama_stack/templates/passthrough/run-with-safety.yaml +++ b/llama_stack/templates/passthrough/run-with-safety.yaml @@ -147,4 +147,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/passthrough/run.yaml b/llama_stack/templates/passthrough/run.yaml index 1f906ae0f..d1dd3b885 100644 --- a/llama_stack/templates/passthrough/run.yaml +++ b/llama_stack/templates/passthrough/run.yaml @@ -137,4 +137,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/remote-vllm/run-with-safety.yaml b/llama_stack/templates/remote-vllm/run-with-safety.yaml index c192c34fe..6931d4ba9 100644 --- a/llama_stack/templates/remote-vllm/run-with-safety.yaml +++ b/llama_stack/templates/remote-vllm/run-with-safety.yaml @@ -144,4 +144,3 @@ tool_groups: provider_id: wolfram-alpha server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/remote-vllm/run.yaml b/llama_stack/templates/remote-vllm/run.yaml index 040a8e69b..05671165d 100644 --- a/llama_stack/templates/remote-vllm/run.yaml +++ b/llama_stack/templates/remote-vllm/run.yaml @@ -132,4 +132,3 @@ tool_groups: provider_id: wolfram-alpha server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/sambanova/run.yaml b/llama_stack/templates/sambanova/run.yaml index e05c6df01..620d50307 100644 --- a/llama_stack/templates/sambanova/run.yaml +++ b/llama_stack/templates/sambanova/run.yaml @@ -202,4 +202,3 @@ tool_groups: provider_id: wolfram-alpha server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/starter/run.yaml b/llama_stack/templates/starter/run.yaml index 52d7a6a07..402695850 100644 --- a/llama_stack/templates/starter/run.yaml +++ b/llama_stack/templates/starter/run.yaml @@ -620,4 +620,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/tgi/run-with-safety.yaml b/llama_stack/templates/tgi/run-with-safety.yaml index b493403d5..3255e9c0b 100644 --- a/llama_stack/templates/tgi/run-with-safety.yaml +++ b/llama_stack/templates/tgi/run-with-safety.yaml @@ -124,4 +124,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/tgi/run.yaml b/llama_stack/templates/tgi/run.yaml index 2c7610500..179087258 100644 --- a/llama_stack/templates/tgi/run.yaml +++ b/llama_stack/templates/tgi/run.yaml @@ -123,4 +123,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/together/run-with-safety.yaml b/llama_stack/templates/together/run-with-safety.yaml index fbe24064d..fe8c8e397 100644 --- a/llama_stack/templates/together/run-with-safety.yaml +++ b/llama_stack/templates/together/run-with-safety.yaml @@ -271,4 +271,3 @@ tool_groups: provider_id: wolfram-alpha server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/together/run.yaml b/llama_stack/templates/together/run.yaml index 1e93c58c1..b903fc659 100644 --- a/llama_stack/templates/together/run.yaml +++ b/llama_stack/templates/together/run.yaml @@ -261,4 +261,3 @@ tool_groups: provider_id: wolfram-alpha server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/verification/run.yaml b/llama_stack/templates/verification/run.yaml index d656e57e2..11af41da9 100644 --- a/llama_stack/templates/verification/run.yaml +++ b/llama_stack/templates/verification/run.yaml @@ -723,4 +723,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/vllm-gpu/run.yaml b/llama_stack/templates/vllm-gpu/run.yaml index a35981b96..5d3482528 100644 --- a/llama_stack/templates/vllm-gpu/run.yaml +++ b/llama_stack/templates/vllm-gpu/run.yaml @@ -128,4 +128,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false diff --git a/llama_stack/templates/watsonx/run.yaml b/llama_stack/templates/watsonx/run.yaml index 50904b7e9..8de6a2b6c 100644 --- a/llama_stack/templates/watsonx/run.yaml +++ b/llama_stack/templates/watsonx/run.yaml @@ -211,4 +211,3 @@ tool_groups: provider_id: rag-runtime server: port: 8321 - disable_ipv6: false