Skip to content

Turn on #1303/#1305/#1306 flags, and pin v1.0 to CI rebuild v1.0.0_2b1164f - #1314

Merged
bl-young merged 3 commits into
mainfrom
pin_v1_0_ci_f083121
Nov 14, 2026
Merged

bl-young merged 3 commits into
mainfrom
pin_v1_0_ci_f083121

Conversation

@bl-young

@bl-young bl-young commented Nov 14, 2026 •

Copy link
Copy Markdown
Member

cc: @MoLi7
Closes:
Related: #1303, #1305, #1306, #1312, #1249

What changed? Why?

Turns on the #1303 / #1305 / #1306 flags in the nine v1.0 configs and pins v1.0 to the CI rebuild v1.0.0_2b1164f: run 43526965633 on branch tip 2b1164fd (flag commit). The repinned files are the nine configs, the GHG flow-by-sector upstream pin, both 2024 pins with new sha256 values, and the config tests. B tracker / IV currents, assessed-sector trend curves, and landfill explanation captions move onto this build (same shape as #1308).

Since fd271dc (#1302), this build adds:

PR change
#1303 Hold imports to BEA summary groups in the balance; condition service exports on the summary rows (#1288, #1250)
#1306 Hold the services seed's AIES years on the SAS 2022 index; trucking electricity on warehousing's (#1304)
#1305 Divide commercial kWh on survey electricity or other inputs, not on bills (#899, #705)
#1312 Derive match_io waste weights for calendar 2017

Uploaded to GCS, nothing overwritten (272 files): 16 balanced supply-use tables, 128 Make, Use, Import and Margins tables, 64 Energy and GHG flow-by-sector tables, the 16 Census trade flow-by-activity tables and the 32 trade flow-by-sector tables, each with its metadata. Build commit tagged build-2b1164f so the vintage SHA stays reachable after squash-merge (MUT/GCS label remains v1.0.0_2b1164f).

Impact

Live v1.0 configs and weekday nowcast_integration / fbs_regeneration load the 2b1164f MUT, balanced SUT, and Cornerstone GHG; eeio_integration stays on the prior .SNAPSHOT_KEY until the follow-on snapshot-key PR. Tracker currents follow this rebuild.

Testing

Config load: uv run pytest bedrock/utils/config/__tests__/test_usa_config.py -k v1_0 (9 passed). GitHub test_integration on this branch: nowcast_balance and fbs_regeneration green; eeio_integration expected red until the snapshot-key PR. Fast CI (format / lint / typecheck / test / test-fast) green. IV equal + spend and sector triage on the pin vintage; details in the IV / tracker comment.

Heads-up

…mmercial kWh

Enable hold_services_seed_at_last_sas_year, hold_imports_on_summary_groups,
condition_service_exports_on_summary, and commercial_kwh_follow_intermediate_inputs
on the nine v1.0 configs, and require the three Step 5-7 holds in the rebuild flag check.
Retarget the nine v1.0 configs, 2024 balanced SUT and Cornerstone GHG
pins, and upstream FBS inputs to the rebuild from Actions run 43526965633.
@bl-young
bl-young requested a review from MoLi7 November 14, 2026 00:30
@MoLi7

MoLi7 commented Nov 14, 2026 •

Copy link
Copy Markdown
Member

git sha bump LGTM.

two thoughts/questions on configs for your consideration @bl-young @WesIngwersen :

  1. Are we sure we want 2026_usa_cornerstone_v1_0.yaml to move with time series configs? Currently, it has exactly the same model configuration as 2026_usa_cornerstone_v1_0_2024.yaml, shall we instead pin it at release candidate version so we can easily gauge the model changes (data + methodology) since rc?
  2. I'm pretty sure these won't be the v1.0 US models we ship in December - there will be more iterations as we validate the global model. So shall we consider adopting what I proposed in https://github.com/cornerstone-data/ceda/pull/722 to use rc-x for version control? Which comes from this Slack thread.

Equal- and spend-weight IV on the flags-on pin rebuild; landfill drops
below 0.2 after calendar-2017 waste weights.
@bl-young

Copy link
Copy Markdown
Member Author

IV / tracker currents + integration

Moves the B driver tracker and About_IV_score.md onto v1.0.0_2b1164f (this pin), and redraws the assessed-sector trend curves. Same shape as #1308.

What changed on the pages

How much moved

Against fd271dc (prior pin):

Equal weights tell the same story: landfill falls from rank 6 to 14; most other top-15 scores move by a few hundredths. Share by year shifts toward 2020 and 2023 and away from 2021 and 2022.

Integration (merge gates)

test_integration on this branch:

Job Result
test_fbs_regeneration pass
test_nowcast_balance pass
test_cornerstone_usa (eeio_integration) fail -- expected until the snapshot-key PR

Fast CI on the PR (format / lint / typecheck / test / test-fast) is green.

Reproduce

uv run python -m bedrock.analysis.time_series_B_matrix.IV_score --weights equal
uv run python -m bedrock.analysis.time_series_B_matrix.IV_score --weights-csv <spend weights>
uv run python -m bedrock.analysis.time_series_B_matrix.sector_deep_dive_triage --iv-csv <IV_score.csv> --codes 221100,481000,211000,562212,484000,324110,325110,531ORE,331110,325190,325211

The spend-weights file is not in the repo.

@bl-young
bl-young marked this pull request as ready for review November 14, 2026 01:20
@bl-young

Copy link
Copy Markdown
Member Author
  1. Are we sure we want 2026_usa_cornerstone_v1_0.yaml to move with time series configs? Currently, it has exactly the same model configuration as 2026_usa_cornerstone_v1_0_2024.yaml, shall we instead pin it at release candidate version so we can easily gauge the model changes (data + methodology) since rc?
  2. I'm pretty sure these won't be the v1.0 US models we ship in December - there will be more iterations as we validate the global model. So shall we consider adopting what I proposed in refactor(configs): name the v1.0 configs rc1 and the time series rc2 ceda#722 to use rc-x for version control? Which comes from this Slack thread.

Why don't we discuss next week and we can rename if we want.

@bl-young

Copy link
Copy Markdown
Member Author

@MoLi7 any new reactions to the IV tracker update before I merge?

@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.

I understand the IV definition has not changed. Updates in this PR change the inputs due to model changes. Refreshed IV metric outputs look reasonable to me. Approving!

@bl-young
bl-young merged commit 6386198 into main Nov 14, 2026
5 checks passed
@bl-young
bl-young deleted the pin_v1_0_ci_f083121 branch November 14, 2026 01:35
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.

2 participants