policyengine 3.1.3__py3-none-any.whl → 3.1.5__py3-none-any.whl

policyengine/core/dataset.py

@@ -1,5 +1,6 @@
 from uuid import uuid4
 
+import numpy as np
 import pandas as pd
 from microdf import MicroDataFrame
 from pydantic import BaseModel, ConfigDict, Field
@@ -100,7 +101,7 @@ def map_to_entity(
     target_entity: str,
     person_entity: str = "person",
     columns: list[str] | None = None,
-    values: list | None = None,
+    values: np.ndarray | None = None,
     how: str = "sum",
 ) -> MicroDataFrame:
     """Map data from source entity to target entity using join keys.
@@ -143,6 +144,9 @@ def map_to_entity(
     # Get source data (convert to plain DataFrame to avoid weighted operations during mapping)
     source_df = pd.DataFrame(entity_data[source_entity])
 
+    # Track if we should return a MicroSeries (values is a numpy array, not a list)
+    return_series = values is not None
+
     # Handle values parameter - create a temporary column with the provided values
     if values is not None:
         if len(values) != len(source_df):
@@ -166,7 +170,10 @@ def map_to_entity(
 
     # Same entity - return as is
     if source_entity == target_entity:
-        return MicroDataFrame(source_df, weights=target_weight)
+        result = MicroDataFrame(source_df, weights=target_weight)
+        if return_series:
+            return result["__mapped_value"]
+        return result
 
     # Get target data and key
     target_df = entity_data[target_entity]
@@ -225,7 +232,10 @@ def map_to_entity(
             # Fill NaN with 0 for groups with no members in source entity
             result[agg_cols] = result[agg_cols].fillna(0)
 
-            return MicroDataFrame(result, weights=target_weight)
+            result_df = MicroDataFrame(result, weights=target_weight)
+            if return_series:
+                return result_df["__mapped_value"]
+            return result_df
 
     # Group entity to person: expand group-level data to person level
     if source_entity != person_entity and target_entity == person_entity:
@@ -284,7 +294,10 @@ def map_to_entity(
                     f"Unsupported aggregation method for group->person: {how}. Use 'project' or 'divide'."
                 )
 
-            return MicroDataFrame(result, weights=target_weight)
+            result_df = MicroDataFrame(result, weights=target_weight)
+            if return_series:
+                return result_df["__mapped_value"]
+            return result_df
 
     # Group to group: go through person table
     if source_entity != person_entity and target_entity != person_entity:
@@ -408,7 +421,10 @@ def map_to_entity(
             # Fill NaN with 0
             result[agg_cols] = result[agg_cols].fillna(0)
 
-            return MicroDataFrame(result, weights=target_weight)
+            result_df = MicroDataFrame(result, weights=target_weight)
+            if return_series:
+                return result_df["__mapped_value"]
+            return result_df
 
     raise ValueError(
         f"Unsupported mapping from {source_entity} to {target_entity}"

policyengine/core/simulation.py

@@ -24,6 +24,13 @@ class Simulation(BaseModel):
     def run(self):
         self.tax_benefit_model_version.run(self)
 
+    def ensure(self):
+        try:
+            self.tax_benefit_model_version.load(self)
+        except Exception:
+            self.run()
+            self.save()
+
     def save(self):
         """Save the simulation's output dataset."""
         self.tax_benefit_model_version.save(self)

policyengine/tax_benefit_models/uk/__init__.py

@@ -1,26 +1,44 @@
 """PolicyEngine UK tax-benefit model."""
 
-from .analysis import general_policy_reform_analysis
-from .datasets import PolicyEngineUKDataset, UKYearData, create_datasets
-from .model import PolicyEngineUK, PolicyEngineUKLatest, uk_latest, uk_model
-from .outputs import ProgrammeStatistics
+from importlib.util import find_spec
 
-__all__ = [
-    "UKYearData",
-    "PolicyEngineUKDataset",
-    "create_datasets",
-    "PolicyEngineUK",
-    "PolicyEngineUKLatest",
-    "uk_model",
-    "uk_latest",
-    "general_policy_reform_analysis",
-    "ProgrammeStatistics",
-]
+if find_spec("policyengine_uk") is not None:
+    from policyengine.core import Dataset
 
-# Rebuild models to resolve forward references
-from policyengine.core import Dataset
+    from .analysis import general_policy_reform_analysis
+    from .datasets import (
+        PolicyEngineUKDataset,
+        UKYearData,
+        create_datasets,
+        ensure_datasets,
+        load_datasets,
+    )
+    from .model import (
+        PolicyEngineUK,
+        PolicyEngineUKLatest,
+        uk_latest,
+        uk_model,
+    )
+    from .outputs import ProgrammeStatistics
 
-Dataset.model_rebuild()
-UKYearData.model_rebuild()
-PolicyEngineUKDataset.model_rebuild()
-PolicyEngineUKLatest.model_rebuild()
+    # Rebuild Pydantic models to resolve forward references
+    Dataset.model_rebuild()
+    UKYearData.model_rebuild()
+    PolicyEngineUKDataset.model_rebuild()
+    PolicyEngineUKLatest.model_rebuild()
+
+    __all__ = [
+        "UKYearData",
+        "PolicyEngineUKDataset",
+        "create_datasets",
+        "load_datasets",
+        "ensure_datasets",
+        "PolicyEngineUK",
+        "PolicyEngineUKLatest",
+        "uk_model",
+        "uk_latest",
+        "general_policy_reform_analysis",
+        "ProgrammeStatistics",
+    ]
+else:
+    __all__ = []

policyengine/tax_benefit_models/uk/datasets.py

@@ -37,11 +37,7 @@ class PolicyEngineUKDataset(Dataset):
         if self.data is not None:
             self.save()
         elif self.filepath and not self.data:
-            try:
-                self.load()
-            except FileNotFoundError:
-                # File doesn't exist yet, that's OK
-                pass
+            self.load()
 
     def save(self) -> None:
         """Save dataset to HDF5 file."""
@@ -85,7 +81,9 @@ def create_datasets(
         "hf://policyengine/policyengine-uk-data/enhanced_frs_2023_24.h5",
     ],
     years: list[int] = [2026, 2027, 2028, 2029, 2030],
-) -> None:
+    data_folder: str = "./data",
+) -> dict[str, PolicyEngineUKDataset]:
+    result = {}
     for dataset in datasets:
         from policyengine_uk import Microsimulation
 
@@ -139,9 +137,10 @@ def create_datasets(
             )
 
             uk_dataset = PolicyEngineUKDataset(
+                id=f"{Path(dataset).stem}_year_{year}",
                 name=f"{dataset}-year-{year}",
                 description=f"UK Dataset for year {year} based on {dataset}",
-                filepath=f"./data/{Path(dataset).stem}_year_{year}.h5",
+                filepath=f"{data_folder}/{Path(dataset).stem}_year_{year}.h5",
                 year=year,
                 data=UKYearData(
                     person=MicroDataFrame(person_df, weights="person_weight"),
@@ -154,3 +153,75 @@ def create_datasets(
                 ),
             )
             uk_dataset.save()
+
+            dataset_key = f"{Path(dataset).stem}_{year}"
+            result[dataset_key] = uk_dataset
+
+    return result
+
+
+def load_datasets(
+    datasets: list[str] = [
+        "hf://policyengine/policyengine-uk-data/frs_2023_24.h5",
+        "hf://policyengine/policyengine-uk-data/enhanced_frs_2023_24.h5",
+    ],
+    years: list[int] = [2026, 2027, 2028, 2029, 2030],
+    data_folder: str = "./data",
+) -> dict[str, PolicyEngineUKDataset]:
+    result = {}
+    for dataset in datasets:
+        for year in years:
+            filepath = f"{data_folder}/{Path(dataset).stem}_year_{year}.h5"
+            uk_dataset = PolicyEngineUKDataset(
+                name=f"{dataset}-year-{year}",
+                description=f"UK Dataset for year {year} based on {dataset}",
+                filepath=filepath,
+                year=year,
+            )
+            uk_dataset.load()
+
+            dataset_key = f"{Path(dataset).stem}_{year}"
+            result[dataset_key] = uk_dataset
+
+    return result
+
+
+def ensure_datasets(
+    datasets: list[str] = [
+        "hf://policyengine/policyengine-uk-data/frs_2023_24.h5",
+        "hf://policyengine/policyengine-uk-data/enhanced_frs_2023_24.h5",
+    ],
+    years: list[int] = [2026, 2027, 2028, 2029, 2030],
+    data_folder: str = "./data",
+) -> dict[str, PolicyEngineUKDataset]:
+    """Ensure datasets exist, loading if available or creating if not.
+
+    Args:
+        datasets: List of HuggingFace dataset paths
+        years: List of years to load/create data for
+        data_folder: Directory containing or to save the dataset files
+
+    Returns:
+        Dictionary mapping dataset keys to PolicyEngineUKDataset objects
+    """
+    # Check if all dataset files exist
+    all_exist = True
+    for dataset in datasets:
+        for year in years:
+            filepath = Path(
+                f"{data_folder}/{Path(dataset).stem}_year_{year}.h5"
+            )
+            if not filepath.exists():
+                all_exist = False
+                break
+        if not all_exist:
+            break
+
+    if all_exist:
+        return load_datasets(
+            datasets=datasets, years=years, data_folder=data_folder
+        )
+    else:
+        return create_datasets(
+            datasets=datasets, years=years, data_folder=data_folder
+        )

policyengine/tax_benefit_models/uk/model.py

@@ -265,17 +265,29 @@ class PolicyEngineUKLatest(TaxBenefitModelVersion):
 
     def load(self, simulation: "Simulation"):
         """Load the simulation's output dataset."""
+        import os
+
+        filepath = str(
+            Path(simulation.dataset.filepath).parent / (simulation.id + ".h5")
+        )
+
         simulation.output_dataset = PolicyEngineUKDataset(
             id=simulation.id,
             name=simulation.dataset.name,
             description=simulation.dataset.description,
-            filepath=str(
-                Path(simulation.dataset.filepath).parent
-                / (simulation.id + ".h5")
-            ),
+            filepath=filepath,
             year=simulation.dataset.year,
             is_output_dataset=True,
         )
 
+        # Load timestamps from file system metadata
+        if os.path.exists(filepath):
+            simulation.created_at = datetime.datetime.fromtimestamp(
+                os.path.getctime(filepath)
+            )
+            simulation.updated_at = datetime.datetime.fromtimestamp(
+                os.path.getmtime(filepath)
+            )
+
 
 uk_latest = PolicyEngineUKLatest()

policyengine/tax_benefit_models/uk.py

@@ -1,33 +1,38 @@
 """PolicyEngine UK tax-benefit model - imports from uk/ module."""
 
-from .uk import (
-    PolicyEngineUK,
-    PolicyEngineUKDataset,
-    PolicyEngineUKLatest,
-    ProgrammeStatistics,
-    UKYearData,
-    create_datasets,
-    general_policy_reform_analysis,
-    uk_latest,
-    uk_model,
-)
+from importlib.util import find_spec
 
-__all__ = [
-    "UKYearData",
-    "PolicyEngineUKDataset",
-    "create_datasets",
-    "PolicyEngineUK",
-    "PolicyEngineUKLatest",
-    "uk_model",
-    "uk_latest",
-    "general_policy_reform_analysis",
-    "ProgrammeStatistics",
-]
+if find_spec("policyengine_uk") is not None:
+    from .uk import (
+        PolicyEngineUK,
+        PolicyEngineUKDataset,
+        PolicyEngineUKLatest,
+        ProgrammeStatistics,
+        UKYearData,
+        create_datasets,
+        ensure_datasets,
+        general_policy_reform_analysis,
+        load_datasets,
+        uk_latest,
+        uk_model,
+    )
 
-# Rebuild models to resolve forward references
-from policyengine.core import Dataset
+    __all__ = [
+        "UKYearData",
+        "PolicyEngineUKDataset",
+        "create_datasets",
+        "load_datasets",
+        "ensure_datasets",
+        "PolicyEngineUK",
+        "PolicyEngineUKLatest",
+        "uk_model",
+        "uk_latest",
+        "general_policy_reform_analysis",
+        "ProgrammeStatistics",
+    ]
 
-Dataset.model_rebuild()
-UKYearData.model_rebuild()
-PolicyEngineUKDataset.model_rebuild()
-PolicyEngineUKLatest.model_rebuild()
+    # Rebuild models to resolve forward references
+    PolicyEngineUKDataset.model_rebuild()
+    PolicyEngineUKLatest.model_rebuild()
+else:
+    __all__ = []

policyengine/tax_benefit_models/us/__init__.py

@@ -6,7 +6,13 @@ if find_spec("policyengine_us") is not None:
     from policyengine.core import Dataset
 
     from .analysis import general_policy_reform_analysis
-    from .datasets import PolicyEngineUSDataset, USYearData, create_datasets
+    from .datasets import (
+        PolicyEngineUSDataset,
+        USYearData,
+        create_datasets,
+        ensure_datasets,
+        load_datasets,
+    )
     from .model import (
         PolicyEngineUS,
         PolicyEngineUSLatest,
@@ -25,6 +31,8 @@ if find_spec("policyengine_us") is not None:
         "USYearData",
         "PolicyEngineUSDataset",
         "create_datasets",
+        "load_datasets",
+        "ensure_datasets",
         "PolicyEngineUS",
         "PolicyEngineUSLatest",
         "us_model",

policyengine/tax_benefit_models/us/datasets.py

@@ -44,11 +44,7 @@ class PolicyEngineUSDataset(Dataset):
         if self.data is not None:
             self.save()
         elif self.filepath and not self.data:
-            try:
-                self.load()
-            except FileNotFoundError:
-                # File doesn't exist yet, that's OK
-                pass
+            self.load()
 
     def save(self) -> None:
         """Save dataset to HDF5 file."""
@@ -112,15 +108,21 @@ def create_datasets(
         "hf://policyengine/policyengine-us-data/enhanced_cps_2024.h5",
     ],
     years: list[int] = [2024, 2025, 2026, 2027, 2028],
-) -> None:
+    data_folder: str = "./data",
+) -> dict[str, PolicyEngineUSDataset]:
     """Create PolicyEngineUSDataset instances from HuggingFace dataset paths.
 
     Args:
         datasets: List of HuggingFace dataset paths (e.g., "hf://policyengine/policyengine-us-data/cps_2024.h5")
         years: List of years to extract data for
+        data_folder: Directory to save the dataset files
+
+    Returns:
+        Dictionary mapping dataset keys (e.g., "enhanced_cps_2024") to PolicyEngineUSDataset objects
     """
     from policyengine_us import Microsimulation
 
+    result = {}
     for dataset in datasets:
         sim = Microsimulation(dataset=dataset)
 
@@ -263,9 +265,10 @@ def create_datasets(
                         tax_unit_df = entity_df
 
             us_dataset = PolicyEngineUSDataset(
+                id=f"{Path(dataset).stem}_year_{year}",
                 name=f"{dataset}-year-{year}",
                 description=f"US Dataset for year {year} based on {dataset}",
-                filepath=f"./data/{Path(dataset).stem}_year_{year}.h5",
+                filepath=f"{data_folder}/{Path(dataset).stem}_year_{year}.h5",
                 year=year,
                 data=USYearData(
                     person=MicroDataFrame(person_df, weights="person_weight"),
@@ -285,3 +288,83 @@ def create_datasets(
                 ),
             )
             us_dataset.save()
+
+            dataset_key = f"{Path(dataset).stem}_{year}"
+            result[dataset_key] = us_dataset
+
+    return result
+
+
+def load_datasets(
+    datasets: list[str] = [
+        "hf://policyengine/policyengine-us-data/enhanced_cps_2024.h5",
+    ],
+    years: list[int] = [2024, 2025, 2026, 2027, 2028],
+    data_folder: str = "./data",
+) -> dict[str, PolicyEngineUSDataset]:
+    """Load PolicyEngineUSDataset instances from saved HDF5 files.
+
+    Args:
+        datasets: List of HuggingFace dataset paths (used to derive file names)
+        years: List of years to load data for
+        data_folder: Directory containing the dataset files
+
+    Returns:
+        Dictionary mapping dataset keys (e.g., "enhanced_cps_2024") to PolicyEngineUSDataset objects
+    """
+    result = {}
+    for dataset in datasets:
+        for year in years:
+            filepath = f"{data_folder}/{Path(dataset).stem}_year_{year}.h5"
+            us_dataset = PolicyEngineUSDataset(
+                name=f"{dataset}-year-{year}",
+                description=f"US Dataset for year {year} based on {dataset}",
+                filepath=filepath,
+                year=year,
+            )
+            us_dataset.load()
+
+            dataset_key = f"{Path(dataset).stem}_{year}"
+            result[dataset_key] = us_dataset
+
+    return result
+
+
+def ensure_datasets(
+    datasets: list[str] = [
+        "hf://policyengine/policyengine-us-data/enhanced_cps_2024.h5",
+    ],
+    years: list[int] = [2024, 2025, 2026, 2027, 2028],
+    data_folder: str = "./data",
+) -> dict[str, PolicyEngineUSDataset]:
+    """Ensure datasets exist, loading if available or creating if not.
+
+    Args:
+        datasets: List of HuggingFace dataset paths
+        years: List of years to load/create data for
+        data_folder: Directory containing or to save the dataset files
+
+    Returns:
+        Dictionary mapping dataset keys to PolicyEngineUSDataset objects
+    """
+    # Check if all dataset files exist
+    all_exist = True
+    for dataset in datasets:
+        for year in years:
+            filepath = Path(
+                f"{data_folder}/{Path(dataset).stem}_year_{year}.h5"
+            )
+            if not filepath.exists():
+                all_exist = False
+                break
+        if not all_exist:
+            break
+
+    if all_exist:
+        return load_datasets(
+            datasets=datasets, years=years, data_folder=data_folder
+        )
+    else:
+        return create_datasets(
+            datasets=datasets, years=years, data_folder=data_folder
+        )

policyengine/tax_benefit_models/us/model.py

@@ -311,18 +311,30 @@ class PolicyEngineUSLatest(TaxBenefitModelVersion):
 
     def load(self, simulation: "Simulation"):
         """Load the simulation's output dataset."""
+        import os
+
+        filepath = str(
+            Path(simulation.dataset.filepath).parent / (simulation.id + ".h5")
+        )
+
         simulation.output_dataset = PolicyEngineUSDataset(
             id=simulation.id,
             name=simulation.dataset.name,
             description=simulation.dataset.description,
-            filepath=str(
-                Path(simulation.dataset.filepath).parent
-                / (simulation.id + ".h5")
-            ),
+            filepath=filepath,
             year=simulation.dataset.year,
             is_output_dataset=True,
         )
 
+        # Load timestamps from file system metadata
+        if os.path.exists(filepath):
+            simulation.created_at = datetime.datetime.fromtimestamp(
+                os.path.getctime(filepath)
+            )
+            simulation.updated_at = datetime.datetime.fromtimestamp(
+                os.path.getmtime(filepath)
+            )
+
     def _build_simulation_from_dataset(self, microsim, dataset, system):
         """Build a PolicyEngine Core simulation from dataset entity IDs.
 

policyengine/tax_benefit_models/us.py

@@ -9,7 +9,10 @@ if find_spec("policyengine_us") is not None:
         PolicyEngineUSLatest,
         ProgramStatistics,
         USYearData,
+        create_datasets,
+        ensure_datasets,
         general_policy_reform_analysis,
+        load_datasets,
         us_latest,
         us_model,
     )
@@ -17,6 +20,9 @@ if find_spec("policyengine_us") is not None:
     __all__ = [
         "USYearData",
         "PolicyEngineUSDataset",
+        "create_datasets",
+        "load_datasets",
+        "ensure_datasets",
         "PolicyEngineUS",
         "PolicyEngineUSLatest",
         "us_model",

{policyengine-3.1.3.dist-info → policyengine-3.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine
-Version: 3.1.3
+Version: 3.1.5
 Summary: A package to conduct policy analysis using PolicyEngine tax-benefit models.
 Author-email: PolicyEngine <hello@policyengine.org>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{policyengine-3.1.3.dist-info → policyengine-3.1.5.dist-info}/RECORD

@@ -1,14 +1,14 @@
 policyengine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-policyengine/__pycache__/__init__.cpython-313.pyc,sha256=JgRxC9Ak_RvgoWALgjD5XZYdps4sZpi5eMtD4-xsIjY,175
+policyengine/__pycache__/__init__.cpython-313.pyc,sha256=i0if-AwQ3fDLDZnEs_L7YxJXPz-_BGDRJstrY56T1cU,175
 policyengine/core/__init__.py,sha256=KBVhkqzkvjWLDDwk96vquQKL63ZFuLen5AzBOBnO9pg,912
-policyengine/core/dataset.py,sha256=SFicjsZgMeKgJjlt8z98fOUWG2dfod0Q9NBy_m9PSc8,15506
+policyengine/core/dataset.py,sha256=iJr9-J6w11uMRYy3EEJO9Gveku1m71AA1yzeo-0SiCs,16094
 policyengine/core/dataset_version.py,sha256=6KeFCRGQto_Yyl4QY4Vo2JFythjaXrNAOHQiwRGESyM,378
 policyengine/core/dynamic.py,sha256=ng9BjDzxdwjJ0e7zoqXFmq33E1SRbaaPYfW7pjRSSzI,1641
 policyengine/core/output.py,sha256=cCW4vbzkLdQaT_nJTyDJBl7Hubm7nZeRuR7aVG1dKvg,643
 policyengine/core/parameter.py,sha256=5nBCw-6-BCfW-_uFqvAN5zcP_Vfz1mAmQsi3peWAbZA,407
 policyengine/core/parameter_value.py,sha256=b0ts1kbWcwjPSYnZm2rlCylmTLPJRLxDL8z3RmxM5OI,377
 policyengine/core/policy.py,sha256=ExMrUDMvNk_uuOL0cSm0UCzDyGka0t_yk6x4U0Kp6Ww,1635
-policyengine/core/simulation.py,sha256=fToaD4ieV99IMMKGU7r6ATCREWuOU2-4k6WqhzAzo7c,971
+policyengine/core/simulation.py,sha256=yvvved75XMcGP3Bj9E2tmKRxvI-DQVZv7k4uTETwBm0,1134
 policyengine/core/tax_benefit_model.py,sha256=2Yc1RlQrUG7djDMZbJOQH4Ns86_lOnLeISCGR4-9zMo,176
 policyengine/core/tax_benefit_model_version.py,sha256=V1CGft5Y6YflMASx0wR3V73jr-WqQu2R8N5QVMRm9yw,2752
 policyengine/core/variable.py,sha256=AjSImORlRkh05xhYxyeT6GFMOfViRzYg0qRQAIj-mxo,350
@@ -16,24 +16,24 @@ policyengine/outputs/__init__.py,sha256=IJUmLP0Og41VrwiqhJF-a9-3fIb4nlXpS7uFuVCI
 policyengine/outputs/aggregate.py,sha256=exI-U04OF5kVf2BBYV6sf8VldIWnT_IzxgkBs5wtnCw,4846
 policyengine/outputs/change_aggregate.py,sha256=tK4K87YlByKikqFaB7OHyh1SqAuGtUnLL7cSF_EhrOs,7373
 policyengine/outputs/decile_impact.py,sha256=jclhbj5U-xX8D-myy0SuWeJFVfQTqJDCh7qBXugak5U,4811
-policyengine/tax_benefit_models/uk.py,sha256=MCeJGQCTwUzBYdz0ru7IgT8Mgv-vJMqqVwFrntGWWTE,734
-policyengine/tax_benefit_models/us.py,sha256=d6rdhW2awoUvk5Ldp9mHAUiHqlnSfEQR318PkIXS_9c,794
-policyengine/tax_benefit_models/uk/__init__.py,sha256=1L1HBbOTflRefjOcU5vgEYkn6wLWOt_uG9G_PF089S0,732
+policyengine/tax_benefit_models/uk.py,sha256=HzAG_dORmsj1NJ9pd9WrqwgZPe9DUDrZ1wV5LuVCKAg,950
+policyengine/tax_benefit_models/us.py,sha256=G51dAmHo8NJLb2mnbne6iO5eNaatCGUd_2unvawwF84,946
+policyengine/tax_benefit_models/uk/__init__.py,sha256=AiA74iED5FEryvUCMfVZi6pYDYuTfQcj9B01h8J5xFA,1105
 policyengine/tax_benefit_models/uk/analysis.py,sha256=O4eYJYF7tsgiuLuiWMU0OXq7ss6U8-vzlg6nC2U8sgU,3175
-policyengine/tax_benefit_models/uk/datasets.py,sha256=Cn3sBvIBQ_-s5pEM9TDp2FwdVIo20h3do_8biVJLyKI,5748
-policyengine/tax_benefit_models/uk/model.py,sha256=tcetdBRSVhrDVNyGZMoYAcJNhrJwFX5-46FIHjdUdZw,9246
+policyengine/tax_benefit_models/uk/datasets.py,sha256=-lmj4eG2my2GGmMMkxI1iXobGQW5irBgylEwyV0xU6c,8039
+policyengine/tax_benefit_models/uk/model.py,sha256=HNdqsAKErDw9nruOdj4SiGF2KMopccaGDJ4RTXkdJ1U,9612
 policyengine/tax_benefit_models/uk/outputs.py,sha256=2mYLwQW4QNvrOHtHfm_ACqE9gbmuLxvcCyldRU46s0o,3543
-policyengine/tax_benefit_models/us/__init__.py,sha256=ClBkFwRa_nFQ3YU003uxBKiMG3pktaUb8jRvhzfR0vE,968
+policyengine/tax_benefit_models/us/__init__.py,sha256=zP-UUQqOc9g0ymyHkweJdi4RVXQDKSR6SUxavUKvV0s,1101
 policyengine/tax_benefit_models/us/analysis.py,sha256=Xf-DT0QjVySs0QG_koCwgvOeWI_scLtv3S3SP8u8ZWc,3253
-policyengine/tax_benefit_models/us/datasets.py,sha256=StvHtliqhYSIzI2ARqadLxTkp6xDYnf_qquB7aeH55Y,11994
-policyengine/tax_benefit_models/us/model.py,sha256=ASuApBtRhWXRi_jOWoxtWs77vaJnC9kOYuwogultct0,16055
+policyengine/tax_benefit_models/us/datasets.py,sha256=UwY5GcrVRl7zdmtqKE5TykYRNtOsGzyDm8kRkc98hyw,14708
+policyengine/tax_benefit_models/us/model.py,sha256=lhffJLnE4tr-ch_tHiyH2zP4IMX9_swWomUllb9WdbM,16421
 policyengine/tax_benefit_models/us/outputs.py,sha256=GT8Eur8DfB9cPQRbSljEl9RpKSNHW80Fq_CBXCybvIU,3519
 policyengine/utils/__init__.py,sha256=1X-VYAWLyB9A0YRHwsGWrqQHns1WfeZ7ISC6DMU5myM,140
 policyengine/utils/dates.py,sha256=HnAqyl8S8EOYp8ibsnMTmECYoDWCSqwL-7A2_qKgxSc,1510
 policyengine/utils/parametric_reforms.py,sha256=4P3U39-4pYTU4BN6JjgmVLUkCkBhRfZJ6UIWTlsjyQE,1155
 policyengine/utils/plotting.py,sha256=ZAzTWz38vIaW0c3Nt4Un1kfrNoXLyHCDd1pEJIlsRg4,5335
-policyengine-3.1.3.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-policyengine-3.1.3.dist-info/METADATA,sha256=MPxVNjBlodeO0vwpcu5dJJM287SbH_RKK_Acy_HL2fY,45889
-policyengine-3.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-policyengine-3.1.3.dist-info/top_level.txt,sha256=_23UPobfkneHQkpJ0e0OmDJfhCUfoXj_F2sTckCGOH4,13
-policyengine-3.1.3.dist-info/RECORD,,
+policyengine-3.1.5.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+policyengine-3.1.5.dist-info/METADATA,sha256=OrYJJBzGq6CZeokXm7gCprOYUPPJe0d4unqvivTPyXU,45889
+policyengine-3.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+policyengine-3.1.5.dist-info/top_level.txt,sha256=_23UPobfkneHQkpJ0e0OmDJfhCUfoXj_F2sTckCGOH4,13
+policyengine-3.1.5.dist-info/RECORD,,