Handle budget-window submission validation errors

Author: anth-volk

policyengine_api/services/economy_service.py

@@ -24,6 +24,7 @@
 from policyengine_api.utils import budget_window as budget_window_utils
 from policyengine.simulation import SimulationOptions
 from policyengine.utils.data.datasets import get_default_dataset
+import httpx
 import json
 import datetime
 import hashlib
@@ -348,6 +349,15 @@ def get_budget_window_economic_impact(
                     budget_window_cache.store_batch_job_id(
                         cache_key, batch_execution.batch_job_id
                     )
+                except httpx.HTTPStatusError as error:
+                    budget_window_cache.clear_starting_claim(cache_key, claim_token)
+                    if 400 <= error.response.status_code < 500:
+                        return BudgetWindowEconomicImpactResult.failed(
+                            self._build_budget_window_submission_error_message(error),
+                            queued_years=years,
+                            cache_status=cache_status,
+                        )
+                    raise
                 except Exception:
                     budget_window_cache.clear_starting_claim(cache_key, claim_token)
                     raise
@@ -443,6 +453,26 @@ def _start_budget_window_batch(
 
         return simulation_api.run_budget_window_batch(sim_params)
 
+    def _build_budget_window_submission_error_message(
+        self, error: httpx.HTTPStatusError
+    ) -> str:
+        try:
+            response_json = error.response.json()
+        except ValueError:
+            response_json = None
+
+        if isinstance(response_json, dict):
+            for key in ("detail", "message", "error"):
+                value = response_json.get(key)
+                if value:
+                    return str(value)
+
+        response_text = error.response.text.strip()
+        if response_text:
+            return response_text
+
+        return str(error)
+
     def _get_budget_window_result_from_batch_job_id(
         self,
         *,

tests/unit/services/test_economy_service.py

@@ -1,5 +1,6 @@
 import json
 import sys
+import httpx
 import pytest
 from unittest.mock import patch, MagicMock
 from typing import Literal
@@ -110,6 +111,19 @@ def make_mock_budget_impact_data(
     }
 
 
+def make_http_status_error(status_code: int, payload: dict) -> httpx.HTTPStatusError:
+    request = httpx.Request(
+        "POST",
+        "https://policyengine-staging--policyengine-simulation-gateway-web-app.modal.run/simulate/economy/budget-window",
+    )
+    response = httpx.Response(status_code, json=payload, request=request)
+    return httpx.HTTPStatusError(
+        f"Client error '{status_code}'",
+        request=request,
+        response=response,
+    )
+
+
 class TestEconomyService:
     class TestGetEconomicImpact:
         @pytest.fixture
@@ -1010,6 +1024,59 @@ def test__given_batch_submission_fails__clears_start_claim(
                 "budget-window-cache-key", MOCK_PROCESS_ID
             )
 
+        def test__given_modal_rejects_batch_submission__returns_failed_result(
+            self,
+            economy_service,
+            base_params,
+            mock_simulation_api,
+            mock_budget_window_cache,
+        ):
+            mock_simulation_api.run_budget_window_batch.side_effect = make_http_status_error(
+                400,
+                {
+                    "detail": (
+                        "Invalid Hugging Face dataset URI: "
+                        "'hf://policyengine/nonexistent-budget-window-test.h5@0.0.0'"
+                    )
+                },
+            )
+
+            result = economy_service.get_budget_window_economic_impact(**base_params)
+
+            assert result.status == ImpactStatus.ERROR
+            assert result.data is None
+            assert result.error == (
+                "Invalid Hugging Face dataset URI: "
+                "'hf://policyengine/nonexistent-budget-window-test.h5@0.0.0'"
+            )
+            assert result.completed_years == []
+            assert result.computing_years == []
+            assert result.queued_years == ["2026", "2027", "2028"]
+            assert result.cache_status == "miss"
+            mock_budget_window_cache.clear_starting_claim.assert_called_once_with(
+                "budget-window-cache-key", MOCK_PROCESS_ID
+            )
+            mock_budget_window_cache.store_batch_job_id.assert_not_called()
+
+        def test__given_modal_server_error_on_batch_submission__raises(
+            self,
+            economy_service,
+            base_params,
+            mock_simulation_api,
+            mock_budget_window_cache,
+        ):
+            mock_simulation_api.run_budget_window_batch.side_effect = (
+                make_http_status_error(500, {"detail": "gateway unavailable"})
+            )
+
+            with pytest.raises(httpx.HTTPStatusError):
+                economy_service.get_budget_window_economic_impact(**base_params)
+
+            mock_budget_window_cache.clear_starting_claim.assert_called_once_with(
+                "budget-window-cache-key", MOCK_PROCESS_ID
+            )
+            mock_budget_window_cache.store_batch_job_id.assert_not_called()
+
         def test__given_cliff_target__raises_value_error(
             self, economy_service, base_params
         ):