Commit Graph

1509 Commits

Author SHA1 Message Date
Nick Todd
873b70c2c9 Merge branch 'dev' into bugfix/2455-notebook_updates 2024-04-19 11:52:09 +01:00
Nick Todd
9334b1e79b #2455: Add NICObservation.ConfigSchema to NIC list. 2024-04-19 11:07:32 +01:00
Charlie Crane
56d03aaf7b Merged PR 339: #2453 - Example Notebooks Refactor
## Summary
Updates to `create-simulation_demo.ipynb` and `network_simulator_demo.ipynb` to reflect changes within repo.
 - Corrected import paths
 - Corrected typo in create-simulation_demo: my_swtich -> my_switch and switch.sys_log.show -> computer.sys_log.show()
 - Changes to ARP implementation within nodes. Now defined as a property within HostNode and NetworkNode, allowing router.arp.show() to work as intended within the notebook.

## Test process
 - Both notebooks now run without issue when ran.
 - All tests pass

## 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
- [ ] 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: #2453, #2477, #2478
2024-04-18 13:36:23 +00: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
d05ded0dc2 Merge branch 'dev' into bugfix/2453-Example_Notebooks_require_refactor 2024-04-18 09:30:12 +01:00
Charlie Crane
999044a444 2453 - removal of notebook metadata 2024-04-17 10:44:44 +01:00
Marek Wolan
137a203acc Merged PR 346: Deprecate PrimaiteSession
## Summary
A while ago we have added several notebooks to get users started training their own agents. These notebooks overlap in functionality with PrimAITE session but they are more suitable.

* removed primaite session
* removed any tests relying on primaite session (except some tests were converted into environment tests.
* removed any CLI commands that rely on `PrimaiteSession`
* Added deprecation warnings to any benchmarking code that will break now because they rely on the old Primaite 2 session. (I left the code in because when we update benchmarking to v3, this will be a useful starting point)
* added similar deprecation warnings to Session metadata writer, reader and transaction stuff, for the same reason.
* removed parts of the documentation that are no longer relevant (session, training config, policy)
* went through all existing yaml config files and removed training options (as they were for session only)

## Test process
Checked that existing pytests all pass, and updated some pytests to use environment instead of session.

## Checklist
- [x] PR is linked to a **work item**
- [x] **acceptance criteria** of linked ticket are met
- [x] performed **self-review** of the code
- [x] written **tests** for any new functionality added with this PR
- [x] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] 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: #2374
2024-04-17 08:25:43 +00:00
Nick Todd
796c0553a4 Merge branch 'dev' into bugfix/2455-notebook_updates 2024-04-17 09:15:29 +01:00
Charlie Crane
750cc98703 #2453 - Actioning review comments 2024-04-16 16:52:36 +01:00
Charlie Crane
dcfcfc0c54 #2453 - Merging in updates on dev branch 2024-04-16 16:51:29 +01:00
Nick Todd
4903c77f65 #2455: Add missing source_wildcard_id and dest_wildcard_id data. 2024-04-16 14:17:58 +01:00
Marek Wolan
db56eea4ce #2374 Update readme and minor fix to yaml 2024-04-16 13:20:07 +01:00
Marek Wolan
e12fd8f1a2 Merged PR 344: Bump version and reenable multi-platform builds
Yes

Related work items: #2471
2024-04-16 11:19:20 +00:00
Marek Wolan
7c0a7702c4 #2374 update changelog 2024-04-16 11:39:13 +01:00
Marek Wolan
9679b898fe Merge remote-tracking branch 'origin/dev' into feature/2471-bump-version 2024-04-16 11:28:30 +01:00
Marek Wolan
8d0d323e0b #2374 Remove primaite session 2024-04-16 11:26:17 +01:00
Nick Todd
8fac8be6c2 Merge branch 'dev' into bugfix/2455-notebook_updates 2024-04-16 11:03:48 +01:00
Christopher McCarthy
2410d5ab37 Merged PR 345: PrimAITE v3.0.0b8 release
Merge the PrimAITE v3.0.0b3 release back into dev

gitflow, init
2024-04-16 09:45:43 +00:00
Marek Wolan
2d444f71c9 Updated VERSION 2024-04-16 08:53:55 +00:00
Marek Wolan
f0ed9d2240 re-enable multi platform builds 2024-04-15 14:16:09 +01:00
Marek Wolan
b797662b1d bump version 2024-04-15 14:15:58 +01:00
Marek Wolan
72dd84886b Merged PR 343: #2459 back-sync b8 changes into core
Copy pasta job

Related work items: #2459
2024-04-15 12:56:26 +00:00
Marek Wolan
39ec55c7b6 #2459 strip notebook outputs to appease pre-commit 2024-04-15 13:12:51 +01:00
Marek Wolan
72283e6184 #2459 Align whitespace and typing 2024-04-15 12:40:50 +01:00
Marek Wolan
e876bb5d41 #2459 update doc page 2024-04-15 11:59:17 +01:00
Marek Wolan
0828f70b4c #2459 back-sync b8 changes into core 2024-04-15 11:50:08 +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
Charlie Crane
3245c7e81e #2453 - Renaming Server hostname in create-simulation_demo and removing saved output 2024-04-09 14:48:49 +01:00
Nick Todd
89de5a298d #2455: Fix typo in config file and notebook 2024-04-09 14:47:31 +01:00
Charlie Crane
265f25b442 #2453 - One final typo correction found in network_simulator_demo.ipynb. Correcting switch.sys_log.show() to computer.sys_log.show() in Computer/Server Nodes section 2024-04-09 14:15:51 +01:00
Charlie Crane
8e6689d881 #2453 - Corrected flake8 linting errors ahead of creating PR, after finally managing to get it to run locally. This should now be ready for review 2024-04-09 13:56:21 +01:00
Charlie Crane
d02b12d1e5 #2453 Addressing some flake8 corrections 2024-04-09 13:45:27 +01:00
Charlie Crane
c13d3f191f #2453 - Correcting errors found from pipeline pre-commit checks 2024-04-09 13:34:57 +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
Czar Echavez
bce32fb376 Merged PR 330: #2448: store last query response for db client
## Summary
Required to complete #2448
DB Client will store last query response - Data Fusion Service will use this to know the difference between no response and invalid response

## Test process
*How have you tested this (if applicable)?*

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [X] 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
- [ ] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#2448: store last query response for db client

Related work items: #2448
2024-04-04 13:30:55 +00:00
Czar Echavez
383cf051df #2448: store last query response for db client 2024-04-04 14:17:34 +01:00
Marek Wolan
5408611c73 Merged PR 329: Remove link refs and put nice naming convention instead
instead of UUID for link primary key in describe state, we are using something more like

router_1:eth-3<->switch_1:eth-8
**all configs need to change the observation space link schema as a result of this change**

It looks like there are a lot of changed files, but it's mostly just removing the `game` parameter from observations and removing 'ref' from config files.

:)

also we no longer need to specify `ref` for nodes, services, or applications. (**but existing configs will not break based on this change!**)

Related work items: #2450
2024-04-04 09:11:23 +00:00
Marek Wolan
3b4962830a #2450 remove unused ref maps in PrimaiteGame 2024-04-03 22:52:06 +01:00
Marek Wolan
698cb83e41 #2450 change link definition schema 2024-04-03 22:20:33 +01:00
Marek Wolan
526dcc7ffe #2450 remove the need to pass Game to observation objects 2024-04-03 22:16:54 +01:00
Marek Wolan
53de4bf7dd Update test assets to new link naming convention 2024-04-03 21:46:42 +01:00
Marek Wolan
e99d238568 #2450 remove link refs and put nice naming convention instead 2024-04-03 21:39:13 +01:00
Marek Wolan
c9a552b836 Merged PR 328: #2449 fix observation integration
small fix

Related work items: #2449
2024-04-03 20:32:32 +00:00
Marek Wolan
2cd9e58994 temp disable extra platforms for build pipeline 2024-04-03 20:18:23 +00:00
Marek Wolan
5f9af03cd9 Merge remote-tracking branch 'origin/dev' into bugfix/2449-observation-where 2024-04-03 20:00:19 +01:00
Marek Wolan
06fd15abaa Merged PR 325: #2446 Fix io config parsing order
Tiny small bugfix.

make sure IO settings are read before the game config in the environments. This is so that SIM_OUTPUT global variable is set before constructing game objects.

Related work items: #2446
2024-04-03 16:33:51 +00:00
Marek Wolan
a4caa3dfe4 #2449 fix observation integration 2024-04-03 15:58:01 +01:00
Czar Echavez
985628f2da Merged PR 324: #2437: fix the visible health status not being carried on after restoring bac...
## Summary
The file being backed up by the database service does not restore the last visible health status of the db file before being restored

## Test process
- Tests that the visible health status is carried forward when the file is corrupted and then restored
- Tests that the visible health status is carried forward when the file is corrupted, deleted and then restored

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [X] 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
- [ ] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#2437: fix the visible health status not being carried on after restoring backup file

Related work items: #2437
2024-04-02 15:37:01 +00:00