Merge pull request #364 from openlegion-ai/fix/dashboard-monthly-budget

fix: add monthly budget support to dashboard

Author: bicced

src/dashboard/server.py

@@ -59,6 +59,19 @@ def _verify_dashboard_auth(request: Request) -> None:
         raise HTTPException(401, error)
 
 
+def _parse_positive_float(value: Any, field: str, fallback: float) -> float:
+    """Validate *value* as a positive float, returning *fallback* if None."""
+    if value is None:
+        return fallback
+    try:
+        result = float(value)
+        if result <= 0:
+            raise ValueError
+    except (ValueError, TypeError):
+        raise HTTPException(status_code=400, detail=f"{field} must be a positive number")
+    return result
+
+
 def create_dashboard_router(
     blackboard: Blackboard,
     health_monitor: HealthMonitor | None,
@@ -552,16 +565,14 @@ async def api_update_agent_config(agent_id: str, request: Request) -> dict:
         if "budget" in body:
             budget_val = body["budget"]
             if isinstance(budget_val, dict):
-                daily = budget_val.get("daily_usd")
-                if daily is not None:
-                    try:
-                        daily = float(daily)
-                        if daily <= 0:
-                            raise ValueError
-                    except (ValueError, TypeError):
-                        raise HTTPException(status_code=400, detail="Budget must be a positive number")
-                    _update_agent_field(agent_id, "budget", {"daily_usd": daily})
-                    cost_tracker.set_budget(agent_id, daily_usd=daily)
+                raw_daily = budget_val.get("daily_usd")
+                raw_monthly = budget_val.get("monthly_usd")
+                if raw_daily is not None or raw_monthly is not None:
+                    current = cost_tracker.check_budget(agent_id)
+                    daily = _parse_positive_float(raw_daily, "daily_usd", current.get("daily_limit", 10.0))
+                    monthly = _parse_positive_float(raw_monthly, "monthly_usd", current.get("monthly_limit", 200.0))
+                    _update_agent_field(agent_id, "budget", {"daily_usd": daily, "monthly_usd": monthly})
+                    cost_tracker.set_budget(agent_id, daily_usd=daily, monthly_usd=monthly)
                     updated.append("budget")
 
         if "thinking" in body:
@@ -633,17 +644,17 @@ async def api_update_budget(agent_id: str, request: Request) -> dict:
         if agent_id not in agent_registry:
             raise HTTPException(status_code=404, detail="Agent not found")
         body = await request.json()
-        daily_usd = body.get("daily_usd")
-        try:
-            daily_usd = float(daily_usd)
-            if daily_usd <= 0:
-                raise ValueError
-        except (ValueError, TypeError):
-            raise HTTPException(status_code=400, detail="daily_usd must be a positive number")
-        cost_tracker.set_budget(agent_id, daily_usd=daily_usd)
+        raw_daily = body.get("daily_usd")
+        raw_monthly = body.get("monthly_usd")
+        if raw_daily is None and raw_monthly is None:
+            raise HTTPException(status_code=400, detail="Provide daily_usd and/or monthly_usd")
+        current = cost_tracker.check_budget(agent_id)
+        daily_usd = _parse_positive_float(raw_daily, "daily_usd", current.get("daily_limit", 10.0))
+        monthly_usd = _parse_positive_float(raw_monthly, "monthly_usd", current.get("monthly_limit", 200.0))
+        cost_tracker.set_budget(agent_id, daily_usd=daily_usd, monthly_usd=monthly_usd)
         from src.cli.config import _update_agent_field
-        _update_agent_field(agent_id, "budget", {"daily_usd": daily_usd})
-        return {"updated": True, "agent": agent_id, "daily_usd": daily_usd}
+        _update_agent_field(agent_id, "budget", {"daily_usd": daily_usd, "monthly_usd": monthly_usd})
+        return {"updated": True, "agent": agent_id, "daily_usd": daily_usd, "monthly_usd": monthly_usd}
 
     @api_router.get("/api/agents/{agent_id}/permissions")
     async def api_agent_permissions(agent_id: str) -> dict:

src/dashboard/static/js/app.js

@@ -1485,6 +1485,7 @@ function dashboard() {
         avatar: cfg.avatar || 1,
         _showAvatarPicker: false,
         budget_daily: cfg.budget?.daily_usd || '',
+        budget_monthly: cfg.budget?.monthly_usd || '',
         allowed_credentials: credsStr,
         _credMode: credMode,
       };
@@ -1515,8 +1516,14 @@ function dashboard() {
       if (this.editForm.model && this.editForm.model !== cfg.model) body.model = this.editForm.model;
       if (this.editForm.role !== undefined && this.editForm.role !== cfg.role) body.role = this.editForm.role;
       if (this.editForm.avatar && this.editForm.avatar !== (cfg.avatar || 1)) body.avatar = this.editForm.avatar;
-      if (this.editForm.budget_daily && parseFloat(this.editForm.budget_daily) > 0) {
-        body.budget = { daily_usd: parseFloat(this.editForm.budget_daily) };
+      if ((this.editForm.budget_daily && parseFloat(this.editForm.budget_daily) > 0) ||
+          (this.editForm.budget_monthly && parseFloat(this.editForm.budget_monthly) > 0)) {
+        const budget = {};
+        if (this.editForm.budget_daily && parseFloat(this.editForm.budget_daily) > 0)
+          budget.daily_usd = parseFloat(this.editForm.budget_daily);
+        if (this.editForm.budget_monthly && parseFloat(this.editForm.budget_monthly) > 0)
+          budget.monthly_usd = parseFloat(this.editForm.budget_monthly);
+        body.budget = budget;
       }
       // Handle allowed_credentials via the permissions endpoint
       const newCreds = (this.editForm.allowed_credentials || '').split(',').map(s => s.trim()).filter(Boolean);
@@ -1596,11 +1603,14 @@ function dashboard() {
       }, true);
     },
 
-    async updateBudget(agentId, dailyUsd) {
+    async updateBudget(agentId, dailyUsd, monthlyUsd) {
       try {
+        const body = {};
+        if (dailyUsd != null) body.daily_usd = parseFloat(dailyUsd);
+        if (monthlyUsd != null) body.monthly_usd = parseFloat(monthlyUsd);
         const resp = await fetch(`${window.__config.apiBase}/agents/${agentId}/budget`, {
           method: 'PUT', headers: {'Content-Type': 'application/json'},
-          body: JSON.stringify({ daily_usd: parseFloat(dailyUsd) }),
+          body: JSON.stringify(body),
         });
         if (resp.ok) this.showToast(`Budget updated for ${agentId}`);
       } catch (e) { console.warn('updateBudget failed:', e); }

src/dashboard/templates/index.html

@@ -1407,6 +1407,10 @@ <h2 class="text-xl font-bold" x-text="agentDetail.id"></h2>
                             <label class="text-xs text-gray-500 mb-1 block">Budget ($/day)</label>
                             <input type="number" step="0.5" min="0.1" x-model="editForm.budget_daily" class="dash-input w-full" placeholder="10.0">
                           </div>
+                          <div>
+                            <label class="text-xs text-gray-500 mb-1 block">Budget ($/month)</label>
+                            <input type="number" step="1" min="1" x-model="editForm.budget_monthly" class="dash-input w-full" placeholder="200.0">
+                          </div>
                           <div class="md:col-span-2">
                             <label class="text-xs text-gray-500 mb-1.5 block">Credential Access</label>
                             <div class="flex items-center gap-3 mb-2">