The BU subsidy and New-PI credit can now be fetched from nerc_rates #148
Conversation
This file contains 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
QuanMPhm
force-pushed
the
147/subsidy_nerc_rates
branch
from
47db22e to
3d6a3ac
Compare
|
@QuanMPhm I see there was an update after the review request. Is this ready for review again? |
|
@joachimweyl Yes. I am waiting for at least a review from @naved001 or @knikolla |
naved001
reviewed
Feb 19, 2025
process_report/util.py
Outdated
| @@ -90,3 +92,8 @@ def fetch_s3(s3_filepath): | |||
| invoice_bucket = get_invoice_bucket() | |||
| invoice_bucket.download_file(s3_filepath, local_name) | |||
| return local_name | |||
|
|
|||
|
|
|||
| def fetch_nerc_rates(metadata_name, invoice_month): | |||
There was a problem hiding this comment.
I don't see a good reason to have this function and unnecessarily bloat util.py. Just move rates_info = load_from_url() to the top of processor_report.py, and then just query the rate as needed instead of this function call.
There was a problem hiding this comment.
I have created a global rates_info in process_report.py
The user now has the option to provide a custom subsidy amount, or to fetch from nerc_rates. A `fetch_nerc_rates` function has been added to `utils.py`, as it is now commonly used.
QuanMPhm
force-pushed
the
147/subsidy_nerc_rates
branch
from
3d6a3ac to
d2e1491
Compare
naved001
approved these changes
Feb 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #147. In addition to fetching the BU subsidy, I decided to also fetch the New-PI credit. These values can optionally be provided through the CLI.
Also, some if-clauses have been refactored for cleanliness.