From 63721754bce2f0a5d7a307391b6edadabc76e441 Mon Sep 17 00:00:00 2001
From: Ashwin Bharambe <ashwin.bharambe@gmail.com>
Date: Sun, 5 Oct 2025 13:10:10 -0700
Subject: [PATCH] Update create_dist_registry to use PersistenceConfig

---
 llama_stack/core/store/registry.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/llama_stack/core/store/registry.py b/llama_stack/core/store/registry.py
index 624dbd176..2967eb130 100644
--- a/llama_stack/core/store/registry.py
+++ b/llama_stack/core/store/registry.py
@@ -10,7 +10,8 @@ from typing import Protocol
 
 import pydantic
 
-from llama_stack.core.datatypes import RoutableObjectWithProvider
+from llama_stack.core.datatypes import PersistenceConfig, RoutableObjectWithProvider
+from llama_stack.core.persistence_resolver import resolve_metadata_store_config
 from llama_stack.core.utils.config_dirs import DISTRIBS_BASE_DIR
 from llama_stack.log import get_logger
 from llama_stack.providers.utils.kvstore import KVStore, kvstore_impl
@@ -189,16 +190,12 @@ class CachedDiskDistributionRegistry(DiskDistributionRegistry):
 
 
 async def create_dist_registry(
-    metadata_store: KVStoreConfig | None,
+    persistence: PersistenceConfig | None,
     image_name: str,
 ) -> tuple[CachedDiskDistributionRegistry, KVStore]:
     # instantiate kvstore for storing and retrieving distribution metadata
-    if metadata_store:
-        dist_kvstore = await kvstore_impl(metadata_store)
-    else:
-        dist_kvstore = await kvstore_impl(
-            SqliteKVStoreConfig(db_path=(DISTRIBS_BASE_DIR / image_name / "kvstore.db").as_posix())
-        )
+    kvstore_config = resolve_metadata_store_config(persistence, image_name)
+    dist_kvstore = await kvstore_impl(kvstore_config)
     dist_registry = CachedDiskDistributionRegistry(dist_kvstore)
     await dist_registry.initialize()
     return dist_registry, dist_kvstore