Commit Graph

2447 Commits

Author SHA1 Message Date
Nick Todd
502d163818 Merged PR 618: Port core notebooks
## Summary
This PR covers changes made for the core notebooks to run correctly.

## Test process
All notebooks were tested to:

- ensure they run to completion
- the output (rewards etc) matches or is similar to the PrimAITE 3.3.1-internal notebooks

All changes run against test suite and successful pipeline builds.

## 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
- [ ] attended to any **TO-DOs** left in the code

Related work items: #3075
2025-02-26 10:49:04 +00:00
Marek Wolan
1605b09899 Apply suggestions from code review 2025-02-26 10:49:01 +00:00
Nick Todd
ea2c018b82 Merge branch 'feature/3075_Migrate_notebooks_to_MilPac_(Core_changes)' of ssh.dev.azure.com:v3/ma-dev-uk/PrimAITE/PrimAITE into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-25 14:28:17 +00:00
Nick Todd
892cdb82b9 #3075: Code review changes. 2025-02-25 14:25:27 +00:00
Archer Bowen
f5cfaeedab #3075 Cleaned up yaml snippets that were rendering as a strings. It seems that adding '...' to yaml snippets seems to end up causing the snippets to render as strings rather than actual yaml. 2025-02-21 14:57:48 +00:00
Nick Todd
90d7af3ff9 #3075: Remove references to src/primaite/simulator/_package_data after notebook move. 2025-02-18 12:42:33 +00:00
Nick Todd
72f80e55da #3075: Move demo notebook to correct folder. 2025-02-18 11:51:35 +00:00
Nick Todd
f7f46a2a3b Merge branch '4.0.0a1-dev' into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-18 11:48:26 +00:00
Nick Todd
8c7f8cd0ec #3075: Fix final two demo notebooks 2025-02-18 11:36:22 +00:00
Marek Wolan
5a7caa33f0 Merged PR 609: fix instantiation of network nodes 2025-02-18 11:05:16 +00:00
Charlie Crane
a426cf567b Merged PR 606: Regression Testing Fixes
## Summary
Changes to PrimAITE to resolve bugs found during regression testing.

- Addressed hardcoding of "abstract_agent" as the name used in logging. This should now use the agent's `ref` from config.
- Fixed some failing terminal tests that were attempting to pass through a remote IP for actions where this wasn't needed.
- Corrected some old uses of `self.hostname` instead of `self.config.hostname` following refactoring.
- Removal of `node_types_map` when calling `network.show` to resolve issues with extensability.

## Test process
Tests pass when ran locally.

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [ ] 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**
- [ ] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code
2025-02-18 10:33:50 +00:00
Charlie Crane
22b197a79a Removal of leftover comment from software.py 2025-02-18 09:13:33 +00:00
Marek Wolan
46240e49a4 update tests and make office lan creation work like previously 2025-02-17 18:46:09 +00:00
Marek Wolan
cc9e73530c Merge remote-tracking branch 'origin/4.0.0a1-dev' into bugfix/network-setup 2025-02-17 18:16:21 +00:00
Marek Wolan
de88974332 Fix airspace hello 2025-02-17 18:14:07 +00:00
Marek Wolan
3651d033d6 fix instantiation of network nodes 2025-02-17 17:34:22 +00:00
Nick Todd
5f076ba225 #3075: Fix pre-commit errors 2025-02-17 15:12:12 +00:00
Nick Todd
7dafec8517 #3075: Test fix 2025-02-17 15:01:02 +00:00
Nick Todd
7e82de919c #3075: Markdown changes. 2025-02-17 14:19:56 +00:00
Nick Todd
486c797d60 #3075: Change duplicate application_name in config file. 2025-02-17 11:54:13 +00:00
Nick Todd
a3e6bcace0 Merge branch '4.0.0a1-dev' into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-17 10:48:28 +00:00
Charlie Crane
4f0e612608 Merged PR 604: #3060 - Adding version to YAML files within PrimAITE
## Summary
Configuration YAML's updated to include the version of PrimAITE for which they were written for

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

Related work items: #3060
2025-02-17 10:22:49 +00:00
Charlie Crane
bf30b70bd2 #3060 - Removal of un-necessary check in game.py 2025-02-17 10:09:39 +00:00
Charlie Crane
2830a2aef5 #3060 - Amendment to new version tag in configuration yaml. Now under the metadata tag 2025-02-14 12:36:23 +00:00
Charlie Crane
7b80d15d81 # Pre-commit actions 2025-02-14 11:39:25 +00:00
Charlie Crane
7e138d1d61 #Bug and test fixes 2025-02-14 11:38:15 +00:00
Charlie Crane
56699d2377 Resolve hardcoding of Agent Logger having agent_name as abstract_agent 2025-02-12 16:18:50 +00:00
Charlie Crane
70fc11f4f1 #3060 - Correct change in game.py that caused test failures 2025-02-11 16:20:11 +00:00
Charlie Crane
dadf93bc7f #3060 - Address some missed pre-commit errors 2025-02-11 14:59:25 +00:00
Charlie Crane
56e81a020c #3060 - Adding version to YAML files within PrimAITE 2025-02-11 10:53:41 +00:00
Marek Wolan
e288572e0b Merged PR 601: Fix action schema for change password 2025-02-10 15:28:44 +00:00
Marek Wolan
fc66e125d6 Fix action schema for change password 2025-02-07 10:08:18 +00:00
Nick Todd
1a8c3b9471 #3075: Fix notebooks after test changes. 2025-02-06 16:42:26 +00:00
Nick Todd
0d8672cdba Merge branch '4.0.0a1-dev' into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-06 09:17:34 +00:00
Marek Wolan
0d1edf0362 Merged PR 598: Make Node schemas stricter
## Summary
- Add extra="forbid" to the node ConfigSchema to prevent future bugs.
- Temporarily add dummy variables that are used by the from_config method of nodes until we refactor them out of the codebase.

## Test process
Yes the tests run correctly.

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [ ] 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**
- [ ] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code
2025-02-06 09:09:18 +00:00
Nick Todd
7b2a9c1d2a #3075: Pre-commit changes. 2025-02-05 16:46:25 +00:00
Nick Todd
b22ba65eb6 #3075: Further notebook updates. 2025-02-05 16:40:59 +00:00
Marek Wolan
09bdfa3ae1 bugfix - Restore wireless networks so they're not broken 2025-02-05 15:11:04 +00:00
Marek Wolan
c1abbfe58c bugfix - Make node schemas stricter 2025-02-05 15:04:41 +00:00
Nick Todd
a4c19608a6 3075: Pre-commit tidy up. 2025-02-05 11:51:22 +00:00
Nick Todd
3a29593f60 3075: Fix bug in notebook helper function. 2025-02-05 11:50:38 +00:00
Marek Wolan
01bf052cc4 Merged PR 597: Standardise discriminator (f.k.a. identifiers) naming convention.
## Summary
I mean I don't expect reviewers to go through every single change. It was painful enough to make all the changes myself, I had to write a script and regex the $*!+ out of the codebase to get this change through

## Test process
Tests pass. Searching through the codebase with regex queries to check for compliant strings.

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

Related work items: #3062
2025-02-05 10:49:40 +00:00
Marek Wolan
4a472c5c75 #3062 - Remove discriminators from abstract classes and fix remaining old discriminator names 2025-02-05 10:12:13 +00:00
Nick Todd
3c84a15d61 Merge branch '4.0.0a1-dev' into feature/3075_Migrate_notebooks_to_MilPac_(Core_changes) 2025-02-05 08:36:59 +00:00
Nick Todd
f7c6ee3df4 #3075: C2C-E2E-Demo wildcard_list changes. 2025-02-04 15:45:19 +00:00
Marek Wolan
0a6b604afd Merge remote-tracking branch 'origin/4.0.0a1-dev' into feature/3062-discriminators 2025-02-04 15:20:56 +00:00
Marek Wolan
f0326f4051 Merge remote-tracking branch 'origin/feature/2887-Align_Node_Types' into feature/3062-discriminators 2025-02-04 15:20:48 +00:00
Charlie Crane
0708c836a3 Merged PR 591: Extensible Nodes
## Summary
Refactor of Node classes within PrimAITE to align with the `ConfigSchema` and `from_config` design implemented for PrimAITE v4.0.
Updates to tests to use the new `from_config` method when creating nodes.
Additional documentation page for how to implement custom Node classes

## Test process
WIP - Updating tests to still pass and prevent regression.

## 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
- [X] 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: #2887
2025-02-04 15:15:28 +00:00
Charlie Crane
24161bb3fc #2887 - Removal of commented out code 2025-02-04 15:06:23 +00:00
Charlie Crane
51bb3f5b07 #2887 - Removal of un-necessary print statement that was used for debugging 2025-02-04 14:26:55 +00:00