From 5ce41fa85ea71c37aa6dd2011b4fd4b66767a71c Mon Sep 17 00:00:00 2001
From: Omar Abdelwahab <omara@fb.com>
Date: Mon, 15 Sep 2025 17:07:42 -0700
Subject: [PATCH] updated the warning message

---
 llama_stack/core/store/registry.py | 44 ++++++++----------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/llama_stack/core/store/registry.py b/llama_stack/core/store/registry.py
index 69d72d69a..6acbe8ab6 100644
--- a/llama_stack/core/store/registry.py
+++ b/llama_stack/core/store/registry.py
@@ -28,9 +28,7 @@ class DistributionRegistry(Protocol):
 
     def get_cached(self, identifier: str) -> RoutableObjectWithProvider | None: ...
 
-    async def update(
-        self, obj: RoutableObjectWithProvider
-    ) -> RoutableObjectWithProvider: ...
+    async def update(self, obj: RoutableObjectWithProvider) -> RoutableObjectWithProvider: ...
 
     async def register(self, obj: RoutableObjectWithProvider) -> bool: ...
 
@@ -56,9 +54,7 @@ def _parse_registry_values(values: list[str]) -> list[RoutableObjectWithProvider
             obj = pydantic.TypeAdapter(RoutableObjectWithProvider).validate_json(value)
             all_objects.append(obj)
         except pydantic.ValidationError as e:
-            logger.error(
-                f"Error parsing registry value, raw value: {value}. Error: {e}"
-            )
+            logger.error(f"Error parsing registry value, raw value: {value}. Error: {e}")
             continue
 
     return all_objects
@@ -71,9 +67,7 @@ class DiskDistributionRegistry(DistributionRegistry):
     async def initialize(self) -> None:
         pass
 
-    def get_cached(
-        self, type: str, identifier: str
-    ) -> RoutableObjectWithProvider | None:
+    def get_cached(self, type: str, identifier: str) -> RoutableObjectWithProvider | None:
         # Disk registry does not have a cache
         raise NotImplementedError("Disk registry does not have a cache")
 
@@ -82,23 +76,15 @@ class DiskDistributionRegistry(DistributionRegistry):
         values = await self.kvstore.values_in_range(start_key, end_key)
         return _parse_registry_values(values)
 
-    async def get(
-        self, type: str, identifier: str
-    ) -> RoutableObjectWithProvider | None:
-        json_str = await self.kvstore.get(
-            KEY_FORMAT.format(type=type, identifier=identifier)
-        )
+    async def get(self, type: str, identifier: str) -> RoutableObjectWithProvider | None:
+        json_str = await self.kvstore.get(KEY_FORMAT.format(type=type, identifier=identifier))
         if not json_str:
             return None
 
         try:
-            return pydantic.TypeAdapter(RoutableObjectWithProvider).validate_json(
-                json_str
-            )
+            return pydantic.TypeAdapter(RoutableObjectWithProvider).validate_json(json_str)
         except pydantic.ValidationError as e:
-            logger.error(
-                f"Error parsing registry value for {type}:{identifier}, raw value: {json_str}. Error: {e}"
-            )
+            logger.error(f"Error parsing registry value for {type}:{identifier}, raw value: {json_str}. Error: {e}")
             return None
 
     async def update(self, obj: RoutableObjectWithProvider) -> None:
@@ -111,9 +97,9 @@ class DiskDistributionRegistry(DistributionRegistry):
     async def register(self, obj: RoutableObjectWithProvider) -> bool:
         existing_obj = await self.get(obj.type, obj.identifier)
         # warn if the object's providerid already exists but proceed with registration
-        if existing_obj and existing_obj.provider_id == obj.provider_id:
+        if existing_obj and existing_obj.provider_id != obj.provider_id:
             logger.warning(
-                f"Object {obj.type}:{obj.identifier} with provider_id {obj.provider_id} already exists, overwriting"
+                f"Object {existing_obj.type}:{existing_obj.identifier} with provider_id {existing_obj.provider_id} is being replaced with {existing_obj.type}:{existing_obj.identifier} with provider_id {obj.provider_id}, overwriting"
             )
 
         await self.kvstore.set(
@@ -163,9 +149,7 @@ class CachedDiskDistributionRegistry(DiskDistributionRegistry):
     async def initialize(self) -> None:
         await self._ensure_initialized()
 
-    def get_cached(
-        self, type: str, identifier: str
-    ) -> RoutableObjectWithProvider | None:
+    def get_cached(self, type: str, identifier: str) -> RoutableObjectWithProvider | None:
         return self.cache.get((type, identifier), None)
 
     async def get_all(self) -> list[RoutableObjectWithProvider]:
@@ -173,9 +157,7 @@ class CachedDiskDistributionRegistry(DiskDistributionRegistry):
         async with self._locked_cache() as cache:
             return list(cache.values())
 
-    async def get(
-        self, type: str, identifier: str
-    ) -> RoutableObjectWithProvider | None:
+    async def get(self, type: str, identifier: str) -> RoutableObjectWithProvider | None:
         await self._ensure_initialized()
         cache_key = (type, identifier)
 
@@ -217,9 +199,7 @@ async def create_dist_registry(
         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()
-            )
+            SqliteKVStoreConfig(db_path=(DISTRIBS_BASE_DIR / image_name / "kvstore.db").as_posix())
         )
     dist_registry = CachedDiskDistributionRegistry(dist_kvstore)
     await dist_registry.initialize()