PolicyEngine-UK 2.23.0__tar.gz → 2.23.2__tar.gz

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.23.2] - 2025-04-15 14:14:21
+
+### Fixed
+
+- Corrected the is_parent variable to properly identify parents.
+- Fixed logic in childcare programs to ensure accurate calculations.
+
+## [2.23.1] - 2025-04-15 08:32:54
+
+### Fixed
+
+- Removed uk-data as a dependency from the package.
+
 ## [2.23.0] - 2025-04-07 09:00:36
 
 ### Added
@@ -1713,6 +1726,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[2.23.2]: https://github.com/PolicyEngine/openfisca-uk/compare/2.23.1...2.23.2
+[2.23.1]: https://github.com/PolicyEngine/openfisca-uk/compare/2.23.0...2.23.1
 [2.23.0]: https://github.com/PolicyEngine/openfisca-uk/compare/2.22.8...2.23.0
 [2.22.8]: https://github.com/PolicyEngine/openfisca-uk/compare/2.22.7...2.22.8
 [2.22.7]: https://github.com/PolicyEngine/openfisca-uk/compare/2.22.6...2.22.7

{policyengine_uk-2.23.0/PolicyEngine_UK.egg-info → policyengine_uk-2.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PolicyEngine-UK
-Version: 2.23.0
+Version: 2.23.2
 Summary: PolicyEngine tax and benefit system for the UK
 Home-page: https://github.com/PolicyEngine/policyengine-uk
 Author: PolicyEngine
@@ -15,7 +15,6 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Requires-Python: >=3.7
 License-File: LICENSE
 Requires-Dist: PolicyEngine-Core>=3.6.4
-Requires-Dist: PolicyEngine-UK-Data==1.9.0
 Requires-Dist: microdf_python
 Provides-Extra: dev
 Requires-Dist: tqdm; extra == "dev"

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2/PolicyEngine_UK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PolicyEngine-UK
-Version: 2.23.0
+Version: 2.23.2
 Summary: PolicyEngine tax and benefit system for the UK
 Home-page: https://github.com/PolicyEngine/policyengine-uk
 Author: PolicyEngine
@@ -15,7 +15,6 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Requires-Python: >=3.7
 License-File: LICENSE
 Requires-Dist: PolicyEngine-Core>=3.6.4
-Requires-Dist: PolicyEngine-UK-Data==1.9.0
 Requires-Dist: microdf_python
 Provides-Extra: dev
 Requires-Dist: tqdm; extra == "dev"

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/PolicyEngine_UK.egg-info/SOURCES.txt

@@ -86,6 +86,7 @@ policyengine_uk/parameters/gov/dcms/bbc/tv_licence/discount/blind/README.md
 policyengine_uk/parameters/gov/dcms/bbc/tv_licence/discount/blind/discount.yaml
 policyengine_uk/parameters/gov/dfe/childcare_funding_rate.yaml
 policyengine_uk/parameters/gov/dfe/compulsory_school_age.yaml
+policyengine_uk/parameters/gov/dfe/weeks_per_year.yaml
 policyengine_uk/parameters/gov/dfe/care_to_learn/age_limit.yaml
 policyengine_uk/parameters/gov/dfe/care_to_learn/amount.yaml
 policyengine_uk/parameters/gov/dfe/extended_childcare_entitlement/disability_criteria.yaml
@@ -597,6 +598,7 @@ policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/ext
 policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_eligible.yaml
 policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_income_condition.yaml
 policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_work_condition.yaml
+policyengine_uk/tests/policy/baseline/gov/dfe/targeted_childcare_entitlement/targeted_childcare_entitlement.yaml
 policyengine_uk/tests/policy/baseline/gov/dfe/universal_childcare_entitlement/universal_childcare_entitlement.yaml
 policyengine_uk/tests/policy/baseline/gov/dfe/universal_childcare_entitlement/universal_childcare_entitlement_eligible.yaml
 policyengine_uk/tests/policy/baseline/gov/dwp/pension_credit/housing_benefit.yaml
@@ -671,7 +673,6 @@ policyengine_uk/tests/policy/reforms/parametric/two_child_limit/ctc_age_exemptio
 policyengine_uk/utils/__init__.py
 policyengine_uk/utils/create_triple_lock.py
 policyengine_uk/utils/parameters.py
-policyengine_uk/utils/psnd.py
 policyengine_uk/utils/solve_private_school_attendance_factor.py
 policyengine_uk/variables/contrib/cec/non_primary_residence_wealth_tax.py
 policyengine_uk/variables/contrib/labour/private_school_vat.py
@@ -689,19 +690,24 @@ policyengine_uk/variables/gov/gov_tax.py
 policyengine_uk/variables/gov/dcms/bbc/tv_licence/tv_licence.py
 policyengine_uk/variables/gov/dcms/bbc/tv_licence/tv_licence_discount.py
 policyengine_uk/variables/gov/dcms/bbc/tv_licence/would_evade_tv_licence_fee.py
+policyengine_uk/variables/gov/dfe/max_free_entitlement_hours_used.py
 policyengine_uk/variables/gov/dfe/care_to_learn/care_to_learn.py
 policyengine_uk/variables/gov/dfe/care_to_learn/care_to_learn_eligible.py
+policyengine_uk/variables/gov/dfe/care_to_learn/would_claim_care_to_learn.py
 policyengine_uk/variables/gov/dfe/compulsory_education/is_of_compulsory_school_age.py
 policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement.py
 policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_eligible.py
+policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/would_claim_extended_childcare.py
 policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/conditions/extended_childcare_entitlement_meets_income_requirements.py
 policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/conditions/extended_childcare_entitlement_work_condition.py
 policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/meets_tax_credit_criteria_for_targeted_childcare_entitlement.py
 policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/meets_universal_credit_criteria_for_targeted_childcare_entitlement.py
 policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/targeted_childcare_entitlement.py
 policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/targeted_childcare_entitlement_eligible.py
+policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/would_claim_targeted_childcare.py
 policyengine_uk/variables/gov/dfe/universal_childcare_entitlement/universal_childcare_entitlement.py
 policyengine_uk/variables/gov/dfe/universal_childcare_entitlement/universal_childcare_entitlement_eligible.py
+policyengine_uk/variables/gov/dfe/universal_childcare_entitlement/would_claim_universal_childcare.py
 policyengine_uk/variables/gov/dwp/AFCS.py
 policyengine_uk/variables/gov/dwp/BSP.py
 policyengine_uk/variables/gov/dwp/ESA_contrib.py
@@ -879,6 +885,7 @@ policyengine_uk/variables/gov/hmrc/pensions/private_pension_contributions_tax.py
 policyengine_uk/variables/gov/hmrc/regional/pays_scottish_income_tax.py
 policyengine_uk/variables/gov/hmrc/tax_free_childcare/tax_free_childcare.py
 policyengine_uk/variables/gov/hmrc/tax_free_childcare/tax_free_childcare_eligibility.py
+policyengine_uk/variables/gov/hmrc/tax_free_childcare/would_claim_tfc.py
 policyengine_uk/variables/gov/hmrc/tax_free_childcare/conditions/tax_free_childcare_child_age_eligible.py
 policyengine_uk/variables/gov/hmrc/tax_free_childcare/conditions/tax_free_childcare_meets_income_requirements.py
 policyengine_uk/variables/gov/hmrc/tax_free_childcare/conditions/tax_free_childcare_program_eligible.py

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/PolicyEngine_UK.egg-info/requires.txt

@@ -1,5 +1,4 @@
 PolicyEngine-Core>=3.6.4
-PolicyEngine-UK-Data==1.9.0
 microdf_python
 
 [dev]

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/__init__.py

@@ -13,6 +13,5 @@ from policyengine_uk.system import (
 from pathlib import Path
 import os
 from policyengine_core.taxbenefitsystems import TaxBenefitSystem
-from policyengine_uk_data import *
 
 REPO = Path(__file__).parent

policyengine_uk-2.23.2/policyengine_uk/parameters/gov/dfe/weeks_per_year.yaml

@@ -0,0 +1,14 @@
+description: The Department for Education provides targeted, extended, and universal childcare entitlement for these weeks per year.
+metadata:
+  period: year
+  unit: week
+  label: childcare entitlement weeks per year
+  reference:
+    - title: The Local Authority (Duty to Secure Early Years Provision Free of Charge) Regulations 2014 - regulation 4
+      href: https://www.legislation.gov.uk/uksi/2014/2147/regulation/4/made
+    - title: Childcare Choices document - 15 and 30 hours childcare support
+      href: https://www.childcarechoices.gov.uk/15-and-30-hours-childcare-support/working-families/eligibility
+    - title: Childcare (Early Years Provision Free of Charge) (Extended Entitlement) Regulations 2016 - Regulation 35(3)
+      href: https://www.legislation.gov.uk/uksi/2016/1257/part/4/made    
+values:
+  2016-01-01: 38

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/system.py

@@ -7,14 +7,12 @@ from policyengine_core.simulations import (
     Microsimulation as CoreMicrosimulation,
 )
 
-from policyengine_uk_data.storage import STORAGE_FOLDER
 import pandas as pd
 from policyengine_uk.utils.parameters import (
     backdate_parameters,
     convert_to_fiscal_year_parameters,
 )
 from policyengine_core.reforms import Reform
-from policyengine_uk_data import DATASETS, EnhancedFRS_2022_23
 from policyengine_uk.reforms import create_structural_reforms_from_parameters
 from policyengine_uk.parameters.gov.obr.add_per_capita_parameters import (
     add_per_capita_parameters,
@@ -157,9 +155,8 @@ class Microsimulation(CoreMicrosimulation):
     default_input_period = 2025
     default_role = "member"
     max_spiral_loops = 10
-    datasets = DATASETS
 
-    def __init__(self, *args, dataset=EnhancedFRS_2022_23, **kwargs):
+    def __init__(self, *args, dataset=ENHANCED_FRS, **kwargs):
         super().__init__(*args, dataset=dataset, **kwargs)
 
         reform = create_structural_reforms_from_parameters(

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement.yaml

@@ -103,4 +103,37 @@
         members: [child1]
         extended_childcare_entitlement_eligible: false
   output:
-    extended_childcare_entitlement: 0  # Not eligible
+    extended_childcare_entitlement: 0  # Not eligible
+
+- name: Child using fewer hours than maximum entitlement
+  period: 2025
+  absolute_error_margin: 1
+  input:
+    people:
+      child1:
+        age: 3
+        max_free_entitlement_hours_used: 20
+    benunits:
+      benunit1:
+        members: [child1]
+        extended_childcare_entitlement_eligible: true
+  output:
+    extended_childcare_entitlement: 4611.457  # 20 hours * 38 weeks * £6.07 per hour (2025 rate)
+
+- name: Child using fewer hours than maximum entitlement - multiple children
+  period: 2025
+  absolute_error_margin: 100
+  input:
+    people:
+      child1:
+        age: 2
+        max_free_entitlement_hours_used: 10
+      child2:
+        age: 3
+        max_free_entitlement_hours_used: 15
+    benunits:
+      benunit1:
+        members: [child1, child2]
+        extended_childcare_entitlement_eligible: true
+  output:
+    extended_childcare_entitlement: 6705.43  # (10 hours * 38 weeks * £8.58 per hour) + (15 hours * 38 weeks * £6.07 per hour) for 2025 rates

policyengine_uk-2.23.2/policyengine_uk/tests/policy/baseline/gov/dfe/targeted_childcare_entitlement/targeted_childcare_entitlement.yaml

@@ -0,0 +1,80 @@
+- name: Child under 2 (ineligible) 
+  period: 2024
+  input:
+    people:
+      child:
+        age: 1
+    benunits:
+      benunit:
+        members: [child]
+        targeted_childcare_entitlement_eligible: False
+  output:
+    targeted_childcare_entitlement: 0.0
+
+- name: Child aged 2 (eligible)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 2
+    benunits:
+      benunit:
+        members: [child]
+        targeted_childcare_entitlement_eligible: True
+  output:
+    targeted_childcare_entitlement: 4_719.60  # 15 hours * 38 weeks * £8.28 per hour
+
+- name: Child aged 3 (not eligible by age, but has targeting)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 3
+    benunits:
+      benunit:
+        members: [child]
+        targeted_childcare_entitlement_eligible: True
+  output:
+    targeted_childcare_entitlement: 0.0  # Not eligible by age even if targeting criteria met
+
+- name: Child using fewer hours than maximum entitlement
+  period: 2024
+  input:
+    people:
+      child:
+        age: 2
+        max_free_entitlement_hours_used: 10
+    benunits:
+      benunit:
+        members: [child]
+        targeted_childcare_entitlement_eligible: True
+  output:
+    targeted_childcare_entitlement: 3_146.4  # 10 hours * 38 weeks * £8.28 per hour
+
+- name: Child using exactly maximum entitlement
+  period: 2024
+  input:
+    people:
+      child:
+        age: 2
+        max_free_entitlement_hours_used: 15
+    benunits:
+      benunit:
+        members: [child]
+        targeted_childcare_entitlement_eligible: True
+  output:
+    targeted_childcare_entitlement: 4_719.6  # 15 hours * 38 weeks * £8.28 per hour
+
+- name: Child using more than maximum entitlement (capped)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 2
+        max_free_entitlement_hours_used: 20
+    benunits:
+      benunit:
+        members: [child]
+        targeted_childcare_entitlement_eligible: True
+  output:
+    targeted_childcare_entitlement: 4_719.6  # Capped at 15 hours * 38 weeks * £8.28 per hour

policyengine_uk-2.23.2/policyengine_uk/tests/policy/baseline/gov/dfe/universal_childcare_entitlement/universal_childcare_entitlement.yaml

@@ -0,0 +1,123 @@
+- name: Child under 3 isn't eligible (person-level)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 2
+        universal_childcare_entitlement_eligible: False
+  output:
+    universal_childcare_entitlement: 0.0
+
+- name: Child aged 3 is eligible (person-level)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 3
+        universal_childcare_entitlement_eligible: True
+  output:
+    universal_childcare_entitlement: 3_351.60
+
+- name: Child aged 4 is eligible (person-level)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 4
+        universal_childcare_entitlement_eligible: True
+  output:
+    universal_childcare_entitlement: 3_351.60
+
+- name: Parent (ineligible)
+  period: 2024
+  input:
+    people:
+      parent:
+        age: 35
+        universal_childcare_entitlement_eligible: False
+  output:
+    universal_childcare_entitlement: 0.0
+
+- name: Child aged 2 (ineligible)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 2
+        universal_childcare_entitlement_eligible: False
+  output:
+    universal_childcare_entitlement: 0.0
+
+- name: Child aged 3 (eligible)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 3
+        universal_childcare_entitlement_eligible: True
+  output:
+    universal_childcare_entitlement: 3_351.60
+
+- name: Child aged 4 (eligible)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 4
+        universal_childcare_entitlement_eligible: True
+  output:
+    universal_childcare_entitlement: 3_351.60
+
+- name: Child aged 5 (ineligible)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 5
+        universal_childcare_entitlement_eligible: False
+  output:
+    universal_childcare_entitlement: 0.0
+
+- name: Child using fewer hours than maximum entitlement
+  period: 2024
+  input:
+    people:
+      child:
+        age: 3
+        universal_childcare_entitlement_eligible: True
+        max_free_entitlement_hours_used: 10
+  output:
+    universal_childcare_entitlement: 2_234.4  # 10 hours * 38 weeks * £5.88 per hour
+
+- name: Child using half of maximum entitlement
+  period: 2024
+  input:
+    people:
+      child:
+        age: 3
+        universal_childcare_entitlement_eligible: True
+        max_free_entitlement_hours_used: 15
+  output:
+    universal_childcare_entitlement: 3_351.6  # 15 hours * 38 weeks * £5.88 per hour
+
+- name: Child using exactly maximum entitlement
+  period: 2024
+  input:
+    people:
+      child:
+        age: 4
+        universal_childcare_entitlement_eligible: True
+        max_free_entitlement_hours_used: 15
+  output:
+    universal_childcare_entitlement: 3_351.6  # 15 hours * 38 weeks * £5.88 per hour
+
+- name: Child using more than maximum entitlement (capped)
+  period: 2024
+  input:
+    people:
+      child:
+        age: 3
+        universal_childcare_entitlement_eligible: True
+        max_free_entitlement_hours_used: 20
+  output:
+    universal_childcare_entitlement: 3_351.6  # Capped at 15 hours * 38 weeks * £5.88 per hour

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/dfe/care_to_learn/care_to_learn_eligible.py

@@ -6,6 +6,7 @@ class care_to_learn_eligible(Variable):
     entity = Person
     label = "eligible for Care to Learn childcare support"
     definition_period = YEAR
+    defined_for = "would_claim_care_to_learn"
 
     def formula(person, period, parameters):
         # Link for instruction: https://www.gov.uk/care-to-learn/eligibility

policyengine_uk-2.23.2/policyengine_uk/variables/gov/dfe/care_to_learn/would_claim_care_to_learn.py

@@ -0,0 +1,12 @@
+from policyengine_uk.model_api import *
+
+
+class would_claim_care_to_learn(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = "would claim Care to Learn"
+    documentation = (
+        "Whether this BenUnit would claim Care to Learn if eligible"
+    )
+    definition_period = YEAR
+    default_value = True

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement.py

@@ -19,13 +19,19 @@ class extended_childcare_entitlement(Variable):
             age
         )
 
+        # Get max hours used per child
+        max_hours_used = benunit.members(
+            "max_free_entitlement_hours_used", period
+        )
+
+        # Use the appropriate hours based on the condition
+        weekly_hours_to_use = min_(max_hours_used, weekly_hours_per_child)
+
         # Compute weekly subsidy per child
         weekly_subsidy_per_child = (
-            weekly_hours_per_child * p.childcare_funding_rate.calc(age)
+            weekly_hours_to_use * p.childcare_funding_rate.calc(age)
         )
 
         # Compute total annual expenses
-        return (
-            benunit.sum(weekly_subsidy_per_child)
-            * p.extended_childcare_entitlement.weeks_per_year
-        )
+        weeks = p.weeks_per_year
+        return benunit.sum(weekly_subsidy_per_child) * weeks

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_eligible.py

@@ -6,6 +6,7 @@ class extended_childcare_entitlement_eligible(Variable):
     entity = BenUnit
     label = "eligibility for extended childcare entitlement"
     definition_period = YEAR
+    defined_for = "would_claim_extended_childcare"
 
     def formula(benunit, period, parameters):
         # Check if household is in England

policyengine_uk-2.23.2/policyengine_uk/variables/gov/dfe/extended_childcare_entitlement/would_claim_extended_childcare.py

@@ -0,0 +1,10 @@
+from policyengine_uk.model_api import *
+
+
+class would_claim_extended_childcare(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = "would claim extended childcare entitlement"
+    documentation = "Whether this family would claim extended childcare entitlement if eligible"
+    definition_period = YEAR
+    default_value = True

policyengine_uk-2.23.2/policyengine_uk/variables/gov/dfe/max_free_entitlement_hours_used.py

@@ -0,0 +1,10 @@
+from policyengine_uk.model_api import *
+
+
+class max_free_entitlement_hours_used(Variable):
+    value_type = float
+    entity = Person
+    label = "maximum hours of free childcare entitlement used"
+    documentation = "The maximum weekly hours of free childcare entitlement used by the person"
+    definition_period = YEAR
+    default_value = 30

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/targeted_childcare_entitlement.py

@@ -19,4 +19,9 @@ class targeted_childcare_entitlement(Variable):
             p.targeted_childcare_entitlement.hours_entitlement
             * eligible_by_age
         )
-        return hours * p.childcare_funding_rate.calc(age)
+        max_hours_used = person("max_free_entitlement_hours_used", period)
+        weeks = p.weeks_per_year
+        total_hours_used = max_hours_used * weeks
+
+        hours_to_use = min_(total_hours_used, hours)
+        return hours_to_use * p.childcare_funding_rate.calc(age)

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/targeted_childcare_entitlement_eligible.py

@@ -6,6 +6,7 @@ class targeted_childcare_entitlement_eligible(Variable):
     entity = BenUnit
     label = "eligibility for targeted childcare entitlement"
     definition_period = YEAR
+    defined_for = "would_claim_targeted_childcare"
 
     def formula(benunit, period, parameters):
 
@@ -16,6 +17,12 @@ class targeted_childcare_entitlement_eligible(Variable):
         # Get parameters
         p = parameters(period).gov.dfe.targeted_childcare_entitlement
 
+        # Check if household has extended childcare. If so, they are not eligible. Combining extended childcare and targeted childcare is not allowed.
+        # https://www.childcarechoices.gov.uk/combining-schemes
+        has_extended_childcare = benunit(
+            "extended_childcare_entitlement_eligible", period
+        )
+
         # Check if household receives any qualifying benefits
         has_qualifying_benefits = (
             add(benunit, period, p.qualifying_benefits) > 0
@@ -24,4 +31,8 @@ class targeted_childcare_entitlement_eligible(Variable):
         # Check if household meets any additional qualifying criteria
         # from qualifying_criteria.yaml (UC/TC specific criteria)
         meets_any_criteria = add(benunit, period, p.qualifying_criteria) > 0
-        return in_england & (has_qualifying_benefits | meets_any_criteria)
+        return (
+            in_england
+            & (has_qualifying_benefits | meets_any_criteria)
+            & ~has_extended_childcare
+        )

policyengine_uk-2.23.2/policyengine_uk/variables/gov/dfe/targeted_childcare_entitlement/would_claim_targeted_childcare.py

@@ -0,0 +1,10 @@
+from policyengine_uk.model_api import *
+
+
+class would_claim_targeted_childcare(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = "would claim targeted childcare entitlement"
+    documentation = "Whether this family would claim targeted childcare entitlement if eligible"
+    definition_period = YEAR
+    default_value = True

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/dfe/universal_childcare_entitlement/universal_childcare_entitlement.py

@@ -13,4 +13,9 @@ class universal_childcare_entitlement(Variable):
         p = parameters(period).gov.dfe
         age = person("age", period)
         hours = p.universal_childcare_entitlement.hours
-        return hours * p.childcare_funding_rate.calc(age)
+        max_hours_used = person("max_free_entitlement_hours_used", period)
+        weeks = p.weeks_per_year
+        total_hours_used = max_hours_used * weeks
+
+        hours_to_use = min_(total_hours_used, hours)
+        return hours_to_use * p.childcare_funding_rate.calc(age)

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/dfe/universal_childcare_entitlement/universal_childcare_entitlement_eligible.py

@@ -6,6 +6,7 @@ class universal_childcare_entitlement_eligible(Variable):
     entity = Person
     label = "eligible for universal childcare entitlement"
     definition_period = YEAR
+    defined_for = "would_claim_universal_childcare"
 
     def formula(person, period, parameters):
         country = person.household("country", period)
@@ -18,6 +19,18 @@ class universal_childcare_entitlement_eligible(Variable):
         p = parameters(period).gov.dfe.universal_childcare_entitlement
         meets_age_condition = (age >= p.min_age) & (age < p.max_age)
         not_compulsory_age = ~person("is_of_compulsory_school_age", period)
+
+        # Check if person has extended childcare. If so, they are not eligible. Combining extended childcare and universal childcare is not allowed.
+        # https://www.childcarechoices.gov.uk/combining-schemes
+        has_extended_childcare = person.benunit(
+            "extended_childcare_entitlement_eligible", period
+        )
+
         # Section 7 of the Childcare Act 2006
         # The regulation above limits free early years provision to children under compulsory school age.
-        return in_england & meets_age_condition & not_compulsory_age
+        return (
+            in_england
+            & meets_age_condition
+            & not_compulsory_age
+            & ~has_extended_childcare
+        )

policyengine_uk-2.23.2/policyengine_uk/variables/gov/dfe/universal_childcare_entitlement/would_claim_universal_childcare.py

@@ -0,0 +1,10 @@
+from policyengine_uk.model_api import *
+
+
+class would_claim_universal_childcare(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = "would claim universal childcare entitlement"
+    documentation = "Whether this BenUnit would claim universal childcare entitlement if eligible"
+    definition_period = YEAR
+    default_value = True

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/gov/hmrc/tax_free_childcare/tax_free_childcare_eligibility.py

@@ -6,6 +6,7 @@ class tax_free_childcare_eligible(Variable):
     entity = BenUnit
     label = "overall eligibility for tax-free childcare"
     definition_period = YEAR
+    defined_for = "would_claim_tfc"
 
     def formula(benunit, period, parameters):
         meets_age_condition = benunit.any(

policyengine_uk-2.23.2/policyengine_uk/variables/gov/hmrc/tax_free_childcare/would_claim_tfc.py

@@ -0,0 +1,12 @@
+from policyengine_uk.model_api import *
+
+
+class would_claim_tfc(Variable):
+    value_type = bool
+    entity = BenUnit
+    label = "would claim Tax-Free Childcare"
+    documentation = (
+        "Whether this family would claim Tax-Free Childcare if eligible"
+    )
+    definition_period = YEAR
+    default_value = True

{policyengine_uk-2.23.0 → policyengine_uk-2.23.2}/policyengine_uk/variables/household/demographic/is_parent.py

@@ -14,22 +14,19 @@ class is_parent(Variable):
 
         # Find two oldest members
         benunit_ages = benunit.members("age", period)
-        first_highest = benunit.max(benunit_ages)
-        second_highest = benunit.max(
-            where(benunit_ages < first_highest, benunit_ages, -np.inf)
-        )
+        adult_index = person("adult_index", period)
 
         # Get family types enum
         family_types = family_type.possible_values
 
         # For lone parents (FamilyType.LONE_PARENT), only the eldest is parent
         is_lone_parent = (family_type == family_types.LONE_PARENT) & (
-            age == first_highest
+            adult_index == 1
         )
 
         # For couples with children (FamilyType.COUPLE_WITH_CHILDREN), two eldest are parents
         is_couple_parent = (
             family_type == family_types.COUPLE_WITH_CHILDREN
-        ) & ((age == first_highest) | (age == second_highest))
+        ) & ((adult_index == 1) | (adult_index == 2))
 
         return is_lone_parent | is_couple_parent