From 6464c1fd6c9a58efcf75f4b73650d541aa4c76bd Mon Sep 17 00:00:00 2001
From: yucheng <yucheng@berri.ai>
Date: Fri, 18 Sep 2026 19:17:08 +0000
Subject: [PATCH] fix(proxy): make SettingsStore.clear() terminate when the
 config file owns a key

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../proxy/config_resolvers/settings_store.py  |  4 ++
 .../config_resolvers/test_settings_store.py   | 49 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/litellm/proxy/config_resolvers/settings_store.py b/litellm/proxy/config_resolvers/settings_store.py
index 079d262319f..49f5a833b8f 100644
--- a/litellm/proxy/config_resolvers/settings_store.py
+++ b/litellm/proxy/config_resolvers/settings_store.py
@@ -87,6 +87,10 @@ class SettingsStore(MutableMapping[str, JsonValue]):
         )
         self._deleted_runtime_keys = self._deleted_runtime_keys | frozenset((key,))
 
+    def clear(self) -> None:
+        self._deleted_runtime_keys = frozenset(key for key in self._keys() if not self.owned_by_config(key))
+        self._runtime_values = _EMPTY_VALUES
+
     def __iter__(self) -> Iterator[str]:
         return iter(
             key
diff --git a/tests/test_litellm/proxy/config_resolvers/test_settings_store.py b/tests/test_litellm/proxy/config_resolvers/test_settings_store.py
index aa410deac43..aec78933c89 100644
--- a/tests/test_litellm/proxy/config_resolvers/test_settings_store.py
+++ b/tests/test_litellm/proxy/config_resolvers/test_settings_store.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import Final
+from unittest.mock import patch
 
 import pytest
 
@@ -168,6 +169,54 @@ def test_settings_store_refuses_a_runtime_write_to_a_config_owned_key() -> None:
     assert store.source("max_parallel_requests") == "config"
 
 
+@pytest.mark.timeout(10)
+def test_settings_store_clear_removes_every_key_the_config_file_does_not_own() -> None:
+    store: Final = SettingsStore("general_settings")
+    store.load_yaml({"master_key": "sk-config"})
+    store.apply_db_row("general_settings", {"max_parallel_requests": 3, "alerting": ["slack"]})
+    store["allow_requests_on_db_unavailable"] = True
+    del store["alerting"]
+
+    store.clear()
+
+    assert dict(store) == {"master_key": "sk-config"}
+    assert "alerting" not in store
+    with pytest.raises(KeyError):
+        store["max_parallel_requests"]
+
+
+@pytest.mark.timeout(10)
+def test_settings_store_clear_then_refill_matches_a_plain_dict() -> None:
+    expected: Final[dict[str, JsonValue]] = {"max_parallel_requests": 3, "alerting": ["slack"]}
+    store: Final = SettingsStore("general_settings")
+    store.update(expected)
+
+    expected.clear()
+    store.clear()
+    expected.update({"alerting": ["email"], "max_parallel_requests": 11})
+    store.update({"alerting": ["email"], "max_parallel_requests": 11})
+
+    assert dict(store) == expected
+    assert tuple(store) == tuple(expected)
+    assert len(store) == len(expected)
+
+
+@pytest.mark.timeout(10)
+@pytest.mark.parametrize("clear", (False, True))
+def test_settings_store_survives_a_patch_dict_round_trip_when_the_config_file_owns_a_key(clear: bool) -> None:
+    store: Final = SettingsStore("general_settings")
+    store.load_yaml({"master_key": "sk-config"})
+    store.apply_db_row("general_settings", {"max_parallel_requests": 3})
+    before: Final = dict(store)
+
+    with patch.dict(store, {"allow_requests_on_db_unavailable": True}, clear=clear):
+        assert store["allow_requests_on_db_unavailable"] is True
+        assert store["master_key"] == "sk-config"
+        assert ("max_parallel_requests" in store) is not clear
+
+    assert dict(store) == before
+
+
 def test_settings_store_reports_the_config_owned_keys_a_write_would_change() -> None:
     store: Final = SettingsStore("general_settings")
     store.load_yaml({"max_parallel_requests": 3, "ui_access_mode": "admin_only"})