From 6d8e744aadcf20ce45e6542d2a2b30036aab8f17 Mon Sep 17 00:00:00 2001 From: yassin Date: Tue, 8 Sep 2026 22:39:10 +0000 Subject: [PATCH] fix(proxy): invalidate reserved counters when the early reconcile fails Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- .../proxy/hooks/proxy_track_cost_callback.py | 14 ++++-- .../hooks/test_proxy_track_cost_callback.py | 47 +++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/litellm/proxy/hooks/proxy_track_cost_callback.py b/litellm/proxy/hooks/proxy_track_cost_callback.py index d1196a35533..d3de84b4513 100644 --- a/litellm/proxy/hooks/proxy_track_cost_callback.py +++ b/litellm/proxy/hooks/proxy_track_cost_callback.py @@ -666,10 +666,18 @@ async def _reconcile_budget_reservation_before_db_update( await reconcile_budget_reservation( budget_reservation=budget_reservation, actual_cost=response_cost, finalize=False ) - except Exception: - verbose_proxy_logger.debug( - "Budget reservation reconcile before DB update failed; deferring to counter update", exc_info=True + except Exception: # noqa: BLE001 # a failed reconcile must not block the spend write; the counters are dropped instead + verbose_proxy_logger.warning( + "Failed to reconcile budget reservation before persisting spend; invalidating reserved counters" ) + try: + await _invalidate_budget_reservation_counters(budget_reservation=budget_reservation) + except Exception: # noqa: BLE001 # nothing left to try; the finalized stamp below keeps it from being reprocessed + verbose_proxy_logger.exception( + "Failed to invalidate budget reservation counters after pre-persist reconcile failed" + ) + finally: + budget_reservation["finalized"] = True async def _release_budget_reservation(budget_reservation: dict | None) -> None: diff --git a/tests/test_litellm/proxy/hooks/test_proxy_track_cost_callback.py b/tests/test_litellm/proxy/hooks/test_proxy_track_cost_callback.py index 9f8473f90e0..8372a38d3ba 100644 --- a/tests/test_litellm/proxy/hooks/test_proxy_track_cost_callback.py +++ b/tests/test_litellm/proxy/hooks/test_proxy_track_cost_callback.py @@ -763,6 +763,53 @@ async def test_update_database_and_spend_counters_releases_reservation_when_db_u increment_spend_counters.assert_not_awaited() +@pytest.mark.asyncio +async def test_update_database_and_spend_counters_invalidates_reservation_when_early_reconcile_fails(): + proxy_logging_obj = MagicMock() + proxy_logging_obj.db_spend_update_writer.update_database = AsyncMock(return_value=True) + increment_spend_counters = AsyncMock() + budget_reservation = { + "reserved_cost": 0.5, + "entries": [{"counter_key": "spend:key:test_api_key"}], + } + + with ( + patch( # test-quality-ok: the helper imports reconcile_budget_reservation in its body, no injection seam + "litellm.proxy.spend_tracking.budget_reservation.reconcile_budget_reservation", + new_callable=AsyncMock, + side_effect=RuntimeError("redis unavailable"), + ) as mock_reconcile_budget_reservation, + patch( # test-quality-ok: _invalidate_budget_reservation_counters imports it in its body, no injection seam + "litellm.proxy.spend_tracking.budget_reservation.invalidate_budget_reservation_counters", + new_callable=AsyncMock, + ) as mock_invalidate_budget_reservation_counters, + ): + charged = await _update_database_and_spend_counters( + proxy_logging_obj=proxy_logging_obj, + increment_spend_counters=increment_spend_counters, + user_api_key="test_api_key", + user_id="test_user_id", + end_user_id=None, + team_id="test_team_id", + org_id="test_org_id", + kwargs={}, + completion_response=None, + start_time=datetime.now(), + end_time=datetime.now(), + response_cost=0.2, + budget_reservation=budget_reservation, + ) + + assert charged is True + mock_reconcile_budget_reservation.assert_awaited_once() + mock_invalidate_budget_reservation_counters.assert_awaited_once_with( + budget_reservation=budget_reservation, + ) + assert budget_reservation["finalized"] is True + proxy_logging_obj.db_spend_update_writer.update_database.assert_awaited_once() + increment_spend_counters.assert_awaited_once() + + @pytest.mark.asyncio async def test_track_cost_callback_skips_when_no_standard_logging_object(): """