Skip to content

feat(ghg): promote retained-activity Cornerstone 2024 FBS pin - #1142

Merged
bl-young merged 1 commit into
by-fbs-toolkitfrom
by-fbs-pin-bump
Oct 22, 2026
Merged

bl-young merged 1 commit into
by-fbs-toolkitfrom
by-fbs-pin-bump

Conversation

@bl-young

@bl-young bl-young commented Oct 22, 2026 •

Copy link
Copy Markdown
Member

cc: @catherinebirney
Related: #1136, #1123

Stack: 2 of 2 (pin promote). Base: toolkit PR (by-fbs-toolkit).

What changed? Why?

Promotes the Cornerstone GHG FBS regeneration pin from the facilities-transportation NFT golden to the year-stem retained-activity object GHG_national_Cornerstone_2024_v0.6.0_635777c.parquet (SHA256 988e0e68…). Updates cornerstone_ghg_fbs_2024_pin.json and drops the fbs_regeneration activity-collapse bridge now that both sides carry ActivityProducedBy. Does not edit USA model configs.

Impact

Weekday fbs_regeneration compares against the retained-activity year-stem golden; model loads via cornerstone_ghg_fbs_filename are unchanged.

Testing

Local rebuild matched prior-pin gas x sector; after uploading the 2024 GHG object to GCS, run uv run pytest bedrock/transform/__tests__/test_fbs.py -m fbs_regeneration -v.

Review focus

  • Pin JSON filename + sha256 match the GCS object (see Evidence).
  • No utils/config/configs/ edits.
  • FBS delta vs last pin is activity grain + naming; gas totals match (Evidence).

Heads-up

GCS inventory (2024 GHG + full time-series siblings) is in the PR comment -- all uploaded. Config cornerstone_ghg_fbs_filename retarget is a follow-on.

Evidence: this FBS vs last pinned FBS
Last pin (regen golden) This pin
Filename GHG_national_Cornerstone_nowcast_facilities_transportation_2024_v0.5.0_82e24cd.parquet GHG_national_Cornerstone_2024_v0.6.0_635777c.parquet
SHA256 f88b3fe9… (committed pin) 988e0e68a15d49d32a6cf7034c812425e417e5b9562f852856e99317dcc13857
Method stem same: GHG_national_Cornerstone_2024 same
ActivityProducedBy absent (pre-#1136 golden) present (retained activities)
Gas x SectorProducedBy baseline match within float noise (max |cell| ~3e-5 kg)
National FlowAmount ~4954.43 Mt ~4954.43 Mt (same)
Shape note -- +3 near-zero GHGRP_sector_floor dust rows on 33151 after activity collapse; immaterial to E

What is not a gas/content delta: short year-stem name vs NFT name; tool/git hash v0.6.0_635777c vs v0.5.0_82e24cd. Upstream Energy highway/distillate used in this rebuild match the prior Energy pins cellwise (max |d|=0) at the new hash.

USA configs still point cornerstone_ghg_fbs_filename at the transportation NFT (…_82e24cd / transport …_011f41f); only the regen pin JSON moves in this PR.

@bl-young

Copy link
Copy Markdown
Member Author

GCS upload inventory (done 2026-10-22)

All objects below are on GCS at hash v0.6.0_635777c (parquet + _metadata.json). Spot-checked merge-blocking 2024 GHG and counts: 42 under flowsa/FlowByActivity/, 48 under transform/output_data/ (90 total).

Required for fbs_regeneration

gs://cornerstone-default/transform/output_data/

  • GHG_national_Cornerstone_2024_v0.6.0_635777c.parquet
  • GHG_national_Cornerstone_2024_v0.6.0_635777c_metadata.json

C. GHG FBS (full series) -- transform/output_data/ (8)

  • GHG_national_Cornerstone_{2017..2024}_v0.6.0_635777c.parquet (+ metadata)

B. Energy FBS -- transform/output_data/ (16)

  • Energy_highway_fuel_shares_national_{2017..2024}_v0.6.0_635777c.parquet (+ metadata)
  • Energy_industrial_distillate_national_{2017..2024}_v0.6.0_635777c.parquet (+ metadata)

A. Energy FBAs -- gs://cornerstone-default/flowsa/FlowByActivity/ (21)

  • FHWA_Highway_Statistics_{2017..2024}_v0.6.0_635777c.parquet (+ metadata) -- 8
  • GSA_FFR_{2017..2024}_v0.6.0_635777c.parquet (+ metadata) -- 8
  • BTS_VIUS_2021_v0.6.0_635777c.parquet (+ metadata) -- 1
  • EIA_FOKS_{2017..2020}_v0.6.0_635777c.parquet (+ metadata) -- 4

Skip (already on GCS)

  • Census_EC_MatFuel_{2017,2022}_v0.3.0_46ab76e
  • EIA_MECS_Energy_{2018,2022}_v0.3.0_d99374e
  • NowcastMUT 011f41f / a166975 under flowsa/NowcastMUT/
  • Manufacturing Energy …_a166975

Do not upload

@bl-young
bl-young added this pull request to stack #1143 October 22, 2026 18:20
Bump the committed FBS regen golden to the year-stem retained-activity
parquet; drop the activity-collapse bridge in test_fbs. Leave USA model
configs unchanged.
@bl-young

Copy link
Copy Markdown
Member Author

Integration tests pass on this stack ✅
https://github.com/cornerstone-data/bedrock/actions/runs/39845452493

@bl-young
bl-young merged commit 2357484 into main Oct 22, 2026
9 checks passed
@bl-young
bl-young deleted the by-fbs-pin-bump branch October 22, 2026 22:40
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