Merged
Conversation
…ect full df of npa_projects
alxsmith
reviewed
Aug 27, 2025
src/npa_howtopay/params.py
Outdated
| class ScenarioParams: | ||
| gas_electric: Literal["gas", "electric"] = field(validator=validators.in_(["gas", "electric"])) | ||
| capex_opex: Literal["capex", "opex"] = field(validator=validators.in_(["capex", "opex"])) | ||
| electric_fixed_cost_pct: float = field(validator=validators.and_(validators.ge(0.0), validator=validators.le(1.0))) |
Contributor
There was a problem hiding this comment.
does this belong int ElectricParams?
Contributor
Author
There was a problem hiding this comment.
Yea probably, since we aren't going to vary it across scenarios to make plots. Will move
alxsmith
reviewed
Aug 27, 2025
src/npa_howtopay/model.py
Outdated
| pl.col("gas_inflation_adjusted_revenue_requirement") | ||
| + pl.col("electric_inflation_adjusted_revenue_requirement") | ||
| ).alias("total_inflation_adjusted_revenue_requirement"), | ||
| (pl.col("gas_inflation_adjusted_revenue_requirement") / pl.col("num_users")).alias("gas_bill_per_user"), |
Contributor
There was a problem hiding this comment.
change num_users to gas_num_users
alxsmith
reviewed
Aug 27, 2025
src/npa_howtopay/model.py
Outdated
| + pl.col("electric_inflation_adjusted_revenue_requirement") | ||
| ).alias("total_inflation_adjusted_revenue_requirement"), | ||
| (pl.col("gas_inflation_adjusted_revenue_requirement") / pl.col("num_users")).alias("gas_bill_per_user"), | ||
| (pl.col("gas_inflation_adjusted_revenue_requirement") / pl.col("num_gas_users")).alias( |
Contributor
There was a problem hiding this comment.
change num_gas_users to gas_num_users
alxsmith
reviewed
Aug 27, 2025
src/npa_howtopay/model.py
Outdated
| "nonconverts_gas_bill_per_user" | ||
| ), | ||
| (pl.lit(0)).alias("converts_gas_bill_per_user"), | ||
| (pl.col("electric_inflation_adjusted_revenue_requirement") / pl.col("num_users")).alias( |
Contributor
There was a problem hiding this comment.
change num_users to electric_num_users
alxsmith
reviewed
Aug 27, 2025
src/npa_howtopay/model.py
Outdated
| ( | ||
| pl.lit(scenario_params.electric_fixed_cost_pct) | ||
| * pl.col("electric_inflation_adjusted_revenue_requirement") | ||
| / pl.col("num_users") |
Contributor
There was a problem hiding this comment.
change num_users to electric_num_users
alxsmith
reviewed
Aug 27, 2025
| return df.filter(year_filter & npa_filter).select(pl.col("num_converts")).sum().item() | ||
|
|
||
|
|
||
| def compute_npa_install_costs_from_df(year: int, df: pl.DataFrame, npa_install_cost: float) -> float: |
Contributor
There was a problem hiding this comment.
i created a duplicate function but we can clean it up when we merge
alxsmith
reviewed
Aug 27, 2025
src/npa_howtopay/params.py
Outdated
| electric: ElectricParams | ||
| shared: SharedParams | ||
|
|
||
| def __attrs_post_init__(self): |
Contributor
There was a problem hiding this comment.
Are these getting used anywhere?
Contributor
Author
There was a problem hiding this comment.
Yea, in the inflation calcs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also addressses: