policyengine-uk 2.53.0__py3-none-any.whl → 2.53.1__py3-none-any.whl

policyengine_uk/dynamics/labour_supply.py

@@ -58,7 +58,7 @@ def calculate_excluded_from_labour_supply_responses(
         | (adult_index == 0)
         | (adult_index >= count_adults + 1)
     )
-    return excluded
+    return excluded.values
 
 
 class FTEImpacts(BaseModel):
@@ -132,8 +132,9 @@ def apply_labour_supply_responses(
     )
     reform_income = sim.calculate(target_variable, year, map_to="person")
 
-    baseline_income = baseline_income.values
-    reform_income = reform_income.values
+    baseline_income = baseline_income
+    reform_income = reform_income
+    baseline_income = pd.Series(baseline_income, index=reform_income.index)
 
     # Calculate relative changes
     income_rel_change = np.where(
@@ -154,7 +155,9 @@ def apply_labour_supply_responses(
     )
 
     # Apply extensive margin responses (participation model)
-    participation_responses = apply_participation_responses(sim=sim, year=year)
+    participation_responses = (
+        None  # = apply_participation_responses(sim=sim, year=year)
+    )
 
     # Add FTE impacts to the response data
     fte_impacts = FTEImpacts(
@@ -336,11 +339,10 @@ def apply_progression_responses(
     response = response_df["total_response"].values
 
     # Apply the labour supply response to the simulation
-    # NOTE: Don't reset calculations as this breaks UC and other benefit calculations
-    # Instead, just update the employment income with the behavioral response
+    sim.reset_calculations()
     sim.set_input(input_variable, year, employment_income + response)
 
-    weight = sim.calculate("household_weight", year, map_to="person")
+    weight = sim.calculate("household_weight", year, map_to="person").values
 
     result = MicroDataFrame(df, weights=weight)
 

policyengine_uk/dynamics/progression.py

@@ -38,7 +38,7 @@ def calculate_derivative(
         Array of marginal rates clipped between 0 and 1
     """
     # Get baseline values for input variable and identify adults
-    input_variable_values = sim.calculate(input_variable, year)
+    input_variable_values = sim.calculate(input_variable, year).copy()
     adult_index = sim.calculate("adult_index")
     entity_key = sim.tax_benefit_system.variables[input_variable].entity.key
 
@@ -67,6 +67,10 @@ def calculate_derivative(
         ~pd.Series(adult_index).isin(range(1, count_adults + 1))
     ] = np.nan
 
+    # Reset simulation to original state
+    sim.reset_calculations()
+    sim.set_input(input_variable, year, input_variable_values)
+
     # Clip to ensure rates are between 0 and 1 (0% to 100% retention)
     return rel_marginal_wages.clip(0, 1)
 
@@ -96,6 +100,9 @@ def calculate_relative_income_change(
     reformed_target_values = sim.calculate(
         target_variable, year, map_to="person"
     )
+    original_target_values = pd.Series(
+        original_target_values, index=reformed_target_values.index
+    )
 
     # Calculate relative change, handling division by zero
     rel_change = (
@@ -159,6 +166,7 @@ def calculate_derivative_change(
         count_adults=count_adults,
         delta=delta,
     )
+    original_deriv = pd.Series(original_deriv, index=reformed_deriv.index)
 
     # Calculate relative and absolute changes in marginal rates
     rel_change = reformed_deriv / original_deriv - 1

policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt.py

@@ -4,67 +4,16 @@ from policyengine_uk.model_api import *
 class is_benefit_cap_exempt(Variable):
     value_type = bool
     entity = BenUnit
-    label = "Whether exempt from the benefits cap"
+    label = (
+        "Whether exempt from the benefits cap because of health or disability"
+    )
     definition_period = YEAR
     reference = "https://www.gov.uk/benefit-cap/when-youre-not-affected"
 
     def formula(benunit, period, parameters):
-        # Check if anyone in benefit unit is over state pension age
-        person = benunit.members
-        over_pension_age = person("is_SP_age", period)
-        has_pensioner = benunit.any(over_pension_age)
-
-        # UC-specific exemptions
-        # Limited capability for work and work-related activity
-        has_lcwra = benunit.any(
-            person("uc_limited_capability_for_WRA", period)
-        )
-
-        # Carer element in UC indicates caring for someone with disability
-        gets_uc_carer_element = benunit("uc_carer_element", period) > 0
-
-        # Earnings exemption for UC (£846/month = £10,152/year)
-        # Note: Only check earned income, not UC amount itself to avoid circular dependency
-        uc_earned = benunit("uc_earned_income", period)
-        earnings_threshold = 10_152
-        meets_earnings_test = uc_earned >= earnings_threshold
-
-        # Disability and carer benefits that exempt from cap
-        QUAL_PERSONAL_BENEFITS = [
-            "attendance_allowance",
-            "carers_allowance",
-            "dla",  # Disability Living Allowance (includes components)
-            "pip_dl",  # PIP daily living component
-            "pip_m",  # PIP mobility component
-            "iidb",  # Industrial injuries disability benefit
-        ]
-
-        # ESA and Working Tax Credit
-        QUAL_BENUNIT_BENEFITS = [
-            "esa_income",  # Income-based ESA
-            "working_tax_credit",  # If getting WTC, likely working enough
-        ]
-
-        qualifying_personal_benefits = add(
-            benunit, period, QUAL_PERSONAL_BENEFITS
-        )
-        qualifying_benunit_benefits = add(
-            benunit, period, QUAL_BENUNIT_BENEFITS
-        )
-
-        # Check for Armed Forces Compensation Scheme payments
-        afcs = benunit("afcs", period) > 0
-
-        # ESA contribution-based with support component
-        esa_support_component = benunit("esa_contrib", period) > 0
-
-        return (
-            has_pensioner
-            | has_lcwra
-            | gets_uc_carer_element
-            | meets_earnings_test
-            | (qualifying_personal_benefits > 0)
-            | (qualifying_benunit_benefits > 0)
-            | afcs
-            | esa_support_component
+        exempt_health = benunit(
+            "is_benefit_cap_exempt_health_disability", period
         )
+        exempt_other = benunit("is_benefit_cap_exempt_other", period)
+        exempt_earnings = benunit("is_benefit_cap_exempt_earnings", period)
+        return exempt_health | exempt_earnings | exempt_other

policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt_earnings.py

@@ -0,0 +1,66 @@
+from policyengine_uk.model_api import *
+
+
+class is_benefit_cap_exempt_earnings(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = "Whether exempt from the benefits cap for non-health/disability reasons"
+    definition_period = YEAR
+    reference = "https://www.gov.uk/benefit-cap/when-youre-not-affected"
+
+    def formula(benunit, period, parameters):
+        # Check if anyone in benefit unit is over state pension age
+        person = benunit.members
+        over_pension_age = person("is_SP_age", period)
+        has_pensioner = benunit.any(over_pension_age)
+
+        # UC-specific exemptions
+        # Limited capability for work and work-related activity
+        has_lcwra = benunit.any(
+            person("uc_limited_capability_for_WRA", period)
+        )
+
+        # Carer element in UC indicates caring for someone with disability
+        gets_uc_carer_element = benunit("uc_carer_element", period) > 0
+
+        # Earnings exemption for UC (£846/month = £10,152/year)
+        # Note: Only check earned income, not UC amount itself to avoid circular dependency
+        uc_earned = benunit.sum(
+            benunit.members("employment_income", period)
+            + benunit.members("self_employment_income", period)
+            - benunit.members("income_tax", period)
+            - benunit.members("national_insurance", period)
+        )
+        earnings_threshold = 10_152
+        meets_earnings_test = uc_earned >= earnings_threshold
+
+        # Disability and carer benefits that exempt from cap
+        QUAL_PERSONAL_BENEFITS = [
+            "attendance_allowance",
+            "carers_allowance",
+            "dla",  # Disability Living Allowance (includes components)
+            "pip_dl",  # PIP daily living component
+            "pip_m",  # PIP mobility component
+            "iidb",  # Industrial injuries disability benefit
+        ]
+
+        # ESA and Working Tax Credit
+        QUAL_BENUNIT_BENEFITS = [
+            "esa_income",  # Income-based ESA
+            "working_tax_credit",  # If getting WTC, likely working enough
+        ]
+
+        qualifying_personal_benefits = add(
+            benunit, period, QUAL_PERSONAL_BENEFITS
+        )
+        qualifying_benunit_benefits = add(
+            benunit, period, QUAL_BENUNIT_BENEFITS
+        )
+
+        # Check for Armed Forces Compensation Scheme payments
+        afcs = benunit("afcs", period) > 0
+
+        # ESA contribution-based with support component
+        esa_support_component = benunit("esa_contrib", period) > 0
+
+        return meets_earnings_test

policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt_health_disability.py

@@ -0,0 +1,75 @@
+from policyengine_uk.model_api import *
+
+
+class is_benefit_cap_exempt_health_disability(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = (
+        "Whether exempt from the benefits cap because of health or disability"
+    )
+    definition_period = YEAR
+    reference = "https://www.gov.uk/benefit-cap/when-youre-not-affected"
+
+    def formula(benunit, period, parameters):
+        # Check if anyone in benefit unit is over state pension age
+        person = benunit.members
+        over_pension_age = person("is_SP_age", period)
+        has_pensioner = benunit.any(over_pension_age)
+
+        # UC-specific exemptions
+        # Limited capability for work and work-related activity
+        has_lcwra = benunit.any(
+            person("uc_limited_capability_for_WRA", period)
+        )
+
+        # Carer element in UC indicates caring for someone with disability
+        gets_uc_carer_element = benunit("uc_carer_element", period) > 0
+
+        # Earnings exemption for UC (£846/month = £10,152/year)
+        # Note: Only check earned income, not UC amount itself to avoid circular dependency
+        uc_earned = benunit.sum(
+            benunit.members("employment_income", period)
+            + benunit.members("self_employment_income", period)
+            - benunit.members("income_tax", period)
+            - benunit.members("national_insurance", period)
+        )
+        earnings_threshold = 10_152
+        meets_earnings_test = uc_earned >= earnings_threshold
+
+        # Disability and carer benefits that exempt from cap
+        QUAL_PERSONAL_BENEFITS = [
+            "attendance_allowance",
+            "carers_allowance",
+            "dla",  # Disability Living Allowance (includes components)
+            "pip_dl",  # PIP daily living component
+            "pip_m",  # PIP mobility component
+            "iidb",  # Industrial injuries disability benefit
+        ]
+
+        # ESA and Working Tax Credit
+        QUAL_BENUNIT_BENEFITS = [
+            "esa_income",  # Income-based ESA
+            "working_tax_credit",  # If getting WTC, likely working enough
+        ]
+
+        qualifying_personal_benefits = add(
+            benunit, period, QUAL_PERSONAL_BENEFITS
+        )
+        qualifying_benunit_benefits = add(
+            benunit, period, QUAL_BENUNIT_BENEFITS
+        )
+
+        # Check for Armed Forces Compensation Scheme payments
+        afcs = benunit("afcs", period) > 0
+
+        # ESA contribution-based with support component
+        esa_support_component = benunit("esa_contrib", period) > 0
+
+        return (
+            has_lcwra
+            | gets_uc_carer_element
+            | (qualifying_personal_benefits > 0)
+            | (qualifying_benunit_benefits > 0)
+            | afcs
+            | esa_support_component
+        )

policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt_other.py

@@ -0,0 +1,66 @@
+from policyengine_uk.model_api import *
+
+
+class is_benefit_cap_exempt_other(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = "Whether exempt from the benefits cap for non-health/disability reasons"
+    definition_period = YEAR
+    reference = "https://www.gov.uk/benefit-cap/when-youre-not-affected"
+
+    def formula(benunit, period, parameters):
+        # Check if anyone in benefit unit is over state pension age
+        person = benunit.members
+        over_pension_age = person("is_SP_age", period)
+        has_pensioner = benunit.any(over_pension_age)
+
+        # UC-specific exemptions
+        # Limited capability for work and work-related activity
+        has_lcwra = benunit.any(
+            person("uc_limited_capability_for_WRA", period)
+        )
+
+        # Carer element in UC indicates caring for someone with disability
+        gets_uc_carer_element = benunit("uc_carer_element", period) > 0
+
+        # Earnings exemption for UC (£846/month = £10,152/year)
+        # Note: Only check earned income, not UC amount itself to avoid circular dependency
+        uc_earned = benunit.sum(
+            benunit.members("employment_income", period)
+            + benunit.members("self_employment_income", period)
+            - benunit.members("income_tax", period)
+            - benunit.members("national_insurance", period)
+        )
+        earnings_threshold = 10_152
+        meets_earnings_test = uc_earned >= earnings_threshold
+
+        # Disability and carer benefits that exempt from cap
+        QUAL_PERSONAL_BENEFITS = [
+            "attendance_allowance",
+            "carers_allowance",
+            "dla",  # Disability Living Allowance (includes components)
+            "pip_dl",  # PIP daily living component
+            "pip_m",  # PIP mobility component
+            "iidb",  # Industrial injuries disability benefit
+        ]
+
+        # ESA and Working Tax Credit
+        QUAL_BENUNIT_BENEFITS = [
+            "esa_income",  # Income-based ESA
+            "working_tax_credit",  # If getting WTC, likely working enough
+        ]
+
+        qualifying_personal_benefits = add(
+            benunit, period, QUAL_PERSONAL_BENEFITS
+        )
+        qualifying_benunit_benefits = add(
+            benunit, period, QUAL_BENUNIT_BENEFITS
+        )
+
+        # Check for Armed Forces Compensation Scheme payments
+        afcs = benunit("afcs", period) > 0
+
+        # ESA contribution-based with support component
+        esa_support_component = benunit("esa_contrib", period) > 0
+
+        return has_pensioner | afcs | esa_support_component

{policyengine_uk-2.53.0.dist-info → policyengine_uk-2.53.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine-uk
-Version: 2.53.0
+Version: 2.53.1
 Summary: PolicyEngine tax and benefit system for the UK.
 Project-URL: Homepage, https://github.com/PolicyEngine/policyengine-uk
 Project-URL: Repository, https://github.com/PolicyEngine/policyengine-uk

{policyengine_uk-2.53.0.dist-info → policyengine_uk-2.53.1.dist-info}/RECORD

@@ -10,9 +10,9 @@ policyengine_uk/data/__init__.py,sha256=J0bZ3WnvPzZ4qfVLYcwOc4lziMUMdbcMqJ3xwjoe
 policyengine_uk/data/dataset_schema.py,sha256=781beGVnPWJhw2FzcG6he-LtmgxtwS1h6keAz7TPoXI,10036
 policyengine_uk/data/economic_assumptions.py,sha256=U3wyBs4zVI5-bcMB-GivELC1qG-895l5NPds3cuWb90,6239
 policyengine_uk/data/uprating_indices.yaml,sha256=kQtfeGWyqge4dbJhs0iF4kTMqovuegill_Zfs8orJi4,2394
-policyengine_uk/dynamics/labour_supply.py,sha256=PlmYTGo6G-bZoazB2slpD35F2Wq5dIGlUJOzjc1dnSw,12283
+policyengine_uk/dynamics/labour_supply.py,sha256=o2UIljuEx1tesZj5n_gzbBqvMzbF8Ko5_VVS5Ky6gP0,12250
 policyengine_uk/dynamics/participation.py,sha256=g5xUqg-Nj2lQny9GrUfI2D_swLx0-9k-486NXtcWwbM,23238
-policyengine_uk/dynamics/progression.py,sha256=4Wl3ZE-bYxNTMVGeOGFh22lYtHGPCarrhp8JzuLQs7I,13738
+policyengine_uk/dynamics/progression.py,sha256=ViyOrpn4uOfYW43sCuBcLP8KiJ5hZyhblEV_BIEUtnQ,14067
 policyengine_uk/parameters/gov/README.md,sha256=bHUep1_2pLHD3Or8SwjStOWXDIbW9OuYxOd4ml8IXcM,13
 policyengine_uk/parameters/gov/benefit_uprating_cpi.yaml,sha256=2zOSdJeUhDZYYsKE2vLkcK-UbKNoOSVwfac0QIAp02g,250
 policyengine_uk/parameters/gov/contrib/README.md,sha256=b282dmUFAmj7cXSfiMLyE81q5Y0Gnehy-6atLus-ESs,70
@@ -846,7 +846,10 @@ policyengine_uk/variables/gov/dwp/is_CTC_child_limit_exempt.py,sha256=_kSBwtMuTL
 policyengine_uk/variables/gov/dwp/is_CTC_eligible.py,sha256=eDWw_fj_dAvE8zZ4XStvxUd06D_D9goDMqvnL1ILTvo,565
 policyengine_uk/variables/gov/dwp/is_SP_age.py,sha256=yiDWUA5FicwN4PSXVQ9CDXwONj96LFtlsGoT22kYH8s,364
 policyengine_uk/variables/gov/dwp/is_WTC_eligible.py,sha256=Oc0ZyQYK09U4PQv00HZtVhXMxh5MQGs3s4M-VjJvv_g,2020
-policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt.py,sha256=jtaAEjRjhesm6UpauO6Th1FteO-Dkt5g7u7qlrdf1hs,2548
+policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt.py,sha256=Q1_t-Hxg18LX39wTB-Sjc3ItDXRHh3FTHqY8_R64CPg,685
+policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt_earnings.py,sha256=CK64_j_Cq7-aF8sCDUXRUf7mAJiodjlyeF3BdFG4Zvk,2547
+policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt_health_disability.py,sha256=4PeVQHBrtbtUlCVOJX5tmxhqKdmAwqtPJY91wPqtaIQ,2772
+policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt_other.py,sha256=5nfrcIMwAV3Q67yMOpFMP4Bjyus9y4AKQr5Uh_G363M,2569
 policyengine_uk/variables/gov/dwp/is_child_for_CTC.py,sha256=p1vdgGohyqRWy-0nppBa5McUr3alDPIwWZl9vC_NDWk,336
 policyengine_uk/variables/gov/dwp/jsa.py,sha256=2m9V-fwcawZzpOLC6TyWEl-Odze9E6vLH5E2h26kBQA,254
 policyengine_uk/variables/gov/dwp/jsa_contrib.py,sha256=6rdONNAAl2OYAmGfLxx2RNo2g0OyMzCn5Fd-S7GHizQ,234
@@ -1387,7 +1390,7 @@ policyengine_uk/variables/misc/spi_imputed.py,sha256=iPVlBF_TisM0rtKvO-3-PQ2UYCe
 policyengine_uk/variables/misc/uc_migrated.py,sha256=zFNcUJaO8gwmbL1iY9GKgUt3G6J9yrCraqBV_5dCvlM,306
 policyengine_uk/variables/misc/categories/lower_middle_or_higher.py,sha256=C54tHYz2DmOyvQYCC1bF8RJwRZinhAq_e3aYC-9F5fM,157
 policyengine_uk/variables/misc/categories/lower_or_higher.py,sha256=81NIbLLabRr9NwjpUZDuV8IV8_mqmp5NM-CZvt55TwE,129
-policyengine_uk-2.53.0.dist-info/METADATA,sha256=-kXsAiFqG1qpcQFlhI7kakfoHjCZNNZA-9zENg0zoUY,3995
-policyengine_uk-2.53.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_uk-2.53.0.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-policyengine_uk-2.53.0.dist-info/RECORD,,
+policyengine_uk-2.53.1.dist-info/METADATA,sha256=BM9ZVTfzvrBkhIgH46wifXufZNvNxUd7PBjRcVMmLn0,3995
+policyengine_uk-2.53.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_uk-2.53.1.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+policyengine_uk-2.53.1.dist-info/RECORD,,