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

Enable customising orchestration #103

Merged
merged 20 commits into from
Sep 23, 2024
Merged

Conversation

liuly12
Copy link
Collaborator

@liuly12 liuly12 commented Sep 12, 2024

As requested by Enable extensions (loader) #99, this PR only keeps the customisation of orchestration from the Enable customisation pull request #54, and bins else. Another test_customise_orchestration function has also been added in test_model.py with an example ymal file test_customise_orchestration_example.yaml.

liuly12 and others added 12 commits January 10, 2024 14:36
The extensions consist of two addresses: (1) 'extension_file' includes the address of a script for any decorations of existing nodes/arcs/models objects; (2) 'new_classes' includes the new node name and the associated script address. It is noted that only the folder address is provided rather than the exact script address.
-Update model:
-- Add custom orchestration
-- Load/save the custom orchestration
-Update model_extensions.py
-- Remove custom orchestration (this is now simplified)
- Update settings_saved.yaml
-- Add custom orchestration
@liuly12 liuly12 linked an issue Sep 12, 2024 that may be closed by this pull request
@liuly12 liuly12 mentioned this pull request Sep 12, 2024
Copy link
Collaborator

@dalonsoa dalonsoa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in principle this looks ok, but the checks are all failing. Please, fix them to make sure these changes don't break anything.

@liuly12
Copy link
Collaborator Author

liuly12 commented Sep 14, 2024

Thank you Diego! I've now reformatted the code to pass the test. However, I still get one failed, which I have no clue how to address. Any suggestions would be helpful.

@liuly12 liuly12 requested a review from dalonsoa September 14, 2024 09:03
Copy link
Collaborator

@dalonsoa dalonsoa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a version obsolete preventing from things to pass, but now is fine.

I've just made a minor suggestion, but happy to go ahead.

wsimod/orchestration/model.py Outdated Show resolved Hide resolved
Co-authored-by: Diego Alonso Álvarez <[email protected]>
Copy link
Collaborator

@barneydobson barneydobson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I committed @dalonsoa 's suggestion since it passes.

Otherwise fine

@barneydobson barneydobson marked this pull request as ready for review September 23, 2024 13:12
@barneydobson barneydobson merged commit e43335e into main Sep 23, 2024
21 checks passed
@barneydobson barneydobson deleted the 102-enable_customise_orchestration branch September 23, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enable_customise_orchestration
3 participants