2675 Commits

Author SHA1 Message Date
Archer Bowen
6769bc917f Merge branch '4.0.0a1-dev' into UC7-migration 2025-03-07 13:41:12 +00:00
Marek Wolan
d8c8aa40a4 3086 UC7 Migration - All YAMLS, tests and notebooks. A few lingering issues such as the OS-SCAN not working and agent logs not appearing. 2025-03-07 13:40:50 +00:00
Marek Wolan
92af387e56 Remove buggy autoreload from notebook 2025-02-28 15:35:06 +00:00
Marek Wolan
75eb1050c9 Merged PR 621: Change acl observations to be less confusing
Related work items: #2869, #2887, #3029, #3060, #3062, #3075, #3089
2025-02-28 11:28:14 +00:00
Marek Wolan
5609dc8d07 Appease precommit 2025-02-28 11:13:23 +00:00
Archer Bowen
b7bc39ce1a Merged PR 610: #3087 - TAP001/003 Core Migration (No Tests & Notebook)
## Summary

This PR migrates the TAP003 and TAP001 agents into the core PrimAITE codebase. This choice was made in order to allow for the UC7 network to utilise the TAP agents.

### **This PR does NOT include the TAP tests and notebooks**

The TAP notebooks and tests are included in the #2925 feature.

### **This PR has a sister PR on the milpac repo which removes the TAP agents from milpac**

PR will also needs to be merged and all relevant branches must be updated.

## Test process

The changes made in this PR were preemptively merged into the UC7 migration branch to create the TAP tests & notebooks.

## Checklist
- [x] PR is linked to a **work item**
- [x] **acceptance criteria** of linked ticket are met
- [x] performed **self-review** of the code
- [N/A] written **tests** for any new functionality added with this PR
- [N/A] updated the **documentation** if this PR changes or adds functionality
- [N/A] written/updated **design docs** if this PR implements new functionality
- [N/A] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [X] attended to any **TO-DOs** left in the code

#3087 - TAP001/003 Added - **No tests or notebooks migrated**

Related work items: #3087
2025-02-28 09:09:14 +00:00
Charlie Crane
110fc9243f Merge in updates from dev 2025-02-27 18:21:43 +00:00
Charlie Crane
1f6f007941 Updates to documentation and inclusion of how-to guides 2025-02-27 18:16:45 +00:00
Archer Bowen
3b4fb2d27f #3087 Addressing docustring TODO's and a few minor spelling mistakes. 2025-02-27 14:03:18 +00:00
Archer Bowen
f0c46cd90e Merge branch 'dev' into feature/3087-TAP-core-migration 2025-02-27 11:36:38 +00:00
Marek Wolan
98914ecdbb Merge remote-tracking branch 'origin/dev' into bugfix/3089-obs-index 2025-02-27 11:31:02 +00:00
Marek Wolan
7b092158db Merged PR 620: 4.0.0 changes into dev
Related work items: #2869, #2887, #2912, #3029, #3060, #3062, #3075
2025-02-27 11:29:24 +00:00
Marek Wolan
2b04695c2e Apply suggestions from code review 2025-02-27 10:07:17 +00:00
Marek Wolan
a19ceada2c Change ACL observation to 0-index and remove weird off-by-one offset 2025-02-26 19:31:43 +00:00
Marek Wolan
bab4060378 Fix agent config in terminal processing notebook 2025-02-26 18:26:54 +00:00
Marek Wolan
fd367d1f0e Fix typos and duplicate identifiers in docs 2025-02-26 18:21:28 +00:00
Marek Wolan
f1a36cafaa remove outdated information from data manipulation bot doc page 2025-02-26 18:13:45 +00:00
Marek Wolan
cf33dcdcf9 remove outdated information from agents doc page 2025-02-26 18:12:20 +00:00
Marek Wolan
8c399c4f61 Fix mismerge of c2 e2e notebook 2025-02-26 18:11:42 +00:00
Marek Wolan
b4b0f99c23 Fix mismerge of agent show_history method 2025-02-26 17:57:23 +00:00
Charlie Crane
891467d1d3 Revert changes to Command & control and Privilege jupyter notebooks 2025-02-26 15:44:06 +00:00
Marek Wolan
2bf118abc9 Merge remote-tracking branch 'origin/4.0.0a1-dev' into 4.0.0-dev 2025-02-26 15:33:50 +00:00
Charlie Crane
6b796608df Revert commit of output in Command and Control notebook 2025-02-26 15:32:50 +00:00
Archer Bowen
5ffde8a426 Merge branch '4.0.0a1-dev' into feature/3087-TAP-core-migration 2025-02-26 15:32:43 +00:00
Charlie Crane
7fe4915f42 Revisions to make the how-to guides show in navigation pane 2025-02-26 15:31:03 +00:00
Marek Wolan
9bb4442bbe Merge remote-tracking branch 'origin/dev' into 4.0.0-dev 2025-02-26 15:20:05 +00:00
Charlie Crane
0d93981ef8 Updates to documentation pages 2025-02-26 12:03:00 +00:00
Charlie Crane
7ec664ae67 Merge branch '4.0.0a1-dev' into feature/Updated-How-To-Guides 2025-02-26 11:02:51 +00:00
Charlie Crane
4268e387c4 Add custom how-to guides to documentation, additional notebook around how to use dev cli 2025-02-26 11:02:00 +00:00
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
Archer Bowen
9768a931ab #3087 - TAP001/003 Added - **No tests or notebooks migrated** 2025-02-17 17:26:50 +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