From 04e4e5ed5b6d30b660b2728a339b4271a2a91d68 Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Tue, 4 Mar 2025 13:26:43 -0800 Subject: [PATCH] fix __distro_dir --- llama_stack/cli/stack/_build.py | 2 +- .../providers/inline/telemetry/meta_reference/config.py | 4 ++-- llama_stack/providers/utils/kvstore/config.py | 4 ++-- llama_stack/templates/bedrock/bedrock.py | 2 +- llama_stack/templates/cerebras/cerebras.py | 2 +- llama_stack/templates/ci-tests/ci_tests.py | 2 +- llama_stack/templates/dev/dev.py | 2 +- llama_stack/templates/fireworks/fireworks.py | 2 +- llama_stack/templates/hf-endpoint/hf_endpoint.py | 2 +- llama_stack/templates/hf-serverless/hf_serverless.py | 2 +- llama_stack/templates/meta-reference-gpu/meta_reference.py | 2 +- .../templates/meta-reference-quantized-gpu/meta_reference.py | 2 +- llama_stack/templates/ollama/ollama.py | 2 +- llama_stack/templates/remote-vllm/vllm.py | 2 +- llama_stack/templates/sambanova/sambanova.py | 2 +- llama_stack/templates/template.py | 4 ++-- llama_stack/templates/tgi/tgi.py | 2 +- llama_stack/templates/together/together.py | 2 +- llama_stack/templates/vllm-gpu/vllm.py | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/llama_stack/cli/stack/_build.py b/llama_stack/cli/stack/_build.py index baa7d2e32..1b2470918 100644 --- a/llama_stack/cli/stack/_build.py +++ b/llama_stack/cli/stack/_build.py @@ -248,7 +248,7 @@ def _generate_run_config( config_type = instantiate_class_type(provider_registry[Api(api)][provider_type].config_class) if hasattr(config_type, "sample_run_config"): - config = config_type.sample_run_config(__distro_dir__=f"distributions/{image_name}") + config = config_type.sample_run_config(__distro_dir__=f"~/.llama/distributions/{image_name}") else: config = {} diff --git a/llama_stack/providers/inline/telemetry/meta_reference/config.py b/llama_stack/providers/inline/telemetry/meta_reference/config.py index f409235d9..67f8cc6ee 100644 --- a/llama_stack/providers/inline/telemetry/meta_reference/config.py +++ b/llama_stack/providers/inline/telemetry/meta_reference/config.py @@ -44,9 +44,9 @@ class TelemetryConfig(BaseModel): return v @classmethod - def sample_run_config(cls, __distro_dir__: str = "runtime", db_name: str = "trace_store.db") -> Dict[str, Any]: + def sample_run_config(cls, __distro_dir__: str, db_name: str = "trace_store.db") -> Dict[str, Any]: return { "service_name": "${env.OTEL_SERVICE_NAME:llama-stack}", "sinks": "${env.TELEMETRY_SINKS:console,sqlite}", - "sqlite_db_path": "${env.SQLITE_DB_PATH:~/.llama/" + __distro_dir__ + "/" + db_name + "}", + "sqlite_db_path": "${env.SQLITE_DB_PATH:" + __distro_dir__ + "/" + db_name + "}", } diff --git a/llama_stack/providers/utils/kvstore/config.py b/llama_stack/providers/utils/kvstore/config.py index b9403df32..4f85982be 100644 --- a/llama_stack/providers/utils/kvstore/config.py +++ b/llama_stack/providers/utils/kvstore/config.py @@ -55,11 +55,11 @@ class SqliteKVStoreConfig(CommonConfig): ) @classmethod - def sample_run_config(cls, __distro_dir__: str = "runtime", db_name: str = "kvstore.db"): + def sample_run_config(cls, __distro_dir__: str, db_name: str = "kvstore.db"): return { "type": "sqlite", "namespace": None, - "db_path": "${env.SQLITE_STORE_DIR:~/.llama/" + __distro_dir__ + "}/" + db_name, + "db_path": "${env.SQLITE_STORE_DIR:" + __distro_dir__ + "}/" + db_name, } diff --git a/llama_stack/templates/bedrock/bedrock.py b/llama_stack/templates/bedrock/bedrock.py index 18e287390..9171ae18a 100644 --- a/llama_stack/templates/bedrock/bedrock.py +++ b/llama_stack/templates/bedrock/bedrock.py @@ -34,7 +34,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) available_models = { diff --git a/llama_stack/templates/cerebras/cerebras.py b/llama_stack/templates/cerebras/cerebras.py index bda22a498..4a9ad90b4 100644 --- a/llama_stack/templates/cerebras/cerebras.py +++ b/llama_stack/templates/cerebras/cerebras.py @@ -62,7 +62,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) default_tool_groups = [ ToolGroupInput( diff --git a/llama_stack/templates/ci-tests/ci_tests.py b/llama_stack/templates/ci-tests/ci_tests.py index 979256fa1..b204af5ea 100644 --- a/llama_stack/templates/ci-tests/ci_tests.py +++ b/llama_stack/templates/ci-tests/ci_tests.py @@ -48,7 +48,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="sqlite-vec", provider_type="inline::sqlite-vec", - config=SQLiteVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=SQLiteVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) embedding_provider = Provider( provider_id="sentence-transformers", diff --git a/llama_stack/templates/dev/dev.py b/llama_stack/templates/dev/dev.py index e8aa31a7e..1aee1bb22 100644 --- a/llama_stack/templates/dev/dev.py +++ b/llama_stack/templates/dev/dev.py @@ -100,7 +100,7 @@ def get_distribution_template() -> DistributionTemplate: Provider( provider_id="sqlite-vec", provider_type="inline::sqlite-vec", - config=SQLiteVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=SQLiteVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ), Provider( provider_id="${env.ENABLE_CHROMADB+chromadb}", diff --git a/llama_stack/templates/fireworks/fireworks.py b/llama_stack/templates/fireworks/fireworks.py index 0111bc118..2baab9d7c 100644 --- a/llama_stack/templates/fireworks/fireworks.py +++ b/llama_stack/templates/fireworks/fireworks.py @@ -56,7 +56,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) available_models = { diff --git a/llama_stack/templates/hf-endpoint/hf_endpoint.py b/llama_stack/templates/hf-endpoint/hf_endpoint.py index f2849f0bc..0dafe0a01 100644 --- a/llama_stack/templates/hf-endpoint/hf_endpoint.py +++ b/llama_stack/templates/hf-endpoint/hf_endpoint.py @@ -51,7 +51,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) inference_model = ModelInput( diff --git a/llama_stack/templates/hf-serverless/hf_serverless.py b/llama_stack/templates/hf-serverless/hf_serverless.py index cea1075e2..25d4c6b30 100644 --- a/llama_stack/templates/hf-serverless/hf_serverless.py +++ b/llama_stack/templates/hf-serverless/hf_serverless.py @@ -52,7 +52,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) inference_model = ModelInput( diff --git a/llama_stack/templates/meta-reference-gpu/meta_reference.py b/llama_stack/templates/meta-reference-gpu/meta_reference.py index 3c38e0edd..6bb1fcb0a 100644 --- a/llama_stack/templates/meta-reference-gpu/meta_reference.py +++ b/llama_stack/templates/meta-reference-gpu/meta_reference.py @@ -58,7 +58,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) inference_model = ModelInput( diff --git a/llama_stack/templates/meta-reference-quantized-gpu/meta_reference.py b/llama_stack/templates/meta-reference-quantized-gpu/meta_reference.py index 32476f37f..5f207bfad 100644 --- a/llama_stack/templates/meta-reference-quantized-gpu/meta_reference.py +++ b/llama_stack/templates/meta-reference-quantized-gpu/meta_reference.py @@ -67,7 +67,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) inference_model = ModelInput( diff --git a/llama_stack/templates/ollama/ollama.py b/llama_stack/templates/ollama/ollama.py index 3c24a41ba..2345bf3e5 100644 --- a/llama_stack/templates/ollama/ollama.py +++ b/llama_stack/templates/ollama/ollama.py @@ -45,7 +45,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider_sqlite = Provider( provider_id="sqlite-vec", provider_type="inline::sqlite-vec", - config=SQLiteVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=SQLiteVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) inference_model = ModelInput( diff --git a/llama_stack/templates/remote-vllm/vllm.py b/llama_stack/templates/remote-vllm/vllm.py index 73ee36c3f..16bf1d0fa 100644 --- a/llama_stack/templates/remote-vllm/vllm.py +++ b/llama_stack/templates/remote-vllm/vllm.py @@ -55,7 +55,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) inference_model = ModelInput( diff --git a/llama_stack/templates/sambanova/sambanova.py b/llama_stack/templates/sambanova/sambanova.py index 08c3a54cc..0b7e82751 100644 --- a/llama_stack/templates/sambanova/sambanova.py +++ b/llama_stack/templates/sambanova/sambanova.py @@ -46,7 +46,7 @@ def get_distribution_template() -> DistributionTemplate: provider_id="faiss", provider_type="inline::faiss", config=FaissVectorIOConfig.sample_run_config( - __distro_dir__=f"distributions/{name}", + __distro_dir__=f"~/.llama/distributions/{name}", ), ), Provider( diff --git a/llama_stack/templates/template.py b/llama_stack/templates/template.py index 2afb84a63..a7b862396 100644 --- a/llama_stack/templates/template.py +++ b/llama_stack/templates/template.py @@ -86,7 +86,7 @@ class RunConfigSettings(BaseModel): config_class = instantiate_class_type(config_class) if hasattr(config_class, "sample_run_config"): - config = config_class.sample_run_config(__distro_dir__=f"distributions/{name}") + config = config_class.sample_run_config(__distro_dir__=f"~/.llama/distributions/{name}") else: config = {} @@ -107,7 +107,7 @@ class RunConfigSettings(BaseModel): apis=apis, providers=provider_configs, metadata_store=SqliteKVStoreConfig.sample_run_config( - __distro_dir__=f"distributions/{name}", + __distro_dir__=f"~/.llama/distributions/{name}", db_name="registry.db", ), models=self.default_models or [], diff --git a/llama_stack/templates/tgi/tgi.py b/llama_stack/templates/tgi/tgi.py index 584831746..45ea74db6 100644 --- a/llama_stack/templates/tgi/tgi.py +++ b/llama_stack/templates/tgi/tgi.py @@ -55,7 +55,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) inference_model = ModelInput( diff --git a/llama_stack/templates/together/together.py b/llama_stack/templates/together/together.py index 24c395e1e..bf6f0cea4 100644 --- a/llama_stack/templates/together/together.py +++ b/llama_stack/templates/together/together.py @@ -49,7 +49,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) embedding_provider = Provider( provider_id="sentence-transformers", diff --git a/llama_stack/templates/vllm-gpu/vllm.py b/llama_stack/templates/vllm-gpu/vllm.py index 27a16b93d..8883f117f 100644 --- a/llama_stack/templates/vllm-gpu/vllm.py +++ b/llama_stack/templates/vllm-gpu/vllm.py @@ -46,7 +46,7 @@ def get_distribution_template() -> DistributionTemplate: vector_io_provider = Provider( provider_id="faiss", provider_type="inline::faiss", - config=FaissVectorIOConfig.sample_run_config(f"distributions/{name}"), + config=FaissVectorIOConfig.sample_run_config(f"~/.llama/distributions/{name}"), ) embedding_provider = Provider( provider_id="sentence-transformers",