feat(python): Add conversion helper functions to Python extension. #231
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
New helper functions for converting from Pywr v1.x to v2.x JSON strings added to the Python extension. Includes a new wrapper around `Metric`.
Batch21
reviewed
Aug 1, 2024
Cargo.toml
Outdated
| @@ -47,5 +47,6 @@ tracing = { version = "0.1", features = ["log"] } | |||
| csv = "1.1" | |||
| hdf5 = { git = "https://github.com/aldanor/hdf5-rust.git", package = "hdf5", features = ["static", "zlib"] } | |||
| pywr-v1-schema = "0.14" | |||
| # pywr-v1-schema = { path = "/home/james/dev/pywr/pywr-schema/pywr-v1-schema" } | |||
pywr-schema/src/nodes/core.rs
Outdated
| @@ -831,7 +831,7 @@ pub struct AggregatedStorageNode { | |||
| } | |||
|
|
|||
| impl AggregatedStorageNode { | |||
| const DEFAULT_ATTRIBUTE: NodeAttribute = NodeAttribute::Outflow; | |||
| const DEFAULT_ATTRIBUTE: NodeAttribute = NodeAttribute::Volume; | |||
There was a problem hiding this comment.
Should this be fixed in another PR?
I think so? I guess I should add some Python tests for these functions. |
deleted the target directory and recreated the venv and it worked. Probably worth adding some more extensive python tests at some point but I tested both functions with some of the test models and they worked fine for me. |
Batch21
approved these changes
Aug 6, 2024
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.
New helper functions for converting from Pywr v1.x to v2.x JSON strings added to the Python extension. Includes a new wrapper around
Metric.