Skip to content

Commit b23e35f

Browse files
test: update tests
1 parent 34ad646 commit b23e35f

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

litellm/proxy/proxy_server.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2679,12 +2679,14 @@ async def _add_router_settings_from_db_config(
26792679
config_router_settings = config_data.get("router_settings", {})
26802680

26812681
combined_router_settings = {}
2682-
if config_router_settings is not None and isinstance(
2683-
config_router_settings, dict
2684-
) and db_router_settings is not None and isinstance(
2685-
db_router_settings.param_value, dict
2682+
if (
2683+
config_router_settings is not None
2684+
and isinstance(config_router_settings, dict)
2685+
and db_router_settings is not None
2686+
and isinstance(db_router_settings.param_value, dict)
26862687
):
26872688
from litellm.utils import _update_dictionary
2689+
26882690
combined_router_settings = _update_dictionary(
26892691
config_router_settings, db_router_settings.param_value
26902692
)
@@ -2697,7 +2699,7 @@ async def _add_router_settings_from_db_config(
26972699
):
26982700
combined_router_settings = db_router_settings.param_value
26992701

2700-
if combined_router_settings is not None:
2702+
if combined_router_settings:
27012703
llm_router.update_settings(**combined_router_settings)
27022704

27032705
def _add_general_settings_from_db_config(

tests/test_litellm/proxy/test_proxy_server.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,8 +1722,11 @@ async def test_add_router_settings_from_db_config_merge_logic():
17221722
assert combined_settings["retry_delay"] == 2
17231723

17241724
# Nested dictionaries should be merged (but this is shallow merge)
1725-
# The entire nested_config dict gets replaced by DB value
1726-
expected_nested = {"setting2": "db_value2", "setting3": "db_value3"}
1725+
expected_nested = {
1726+
"setting1": "config_value1",
1727+
"setting2": "db_value2",
1728+
"setting3": "db_value3",
1729+
}
17271730
assert combined_settings["nested_config"] == expected_nested
17281731

17291732

0 commit comments

Comments
 (0)