Nick Todd
a37ed4e487
#2442 : Fix config file path to be OS independent.
2024-05-02 16:16:36 +01:00
Nick Todd
2774442561
Merge branch 'bugfix/2442-add_SubprocVecEnv_support' of ssh.dev.azure.com:v3/ma-dev-uk/PrimAITE/PrimAITE into bugfix/2442-add_SubprocVecEnv_support
2024-05-02 15:48:30 +01:00
Nick Todd
db29d33629
#2442 : Add multi-processing notebook example.
2024-05-02 15:44:18 +01:00
Nick Todd
831f80f617
Merge branch 'bugfix/2442-add_SubprocVecEnv_support' of ssh.dev.azure.com:v3/ma-dev-uk/PrimAITE/PrimAITE into bugfix/2442-add_SubprocVecEnv_support
2024-05-01 11:22:08 +01:00
Nick Todd
b7fa826d95
#2442 : Initial commit of MP test script
2024-05-01 11:16:45 +01:00
Charlie Crane
13cabf8e21
Merged PR 360: 2523 - Logging Rewards updates.
...
## Summary
This PR updates `PrimaiteGymEnv` and `PrimaiteRayMARLEnv` within `environment.py` to log reward values per step and per episode.
Corrects an import statement within `io.py` - removing the use of `src`.
Fixes an error within notebooks that saw them failing following a rename of `game_config` to `env_config`.
## Test process
- Tests all continue to pass, and notebooks now run without error. This PR does not change any functionality, just adds some logging.
- Searched for the catch-22 that would trip me up as part of this ticket. A 3 line change felt like too simple an implementation...
## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [X] attended to any **TO-DOs** left in the code
Related work items: #2523
2024-04-30 17:13:50 +00:00
Charlie Crane
9c89fe4143
#2523 - Typo corrections within notebooks that stopped them from running
2024-04-30 16:14:34 +01:00
Charlie Crane
b8c46a92e9
#2523 - Minor typos/corrections to make things run locally. Added one logging line to record Blue agent reward per step in environment.py
2024-04-30 14:16:29 +01:00
Nick Todd
3d0ebe1aba
#2299 : Correct possible mis-merge.
2024-04-30 10:39:33 +01:00
Nick Todd
9906ba20ae
Merge branch 'dev' into bugfix/2299-check_hash_function_corrupts_files_and_folders
2024-04-30 09:17:40 +01:00
Nick Todd
5b03013e3f
Merge branch 'dev' into bugfix/2299-check_hash_function_corrupts_files_and_folders
2024-04-29 15:44:06 +01:00
Nick Todd
e667223a98
#2299 : Remove debug cell from notebook.
2024-04-29 15:34:23 +01:00
Marek Wolan
68d4751f73
Apply suggestions from code review
2024-04-29 11:56:40 +00:00
Marek Wolan
3c046b838b
#2514 Document request response.
2024-04-29 11:11:51 +01:00
Marek Wolan
30cc04411d
#2476 apply pr comments
2024-04-26 16:23:02 +01:00
Marek Wolan
37945c0065
#2476 Remove temporary testing file
2024-04-25 15:16:20 +01:00
Marek Wolan
66f31e8ed1
#2476 Add test for episode scheduler
2024-04-25 15:09:46 +01:00
Marek Wolan
e3f9162a77
Merge remote-tracking branch 'origin/dev' into feature/2476-training-schedules-mockup
2024-04-25 13:50:11 +01:00
Marek Wolan
a92898d001
#2476 Finalise explanation notebook for episode schedule
2024-04-25 13:25:26 +01:00
Nick Todd
3eea70f7d8
Merge branch 'dev' into bugfix/2299-check_hash_function_corrupts_files_and_folders
2024-04-23 16:40:02 +01:00
Marek Wolan
28c8b7c9d9
#2476 Get episode schedule working
2024-04-23 11:51:50 +01:00
Marek Wolan
2b3664ce36
#2476 Add proof of concept yaml combining notebook
2024-04-23 09:29:59 +01:00
Nick Todd
873b70c2c9
Merge branch 'dev' into bugfix/2455-notebook_updates
2024-04-19 11:52:09 +01:00
Charlie Crane
abf94fc4bb
#2453 - Committing additional explanations to notebook
2024-04-18 13:52:43 +01:00
Charlie Crane
bb88d43b90
#2453 - Updating with some explanation to improve the readability of the notebook
2024-04-18 13:50:47 +01:00
Charlie Crane
49be3b3639
#2453 - Updates to Training-an-SB3-agent.ipynb following review
2024-04-18 10:23:26 +01:00
Charlie Crane
9496441169
#2453 - Ignore this commit. Removing saved output in Training-an-SB3-Agent Notebook
2024-04-09 15:19:45 +01:00
Nick Todd
89de5a298d
#2455 : Fix typo in config file and notebook
2024-04-09 14:47:31 +01:00
Charlie Crane
f8432bf53b
#2453 - Example Notebooks Require Refactor
...
- create_simulation_demo and network_simulator_demo notebooks have been updated with correct import paths to reflect refactoring within condebase.
- Corrected typo within create-simulation_demo: my_swtich -> my_switch
- updates to ARP implementation. This is now a property in HostNode and NetworkNode, meaning router.arp.show() now works in network_simulator_demo notebook as intended.
2024-04-09 13:26:35 +01:00
Marek Wolan
a4caa3dfe4
#2449 fix observation integration
2024-04-03 15:58:01 +01:00
Cristian-VM2
94e637375d
#2404 update software state to fixing in UC2 e2e notebook [skip ci]
2024-03-26 17:02:51 +00:00
Cristian-VM2
5860c74ef9
#2404 change software state from patching to fixing to align with CAOS v0.8
2024-03-26 16:41:11 +00:00
Cristian-VM2
bef2bd8084
add actions to enable/disable ports in routers/firewalls, improve notebook for training PPO agents
2024-03-22 16:35:53 +00:00
Marek Wolan
fc67fc4833
Fix notebook parsing data
2024-03-15 14:37:28 +00:00
Marek Wolan
c8beb39fac
clear notebook output
2024-03-15 14:03:49 +00:00
Marek Wolan
33dd6e4dcd
Make sure notebook is using correct dict key
2024-03-15 14:03:37 +00:00
Nick Todd
90224960e5
2299: Backup Jupyter notebook changes.
2024-03-15 10:33:58 +00:00
Marek Wolan
24fdb8dc17
Fix minor reward sharing bugs
2024-03-12 11:40:26 +00:00
Marek Wolan
7599655879
Add agent action history
2024-03-11 20:10:08 +00:00
Marek Wolan
f4684b0349
Fix how nmnes are getting put into obs space.
2024-03-09 23:32:00 +00:00
Marek Wolan
618da8abe9
Rename notebooks
2024-03-07 15:25:11 +00:00
Marek Wolan
17d4807660
Rename configs
2024-03-07 14:33:21 +00:00
Marek Wolan
3e495c4622
Cosmetic changes to notebook
2024-03-05 09:28:22 +00:00
Marek Wolan
758f892b74
Make notebook for varying red agent behaviour in uc2
2024-03-04 21:04:27 +00:00
Marek Wolan
a222a8c58f
Give the UC2 config load function a meaningful name
2024-03-04 19:43:51 +00:00
Marek Wolan
1e8dfa40cf
Give uc2 notebook a meaningful name
2024-03-04 19:36:54 +00:00
Marek Wolan
ea1d016bc2
Merge remote-tracking branch 'origin/feature/2319-database-admin' into feature/2243-sync-uc2-action-to-iy
2024-03-03 16:55:42 +00:00
Marek Wolan
0e8c60df4c
Update actions
2024-03-03 16:53:18 +00:00
Marek Wolan
ef1a2dc3f4
clear uc2 notebook outputs
2024-03-03 16:00:10 +00:00
Marek Wolan
9762927289
Update notebook with new changes
2024-03-03 11:43:24 +00:00
