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.

Sign up for GitHub

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

Model didn't save extensions #116

Merged
merged 3 commits into from
Oct 15, 2024
Merged

Model didn't save extensions #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f78d5a9
add test and fix
Oct 15, 2024
05b8469
Update ci.yml
dalonsoa Oct 15, 2024
ebd6581
Merge branch 'main' into model-extension-attribute
barneydobson Oct 15, 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
12 changes: 12 additions & 0 deletions tests/test_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,18 @@ def test_custom_class_from_file():
model.run(dates=[to_datetime("2000-01-01")])
assert model.nodes["node_name"].custom_attr == 2

model.save(temp_dir, "new_config.yml")

# Remove the custom class from the registry to test loading it again
del model
NODES_REGISTRY.pop("CustomNode", None)

model = Model()
model.load(temp_dir, "new_config.yml")
assert model.nodes["node_name"].custom_attr == 1
model.run(dates=[to_datetime("2000-01-01")])
assert model.nodes["node_name"].custom_attr == 2


def test_custom_class_on_the_fly():
"""Test a custom class."""
Expand Down
3 changes: 3 additions & 0 deletions wsimod/orchestration/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ def __init__(self):
# self.arcs_type = {} #not sure that this would be necessary
self.nodes = {}
self.nodes_type = {}
self.extensions = []

# Default orchestration
self.orchestration = [
Expand Down Expand Up @@ -200,6 +201,7 @@ def load(self, address, config_name="config.yml", overrides={}):
E.G. ADDITION FOR NEW ORCHESTRATION
"""
load_extension_files(data.get("extensions", []))
self.extensions = data.get("extensions", [])

if "orchestration" in data.keys():
# Update orchestration
Expand Down Expand Up @@ -330,6 +332,7 @@ def save(self, address, config_name="config.yml", compress=False):
"additive_pollutants": constants.ADDITIVE_POLLUTANTS,
"non_additive_pollutants": constants.NON_ADDITIVE_POLLUTANTS,
"float_accuracy": constants.FLOAT_ACCURACY,
"extensions": self.extensions,
}
if hasattr(self, "dates"):
data["dates"] = [str(x) for x in self.dates]
Expand Down
Loading