policyengine 3.1.0__py3-none-any.whl → 3.1.1__py3-none-any.whl

policyengine/core/dynamic.py

@@ -15,3 +15,29 @@ class Dynamic(BaseModel):
     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/core/policy.py

@@ -15,3 +15,29 @@ class Policy(BaseModel):
     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.dist-info → policyengine-3.1.1.dist-info}/METADATA

@@ -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.dist-info → policyengine-3.1.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 policyengine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-policyengine/__pycache__/__init__.cpython-313.pyc,sha256=GAB2_whebwzrl3SPkovueBC_A0aThpeDXzY3zYJq5gc,175
+policyengine/__pycache__/__init__.cpython-313.pyc,sha256=dmkhqYKcUjDPvirOFgf1L-P-aV3l7JIWK6zZZ6J45LU,175
 policyengine/core/__init__.py,sha256=3vabkWXYNNmQmN4Vy1yx2kKk6RKVSsdjtToQ8s8gzUg,870
 policyengine/core/dataset.py,sha256=jGjnoyEQ6VcTiCs8Hr6PT22l59CRhK1oUT5RPaz7mC0,9256
 policyengine/core/dataset_version.py,sha256=6KeFCRGQto_Yyl4QY4Vo2JFythjaXrNAOHQiwRGESyM,378
-policyengine/core/dynamic.py,sha256=3k1PtHWt0EzrTbm9zzp1Q9YpgbOoQvTPpC3OKII2rzw,531
+policyengine/core/dynamic.py,sha256=40RO3N6hmUT6-3tpJy0wSOC-9ITdFSS5LRiqPmi79f0,1605
 policyengine/core/output.py,sha256=cCW4vbzkLdQaT_nJTyDJBl7Hubm7nZeRuR7aVG1dKvg,643
 policyengine/core/parameter.py,sha256=PLDaepytqB7FVSfYQ541vnkVuMDLamFBeHtz2TmQrOE,378
 policyengine/core/parameter_value.py,sha256=b0ts1kbWcwjPSYnZm2rlCylmTLPJRLxDL8z3RmxM5OI,377
-policyengine/core/policy.py,sha256=FjpBR1Dr_9S_3kpQb8Q6qKdcrfRheh1F2h3wLBKgw5g,530
+policyengine/core/policy.py,sha256=xorVf03bcjB-3mBEmwj2YMqF1-6Xzps74SquzqtS0lo,1599
 policyengine/core/simulation.py,sha256=x9dU_nKEIgCZa11cxB-VdRNt9DZjjSML7n7M8_3STv8,941
 policyengine/core/tax_benefit_model.py,sha256=2Yc1RlQrUG7djDMZbJOQH4Ns86_lOnLeISCGR4-9zMo,176
 policyengine/core/tax_benefit_model_version.py,sha256=AJHFRaSEzR2_0FVkBBb40ID3FAaFFrFLnhSXRYYbtWs,1291
@@ -32,8 +32,8 @@ policyengine/utils/__init__.py,sha256=1X-VYAWLyB9A0YRHwsGWrqQHns1WfeZ7ISC6DMU5my
 policyengine/utils/dates.py,sha256=HnAqyl8S8EOYp8ibsnMTmECYoDWCSqwL-7A2_qKgxSc,1510
 policyengine/utils/parametric_reforms.py,sha256=4P3U39-4pYTU4BN6JjgmVLUkCkBhRfZJ6UIWTlsjyQE,1155
 policyengine/utils/plotting.py,sha256=JbMPwD7SCQqp_qbjYrXixT5zS0eG734n0Sg4JkD9nDc,5336
-policyengine-3.1.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-policyengine-3.1.0.dist-info/METADATA,sha256=pA3qr017txRk8csbR5A6cQo_NMXXOE9BBQXMa8fKX0w,45889
-policyengine-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-policyengine-3.1.0.dist-info/top_level.txt,sha256=_23UPobfkneHQkpJ0e0OmDJfhCUfoXj_F2sTckCGOH4,13
-policyengine-3.1.0.dist-info/RECORD,,
+policyengine-3.1.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+policyengine-3.1.1.dist-info/METADATA,sha256=JuCAmXnSyBcTeeqyBm54GYmsYrrOPg8zGhWHdYoleT4,45889
+policyengine-3.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+policyengine-3.1.1.dist-info/top_level.txt,sha256=_23UPobfkneHQkpJ0e0OmDJfhCUfoXj_F2sTckCGOH4,13
+policyengine-3.1.1.dist-info/RECORD,,