From 1e2b5b20fa613063d574e365773c33988f726012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 9 Oct 2025 13:02:42 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20Raising=20an=20error=20message?= =?UTF-8?q?=20to=20the=20user=20when=20registering=20an=20existin=E2=80=A6?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 702fcd1abfae613a34b0cd955e155099ac1b9247. --- llama_stack/core/store/registry.py | 5 +---- tests/unit/registry/test_registry.py | 9 +-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/llama_stack/core/store/registry.py b/llama_stack/core/store/registry.py index 0486553d5..624dbd176 100644 --- a/llama_stack/core/store/registry.py +++ b/llama_stack/core/store/registry.py @@ -98,10 +98,7 @@ class DiskDistributionRegistry(DistributionRegistry): existing_obj = await self.get(obj.type, obj.identifier) # dont register if the object's providerid already exists if existing_obj and existing_obj.provider_id == obj.provider_id: - raise ValueError( - f"Provider '{obj.provider_id}' is already registered." - f"Unregister the existing provider first before registering it again." - ) + return False await self.kvstore.set( KEY_FORMAT.format(type=obj.type, identifier=obj.identifier), diff --git a/tests/unit/registry/test_registry.py b/tests/unit/registry/test_registry.py index c1f834d5d..4ea4a20b9 100644 --- a/tests/unit/registry/test_registry.py +++ b/tests/unit/registry/test_registry.py @@ -125,15 +125,8 @@ async def test_duplicate_provider_registration(cached_disk_dist_registry): provider_resource_id="test_vector_db_2", provider_id="baz", # Same provider_id ) + await cached_disk_dist_registry.register(duplicate_vector_db) - # Now we expect a ValueError to be raised for duplicate registration - with pytest.raises( - ValueError, - match=r"Provider 'baz' is already registered.*Unregister the existing provider first before registering it again.", - ): - await cached_disk_dist_registry.register(duplicate_vector_db) - - # Verify the original registration is still intact result = await cached_disk_dist_registry.get("vector_db", "test_vector_db_2") assert result is not None assert result.embedding_model == original_vector_db.embedding_model # Original values preserved