policyengine-us 1.351.4__py3-none-any.whl → 1.352.0__py3-none-any.whl

policyengine_us/reforms/reforms.py

@@ -63,9 +63,6 @@ from .ctc import (
     create_ctc_older_child_supplement_reform,
     create_ctc_additional_bracket_reform,
 )
-from .second_earner import (
-    create_second_earner_tax_reform,
-)
 from .snap import (
     create_abolish_snap_deductions_reform,
     create_abolish_snap_net_income_test_reform,
@@ -192,9 +189,6 @@ def create_structural_reforms_from_parameters(parameters, period):
     ctc_older_child_supplement = create_ctc_older_child_supplement_reform(
         parameters, period
     )
-    second_earner_tax_reform = create_second_earner_tax_reform(
-        parameters, period
-    )
     abolish_snap_deductions = create_abolish_snap_deductions_reform(
         parameters, period
     )
@@ -301,7 +295,6 @@ def create_structural_reforms_from_parameters(parameters, period):
         salt_phase_out,
         repeal_state_dependent_exemptions,
         ctc_older_child_supplement,
-        second_earner_tax_reform,
         abolish_snap_deductions,
         abolish_snap_net_income_test,
         dc_property_tax_credit,

policyengine_us/tests/utilities/test_ucgid_hierarchical.py

@@ -0,0 +1,58 @@
+"""
+Test script demonstrating UCGID hierarchical functionality.
+"""
+
+from policyengine_us import Microsimulation
+from policyengine_us.variables.household.demographic.geographic.ucgid.ucgid_enum import (
+    UCGID,
+)
+
+
+class TestUCGIDHierarchical:
+    """Test class for UCGID hierarchical functionality."""
+
+    def test_ucgid_enum_hierarchical_methods(self):
+        """Test the hierarchical methods on UCGID enum values directly."""
+        print("\n=== Testing UCGID Enum Hierarchical Methods ===")
+
+        # Test Congressional District (CA_23)
+        ca_23 = UCGID.CA_23
+        ca_23_codes = ca_23.get_hierarchical_codes()
+        print(f"CA_23 hierarchical codes: {ca_23_codes}")
+        assert ca_23_codes == ["5001800US0623", "0400000US06", "0100000US"]
+
+        # Test State (CA)
+        ca = UCGID.CA
+        ca_codes = ca.get_hierarchical_codes()
+        print(f"CA hierarchical codes: {ca_codes}")
+        assert ca_codes == ["0400000US06", "0100000US"]
+
+        # Test US
+        us = UCGID.US
+        us_codes = us.get_hierarchical_codes()
+        print(f"US hierarchical codes: {us_codes}")
+        assert us_codes == ["0100000US"]
+
+        # Test hierarchy matching
+        assert ca_23.matches_hierarchy("0400000US06") == True
+        assert ca_23.matches_hierarchy("0100000US") == True
+        assert ca.matches_hierarchy("5001800US0623") == False
+
+    def test_ucgid_simulation_usage(self):
+        """Test how UCGID is used in a PolicyEngine simulation."""
+        simulation = Microsimulation()
+        ucgid_values = simulation.calculate("ucgid", "2024")
+
+        # The UCGID value should be a string (enum name)
+        ucgid_string = ucgid_values.iloc[0]  # First household
+        assert type(ucgid_string) == str
+
+        # Convert the string back to enum to access hierarchical methods
+        ucgid_enum = UCGID[ucgid_string]
+        hierarchical_codes = ucgid_enum.get_hierarchical_codes()
+        assert len(hierarchical_codes) == 1
+        assert hierarchical_codes[0] == "0100000US"
+
+        # Test hierarchy matching in simulation context
+        is_in_us = ucgid_enum.matches_hierarchy("0100000US")
+        assert is_in_us == True

policyengine_us/variables/household/demographic/geographic/ucgid/ucgid.py

@@ -0,0 +1,97 @@
+from policyengine_us.model_api import *
+from policyengine_core.simulations import Simulation
+from policyengine_us.variables.household.demographic.geographic.ucgid.ucgid_enum import (
+    UCGID,
+)
+import numpy as np
+
+
+class ucgid(Variable):
+    value_type = Enum
+    possible_values = UCGID
+    default_value = UCGID.US
+    entity = Household
+    label = "Unified Congressional Geographic Identifier (UCGID)"
+    definition_period = YEAR
+    documentation = """
+    Unified Congressional Geographic Identifier (UCGID) for the household as defined by the U.S. Census Bureau.
+    """
+
+    def formula(household, period, parameters):
+        simulation: Simulation = household.simulation
+
+        # If we're running over a dataset and UCGID is provided, it should be used directly
+        # (This is handled automatically by the simulation framework)
+
+        # For non-dataset simulations, try to derive from state_code
+        if not simulation.is_over_dataset:
+            state_code = household("state_code", period)
+
+            # Map state codes to UCGID state values
+            state_mapping = {
+                "AL": UCGID.AL,
+                "AK": UCGID.AK,
+                "AZ": UCGID.AZ,
+                "AR": UCGID.AR,
+                "CA": UCGID.CA,
+                "CO": UCGID.CO,
+                "CT": UCGID.CT,
+                "DE": UCGID.DE,
+                "DC": UCGID.DC,
+                "FL": UCGID.FL,
+                "GA": UCGID.GA,
+                "HI": UCGID.HI,
+                "ID": UCGID.ID,
+                "IL": UCGID.IL,
+                "IN": UCGID.IN,
+                "IA": UCGID.IA,
+                "KS": UCGID.KS,
+                "KY": UCGID.KY,
+                "LA": UCGID.LA,
+                "ME": UCGID.ME,
+                "MD": UCGID.MD,
+                "MA": UCGID.MA,
+                "MI": UCGID.MI,
+                "MN": UCGID.MN,
+                "MS": UCGID.MS,
+                "MO": UCGID.MO,
+                "MT": UCGID.MT,
+                "NE": UCGID.NE,
+                "NV": UCGID.NV,
+                "NH": UCGID.NH,
+                "NJ": UCGID.NJ,
+                "NM": UCGID.NM,
+                "NY": UCGID.NY,
+                "NC": UCGID.NC,
+                "ND": UCGID.ND,
+                "OH": UCGID.OH,
+                "OK": UCGID.OK,
+                "OR": UCGID.OR,
+                "PA": UCGID.PA,
+                "RI": UCGID.RI,
+                "SC": UCGID.SC,
+                "SD": UCGID.SD,
+                "TN": UCGID.TN,
+                "TX": UCGID.TX,
+                "UT": UCGID.UT,
+                "VT": UCGID.VT,
+                "VA": UCGID.VA,
+                "WA": UCGID.WA,
+                "WV": UCGID.WV,
+                "WI": UCGID.WI,
+                "WY": UCGID.WY,
+            }
+
+            # Convert state codes to UCGID values
+            result = np.empty(len(state_code), dtype=object)
+            for i, code in enumerate(state_code):
+                state_str = str(code) if hasattr(code, "__str__") else code
+                if state_str in state_mapping:
+                    result[i] = state_mapping[state_str]
+                else:
+                    result[i] = UCGID.US
+
+            return result
+
+        # Default fallback
+        return np.full(household.count, UCGID.US, dtype=object)