Fix US analysis output mismatches and row filter typing

Author: PavelMakarchuk

docs/country-models-us.md

@@ -26,7 +26,7 @@ Individual people with demographic and income characteristics.
 - `social_security`: Annual Social Security benefits
 - `ssi`: Annual Supplemental Security Income
 - `medicaid`: Annual Medicaid value
-- `medicare`: Annual Medicare value
+- `medicare_cost`: Annual Medicare value
 - `unemployment_compensation`: Annual unemployment benefits
 
 ### Tax unit

docs/economic-impact-analysis.md

@@ -138,7 +138,7 @@ for d in analysis.decile_impacts.outputs:
 
 Per-programme totals, changes, and winner/loser counts.
 
-**US programs analysed:** `income_tax`, `payroll_tax`, `state_income_tax`, `snap`, `tanf`, `ssi`, `social_security`, `medicare`, `medicaid`, `eitc`, `ctc`
+**US programs analysed:** `income_tax`, `employee_payroll_tax`, `state_income_tax`, `snap`, `tanf`, `ssi`, `social_security`, `medicare_cost`, `medicaid`, `eitc`, `ctc`
 
 **UK programmes analysed:** `income_tax`, `national_insurance`, `vat`, `council_tax`, `universal_credit`, `child_benefit`, `pension_credit`, `income_support`, `working_tax_credit`, `child_tax_credit`
 

src/policyengine/core/scoping_strategy.py

@@ -12,7 +12,7 @@
 import logging
 from abc import abstractmethod
 from pathlib import Path
-from typing import Annotated, Literal
+from typing import Annotated, Any, Literal
 
 import h5py
 import numpy as np
@@ -69,7 +69,7 @@ class RowFilterStrategy(RegionScopingStrategy):
 
     strategy_type: Literal["row_filter"] = "row_filter"
     variable_name: str
-    variable_value: str
+    variable_value: Any
 
     def apply(
         self,

src/policyengine/tax_benefit_models/us/analysis.py

@@ -227,15 +227,15 @@ def economic_impact_analysis(
     programs = {
         # Federal taxes
         "income_tax": {"entity": "tax_unit", "is_tax": True},
-        "employee_payroll_tax": {"entity": "person", "is_tax": True},
+        "employee_payroll_tax": {"entity": "tax_unit", "is_tax": True},
         # State and local taxes
         "state_income_tax": {"entity": "tax_unit", "is_tax": True},
         # Benefits
         "snap": {"entity": "spm_unit", "is_tax": False},
         "tanf": {"entity": "spm_unit", "is_tax": False},
         "ssi": {"entity": "person", "is_tax": False},
         "social_security": {"entity": "person", "is_tax": False},
-        "medicare": {"entity": "person", "is_tax": False},
+        "medicare_cost": {"entity": "person", "is_tax": False},
         "medicaid": {"entity": "person", "is_tax": False},
         "eitc": {"entity": "tax_unit", "is_tax": False},
         "ctc": {"entity": "tax_unit", "is_tax": False},

src/policyengine/tax_benefit_models/us/model.py

@@ -75,6 +75,7 @@ class PolicyEngineUSLatest(TaxBenefitModelVersion):
             # Benefits
             "ssi",
             "social_security",
+            "medicare_cost",
             "medicaid",
             "unemployment_compensation",
         ],
@@ -101,6 +102,7 @@ class PolicyEngineUSLatest(TaxBenefitModelVersion):
             "tax_unit_weight",
             "income_tax",
             "employee_payroll_tax",
+            "state_income_tax",
             "household_state_income_tax",
             "eitc",
             "ctc",