scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-28 01:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 43

fix(proxy): reschedule cleanup when only the cron or interval changes at runtime

Browse source 
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
yucheng 2026-09-24 19:05:34 +00:00
parent 4bd8117f8e
commit 5f16a3ad83
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
litellm/proxy/proxy_server.py
View file

@ -7649,10 +7649,14 @@ class ProxyConfig:
self.settings.get("maximum_spend_logs_cleanup_cron"),
self.settings.get("maximum_spend_logs_retention_interval"),
)
job_missing: Final = wants_job and not has_job and attempt != self._last_cleanup_schedule_attempt
if previous_retention_values != resolved or job_missing or (has_job and not wants_job):
last_attempt: Final = self._last_cleanup_schedule_attempt
schedule_changed: Final = last_attempt is not None and attempt != last_attempt
job_missing: Final = wants_job and not has_job and attempt != last_attempt
if previous_retention_values != resolved or schedule_changed or job_missing or (has_job and not wants_job):
self._last_cleanup_schedule_attempt = attempt
await self._reschedule_spend_log_cleanup_job()
elif last_attempt is None:
self._last_cleanup_schedule_attempt = attempt
async def _apply_ssrf_settings(self, db_values: Mapping[str, SettingsJsonValue]) -> None:
_apply_ssrf_general_settings(db_values)

22
tests/test_litellm/proxy/proxy_server/test_proxy_config.py
View file

@ -3940,6 +3940,28 @@ async def test_ProxyConfig__update_general_settings_retries_a_failed_schedule_on
assert fake_scheduler.add_job.call_args.kwargs["id"] == "spend_log_cleanup_job"
@pytest.mark.asyncio
async def test_ProxyConfig__update_general_settings_reschedules_when_only_the_cron_changes(monkeypatch):
fake_scheduler = MagicMock()
fake_scheduler.get_job.return_value = MagicMock()
monkeypatch.setattr("litellm.proxy.proxy_server.scheduler", fake_scheduler)
monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", None)
pc = ProxyConfig()
hourly = {"maximum_daily_tag_spend_retention_period": "90d", "maximum_spend_logs_cleanup_cron": "0 * * * *"}
pc.settings.apply_db_row("general_settings", hourly)
monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", pc.settings)
await pc._update_general_settings(hourly)
await pc._update_general_settings(hourly)
assert fake_scheduler.add_job.call_count == 0
daily = {**hourly, "maximum_spend_logs_cleanup_cron": "0 3 * * *"}
pc.settings.apply_db_row("general_settings", daily)
await pc._update_general_settings(daily)
assert fake_scheduler.add_job.call_count == 1
assert fake_scheduler.add_job.call_args.kwargs["id"] == "spend_log_cleanup_job"
assert "hour='3'" in str(fake_scheduler.add_job.call_args.args[1])
# ---------------------------------------------------------------------------
# ProxyConfig._update_general_settings
# ---------------------------------------------------------------------------