Skip to content

feat(config): add v1.0 USA year configs for 2017-2024 - #1145

Open
bl-young wants to merge 1 commit into
mainfrom
by-v1-0-year-configs
Open

bl-young wants to merge 1 commit into
mainfrom
by-v1-0-year-configs

Conversation

@bl-young

Copy link
Copy Markdown
Member

cc:
Closes: #1123
Related: #1114, #1142

Plan: .cursor/plan/10_22_v1_0_year_configs.md

What changed? Why?

Adds the Cornerstone 2026 v1.0 USA config family for calendar years 2017-2024, plus the unsuffixed 2026_usa_cornerstone_v1_0 release member that matches _2024. Each year file uses v0.6 methodology with model_base_year / IO / GHG year set to that calendar year, pins GHG_national_Cornerstone_{year}_v0.6.0_635777c.parquet, and uses MUT v0.5.0_a166975 (2017: v0.5.0_011f41f). Points B_change_diagnostics.CONFIG_TEMPLATE (and thus supply_mix_diagnostic) at the v1.0 year template. Does not flip CANONICAL_USA_CONFIG or retarget the live v0.6 FBS pin (…nowcast_facilities_transportation_2024_…_82e24cd).

Impact

B-series and supply-mix diagnostics load the v1.0 year configs and the year-method retained-activity FBS; the live canonical model and weekday snapshots stay on 2025_usa_cornerstone_v0_6.

Testing

Config load tests cover each year member and assert the unsuffixed v1.0 dump matches _2024 while v0.6 still pins the facilities-transportation 2024 object.

uv run pytest bedrock/utils/config/__tests__/test_usa_config.py::test_v1_0_yearly_yamls_load bedrock/utils/config/__tests__/test_usa_config.py::test_v1_0_release_yaml_matches_2024_series_member -v

Review focus

  • 2017 MUT is 011f41f; 2018-2024 are a166975.
  • FBS filenames are the uploaded GHG_national_Cornerstone_{year}_v0.6.0_635777c objects.
  • CANONICAL_USA_CONFIG and 2025_usa_cornerstone_v0_6 FBS pin are unchanged.

Heads-up

Flipping canonical to v1.0 and bumping .SNAPSHOT_KEY are follow-ons (not this PR). #1134 ES export fill-in stays held pending FBS method breakouts.

Add 2026_usa_cornerstone_v1_0 and per-year members that pin the
latest GHG_national_Cornerstone_{year} FBS. Point
B_change_diagnostics at the v1.0 template. Leave CANONICAL and the
v0.6 release FBS pin unchanged.
@bl-young bl-young linked an issue Oct 23, 2026 that may be closed by this pull request
@bl-young
bl-young requested a review from MoLi7 October 23, 2026 00:56

@MoLi7 MoLi7 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LET'S GO!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add the v0.6 USA model for each year 2017-2024 Use 2026_ for the next canonical config

2 participants