Strengthen budget-window integration coverage

Author: anth-volk

projects/policyengine-api-simulation/src/modal/app.py

@@ -39,6 +39,7 @@ def get_app_name(us_version: str, uk_version: str) -> str:
 # Secrets
 # GCP credentials are shared across environments (always from main)
 gcp_secret = modal.Secret.from_name("gcp-credentials", environment_name="main")
+data_secret = modal.Secret.from_name("policyengine-data-credentials")
 # Logfire secret is environment-specific
 logfire_secret = modal.Secret.from_name("policyengine-logfire")
 
@@ -80,7 +81,7 @@ def configure_logfire(service_name: str = "policyengine-simulation"):
     timeout=3600,
     retries=0,
     max_containers=100,
-    secrets=[gcp_secret, logfire_secret],
+    secrets=[gcp_secret, data_secret, logfire_secret],
 )
 def run_simulation(params: dict) -> dict:
     """
@@ -118,7 +119,7 @@ def run_simulation(params: dict) -> dict:
     timeout=3600,
     retries=0,
     max_containers=100,
-    secrets=[gcp_secret, logfire_secret],
+    secrets=[gcp_secret, data_secret, logfire_secret],
 )
 def run_budget_window_batch(params: dict) -> dict:
     """Execute a multi-year budget-window batch orchestration."""

projects/policyengine-apis-integ/tests/simulation/test_budget_window.py

@@ -14,9 +14,28 @@
 from policyengine_api_simulation_client.models import (
     BudgetWindowBatchSubmitResponse,
     BudgetWindowResult,
+    SingleYearMacroOutput,
 )
 from policyengine_api_simulation_client.types import Unset
 
+SINGLE_YEAR_MACRO_OUTPUT_KEYS = {
+    "budget",
+    "detailed_budget",
+    "decile",
+    "inequality",
+    "poverty",
+    "poverty_by_gender",
+    "poverty_by_race",
+    "intra_decile",
+    "wealth_decile",
+    "intra_wealth_decile",
+    "labor_supply_response",
+    "constituency_impact",
+    "local_authority_impact",
+    "congressional_district_impact",
+    "cliff_impact",
+}
+
 
 @pytest.mark.beta_only
 def test_budget_window_multi_year_batch_completes(
@@ -61,11 +80,24 @@ def test_budget_window_multi_year_batch_completes(
     assert result.end_year == budget_window_years[-1]
     assert result.window_size == len(budget_window_years)
     assert result.years == budget_window_years
+    result_payload = result.to_dict()
+    assert "annualImpacts" not in result_payload
+    assert "outputsByYear" in result_payload
+
     outputs_by_year = result.outputs_by_year
     assert not isinstance(outputs_by_year, Unset)
     assert outputs_by_year.additional_keys == budget_window_years
-    assert all(
-        outputs_by_year[year].budget.budgetary_impact is not None
-        for year in budget_window_years
-    )
+    for year in budget_window_years:
+        output = outputs_by_year[year]
+        assert isinstance(output, SingleYearMacroOutput)
+        output_payload = output.to_dict()
+        assert SINGLE_YEAR_MACRO_OUTPUT_KEYS <= set(output_payload)
+        assert output.budget.budgetary_impact is not None
+        assert isinstance(output_payload["decile"], dict)
+        assert isinstance(output_payload["inequality"], dict)
+        assert isinstance(output_payload["poverty"], dict)
+        assert isinstance(output_payload["poverty_by_gender"], dict)
+        assert isinstance(output_payload["intra_decile"], dict)
+        assert isinstance(output_payload["labor_supply_response"], dict)
+
     assert isinstance(result.totals.budgetary_impact, int | float)