simplified some, walked back some decisions

llama_stack/distributions/postgres-demo/build.yaml

@@ -17,4 +17,7 @@ distribution_spec:
     - provider_type: inline::rag-runtime
     - provider_type: remote::model-context-protocol
 image_type: venv
-additional_pip_packages: []
+additional_pip_packages:
+- asyncpg
+- psycopg2-binary
+- sqlalchemy[asyncio]

llama_stack/distributions/postgres-demo/postgres_demo.py

@@ -91,7 +91,6 @@ def get_distribution_template() -> DistributionTemplate:
             "embedding_dimension": 768,
         },
     )
-    postgres_config = PostgresSqlStoreConfig.sample_run_config()
     return DistributionTemplate(
         name=name,
         distro_type="self_hosted",
@@ -109,13 +108,11 @@ def get_distribution_template() -> DistributionTemplate:
                 default_models=default_models + [embedding_model],
                 default_tool_groups=default_tool_groups,
                 default_shields=[ShieldInput(shield_id="meta-llama/Llama-Guard-3-8B")],
-                metadata_store=PostgresKVStoreConfig.sample_run_config(),
-                inference_store=postgres_config,
                 storage_backends={
-                    "default_kv_store": PostgresKVStoreConfig.sample_run_config(
+                    "kv_default": PostgresKVStoreConfig.sample_run_config(
                         table_name="llamastack_kvstore",
                     ),
-                    "default_sql_store": PostgresSqlStoreConfig.sample_run_config(),
+                    "sql_default": PostgresSqlStoreConfig.sample_run_config(),
                 },
             ),
         },

llama_stack/distributions/postgres-demo/run.yaml

@@ -24,6 +24,7 @@ providers:
       url: ${env.CHROMADB_URL:=}
       kvstore:
         namespace: vector_io::chroma_remote
+        backend: kv_default
   safety:
   - provider_id: llama-guard
     provider_type: inline::llama-guard
@@ -36,8 +37,12 @@ providers:
       persistence:
         agent_state:
           namespace: agents
+          backend: kv_default
         responses:
           table_name: responses
+          backend: sql_default
+          max_write_queue_size: 10000
+          num_writers: 4
   tool_runtime:
   - provider_id: brave-search
     provider_type: remote::brave-search
@@ -55,7 +60,7 @@ providers:
     provider_type: remote::model-context-protocol
 storage:
   backends:
-    default_kv_store:
+    kv_default:
       type: kv_postgres
       host: ${env.POSTGRES_HOST:=localhost}
       port: ${env.POSTGRES_PORT:=5432}
@@ -63,24 +68,24 @@ storage:
       user: ${env.POSTGRES_USER:=llamastack}
       password: ${env.POSTGRES_PASSWORD:=llamastack}
       table_name: ${env.POSTGRES_TABLE_NAME:=llamastack_kvstore}
-    default_sql_store:
+    sql_default:
       type: sql_postgres
       host: ${env.POSTGRES_HOST:=localhost}
       port: ${env.POSTGRES_PORT:=5432}
       db: ${env.POSTGRES_DB:=llamastack}
       user: ${env.POSTGRES_USER:=llamastack}
       password: ${env.POSTGRES_PASSWORD:=llamastack}
-  metadata:
-    namespace: registry
-    backend: default_kv_store
-  inference:
-    table_name: inference_store
-    backend: default_sql_store
-    max_write_queue_size: 10000
-    num_writers: 4
-  conversations:
-    table_name: openai_conversations
-    backend: default_sql_store
+metadata_store:
+  namespace: registry
+  backend: kv_default
+inference_store:
+  table_name: inference_store
+  backend: sql_default
+  max_write_queue_size: 10000
+  num_writers: 4
+conversations_store:
+  table_name: openai_conversations
+  backend: sql_default
 models:
 - metadata: {}
   model_id: ${env.INFERENCE_MODEL}