Commit Graph

870 Commits

Author SHA1 Message Date
Nick Todd
87dde6ee0b #2042: Test tidying changes. 2023-11-23 15:55:58 +00:00
Nick Todd
8584fa8f51 # 2041: Minor test changes 2023-11-23 10:04:52 +00:00
Nick Todd
006a37d268 #2042: extract code into request_time() method. 2023-11-22 14:40:44 +00:00
Nick Todd
3f76e09521 #2042: remove apply_timestep() return value 2023-11-22 14:13:50 +00:00
Nick Todd
dd7c2b05f8 #2041: Add RST doc 2023-11-22 08:54:39 +00:00
Nick Todd
984d165364 #2041: Fix long line 2023-11-21 17:24:50 +00:00
Nick Todd
eb2e37429a #2042: Add time attribute 2023-11-21 17:24:24 +00:00
Nick Todd
243f2dd938 #2041: Update CHANGELOG 2023-11-21 12:11:30 +00:00
Nick Todd
9ab33a4aa4 Merge branch 'dev' into feature/2041_2042-Add-NTP-Services 2023-11-21 11:28:50 +00:00
Nick Todd
60d94bf4b5 #2041: Remove test 2023-11-21 11:17:38 +00:00
Nick Todd
4f0f758ce9 #2041: Correct return value from receive() 2023-11-21 11:16:34 +00:00
Nick Todd
813a1f356e #2042: Remove debug statement 2023-11-21 11:15:07 +00:00
Marek Wolan
e9d2437db8 Merged PR 212: GATE-less agents
## Summary
Remove gate and integrate SB3 agent natively.
This includes:
- agent saving
- checkpoints
- session output directory
- simulation output (such as syslogs) are now in the session output directory
- agent loading
- training progress bar (with `enlighten`)

## Test process
End to end tests that verify that a session is being created correctly with a network
They also check the outputs exist.

## Checklist
- [y] PR is linked to a **work item**
- [upcoming PR] **acceptance criteria** of linked ticket are met
- [y] performed **self-review** of the code
- [loading not tested but need to move onto Ray now] written **tests** for any new functionality added with this PR
- [n] updated the **documentation** if this PR changes or adds functionality
- [n] written/updated **design docs** if this PR implements new functionality
- [n] updated the **change log**
- [y] ran **pre-commit** checks for code style
- [n] attended to any **TO-DOs** left in the code

Related work items: #1971
2023-11-21 09:33:29 +00:00
Nick Todd
f7215847d4 #2041: ntp_server test fixes. 2023-11-20 18:08:55 +00:00
Nick Todd
b0b37f9da5 #2042: ntp_client test fixes. 2023-11-20 18:06:50 +00:00
Nick Todd
95ad55a783 #2041: change deprecated logger levels. 2023-11-20 18:04:49 +00:00
Marek Wolan
9d0a98b221 Apply suggestions from code review 2023-11-17 20:30:07 +00:00
Nick Todd
d28bd0d1c3 #2041: Fix names 2023-11-17 14:19:36 +00:00
Nick Todd
dbecc681dc #2041: Install NTPServer and NTPClient. 2023-11-17 12:59:06 +00:00
Nick Todd
6081f02caa #2041: Add missing return statement 2023-11-17 12:41:53 +00:00
Nick Todd
622c6931d8 #2041: Create test network + extra test 2023-11-17 12:07:46 +00:00
Marek Wolan
c5b4ae45be Remove problematic progress bars 2023-11-17 11:40:36 +00:00
Marek Wolan
5bda952ead Fix sim output 2023-11-17 10:20:26 +00:00
Marek Wolan
ba580b00b4 Improve config validation and fix tests 2023-11-16 16:14:50 +00:00
Marek Wolan
0861663cc1 Add agent loading 2023-11-16 15:40:49 +00:00
Marek Wolan
e52d1fbd45 Add enlighten dependency 2023-11-16 15:29:48 +00:00
Marek Wolan
0b9bdedebd Fix typehints 2023-11-16 15:28:38 +00:00
Marek Wolan
13c49bf3ea Fix session path monkeypatch 2023-11-16 15:19:14 +00:00
Marek Wolan
7545c25a46 Make pytest patch with temporary session dir 2023-11-16 15:11:03 +00:00
Nick Todd
7ee2c4220a #2042: ntp_client test 2023-11-16 15:04:01 +00:00
Marek Wolan
829500a60f Get sb3 checkpoints saving during training 2023-11-16 14:37:37 +00:00
Marek Wolan
4cc7ba1522 Add ability to save sb3 final model 2023-11-15 16:59:56 +00:00
Marek Wolan
64e8b3bcea Add basic primaite session e2e tests 2023-11-15 16:04:16 +00:00
Nick Todd
0c544a9a26 #2042: Add support for apply_timestep() 2023-11-15 15:58:10 +00:00
Marek Wolan
6182b53bfd Fix incorrect number of steps per episode 2023-11-15 14:49:44 +00:00
Marek Wolan
c8f2f193bd Implement agent training with sb3 2023-11-15 12:52:18 +00:00
Nick Todd
9deb130d10 #2042: pre-commit changes 2023-11-15 10:58:24 +00:00
Nick Todd
d31fce202c #2041: pre-commit changes. 2023-11-15 10:57:56 +00:00
Nick Todd
195e8a4e84 #2042: Implement NTP protocol for client 2023-11-14 15:13:28 +00:00
Nick Todd
f320487128 #2041: Implement NTP protocol for server 2023-11-14 15:13:05 +00:00
Marek Wolan
e6ead6e532 Update agent interface to work better with envs 2023-11-14 15:10:07 +00:00
Nick Todd
764d9561bd #2042: NTP client initial commit 2023-11-13 17:40:25 +00:00
Nick Todd
2ee8203397 #2041: NTP server initial commits 2023-11-13 17:39:27 +00:00
Marek Wolan
1cb54da2dd Remove more GATE stuff 2023-11-13 17:12:50 +00:00
Marek Wolan
08e88e52b0 Begin implementing training loop in session 2023-11-13 16:35:35 +00:00
Marek Wolan
707f2b59af Add SB3 RL agent 2023-11-13 16:08:39 +00:00
Marek Wolan
21c06dbea1 Remove GATE-related code. 2023-11-13 16:04:25 +00:00
Czar Echavez
815bdfe603 Merged PR 206: 1962-Folder and File restore
## Summary
- Implement the folder/file restore
- Split the FileSystem and its classes into their own files so that it is easier to maintain.
- Reimplement how deleted folders and files are stored in a deleted list, so that it is possible to restore later

## Test process
See https://dev.azure.com/ma-dev-uk/PrimAITE/_git/PrimAITE/pullrequest/206?_a=files&path=/tests/unit_tests/_primaite/_simulator/_file_system
- Unit tests written to make sure methods work as intended
- Integration tests with the apply_request method which tests that the agents can send the request to the simulation to affect it

## 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

Related work items: #1962
2023-11-09 11:55:53 +00:00
Czar.Echavez
6e1f9bd63d #1962: add gate installation for docs build pipeline 2023-11-08 13:00:07 +00:00
Czar.Echavez
be4a467877 #1962: revert pulling from src 2023-11-08 10:48:41 +00:00