policyengine-us 1.362.1__py3-none-any.whl → 1.363.1__py3-none-any.whl

policyengine_us/tests/policy/baseline/gov/states/nc/ncdhhs/scca/integration.yaml

@@ -12,6 +12,7 @@
       spm_unit:
         nc_scca_countable_income: 1700
         members: [person1, person2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2]
@@ -34,6 +35,7 @@
       spm_unit:
         nc_scca_countable_income: 1700
         members: [person1, person2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2]
@@ -60,6 +62,7 @@
       spm_unit:
         nc_scca_countable_income: 2150
         members: [person1, person2, child1]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1]
@@ -86,6 +89,7 @@
       spm_unit:
         nc_scca_countable_income: 2150
         members: [person1, person2, child1]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1]
@@ -112,6 +116,7 @@
       spm_unit:
         nc_scca_countable_income: 2150
         members: [person1, person2, child1]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1]
@@ -138,6 +143,7 @@
       spm_unit:
         nc_scca_countable_income: 4302
         members: [person1, person2, child1]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1]
@@ -164,6 +170,7 @@
       spm_unit:
         nc_scca_countable_income: 4302
         members: [person1, person2, child1]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1]
@@ -194,6 +201,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -224,6 +232,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -254,6 +263,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -284,6 +294,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -314,6 +325,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -344,6 +356,7 @@
       spm_unit:
         nc_scca_countable_income: 5200
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -374,6 +387,7 @@
       spm_unit:
         nc_scca_countable_income: 3457
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -404,6 +418,7 @@
       spm_unit:
         nc_scca_countable_income: 3457
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -434,6 +449,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -464,6 +480,7 @@
       spm_unit:
         nc_scca_countable_income: 5200
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -494,6 +511,7 @@
       spm_unit:
         nc_scca_countable_income: 3457
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -524,6 +542,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -554,6 +573,7 @@
       spm_unit:
         nc_scca_countable_income: 3457
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -584,6 +604,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -614,6 +635,7 @@
       spm_unit:
         nc_scca_countable_income: 2000
         members: [person1, person2, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2]
@@ -652,6 +674,7 @@
       spm_unit:
         nc_scca_countable_income: 5199
         members: [person1, person2, child1, child2, child3, child4]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, person2, child1, child2, child3, child4]
@@ -679,6 +702,7 @@
       spm_unit:
         nc_scca_countable_income: 2000
         members: [person1, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 120_000
     households:
       household:
         members: [person1, child1, child2]
@@ -686,3 +710,31 @@
         state_code: NC
   output:
     nc_scca: 1305
+
+- name: No childcare expenses
+  period: 2025-01
+  input:
+    people:
+      person1:
+        age: 30
+        is_disabled: false
+      child1:
+        age: 3
+        is_disabled: false
+        is_tax_unit_dependent: true
+      child2:
+        age: 7
+        is_disabled: false
+        is_tax_unit_dependent: true
+    spm_units:
+      spm_unit:
+        nc_scca_countable_income: 2000
+        members: [person1, child1, child2]
+        spm_unit_pre_subsidy_childcare_expenses: 0
+    households:
+      household:
+        members: [person1, child1, child2]
+        county_str: CABARRUS_COUNTY_NC
+        state_code: NC
+  output:
+    nc_scca: 0

policyengine_us/tests/policy/baseline/household/demographic/geographic/county/county.yaml

@@ -39,3 +39,17 @@
     county_fips: ["36059", "06037", "26163", "32003"]
   output:
     county: [NASSAU_COUNTY_NY, LOS_ANGELES_COUNTY_CA, WAYNE_COUNTY_MI, CLARK_COUNTY_NV]
+
+- name: Only have the state code CA as input, return the first county of that state.
+  period: 2025
+  input:
+    state_code: CA
+  output:
+    county: ALAMEDA_COUNTY_CA
+
+- name: Only have the state code DC as input, return the first county of that state.
+  period: 2025
+  input:
+    state_code: DC
+  output:
+    county: DISTRICT_OF_COLUMBIA_DC

policyengine_us/tests/policy/baseline/household/demographic/geographic/county/first_county_in_state.yaml

@@ -0,0 +1,21 @@
+- name: Check default county in CA.
+  period: 2022
+  input:
+    state_code: CA
+  output: 
+    first_county_in_state: ALAMEDA_COUNTY_CA
+    county: ALAMEDA_COUNTY_CA
+
+- name: Check default county in MA.
+  period: 2022
+  input:
+    state_code: MA
+  output: 
+    first_county_in_state: BARNSTABLE_COUNTY_MA
+
+- name: Check default county in DC.
+  period: 2022
+  input:
+    state_code: DC
+  output: 
+    first_county_in_state: DISTRICT_OF_COLUMBIA_DC

policyengine_us/variables/gov/states/nc/ncdhhs/scca/nc_scca.py

@@ -19,4 +19,8 @@ class nc_scca(Variable):
         )
 
         parent_fee = spm_unit("nc_scca_parent_fee", period)
-        return max_(total_market_rate - parent_fee, 0)
+        uncapped_amount = max_(total_market_rate - parent_fee, 0)
+        childcare_expenses = spm_unit(
+            "spm_unit_pre_subsidy_childcare_expenses", period
+        )
+        return min_(childcare_expenses, uncapped_amount)

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

@@ -35,9 +35,23 @@ class county(Variable):
             state_code = county_fips_codes.loc[county_fips, "state"]
             return map_county_string_to_enum(county_name, state_code)
 
-        # Attempt to look up from ZIP code
-        zip_code = household("zip_code", period).astype(int)
-        zip_codes = ZIP_CODE_DATASET.set_index("zip_code")
-        county_name = zip_codes.county[zip_code]
-        state_code = zip_codes.state[zip_code]
-        return map_county_string_to_enum(county_name, state_code)
+        # Check if zip_code was explicitly provided as input
+        # The zip_code variable auto-generates values, so we need to check if it was user input
+        input_variables = getattr(simulation, "input_dataset", {})
+        if (
+            isinstance(input_variables, dict)
+            and "zip_code" not in input_variables
+        ):
+            # No ZIP code was provided by user, use first county in state
+            return household("first_county_in_state", period)
+
+        # Attempt to look up from ZIP code (only if explicitly provided)
+        try:
+            zip_code = household("zip_code", period).astype(int)
+            zip_codes = ZIP_CODE_DATASET.set_index("zip_code")
+            county_name = zip_codes.county[zip_code]
+            state_code = zip_codes.state[zip_code]
+            return map_county_string_to_enum(county_name, state_code)
+        except:
+            # If ZIP code lookup fails, use first county in state as fallback
+            return household("first_county_in_state", period)

policyengine_us/variables/household/demographic/geographic/county/first_county_in_state.py

@@ -0,0 +1,47 @@
+from policyengine_us.model_api import *
+from policyengine_us.variables.household.demographic.geographic.county.county_enum import (
+    County,
+)
+from policyengine_us.variables.household.demographic.geographic.state_code import (
+    StateCode,
+)
+
+
+class first_county_in_state(Variable):
+    value_type = Enum
+    possible_values = County
+    default_value = County.UNKNOWN
+    entity = Household
+    label = "First county alphabetically in household's state"
+    definition_period = YEAR
+
+    def formula(household, period, parameters):
+        # Get state codes as strings
+        state_code_str = household("state_code_str", period)
+
+        # Build mapping of state abbreviations to first county
+        state_to_first_county = {}
+
+        for state in StateCode:
+            state_abbr = state.value  # e.g., "CA", "TX", etc.
+
+            # Find all counties for this state
+            state_counties = [
+                county
+                for county in County
+                if county != County.UNKNOWN
+                and county.value.endswith(f", {state_abbr}")
+            ]
+
+            # Sort alphabetically and get the first one
+            if state_counties:
+                first_county = min(state_counties, key=lambda c: c.value)
+                state_to_first_county[state_abbr] = first_county
+
+        # Map each household's state to its first county
+        result = []
+        for state_abbr in state_code_str:
+            county = state_to_first_county.get(state_abbr, County.UNKNOWN)
+            result.append(county)
+
+        return np.array(result)

{policyengine_us-1.362.1.dist-info → policyengine_us-1.363.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine-us
-Version: 1.362.1
+Version: 1.363.1
 Summary: Add your description here.
 Author-email: PolicyEngine <hello@policyengine.org>
 License-File: LICENSE

{policyengine_us-1.362.1.dist-info → policyengine_us-1.363.1.dist-info}/RECORD

@@ -4461,7 +4461,7 @@ policyengine_us/tests/policy/baseline/gov/states/mt/tax/income/subtractions/mt_d
 policyengine_us/tests/policy/baseline/gov/states/mt/tax/income/subtractions/mt_disability_income_exclusion_person.yaml,sha256=9lqqiAwItIZitOJg18pGlt7FIQPjQCIHKHZJg-29HuA,757
 policyengine_us/tests/policy/baseline/gov/states/mt/tax/income/subtractions/mt_old_age_subtraction.yaml,sha256=z-kGEWhn1XvbzQUOhq3j-U60-qa2Z0RoyY6unuOF2Ss,241
 policyengine_us/tests/policy/baseline/gov/states/mt/tax/income/subtractions/mt_tuition_subtraction_person.yaml,sha256=lRHx9pLz2SgqX8t45BFyrjN2DqhxM4_hNo25AOer3t8,1373
-policyengine_us/tests/policy/baseline/gov/states/nc/ncdhhs/scca/integration.yaml,sha256=Npfi3d8q2zb2ucql3Uy1aanM05CJ7vK8mlPC5GQNJ0E,17285
+policyengine_us/tests/policy/baseline/gov/states/nc/ncdhhs/scca/integration.yaml,sha256=IgQpeWhb5yVUO6cbCpqy_tQOQ0g-yALnvXAOCqlFq5Y,19292
 policyengine_us/tests/policy/baseline/gov/states/nc/ncdhhs/scca/nc_scca_age_group.yaml,sha256=-uyaqkmj9GZzgDdlUtudrN-v2Djp_XCUi9Ox9OLQ03Y,1461
 policyengine_us/tests/policy/baseline/gov/states/nc/ncdhhs/scca/nc_scca_child_age_eligible.yaml,sha256=nkZvK2MUCfEMjGfG9iCJmGsLQjtHdIXRGGB7V4yyvVg,886
 policyengine_us/tests/policy/baseline/gov/states/nc/ncdhhs/scca/nc_scca_countable_income.yaml,sha256=K9GjvmjWm1Ash2qGVxQddpWvhxb_ORZQbWFODPfeskg,1128
@@ -5014,7 +5014,8 @@ policyengine_us/tests/policy/baseline/household/demographic/age/monthly_age.yaml
 policyengine_us/tests/policy/baseline/household/demographic/geographic/lives_in_vehicle.yaml,sha256=TaFZl3mSZl7wcuQvfCy-mmhBCzAfNZ2EXnMAPs0ZErw,585
 policyengine_us/tests/policy/baseline/household/demographic/geographic/state_group.yaml,sha256=Is1iFAICyaT7gTxOFth7iFHoAM8uaGWM-Sg-OrpMG3A,192
 policyengine_us/tests/policy/baseline/household/demographic/geographic/state_name.yaml,sha256=wv0gP9Cp0tOAWapOYFCZL2nLPRgs2BmTp9xnelFPFGo,154
-policyengine_us/tests/policy/baseline/household/demographic/geographic/county/county.yaml,sha256=1TMMbBpOCIMDqDN3Y6rLjx1Uv0cJufLaoLf9__WgjOc,1000
+policyengine_us/tests/policy/baseline/household/demographic/geographic/county/county.yaml,sha256=hMg6qJf_W6WkIXPJXPS0orEhIMIfLhcEnsrMJkPUCPk,1344
+policyengine_us/tests/policy/baseline/household/demographic/geographic/county/first_county_in_state.yaml,sha256=cLAyzsr2ztmvZwwPjtR06dc-IK1ZN3krMtKTFe5Wkek,446
 policyengine_us/tests/policy/baseline/household/demographic/household/county_str.yaml,sha256=Ocgx2tgPj1cgXf0L1W3Id8FFFIRJko8xaa5hLaliCmQ,134
 policyengine_us/tests/policy/baseline/household/demographic/person/immigration_status.yaml,sha256=Q9lF4EPbgw4XxPtIGEE6BHRlM1882JU7zLy8QogDUTo,413
 policyengine_us/tests/policy/baseline/household/demographic/person/is_child_dependent.yaml,sha256=O-osoiYeJfrb7jvGTZQU9fatTHHOGlzCSRAok6IRfYU,888
@@ -7009,7 +7010,7 @@ policyengine_us/variables/gov/states/mt/tax/income/tax_calculation/mt_regular_in
 policyengine_us/variables/gov/states/mt/tax/income/tax_calculation/mt_regular_income_tax_joint.py,sha256=HqTHpJ9vwwITJRIYKTDBaIRN18ChJwe1SQkk0KM3ZUc,1429
 policyengine_us/variables/gov/states/mt/tax/income/tax_calculation/mt_taxable_income_indiv.py,sha256=7_1ml0-QNqjRZcUL_WP1_IQkjU_7xeFe-JINSzzMnls,2537
 policyengine_us/variables/gov/states/mt/tax/income/tax_calculation/mt_taxable_income_joint.py,sha256=Yzr3bjxggadC1Um2P-gvmVrP9rHnrL0_Nwo6JW4LDZw,1335
-policyengine_us/variables/gov/states/nc/ncdhhs/scca/nc_scca.py,sha256=AVxV29CTvYwDZphz5uYZfI5qBb9GELylm907HXImcnQ,715
+policyengine_us/variables/gov/states/nc/ncdhhs/scca/nc_scca.py,sha256=tFCarOqDh7fNAhD_FGRgEQqG_dPs98P90rnnF5A4pAo,894
 policyengine_us/variables/gov/states/nc/ncdhhs/scca/nc_scca_age_group.py,sha256=gEH7CgaiI_mMTGXhycpaKuY6bQGa8SSAu5Kp_rS9fGA,1083
 policyengine_us/variables/gov/states/nc/ncdhhs/scca/nc_scca_child_age_eligible.py,sha256=uioF3NzN-RO_OVSj1rHeua93Gj4yGQKurqxRJsxAkvU,836
 policyengine_us/variables/gov/states/nc/ncdhhs/scca/nc_scca_countable_income.py,sha256=DRpNqR-Ep6ndGGNBlQjt4dKKg9DcuyGNSTBqiqjX_04,500
@@ -7772,9 +7773,10 @@ policyengine_us/variables/household/demographic/geographic/state_group.py,sha256
 policyengine_us/variables/household/demographic/geographic/state_group_str.py,sha256=YVapmNgz-QhCZXVfVnU72_G_fijilHLJ1kBDThX9IUE,359
 policyengine_us/variables/household/demographic/geographic/state_name.py,sha256=tfpURwlCmHRJkk4m0_NVPInByKbWY0Upq7sbZUobZIs,1495
 policyengine_us/variables/household/demographic/geographic/tax_unit_state.py,sha256=yQCj1TgJplNL7EGOx59C9av7isbHsyThaWheZMCjSFg,282
-policyengine_us/variables/household/demographic/geographic/county/county.py,sha256=hP3wgV41mXN1CBr0I8X4Ggftz94WZcc9fZ2jMl6UYl4,1674
+policyengine_us/variables/household/demographic/geographic/county/county.py,sha256=MPPzpU7ZciOgm3paZRne4w5s7zAljGl2MkI3Xdyi5pw,2374
 policyengine_us/variables/household/demographic/geographic/county/county_enum.py,sha256=2-SIpjp72QWPhQQUs8hzxrLcE2baWSkLTdCVRwKOXXw,145769
 policyengine_us/variables/household/demographic/geographic/county/county_str.py,sha256=UDWJ8YqH4Ef_JTscy8LMwLAMQ_o-Zan13hziZBY3XPs,339
+policyengine_us/variables/household/demographic/geographic/county/first_county_in_state.py,sha256=yXCj-LVjxPeILIg42ijefTmi_j4NxJwX0kMtoE47xic,1578
 policyengine_us/variables/household/demographic/geographic/state/average_home_energy_use_in_state.py,sha256=aaGYAXLU7tsx-A9NW4nyLij5J5mp0WTRXsyObngekvY,319
 policyengine_us/variables/household/demographic/geographic/state/in_state.py,sha256=o3ksZCOHtlJ1JGHIXAPlqcs5-rVbTgOCcDdN1-fYqmA,551
 policyengine_us/variables/household/demographic/geographic/ucgid/ucgid.py,sha256=RX4zSK6mqUoI10Jhe8XSDhrG-H0qOv3zmKMHeSl-TQY,3270
@@ -8228,8 +8230,8 @@ policyengine_us/variables/input/farm_income.py,sha256=BEKxYmHNNnWJAAvULl5qZJigy5
 policyengine_us/variables/input/geography.py,sha256=XmBlgXhzBoLRKk6R8taVZHqUw1eU8MbNeGS9iJ7_l44,4506
 policyengine_us/variables/input/self_employment_income.py,sha256=PwsGz8R4lRikKWUYOhsC0qosNNLXq4f5SQmfw4S3mk8,511
 policyengine_us/variables/input/self_employment_income_before_lsr.py,sha256=E8fcX9Nlyqz8dziHhQv_euutdmoIwFMMWePUwbbwv_w,379
-policyengine_us-1.362.1.dist-info/METADATA,sha256=R5_J7iVsM5BIMiIhr9nuNYaUFkEiGErU3o6ggyI3YzU,1693
-policyengine_us-1.362.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_us-1.362.1.dist-info/entry_points.txt,sha256=MLaqNyNTbReALyKNkde85VkuFFpdPWAcy8VRG1mjczc,57
-policyengine_us-1.362.1.dist-info/licenses/LICENSE,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-policyengine_us-1.362.1.dist-info/RECORD,,
+policyengine_us-1.363.1.dist-info/METADATA,sha256=wGeHWYnyQKAKlOz74KcgiCDgSPMa8rbtqSHlubZYQE0,1693
+policyengine_us-1.363.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_us-1.363.1.dist-info/entry_points.txt,sha256=MLaqNyNTbReALyKNkde85VkuFFpdPWAcy8VRG1mjczc,57
+policyengine_us-1.363.1.dist-info/licenses/LICENSE,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+policyengine_us-1.363.1.dist-info/RECORD,,