scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-12 23:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 88

fix: use _init_non_llm_objects_in_db to load all DB objects with proper guards

Browse source 
Address Greptile review: call _init_non_llm_objects_in_db instead of
_init_mcp_servers_in_db so all non-LLM DB objects (guardrails, agents,
vector stores, etc.) are loaded on startup when store_model_in_db is
False, and the _should_load_db_object guard is respected
This commit is contained in:
Devin AI 2026-07-01 04:23:54 +00:00
parent e2c7a37645
commit 3a6b332b3b
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
litellm/proxy/proxy_server.py
View file

@ -7535,7 +7535,7 @@ class ProxyStartupEvent:
)
await proxy_config.get_credentials(prisma_client=prisma_client)
else:
await proxy_config._init_mcp_servers_in_db()
await proxy_config._init_non_llm_objects_in_db(prisma_client=prisma_client)
await cls._initialize_slack_alerting_jobs(
scheduler=scheduler,

23
tests/test_litellm/proxy/test_proxy_server.py
View file

@ -6288,22 +6288,18 @@ async def test_store_model_in_db_db_failure_graceful(monkeypatch):
# add_deployment should NOT have been called since store_model_in_db is False
mock_proxy_config.add_deployment.assert_not_called()
# _init_mcp_servers_in_db should still be called even when
# store_model_in_db is False so DB-added MCP servers are loaded
# on restart (LIT-4128)
mock_proxy_config._init_mcp_servers_in_db.assert_awaited_once()
mock_proxy_config._init_non_llm_objects_in_db.assert_awaited_once()
@pytest.mark.asyncio
async def test_mcp_servers_loaded_on_startup_without_store_model_in_db(monkeypatch):
async def test_non_llm_objects_loaded_on_startup_without_store_model_in_db(monkeypatch):
"""
Regression test for LIT-4128: MCP servers added via the UI are stored
in the database but only loaded into the in-memory registry during
add_deployment, which is gated by store_model_in_db=True. When
store_model_in_db is False (common in single-instance deployments),
the registry stays empty after restart until a new server is added.
Regression test for LIT-4128: non-LLM DB objects (MCP servers, guardrails,
agents, etc.) are only loaded inside add_deployment, which is gated by
store_model_in_db=True. When that flag is False (common in single-instance
deployments), the in-memory registries stay empty after restart.
Verify that _init_mcp_servers_in_db is called during startup even when
Verify that _init_non_llm_objects_in_db is called during startup even when
store_model_in_db is False.
"""
monkeypatch.delenv("STORE_MODEL_IN_DB", raising=False)
@ -6331,11 +6327,8 @@ async def test_mcp_servers_loaded_on_startup_without_store_model_in_db(monkeypat
proxy_logging_obj=mock_proxy_logging,
)
# add_deployment should NOT be called (store_model_in_db is False)
mock_proxy_config.add_deployment.assert_not_called()
# MCP servers should still be loaded from DB on startup
mock_proxy_config._init_mcp_servers_in_db.assert_awaited_once()
mock_proxy_config._init_non_llm_objects_in_db.assert_awaited_once()
# =====================================================================