policyengine 3.1.0__tar.gz → 3.1.1__tar.gz

{policyengine-3.1.0 → policyengine-3.1.1}/CHANGELOG.md

@@ -5,6 +5,14 @@ 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.1] - 2025-11-17 11:45:43
+
+### Added
+
+- Policy and Dynamic classes now support addition operator (__add__) to combine policies and dynamics.
+- Parameter values are appended when combining policies/dynamics.
+- Simulation modifiers are chained in sequence when combining policies/dynamics.
+
 ## [3.1.0] - 2025-11-17 10:25:50
 
 ## [3.0.0] - 2025-09-23 08:43:22
@@ -195,6 +203,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[3.1.1]: https://github.com/PolicyEngine/policyengine.py/compare/3.1.0...3.1.1
 [3.1.0]: https://github.com/PolicyEngine/policyengine.py/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/PolicyEngine/policyengine.py/compare/2.0.0...3.0.0
 [2.0.0]: https://github.com/PolicyEngine/policyengine.py/compare/1.0.0...2.0.0

{policyengine-3.1.0 → policyengine-3.1.1}/PKG-INFO

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

@@ -157,3 +157,11 @@
   - Just basemodels, no sqlmodels.
   - Clean, working analysis at both household and macro level for uk and us.
   date: 2025-11-17 10:25:50
+- bump: patch
+  changes:
+    added:
+    - Policy and Dynamic classes now support addition operator (__add__) to combine
+      policies and dynamics.
+    - Parameter values are appended when combining policies/dynamics.
+    - Simulation modifiers are chained in sequence when combining policies/dynamics.
+  date: 2025-11-17 11:45:43

{policyengine-3.1.0 → policyengine-3.1.1}/pyproject.toml

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

policyengine-3.1.1/src/policyengine/core/dynamic.py

@@ -0,0 +1,43 @@
+from collections.abc import Callable
+from datetime import datetime
+from uuid import uuid4
+
+from pydantic import BaseModel, Field
+
+from .parameter_value import ParameterValue
+
+
+class Dynamic(BaseModel):
+    id: str = Field(default_factory=lambda: str(uuid4()))
+    name: str
+    description: str | None = None
+    parameter_values: list[ParameterValue] = []
+    simulation_modifier: Callable | None = None
+    created_at: datetime = Field(default_factory=datetime.now)
+    updated_at: datetime = Field(default_factory=datetime.now)
+
+    def __add__(self, other: "Dynamic") -> "Dynamic":
+        """Combine two dynamics by appending parameter values and chaining simulation modifiers."""
+        if not isinstance(other, Dynamic):
+            return NotImplemented
+
+        # Combine simulation modifiers
+        combined_modifier = None
+        if self.simulation_modifier is not None and other.simulation_modifier is not None:
+
+            def combined_modifier(sim):
+                sim = self.simulation_modifier(sim)
+                sim = other.simulation_modifier(sim)
+                return sim
+
+        elif self.simulation_modifier is not None:
+            combined_modifier = self.simulation_modifier
+        elif other.simulation_modifier is not None:
+            combined_modifier = other.simulation_modifier
+
+        return Dynamic(
+            name=f"{self.name} + {other.name}",
+            description=f"Combined dynamic: {self.name} and {other.name}",
+            parameter_values=self.parameter_values + other.parameter_values,
+            simulation_modifier=combined_modifier,
+        )

policyengine-3.1.1/src/policyengine/core/policy.py

@@ -0,0 +1,43 @@
+from collections.abc import Callable
+from datetime import datetime
+from uuid import uuid4
+
+from pydantic import BaseModel, Field
+
+from .parameter_value import ParameterValue
+
+
+class Policy(BaseModel):
+    id: str = Field(default_factory=lambda: str(uuid4()))
+    name: str
+    description: str | None = None
+    parameter_values: list[ParameterValue] = []
+    simulation_modifier: Callable | None = None
+    created_at: datetime = Field(default_factory=datetime.now)
+    updated_at: datetime = Field(default_factory=datetime.now)
+
+    def __add__(self, other: "Policy") -> "Policy":
+        """Combine two policies by appending parameter values and chaining simulation modifiers."""
+        if not isinstance(other, Policy):
+            return NotImplemented
+
+        # Combine simulation modifiers
+        combined_modifier = None
+        if self.simulation_modifier is not None and other.simulation_modifier is not None:
+
+            def combined_modifier(sim):
+                sim = self.simulation_modifier(sim)
+                sim = other.simulation_modifier(sim)
+                return sim
+
+        elif self.simulation_modifier is not None:
+            combined_modifier = self.simulation_modifier
+        elif other.simulation_modifier is not None:
+            combined_modifier = other.simulation_modifier
+
+        return Policy(
+            name=f"{self.name} + {other.name}",
+            description=f"Combined policy: {self.name} and {other.name}",
+            parameter_values=self.parameter_values + other.parameter_values,
+            simulation_modifier=combined_modifier,
+        )

{policyengine-3.1.0 → policyengine-3.1.1}/src/policyengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine
-Version: 3.1.0
+Version: 3.1.1
 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.0/src/policyengine/core/dynamic.py

@@ -1,17 +0,0 @@
-from collections.abc import Callable
-from datetime import datetime
-from uuid import uuid4
-
-from pydantic import BaseModel, Field
-
-from .parameter_value import ParameterValue
-
-
-class Dynamic(BaseModel):
-    id: str = Field(default_factory=lambda: str(uuid4()))
-    name: str
-    description: str | None = None
-    parameter_values: list[ParameterValue] = []
-    simulation_modifier: Callable | None = None
-    created_at: datetime = Field(default_factory=datetime.now)
-    updated_at: datetime = Field(default_factory=datetime.now)

policyengine-3.1.0/src/policyengine/core/policy.py

@@ -1,17 +0,0 @@
-from collections.abc import Callable
-from datetime import datetime
-from uuid import uuid4
-
-from pydantic import BaseModel, Field
-
-from .parameter_value import ParameterValue
-
-
-class Policy(BaseModel):
-    id: str = Field(default_factory=lambda: str(uuid4()))
-    name: str
-    description: str | None = None
-    parameter_values: list[ParameterValue] = []
-    simulation_modifier: Callable | None = None
-    created_at: datetime = Field(default_factory=datetime.now)
-    updated_at: datetime = Field(default_factory=datetime.now)