policyengine 3.1.4__tar.gz → 3.1.6__tar.gz

{policyengine-3.1.4 → policyengine-3.1.6}/CHANGELOG.md

@@ -5,6 +5,18 @@ 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).
 
+## [3.1.6] - 2025-11-24 16:23:57
+
+### Fixed
+
+- Parameter values now accessible from models.
+
+## [3.1.5] - 2025-11-21 12:59:36
+
+### Fixed
+
+- Minor fixes
+
 ## [3.1.4] - 2025-11-20 14:06:49
 
 ### Fixed
@@ -221,6 +233,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[3.1.6]: https://github.com/PolicyEngine/policyengine.py/compare/3.1.5...3.1.6
+[3.1.5]: https://github.com/PolicyEngine/policyengine.py/compare/3.1.4...3.1.5
 [3.1.4]: https://github.com/PolicyEngine/policyengine.py/compare/3.1.3...3.1.4
 [3.1.3]: https://github.com/PolicyEngine/policyengine.py/compare/3.1.2...3.1.3
 [3.1.2]: https://github.com/PolicyEngine/policyengine.py/compare/3.1.1...3.1.2

{policyengine-3.1.4 → policyengine-3.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine
-Version: 3.1.4
+Version: 3.1.6
 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.4 → policyengine-3.1.6}/changelog.yaml

@@ -180,3 +180,13 @@
     fixed:
     - Minor fixes
   date: 2025-11-20 14:06:49
+- bump: patch
+  changes:
+    fixed:
+    - Minor fixes
+  date: 2025-11-21 12:59:36
+- bump: patch
+  changes:
+    fixed:
+    - Parameter values now accessible from models.
+  date: 2025-11-24 16:23:57

{policyengine-3.1.4 → policyengine-3.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "policyengine"
-version = "3.1.4"
+version = "3.1.6"
 description = "A package to conduct policy analysis using PolicyEngine tax-benefit models."
 readme = "README.md"
 authors = [

{policyengine-3.1.4 → policyengine-3.1.6}/src/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-3.1.4 → policyengine-3.1.6}/src/policyengine/core/parameter.py

@@ -2,6 +2,7 @@ from uuid import uuid4
 
 from pydantic import BaseModel, Field
 
+from .parameter_value import ParameterValue
 from .tax_benefit_model_version import TaxBenefitModelVersion
 
 
@@ -13,3 +14,4 @@ class Parameter(BaseModel):
     data_type: type | None = None
     tax_benefit_model_version: TaxBenefitModelVersion
     unit: str | None = None
+    parameter_values: list["ParameterValue"] = Field(default_factory=list)

{policyengine-3.1.4 → policyengine-3.1.6}/src/policyengine/tax_benefit_models/uk/model.py

@@ -177,6 +177,9 @@ class PolicyEngineUKLatest(TaxBenefitModelVersion):
                         value=param_at_instant.value,
                     )
                     self.parameter_values.append(parameter_value)
+                    self.get_parameter(parameter.name).parameter_values.append(
+                        parameter_value
+                    )
 
     def run(self, simulation: "Simulation") -> "Simulation":
         from policyengine_uk import Microsimulation

{policyengine-3.1.4 → policyengine-3.1.6}/src/policyengine/tax_benefit_models/us/model.py

@@ -167,6 +167,9 @@ class PolicyEngineUSLatest(TaxBenefitModelVersion):
                         value=param_at_instant.value,
                     )
                     self.parameter_values.append(parameter_value)
+                    self.get_parameter(parameter.name).parameter_values.append(
+                        parameter_value
+                    )
 
     def run(self, simulation: "Simulation") -> "Simulation":
         from policyengine_us import Microsimulation

{policyengine-3.1.4 → policyengine-3.1.6}/src/policyengine.egg-info/PKG-INFO

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