Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transform FERC-714 load forecast table #3670

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d24b527
Add initial transformation framework
Jun 14, 2024
4e9b9b2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 14, 2024
1e1a420
Add columns to be renamed
Jun 14, 2024
ae23745
Pulled latest changes
Jun 14, 2024
e9319a8
Cleanup transform script and add schema changes
Jun 19, 2024
c2c9d12
Merge remote-tracking branch 'upstream/main' into issue-3519-transfor…
Jun 19, 2024
967f199
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 19, 2024
526ac08
Remove temp local dev logic
Jun 19, 2024
f014efd
Fix merge conflicts
Jun 19, 2024
70d170b
Correct job params and improve resource naming
Jun 23, 2024
855c74c
Merging in from upstream main
Jun 23, 2024
d5a60bd
Merge branch 'main' into issue-3519-transform-forecast
zaneselvans Jun 24, 2024
79e5a54
Merge remote-tracking branch 'upstream/main' into issue-3519-transfor…
Jul 10, 2024
9925d21
Add row count check
Jul 10, 2024
261242e
Merge branch 'issue-3519-transform-forecast' of https://github.com/se…
Jul 10, 2024
a814264
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 10, 2024
ec87d33
Add logic to handle duplicate report years
Jul 13, 2024
863cf90
Merge branch 'issue-3519-transform-forecast' of https://github.com/se…
Jul 13, 2024
6d3202b
Merge remote-tracking branch 'upstream/main' into issue-3519-transfor…
Jul 13, 2024
77f2bfd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 13, 2024
81e8852
Add documentation
Jul 13, 2024
dae16df
Merge branch 'issue-3519-transform-forecast' of https://github.com/se…
Jul 13, 2024
fd14e73
Update docs and check dupe rows removed
Jul 15, 2024
cda231f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 15, 2024
fc55f47
Apply suggestions from code review
zaneselvans Jul 15, 2024
c379126
Add temp notebook for analysis
Jul 16, 2024
f4638f6
:erge branch 'issue-3519-transform-forecast' of https://github.com/se…
Jul 16, 2024
d8d96e6
Merge latest from main
Jul 18, 2024
2795fb3
Merge branch 'main' into issue-3519-transform-forecast
zaneselvans Jul 18, 2024
6ddbcdc
Fix migration
Jul 18, 2024
98aa322
Merge branch 'issue-3519-transform-forecast' of https://github.com/se…
Jul 18, 2024
09dc53d
Merge branch 'main' into issue-3519-transform-forecast
zaneselvans Jul 19, 2024
3bceada
Check upper bound on duplicate rows, not exact number.
zaneselvans Jul 19, 2024
8f5f447
Modify assertion
Jul 19, 2024
38b05dc
Resolve merge conflict
Jul 19, 2024
b2fffd3
Disable build-distribution check on forks.
zaneselvans Jul 19, 2024
b6ba676
Merge branch 'issue-3519-transform-forecast' of github.com:seeess1/pu…
zaneselvans Jul 19, 2024
b95c868
Empty commit to retrigger GitHub checks
zaneselvans Jul 20, 2024
667335b
Merge branch 'main' into issue-3519-transform-forecast
zaneselvans Jul 20, 2024
0aa9d11
Remove conditional around build-distribution as it didn't work.
zaneselvans Jul 20, 2024
ee51721
Merge branch 'issue-3519-transform-forecast' of github.com:seeess1/pu…
zaneselvans Jul 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on: push
jobs:
build-distribution:
name: Build catalystcoop.pudl distribution for PyPI
if: github.repository == ‘catalyst-cooperative/pudl’
runs-on: ubuntu-latest
steps:
- name: Checkout source
Expand Down
7 changes: 7 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ EIA 860
regarding energy storage and solar generators. See issue :issue:`3676` and PR
:pr:`3681`.

FERC 714
~~~~~~~~

* Added :ref:`core_ferc714__yearly_planning_area_demand_forecast` based on FERC
Form 714, Part III, Schedule 2b. Data includes forecasted demand and net energy load.
See issue :issue:`3519` and PR :pr:`3670`.

NREL ATB
~~~~~~~~
* Added 2024 NREL ATB data. This includes adding a new tax credit case,
Expand Down
24 changes: 24 additions & 0 deletions migrations/versions/0f594b84fbe7_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"""empty message

Revision ID: 0f594b84fbe7
Revises: 2c52a938f5cc, c4e8e24d4a98
Create Date: 2024-07-18 19:06:38.337919

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '0f594b84fbe7'
down_revision = ('2c52a938f5cc', 'c4e8e24d4a98')
branch_labels = None
depends_on = None


def upgrade() -> None:
pass


def downgrade() -> None:
pass
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
"""Updated yearly_planning_area_demand_forecast schema

Revision ID: c4e8e24d4a98
Revises: b9b6cb1a5405
Create Date: 2024-07-10 12:57:31.753979

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'c4e8e24d4a98'
down_revision = 'b9b6cb1a5405'
branch_labels = None
depends_on = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('core_ferc714__yearly_planning_area_demand_forecast',
sa.Column('respondent_id_ferc714', sa.Integer(), nullable=False, comment='FERC Form 714 respondent ID. Note that this ID does not correspond to FERC respondent IDs from other forms.'),
sa.Column('report_year', sa.Integer(), nullable=False, comment='Four-digit year in which the data was reported.'),
sa.Column('forecast_year', sa.Integer(), nullable=False, comment='Four-digit year that applies to a particular forecasted value.'),
sa.Column('summer_peak_demand_mw', sa.Float(), nullable=True, comment='The maximum hourly summer load (for the months of June through September) based on net energy for the system during the reporting year. Net energy for the system is the sum of energy an electric utility needs to satisfy their service area and includes full and partial wholesale requirements customers, and the losses experienced in delivery. The maximum hourly load is determined by the interval in which the 60-minute integrated demand is the greatest.'),
sa.Column('winter_peak_demand_mw', sa.Float(), nullable=True, comment='The maximum hourly winter load (for the months of January through March) based on net energy for the system during the reporting year. Net energy for the system is the sum of energy an electric utility needs to satisfy their service area and includes full and partial wholesale requirements customers, and the losses experienced in delivery. The maximum hourly load is determined by the interval in which the 60-minute integrated demand is the greatest.'),
sa.Column('net_demand_mwh', sa.Float(), nullable=True, comment='Net electricity demand for the specified period in megawatt-hours (MWh).'),
sa.ForeignKeyConstraint(['respondent_id_ferc714'], ['core_ferc714__respondent_id.respondent_id_ferc714'], name=op.f('fk_core_ferc714__yearly_planning_area_demand_forecast_respondent_id_ferc714_core_ferc714__respondent_id')),
sa.PrimaryKeyConstraint('respondent_id_ferc714', 'report_year', 'forecast_year', name=op.f('pk_core_ferc714__yearly_planning_area_demand_forecast'))
)
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('core_ferc714__yearly_planning_area_demand_forecast')
# ### end Alembic commands ###
Loading