From 9bf49d8e920747b66153d107166a8d8b84c11564 Mon Sep 17 00:00:00 2001
From: araman-godaddy <89882562+araman-godaddy@users.noreply.github.com>
Date: Tue, 3 Mar 2026 20:28:29 -0800
Subject: [PATCH] bug fix in end user budget creation logic (#22009)

---
 .../customer_endpoints.py                     |  9 ++++-
 .../test_customer_budget.py                   | 39 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/litellm/proxy/management_endpoints/customer_endpoints.py b/litellm/proxy/management_endpoints/customer_endpoints.py
index bfafc943c45..bce5f6cda70 100644
--- a/litellm/proxy/management_endpoints/customer_endpoints.py
+++ b/litellm/proxy/management_endpoints/customer_endpoints.py
@@ -10,12 +10,14 @@ All /customer management endpoints
 """
 
 #### END-USER/CUSTOMER MANAGEMENT ####
+from datetime import datetime, timedelta
 from typing import List, Optional
 
 import fastapi
 from fastapi import APIRouter, Depends, HTTPException, Request
 
 import litellm
+from litellm.litellm_core_utils.duration_parser import duration_in_seconds
 from litellm._logging import verbose_proxy_logger
 from litellm.proxy._types import *
 from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
@@ -161,7 +163,12 @@ def new_budget_request(data: NewCustomerRequest) -> Optional[BudgetNewRequest]:
             budget_kv_pairs[field_name] = value
 
     if budget_kv_pairs:
-        return BudgetNewRequest(**budget_kv_pairs)
+        budget_request = BudgetNewRequest(**budget_kv_pairs)
+        if budget_request.budget_reset_at is None and budget_request.budget_duration is not None:
+            budget_request.budget_reset_at = datetime.utcnow() + timedelta(
+                seconds=duration_in_seconds(duration=budget_request.budget_duration)
+            )
+        return budget_request
     return None
 
 
diff --git a/tests/test_litellm/proxy/management_endpoints/test_customer_budget.py b/tests/test_litellm/proxy/management_endpoints/test_customer_budget.py
index 4a24e94dded..286592c861e 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_customer_budget.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_customer_budget.py
@@ -6,18 +6,25 @@ Tests customer update functionality related to budget management:
 - Creating new budgets for customers with proper field validation
 - Budget creation with required metadata fields
 - Proper database relationship handling
+- Budget initialization on customer creation
 """
 
+from datetime import datetime, timedelta
+
 import pytest
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from litellm.proxy._types import (
     LiteLLM_BudgetTable,
     LiteLLM_EndUserTable,
+    NewCustomerRequest,
     UpdateCustomerRequest,
 )
 from litellm.proxy.auth.user_api_key_auth import UserAPIKeyAuth
-from litellm.proxy.management_endpoints.customer_endpoints import update_end_user
+from litellm.proxy.management_endpoints.customer_endpoints import (
+    new_budget_request,
+    update_end_user,
+)
 
 
 @pytest.fixture
@@ -340,4 +347,32 @@ async def test_update_customer_with_budget_id_and_creation_fields(
     
     # The update data should contain budget_id from the created budget, not the original budget_id
     update_data = call_args[1]['data']
-    assert update_data['budget_id'] == "new-budget-combo"  # From created budget
\ No newline at end of file
+    assert update_data['budget_id'] == "new-budget-combo"  # From created budget
+
+
+def test_new_budget_request_sets_budget_reset_at_when_duration_provided():
+    """
+    Test that new_budget_request auto-populates budget_reset_at when
+    budget_duration is provided but budget_reset_at is not.
+
+    Without this fix, budgets created via /customer/new with a budget_duration
+    but no budget_reset_at would have budget_reset_at=NULL in the DB, causing
+    the ResetBudgetJob to immediately pick them up and zero out enduser spend.
+    """
+    data = NewCustomerRequest(
+        user_id="test-user",
+        max_budget=10.0,
+        budget_duration="30d",
+    )
+
+    before = datetime.utcnow()
+    result = new_budget_request(data)
+    after = datetime.utcnow()
+
+    assert result is not None
+    assert result.budget_reset_at is not None
+    assert result.budget_duration == "30d"
+
+    expected_min = before + timedelta(days=30)
+    expected_max = after + timedelta(days=30)
+    assert expected_min <= result.budget_reset_at <= expected_max