Tighten FastAPI shell review follow-ups

Author: anth-volk

policyengine_api/services/economy_service.py

@@ -78,6 +78,7 @@ class ImpactStatus(Enum):
 BUDGET_WINDOW_MAX_ACTIVE_YEARS = budget_window_utils.BUDGET_WINDOW_MAX_ACTIVE_YEARS
 BUDGET_WINDOW_MAX_YEARS = budget_window_utils.BUDGET_WINDOW_MAX_YEARS
 BUDGET_WINDOW_MAX_END_YEAR = budget_window_utils.BUDGET_WINDOW_MAX_END_YEAR
+BUDGET_WINDOW_SUBMISSION_VALIDATION_ERROR_STATUS_CODES = {400, 422}
 
 
 class EconomicImpactSetupOptions(BaseModel):
@@ -351,7 +352,10 @@ def get_budget_window_economic_impact(
                     )
                 except httpx.HTTPStatusError as error:
                     budget_window_cache.clear_starting_claim(cache_key, claim_token)
-                    if 400 <= error.response.status_code < 500:
+                    if (
+                        error.response.status_code
+                        in BUDGET_WINDOW_SUBMISSION_VALIDATION_ERROR_STATUS_CODES
+                    ):
                         return BudgetWindowEconomicImpactResult.failed(
                             self._build_budget_window_submission_error_message(error),
                             queued_years=years,

tests/unit/services/test_economy_service.py

@@ -1024,15 +1024,17 @@ 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(
+        @pytest.mark.parametrize("status_code", [400, 422])
+        def test__given_modal_rejects_batch_submission_for_validation__returns_failed_result(
             self,
             economy_service,
             base_params,
             mock_simulation_api,
             mock_budget_window_cache,
+            status_code,
         ):
             mock_simulation_api.run_budget_window_batch.side_effect = make_http_status_error(
-                400,
+                status_code,
                 {
                     "detail": (
                         "Invalid Hugging Face dataset URI: "
@@ -1058,15 +1060,17 @@ def test__given_modal_rejects_batch_submission__returns_failed_result(
             )
             mock_budget_window_cache.store_batch_job_id.assert_not_called()
 
-        def test__given_modal_server_error_on_batch_submission__raises(
+        @pytest.mark.parametrize("status_code", [401, 403, 429, 500])
+        def test__given_modal_non_validation_error_on_batch_submission__raises(
             self,
             economy_service,
             base_params,
             mock_simulation_api,
             mock_budget_window_cache,
+            status_code,
         ):
             mock_simulation_api.run_budget_window_batch.side_effect = (
-                make_http_status_error(500, {"detail": "gateway unavailable"})
+                make_http_status_error(status_code, {"detail": "gateway unavailable"})
             )
 
             with pytest.raises(httpx.HTTPStatusError):

tests/unit/test_asgi_factory.py

@@ -1,4 +1,6 @@
+import importlib
 import json
+import sys
 
 from fastapi.testclient import TestClient
 from flask import Flask, Response, jsonify, make_response, request
@@ -54,6 +56,18 @@ def test_native_health_route_is_fastapi_json():
     assert response.headers["content-type"].startswith("application/json")
 
 
+def test_asgi_entrypoint_imports_and_serves_health(monkeypatch):
+    monkeypatch.setenv("FLASK_DEBUG", "1")
+    sys.modules.pop("policyengine_api.asgi", None)
+
+    asgi_module = importlib.import_module("policyengine_api.asgi")
+    response = TestClient(asgi_module.app).get("/health")
+
+    assert asgi_module.application is asgi_module.app
+    assert response.status_code == 200
+    assert response.json() == {"status": "healthy"}
+
+
 def test_fastapi_documentation_routes_fall_through_to_flask_404():
     client = TestClient(create_asgi_app(create_test_wsgi_app()))