policyengine-uk 2.54.1__py3-none-any.whl → 2.55.0__py3-none-any.whl

policyengine_uk/data/economic_assumptions.py

@@ -9,6 +9,7 @@ import logging
 
 def extend_single_year_dataset(
     dataset: UKSingleYearDataset,
+    tax_benefit_system_parameters: ParameterNode,
     end_year: int = 2030,
 ) -> UKMultiYearDataset:
     # Extend years and uprate
@@ -19,11 +20,15 @@ def extend_single_year_dataset(
         next_year.time_period = str(year)
         datasets.append(next_year)
     multi_year_dataset = UKMultiYearDataset(datasets=datasets)
-    return apply_uprating(multi_year_dataset)
+    return apply_uprating(
+        multi_year_dataset,
+        tax_benefit_system_parameters=tax_benefit_system_parameters,
+    )
 
 
 def apply_uprating(
     dataset: UKMultiYearDataset,
+    tax_benefit_system_parameters: ParameterNode = None,
 ):
     from policyengine_uk.system import system
 
@@ -38,7 +43,9 @@ def apply_uprating(
             continue  # Don't uprate the first year
         current_year = dataset.datasets[year]
         prev_year = dataset.datasets[year - 1]
-        apply_single_year_uprating(current_year, prev_year, system.parameters)
+        apply_single_year_uprating(
+            current_year, prev_year, tax_benefit_system_parameters
+        )
 
     return dataset
 

policyengine_uk/simulation.py

@@ -84,6 +84,12 @@ class Simulation(CoreSimulation):
 
         self.branches: Dict[str, Simulation] = {}
 
+        if scenario is not None:
+            if scenario.parameter_changes is not None:
+                self.apply_parameter_changes(scenario.parameter_changes)
+            if scenario.simulation_modifier is not None:
+                scenario.simulation_modifier(self)
+
         # Build simulation from appropriate source
         if situation is not None:
             self.build_from_situation(situation)
@@ -129,12 +135,6 @@ class Simulation(CoreSimulation):
         else:
             self.baseline = self.clone()
 
-        if scenario is not None:
-            if scenario.parameter_changes is not None:
-                self.apply_parameter_changes(scenario.parameter_changes)
-            if scenario.simulation_modifier is not None:
-                scenario.simulation_modifier(self)
-
         self.calculated_periods = []
 
     def reset_calculations(self):
@@ -321,7 +321,9 @@ class Simulation(CoreSimulation):
         dataset = UKSingleYearDataset.from_simulation(
             self, fiscal_year=first_time_period
         )
-        multi_year_dataset = extend_single_year_dataset(dataset)
+        multi_year_dataset = extend_single_year_dataset(
+            dataset, self.tax_benefit_system.parameters
+        )
 
         self.build_from_multi_year_dataset(multi_year_dataset)
         self.dataset = multi_year_dataset
@@ -335,7 +337,9 @@ class Simulation(CoreSimulation):
             dataset: UKSingleYearDataset containing one year of data
         """
 
-        dataset = extend_single_year_dataset(dataset)
+        dataset = extend_single_year_dataset(
+            dataset, self.tax_benefit_system.parameters
+        )
         self.build_from_multi_year_dataset(dataset)
         self.dataset = dataset
 

policyengine_uk/variables/gov/dwp/additional_state_pension.py

@@ -12,8 +12,10 @@ class additional_state_pension(Variable):
         simulation = person.simulation
         if simulation.dataset is None:
             return 0
-
-        data_year = 2023
+        try:
+            data_year = min(simulation.dataset.years)
+        except:
+            data_year = period.year
         reported = person("state_pension_reported", data_year) / WEEKS_IN_YEAR
         type = person("state_pension_type", data_year)
         maximum_basic_sp = parameters(

policyengine_uk/variables/gov/dwp/basic_state_pension.py

@@ -12,8 +12,10 @@ class basic_state_pension(Variable):
         simulation = person.simulation
         if simulation.dataset is None:
             return 0
-
-        data_year = 2023
+        try:
+            data_year = min(simulation.dataset.years)
+        except:
+            data_year = period.year
         reported = person("state_pension_reported", data_year) / WEEKS_IN_YEAR
         type = person("state_pension_type", period)
         maximum_basic_sp = parameters(

policyengine_uk/variables/household/post_tax_income.py

@@ -0,0 +1,12 @@
+from policyengine_uk.model_api import *
+
+
+class post_tax_income(Variable):
+    label = "post-tax income"
+    documentation = "The income of a household after taxes have been deducted."
+    entity = Household
+    definition_period = YEAR
+    value_type = float
+    unit = GBP
+    adds = ["total_income"]
+    subtracts = ["income_tax", "national_insurance"]

{policyengine_uk-2.54.1.dist-info → policyengine_uk-2.55.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine-uk
-Version: 2.54.1
+Version: 2.55.0
 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.54.1.dist-info → policyengine_uk-2.55.0.dist-info}/RECORD

@@ -3,12 +3,12 @@ policyengine_uk/entities.py,sha256=9yUbkUWQr3WydNE-gHhUudG97HGyXIZY3dkgQ6Z3t9A,1
 policyengine_uk/microsimulation.py,sha256=WskrrDrLGfDYwS1CzFk5rJkQSQlTknLkxFufStKRpxc,3379
 policyengine_uk/model_api.py,sha256=KdwJCL2HkXVxDpL6fCsCnQ9Sub6Kqp7Hyxlis3MNIx4,241
 policyengine_uk/modelled_policies.yaml,sha256=TLhvmkuI9ip-Fjq63n66RzDErCkN8K4BzY6XLxLMtFg,463
-policyengine_uk/simulation.py,sha256=YR8mxP6D5wSQGdCo2nLO0Jq6isNv5U83ddusVMnoOZk,21265
+policyengine_uk/simulation.py,sha256=0FRttWoO05aTG7qvsJ5-mALEgxDHFCVRh28kwKP0XUY,21381
 policyengine_uk/system.py,sha256=Z-ax_ImUq5k4tycuThczTxQNW5iTE6ikBJIBQdKfIzU,91
 policyengine_uk/tax_benefit_system.py,sha256=CjX1lERyOm_vlgHQcQO92HZtJiwItLH-MxJveJqk6iM,5165
 policyengine_uk/data/__init__.py,sha256=fF3Qhm01PCx26pbG_WRKddacNzbgbuEoayV_xMETDgc,144
 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/economic_assumptions.py,sha256=rb4Utj5bHQhIXfz-eSLvluvyZXECvF_cWtag_sefr0s,6464
 policyengine_uk/data/filter_dataset.py,sha256=DtIixUMRnY-g-acXZIxaZ5217NYYVAMxVgs1Wa3rya0,1622
 policyengine_uk/data/uprating_indices.yaml,sha256=kQtfeGWyqge4dbJhs0iF4kTMqovuegill_Zfs8orJi4,2394
 policyengine_uk/dynamics/labour_supply.py,sha256=MQnlp2OfD2RboqBOxKoLHzVKfZjP04j6Oif1Jswp1-w,12074
@@ -800,7 +800,7 @@ policyengine_uk/variables/gov/dwp/WTC_severely_disabled_element.py,sha256=2dbYIc
 policyengine_uk/variables/gov/dwp/WTC_worker_element.py,sha256=c1Lm5Ke8Gr30gXV2x-HCAwlcMO1aqy989kiZOMm5QlQ,595
 policyengine_uk/variables/gov/dwp/aa_category.py,sha256=mY_cgi6Sq4yROsop0Pix024Go6bMWAeYbN4xT5DrN1U,1032
 policyengine_uk/variables/gov/dwp/access_fund.py,sha256=A5qKLeuwBsvPVrNfQi9grBb-dFSX8XtnE-RB9heCnug,245
-policyengine_uk/variables/gov/dwp/additional_state_pension.py,sha256=R_U1r3nA__kMTpBwWSl2UTAS1kpJVDhLgwmOi_KdK1Q,846
+policyengine_uk/variables/gov/dwp/additional_state_pension.py,sha256=bLhy5BOxj9CQCDAYRidzInI5WsXxQJyB4o5O_M96Ib4,939
 policyengine_uk/variables/gov/dwp/adult_ema.py,sha256=M3VfIALFbILPhaOb6NeY3ffBg4HR-ASBuECvDRQPoVE,247
 policyengine_uk/variables/gov/dwp/afcs.py,sha256=rReaIh1KfrsZUyKRYFElTB_eLAge6zee1Yc5DRoBT7w,228
 policyengine_uk/variables/gov/dwp/afcs_reported.py,sha256=JueDBWlD1hhSedf8q54EdpqFDEgFdMpBwGWwrMTVDNE,293
@@ -810,7 +810,7 @@ policyengine_uk/variables/gov/dwp/attendance_allowance_reported.py,sha256=6RD4Nq
 policyengine_uk/variables/gov/dwp/baseline_ctc_entitlement.py,sha256=Z6aAfyDCvaepEX6PPfTdjQPwGgFnMhP4lpQjZ8P8AkE,445
 policyengine_uk/variables/gov/dwp/baseline_income_support_entitlement.py,sha256=TvcCQjTPbtvrbwWTUhaBPqZSiu93ys6qcoNU7S4kqRU,232
 policyengine_uk/variables/gov/dwp/baseline_wtc_entitlement.py,sha256=0BKhLGQAPlJBR6P7Yk28XFlyrFojCsVsFkJC00FMgkc,436
-policyengine_uk/variables/gov/dwp/basic_state_pension.py,sha256=FQbEQPDakKwTwnrQ3g9b6OWv29a_GNWK8kdkJtK34ek,1014
+policyengine_uk/variables/gov/dwp/basic_state_pension.py,sha256=VGxBrZt4Adw3ARmaRHbRNPvLn1-ZwgSBZyUwIRWn1Wc,1107
 policyengine_uk/variables/gov/dwp/benefit_cap.py,sha256=x6ad7zFYKX6jaNoXV8xj0Hql5O3HraXKZlFFmxYGuSU,1287
 policyengine_uk/variables/gov/dwp/benefit_cap_reduction.py,sha256=lbRftEtfkQQOt5ojhNnRYlinnDGiqTH9XwAd2fdR7Kg,777
 policyengine_uk/variables/gov/dwp/bsp.py,sha256=D8WzwacEe789RHAIvB5RYQ1NOq9nsoFMNhDPrvb4qM0,221
@@ -1138,6 +1138,7 @@ policyengine_uk/variables/household/cliff_evaluated.py,sha256=UfQ3GYys2L61PyAMWr
 policyengine_uk/variables/household/cliff_gap.py,sha256=jZmKoLjJYAojwUEF4cfu4wvfaeN_tMYFhpRYdVk1_Vs,498
 policyengine_uk/variables/household/is_on_cliff.py,sha256=MmRHX9pxnzUKGgPw2F_5dSlLv8NjSQOvcH9Z4r6-MQM,392
 policyengine_uk/variables/household/marginal_tax_rate.py,sha256=hK41cSc9i4QAnGBLqUViwTiw3BsQPtfsO3jjvRfjhPE,2001
+policyengine_uk/variables/household/post_tax_income.py,sha256=YP4fL_hHdOK1LXQ9huqfPiCewfQWd0RKpwJgRRLKweY,356
 policyengine_uk/variables/household/region.py,sha256=swhjOMUg_crfDi4oEcJY7GoaiNQXfMsyDnJPAmMjp5U,456
 policyengine_uk/variables/household/benefits/employment_benefits.py,sha256=Q3vdJv6MOTv4pIQkyOYhrfyztKV7t6kEAqIYssUNZw8,262
 policyengine_uk/variables/household/consumption/additional_residential_property_purchased.py,sha256=lUd5VjLB2jysui8RuLEJCC4C4Yx0zDXlpybLUEUHuiU,742
@@ -1391,7 +1392,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.54.1.dist-info/METADATA,sha256=1kOpL7EC6aBugy0R27XQ2QpqSzowUF_40vBNSp-sh3c,3995
-policyengine_uk-2.54.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_uk-2.54.1.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-policyengine_uk-2.54.1.dist-info/RECORD,,
+policyengine_uk-2.55.0.dist-info/METADATA,sha256=oTS2B2A-JFdq2FI4T73OVT4wmzA3u1OIvLv1_NyUla0,3995
+policyengine_uk-2.55.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_uk-2.55.0.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+policyengine_uk-2.55.0.dist-info/RECORD,,