undo SafetyConfig, fix pre-commit

docs/docs/distributions/self_hosted_distro/meta-reference-gpu.md

@@ -79,33 +79,6 @@ docker run \
   --port $LLAMA_STACK_PORT
 ```
 
-### Via Docker with Custom Run Configuration
-
-You can also run the Docker container with a custom run configuration file by mounting it into the container:
-
-```bash
-# Set the path to your custom run.yaml file
-CUSTOM_RUN_CONFIG=/path/to/your/custom-run.yaml
-LLAMA_STACK_PORT=8321
-
-docker run \
-  -it \
-  --pull always \
-  --gpu all \
-  -p $LLAMA_STACK_PORT:$LLAMA_STACK_PORT \
-  -v ~/.llama:/root/.llama \
-  -v $CUSTOM_RUN_CONFIG:/app/custom-run.yaml \
-  -e RUN_CONFIG_PATH=/app/custom-run.yaml \
-  llamastack/distribution-meta-reference-gpu \
-  --port $LLAMA_STACK_PORT
-```
-
-**Note**: The run configuration must be mounted into the container before it can be used. The `-v` flag mounts your local file into the container, and the `RUN_CONFIG_PATH` environment variable tells the entrypoint script which configuration to use.
-
-Available run configurations for this distribution:
-- `run.yaml`
-- `run-with-safety.yaml`
-
 ### Via venv
 
 Make sure you have the Llama Stack CLI available.

docs/docs/distributions/self_hosted_distro/nvidia.md

@@ -127,39 +127,13 @@ docker run \
   -it \
   --pull always \
   -p $LLAMA_STACK_PORT:$LLAMA_STACK_PORT \
-  -v ~/.llama:/root/.llama \
+  -v ./run.yaml:/root/my-run.yaml \
   -e NVIDIA_API_KEY=$NVIDIA_API_KEY \
   llamastack/distribution-nvidia \
+  --config /root/my-run.yaml \
   --port $LLAMA_STACK_PORT
 ```
 
-### Via Docker with Custom Run Configuration
-
-You can also run the Docker container with a custom run configuration file by mounting it into the container:
-
-```bash
-# Set the path to your custom run.yaml file
-CUSTOM_RUN_CONFIG=/path/to/your/custom-run.yaml
-LLAMA_STACK_PORT=8321
-
-docker run \
-  -it \
-  --pull always \
-  -p $LLAMA_STACK_PORT:$LLAMA_STACK_PORT \
-  -v ~/.llama:/root/.llama \
-  -v $CUSTOM_RUN_CONFIG:/app/custom-run.yaml \
-  -e RUN_CONFIG_PATH=/app/custom-run.yaml \
-  -e NVIDIA_API_KEY=$NVIDIA_API_KEY \
-  llamastack/distribution-nvidia \
-  --port $LLAMA_STACK_PORT
-```
-
-**Note**: The run configuration must be mounted into the container before it can be used. The `-v` flag mounts your local file into the container, and the `RUN_CONFIG_PATH` environment variable tells the entrypoint script which configuration to use.
-
-Available run configurations for this distribution:
-- `run.yaml`
-- `run-with-safety.yaml`
-
 ### Via venv
 
 If you've set up your local development environment, you can also install the distribution dependencies using your local virtual environment.

llama_stack/distributions/ci-tests/run-with-postgres-store.yaml

@@ -46,9 +46,6 @@ providers:
       api_key: ${env.TOGETHER_API_KEY:=}
   - provider_id: bedrock
     provider_type: remote::bedrock
-    config:
-      api_key: ${env.AWS_BEDROCK_API_KEY:=}
-      region_name: ${env.AWS_DEFAULT_REGION:=us-east-2}
   - provider_id: ${env.NVIDIA_API_KEY:+nvidia}
     provider_type: remote::nvidia
     config:
@@ -259,9 +256,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields:
@@ -289,5 +283,3 @@ vector_stores:
   default_embedding_model:
     provider_id: sentence-transformers
     model_id: nomic-ai/nomic-embed-text-v1.5
-safety:
-  default_shield_id: llama-guard

llama_stack/distributions/ci-tests/run.yaml

@@ -46,9 +46,6 @@ providers:
       api_key: ${env.TOGETHER_API_KEY:=}
   - provider_id: bedrock
     provider_type: remote::bedrock
-    config:
-      api_key: ${env.AWS_BEDROCK_API_KEY:=}
-      region_name: ${env.AWS_DEFAULT_REGION:=us-east-2}
   - provider_id: ${env.NVIDIA_API_KEY:+nvidia}
     provider_type: remote::nvidia
     config:
@@ -250,9 +247,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields:
@@ -280,5 +274,3 @@ vector_stores:
   default_embedding_model:
     provider_id: sentence-transformers
     model_id: nomic-ai/nomic-embed-text-v1.5
-safety:
-  default_shield_id: llama-guard

llama_stack/distributions/dell/run-with-safety.yaml

@@ -109,9 +109,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models:
   - metadata: {}

llama_stack/distributions/dell/run.yaml

@@ -105,9 +105,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models:
   - metadata: {}

llama_stack/distributions/meta-reference-gpu/run-with-safety.yaml

@@ -122,9 +122,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models:
   - metadata: {}

llama_stack/distributions/meta-reference-gpu/run.yaml

@@ -112,9 +112,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models:
   - metadata: {}

llama_stack/distributions/nvidia/run-with-safety.yaml

@@ -111,9 +111,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models:
   - metadata: {}

llama_stack/distributions/nvidia/run.yaml

@@ -100,9 +100,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields: []

llama_stack/distributions/open-benchmark/run.yaml

@@ -142,9 +142,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models:
   - metadata: {}

llama_stack/distributions/starter-gpu/run-with-postgres-store.yaml

@@ -46,9 +46,6 @@ providers:
       api_key: ${env.TOGETHER_API_KEY:=}
   - provider_id: bedrock
     provider_type: remote::bedrock
-    config:
-      api_key: ${env.AWS_BEDROCK_API_KEY:=}
-      region_name: ${env.AWS_DEFAULT_REGION:=us-east-2}
   - provider_id: ${env.NVIDIA_API_KEY:+nvidia}
     provider_type: remote::nvidia
     config:
@@ -262,9 +259,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields:
@@ -292,5 +286,3 @@ vector_stores:
   default_embedding_model:
     provider_id: sentence-transformers
     model_id: nomic-ai/nomic-embed-text-v1.5
-safety:
-  default_shield_id: llama-guard

llama_stack/distributions/starter-gpu/run.yaml

@@ -46,9 +46,6 @@ providers:
       api_key: ${env.TOGETHER_API_KEY:=}
   - provider_id: bedrock
     provider_type: remote::bedrock
-    config:
-      api_key: ${env.AWS_BEDROCK_API_KEY:=}
-      region_name: ${env.AWS_DEFAULT_REGION:=us-east-2}
   - provider_id: ${env.NVIDIA_API_KEY:+nvidia}
     provider_type: remote::nvidia
     config:
@@ -253,9 +250,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields:
@@ -283,5 +277,3 @@ vector_stores:
   default_embedding_model:
     provider_id: sentence-transformers
     model_id: nomic-ai/nomic-embed-text-v1.5
-safety:
-  default_shield_id: llama-guard

llama_stack/distributions/starter/run-with-postgres-store.yaml

@@ -46,9 +46,6 @@ providers:
       api_key: ${env.TOGETHER_API_KEY:=}
   - provider_id: bedrock
     provider_type: remote::bedrock
-    config:
-      api_key: ${env.AWS_BEDROCK_API_KEY:=}
-      region_name: ${env.AWS_DEFAULT_REGION:=us-east-2}
   - provider_id: ${env.NVIDIA_API_KEY:+nvidia}
     provider_type: remote::nvidia
     config:
@@ -259,9 +256,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields:
@@ -289,5 +283,3 @@ vector_stores:
   default_embedding_model:
     provider_id: sentence-transformers
     model_id: nomic-ai/nomic-embed-text-v1.5
-safety:
-  default_shield_id: llama-guard

llama_stack/distributions/starter/run.yaml

@@ -46,9 +46,6 @@ providers:
       api_key: ${env.TOGETHER_API_KEY:=}
   - provider_id: bedrock
     provider_type: remote::bedrock
-    config:
-      api_key: ${env.AWS_BEDROCK_API_KEY:=}
-      region_name: ${env.AWS_DEFAULT_REGION:=us-east-2}
   - provider_id: ${env.NVIDIA_API_KEY:+nvidia}
     provider_type: remote::nvidia
     config:
@@ -250,9 +247,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields:
@@ -280,5 +274,3 @@ vector_stores:
   default_embedding_model:
     provider_id: sentence-transformers
     model_id: nomic-ai/nomic-embed-text-v1.5
-safety:
-  default_shield_id: llama-guard

llama_stack/distributions/starter/starter.py

@@ -35,6 +35,7 @@ from llama_stack.providers.remote.vector_io.pgvector.config import (
 )
 from llama_stack.providers.remote.vector_io.qdrant.config import QdrantVectorIOConfig
 from llama_stack.providers.remote.vector_io.weaviate.config import WeaviateVectorIOConfig
+from llama_stack.providers.utils.kvstore.config import PostgresKVStoreConfig
 from llama_stack.providers.utils.sqlstore.sqlstore import PostgresSqlStoreConfig
 
 
@@ -251,9 +252,6 @@ def get_distribution_template(name: str = "starter") -> DistributionTemplate:
                 model_id="nomic-ai/nomic-embed-text-v1.5",
             ),
         ),
-        safety_config=SafetyConfig(
-            default_shield_id="llama-guard",
-        ),
     )
 
     postgres_run_settings = base_run_settings.model_copy(

llama_stack/distributions/watsonx/run.yaml

@@ -115,9 +115,6 @@ storage:
     conversations:
       table_name: openai_conversations
       backend: sql_default
-    prompts:
-      namespace: prompts
-      backend: kv_default
 registered_resources:
   models: []
   shields: []