Apply five year forward checks with utility function

changelog_entry.yaml

@@ -0,0 +1,4 @@
+- bump: minor
+  changes:
+    added:
+      - Add five-year-forward check on all reforms

policyengine_us/reforms/biden/budget_2025/capital_gains_tax_increase.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_capital_gains_tax_increase() -> Reform:
     class capital_gains_tax(Variable):
@@ -145,8 +145,9 @@ def create_capital_gains_tax_increase_reform(
         return create_capital_gains_tax_increase()
 
     p = parameters(period).gov.contrib.biden.budget_2025.capital_gains
+    reform_active = is_reform_active(p, period, "active")
 
-    if p.active:
+    if reform_active:
         return create_capital_gains_tax_increase()
     else:
         return None

policyengine_us/reforms/biden/budget_2025/medicare_and_investment_tax_increase.py

@@ -1,4 +1,5 @@
 from policyengine_us.model_api import *
+from policyengine_core.periods import period as period_
 
 
 def create_medicare_and_investment_tax_increase() -> Reform:
@@ -75,8 +76,19 @@ def create_medicare_and_investment_tax_increase_reform(
         return create_medicare_and_investment_tax_increase()
 
     p = parameters(period).gov.contrib.biden.budget_2025
+    current_period = period_(period)
+    reform_active = False
 
-    if (p.medicare.rate > 0) | (p.net_investment_income.rate > 0):
+    for i in range(5):
+        if (
+            p(current_period).medicare.rate > 0
+            or p(current_period).net_investment_income.rate > 0
+        ):
+            reform_active = True
+            break
+        current_period = current_period.offset(1, "year")
+
+    if reform_active:
         return create_medicare_and_investment_tax_increase()
     else:
         return None

policyengine_us/reforms/cbo/payroll/increase_taxable_earnings_for_social_security.py

@@ -1,4 +1,5 @@
 from policyengine_us.model_api import *
+from policyengine_core.periods import period as period_
 
 
 def create_increase_taxable_earnings_for_social_security() -> Reform:
@@ -33,8 +34,16 @@ def create_increase_taxable_earnings_for_social_security_reform(
         return create_increase_taxable_earnings_for_social_security()
 
     p = parameters(period).gov.contrib.cbo.payroll
+    current_period = period_(period)
+    reform_active = False
 
-    if p.secondary_earnings_threshold < np.inf:
+    for i in range(5):
+        if p(current_period).secondary_earnings_threshold < np.inf:
+            reform_active = True
+            break
+        current_period = current_period.offset(1, "year")
+
+    if reform_active:
         return create_increase_taxable_earnings_for_social_security()
     else:
         return None

policyengine_us/reforms/congress/romney/family_security_act/remove_head_of_household.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-from policyengine_core.periods import period as period_
+from reforms.utilities import is_reform_active
 
 
 def create_remove_head_of_household() -> Reform:
@@ -18,14 +18,7 @@ def create_remove_head_of_household_reform(
 
     # Look ahead for the next five years
     p = parameters.gov.contrib.congress.romney.family_security_act
-    reform_active = False
-    current_period = period_(period)
-
-    for i in range(5):
-        if p(current_period).remove_head_of_household:
-            reform_active = True
-            break
-        current_period = current_period.offset(1, "year")
+    reform_active = is_reform_active(p, period, "remove_head_of_household")
 
     if reform_active:
         return create_remove_head_of_household()

policyengine_us/reforms/congress/romney/family_security_act_2024/ctc/family_security_act_2024_ctc.py

@@ -1,6 +1,5 @@
 from policyengine_us.model_api import *
-from policyengine_core.periods import period as period_
-
+from reforms.utilities import is_reform_active
 
 def create_family_security_act_2024_ctc() -> Reform:
     class ctc_phase_in_rate(Variable):
@@ -147,14 +146,7 @@ def create_family_security_act_2024_ctc_reform(
 
     # Look ahead for the next five years
     p = parameters.gov.contrib.congress.romney.family_security_act_2_0.ctc
-    reform_active = False
-    current_period = period_(period)
-
-    for i in range(5):
-        if p(current_period).apply_ctc_structure:
-            reform_active = True
-            break
-        current_period = current_period.offset(1, "year")
+    reform_active = is_reform_active(p, period, "apply_ctc_structure")
 
     if reform_active:
         return create_family_security_act_2024_ctc()

policyengine_us/reforms/congress/romney/family_security_act_2024/eitc/family_security_act_2024_eitc.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-from policyengine_core.periods import period as period_
+from reforms.utilities import is_reform_active
 
 
 def create_family_security_act_2024_eitc() -> Reform:
@@ -38,14 +38,7 @@ def create_family_security_act_2024_eitc_reform(
 
     # Look ahead for the next five years
     p = parameters.gov.contrib.congress.romney.family_security_act_2_0.eitc
-    reform_active = False
-    current_period = period_(period)
-
-    for i in range(5):
-        if p(current_period).apply_eitc_structure:
-            reform_active = True
-            break
-        current_period = current_period.offset(1, "year")
+    reform_active = is_reform_active(p, period, "apply_eitc_structure")
 
     if reform_active:
         return create_family_security_act_2024_eitc()

policyengine_us/reforms/congress/tlaib/boost/boost_middle_class_tax_credit.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_boost_middle_class_tax_credit() -> Reform:
     class boost_middle_class_tax_credit(Variable):
@@ -147,8 +147,9 @@ def create_boost_middle_class_tax_credit_reform(
         return create_boost_middle_class_tax_credit()
 
     p = parameters(period).gov.contrib.harris.lift.middle_class_tax_credit
+    reform_active = is_reform_active(p, period)
 
-    if p.in_effect:
+    if reform_active:
         return create_boost_middle_class_tax_credit()
     else:
         return None

policyengine_us/reforms/congress/tlaib/end_child_poverty_act.py

@@ -1,4 +1,5 @@
 from policyengine_us.model_api import *
+from reforms.utilities import is_reform_active
 
 
 def create_end_child_poverty_act() -> Reform:
@@ -180,8 +181,9 @@ def create_end_child_poverty_act_reform(
         return create_end_child_poverty_act()
 
     p = parameters(period).gov.contrib.congress.tlaib.end_child_poverty_act
+    reform_active = is_reform_active(p, period)
 
-    if p.in_effect:
+    if reform_active:
         return create_end_child_poverty_act()
     else:
         return None

policyengine_us/reforms/congress/wyden_smith/ctc_expansion.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-from policyengine_core.periods import period as period_
+from reforms.utilities import is_reform_active
 
 
 def create_ctc_expansion() -> Reform:
@@ -111,18 +111,7 @@ def create_ctc_expansion_reform(parameters, period, bypass: bool = False):
     # Look ahead for the next five years
 
     p = parameters.gov.contrib.congress.wyden_smith
-
-    reform_active = False
-    current_period = period_(period)
-
-    for i in range(5):
-        if (
-            p(current_period).actc_lookback
-            or p(current_period).per_child_actc_phase_in
-        ):
-            reform_active = True
-            break
-        current_period = current_period.offset(1, "year")
+    reform_active = is_reform_active(p, period, "actc_lookback") or is_reform_active(p, period, "per_child_actc_phase_in")
 
     if reform_active:
         return create_ctc_expansion()

policyengine_us/reforms/dc_kccatc.py

@@ -1,7 +1,7 @@
 from policyengine_us.model_api import *
+from reforms.utilities import is_reform_active
 
-
-def create_dc_kccatc_reform(parameters, period, bypass=False):
+def create_dc_kccatc():
     class dc_kccatc(Variable):
         value_type = float
         entity = TaxUnit
@@ -87,8 +87,18 @@ class reform(Reform):
         def apply(self):
             self.update_variable(dc_kccatc)
 
-    if bypass or parameters(period).gov.contrib.dc_kccatc.active:
-        return reform
+    return reform
+
+
+def create_dc_kccatc_reform(parameters, period, bypass=False):
+    if bypass:
+        return create_dc_kccatc()
+
+    p = parameters(period).gov.contrib.dc_kccatc
+    reform_active = is_reform_active(p, period, "active")
+
+    if reform_active:
+        return create_dc_kccatc()
     else:
         return None
 

policyengine_us/reforms/eitc/halve_joint_eitc_phase_out_rate.py

@@ -1,4 +1,5 @@
 from policyengine_us.model_api import *
+from reforms.utilities import is_reform_active
 
 
 def create_halve_joint_eitc_phase_out_rate() -> Reform:
@@ -32,8 +33,9 @@ def create_halve_joint_eitc_phase_out_rate_reform(
         return create_halve_joint_eitc_phase_out_rate()
 
     p = parameters(period).gov.contrib.joint_eitc
+    reform_active = is_reform_active(p, period)
 
-    if p.in_effect:
+    if reform_active:
         return create_halve_joint_eitc_phase_out_rate()
     else:
         return None

policyengine_us/reforms/federal/abolish_federal_income_tax.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_abolish_federal_income_tax() -> Reform:
     class household_tax_before_refundable_credits(Variable):
@@ -54,8 +54,9 @@ def create_abolish_federal_income_tax_reform(
         return create_abolish_federal_income_tax()
 
     p = parameters(period).gov.contrib.ubi_center.flat_tax
+    reform_active = is_reform_active(p, period, "abolish_federal_income_tax")
 
-    if p.abolish_federal_income_tax:
+    if reform_active:
         return create_abolish_federal_income_tax()
     else:
         return None

policyengine_us/reforms/federal/abolish_payroll_tax.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_abolish_payroll_tax() -> Reform:
     class household_tax_before_refundable_credits(Variable):
@@ -34,8 +34,9 @@ def create_abolish_payroll_tax_reform(
         return create_abolish_payroll_tax()
 
     p = parameters(period).gov.contrib.ubi_center.flat_tax
+    reform_active = is_reform_active(p, period, "abolish_payroll_tax")
 
-    if p.abolish_payroll_tax:
+    if reform_active:
         return create_abolish_payroll_tax()
     else:
         return None

policyengine_us/reforms/federal/reported_state_income_tax.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_reported_state_income_tax() -> Reform:
     class household_tax_before_refundable_credits(Variable):
@@ -61,8 +61,9 @@ def create_reported_state_income_tax_reform(
         return create_reported_state_income_tax()
 
     p = parameters(period).simulation
+    reform_active = is_reform_active(p, period, "reported_state_income_tax")
 
-    if p.reported_state_income_tax:
+    if reform_active:
         return create_reported_state_income_tax()
     else:
         return None

policyengine_us/reforms/harris/lift/middle_class_tax_credit.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_middle_class_tax_credit() -> Reform:
     class middle_class_tax_credit(Variable):
@@ -61,8 +61,9 @@ def create_middle_class_tax_credit_reform(
         return create_middle_class_tax_credit()
 
     p = parameters(period).gov.contrib.harris.lift.middle_class_tax_credit
+    reform_active = is_reform_active(p, period)
 
-    if p.in_effect:
+    if reform_active:
         return create_middle_class_tax_credit()
     else:
         return None

policyengine_us/reforms/harris/rent_relief_act/rent_relief_tax_credit.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_rent_relief_tax_credit() -> Reform:
     class rent_relief_tax_credit(Variable):
@@ -83,8 +83,9 @@ def create_rent_relief_tax_credit_reform(
     p = parameters(
         period
     ).gov.contrib.harris.rent_relief_act.rent_relief_credit
+    reform_active = is_reform_active(p, period)
 
-    if p.in_effect:
+    if reform_active:
         return create_rent_relief_tax_credit()
     else:
         return None

policyengine_us/reforms/local/nyc/stc/adjust_income_limit_by_filing_status_and_eligibility_by_children.py

@@ -1,5 +1,5 @@
 from policyengine_us.model_api import *
-
+from reforms.utilities import is_reform_active
 
 def create_adjust_income_limit_and_min_children_by_filing_status() -> Reform:
     class nyc_school_tax_credit_eligible(Variable):
@@ -55,8 +55,9 @@ def create_adjust_income_limit_by_filing_status_and_eligibility_by_children_refo
         return create_adjust_income_limit_and_min_children_by_filing_status()
 
     p = parameters(period).gov.contrib.local.nyc.stc
+    reform_active = is_reform_active(p, period, "adjust_income_limit_by_filing_status_and_eligibility_by_children")
 
-    if p.adjust_income_limit_by_filing_status_and_eligibility_by_children:
+    if reform_active:
         return create_adjust_income_limit_and_min_children_by_filing_status()
     else:
         return None

policyengine_us/reforms/states/dc/dc_ctc.py

@@ -1,6 +1,5 @@
 from policyengine_us.model_api import *
-from policyengine_core.periods import period as period_
-
+from reforms.utilities import is_reform_active
 
 def create_dc_ctc() -> Reform:
     class dc_ctc(Variable):
@@ -61,14 +60,12 @@ def create_dc_ctc_reform(parameters, period, bypass: bool = False):
         return create_dc_ctc()
 
     p = parameters.gov.contrib.states.dc.ctc
+    reform_active = is_reform_active(p, period)
 
-    current_period = period_(period)
-
-    for i in range(5):
-        if p(current_period).in_effect:
-            return create_dc_ctc()
-        current_period = current_period.offset(1, "year")
-    return None
+    if reform_active:
+        return create_dc_ctc()
+    else:
+        return None
 
 
 dc_ctc = create_dc_ctc_reform(None, None, bypass=True)