Commit Graph

2392 Commits

Author SHA1 Message Date
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
Charlie Crane
99e38fbbc2 #2887 - Removal of un-necessary code and cleanup following review comments 2025-02-04 14:25:26 +00:00
Marek Wolan
7ebe7fa4ef Merge '2887-Align_Node_Types' into 3062-discriminators 2025-02-04 14:04:40 +00:00
Charlie Crane
05946431ca #2887 - Correct type in documentation 2025-02-04 11:19:13 +00:00
Charlie Crane
961136fb42 #2887 - Updates to extensible_nodes.rst 2025-02-04 10:41:51 +00:00
Charlie Crane
c1a5a26ffc #2887 - Actioning review comments 2025-02-04 10:21:56 +00:00
Marek Wolan
a310fb3b64 #3062 - Discriminator bugfixes 2025-02-03 16:29:27 +00:00
Marek Wolan
abccf4afc5 #3062 - First pass at unifying naming convention for discriminators (still errors) [skip ci] 2025-02-03 16:24:03 +00:00
Charlie Crane
f3bbfffe7f #2887 - Update CHANGELOG.md 2025-02-03 14:03:21 +00:00
Charlie Crane
0920ec5f5b #2887 - Remove debug print statements 2025-02-03 11:32:07 +00:00
Charlie Crane
3d01f52eea #2887 - Merge in changes on dev to resolve conflicts. All tests should now pass 2025-02-03 11:18:34 +00:00
Charlie Crane
d1e932a57c #2887 - Merge in changes on dev to resolve conflicts. All tests should now pass 2025-02-03 11:16:34 +00:00
Charlie Crane
d806391625 #2887 - Test fixes 2025-01-31 18:46:02 +00:00
Marek Wolan
055c853b0f #3062 - rename identifier to discriminator 2025-01-31 16:00:32 +00:00
Marek Wolan
8feb2db954 Fix properties 2025-01-31 15:29:10 +00:00
Marek Wolan
20e5177544 Merged PR 593: Core bugfixes in support of extension tests.
## Summary
- Corrected some validation in observations and actions to use strings (in alignment with 'describe_state' methods.)
- Fixed bug where periodic agent would start on step 0 instead of on the configured start step
- Improved validations on network node adder
- Added database password to config schema of database service
- DNS client lookup no longer requires a DNS server address to be configured if the requested domain exists in the client cache
- DNS client can now inherit the parent node's DNS server address

## Test process
Unit tests and tests against the extension

## 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
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#3029 - Add string-ip validator, improve validation, fix minor bugs in pulling schema data

Related work items: #3029
2025-01-31 14:47:16 +00:00
Marek Wolan
a77fa65c39 #3029 - Remove old initialisation of dns server attr that caused a bug 2025-01-31 14:46:43 +00:00
Marek Wolan
3260e1f30b #3029 - make new config items properties as per PR comments 2025-01-31 14:41:49 +00:00
Marek Wolan
037dd8278b #3029 - update changelog 2025-01-31 12:30:08 +00:00
Marek Wolan
4fb54c9492 #3029 - Add string-ip validator, improve validation, fix minor bugs in pulling schema data 2025-01-31 12:18:52 +00:00
Charlie Crane
3d47b9c863 #2887 - Further fixes to unit tests 2025-01-30 17:33:00 +00:00
Charlie Crane
4b42a74ac8 #2887 - Corrected failures seen when generating services from config & syntax issues. Wireless Router tests currently fail due to port 1 being disabled on startup 2025-01-29 16:57:25 +00:00
Charlie Crane
51f1c91e15 #2887 - Fixed Node unit test failures 2025-01-29 11:55:10 +00:00
Charlie Crane
f85aace31b #2887 - Correct networking troubles causing test failures 2025-01-28 19:35:27 +00:00
Charlie Crane
d5e4d3d2ad Merge branch '4.0.0a1-dev' into feature/2887-Align_Node_Types 2025-01-28 09:40:27 +00:00
Charlie Crane
e1f2f73db0 #2887 - Test changes to correct NodeOperatingState is correct per passed config. 2025-01-28 09:37:58 +00:00
Charlie Crane
0570ab984d #2887 - Node class changes to address some test failures. Addressed some inconsistencies around operating_state, amended instantiation of some Nodes in test environments 2025-01-27 16:35:40 +00:00
Marek Wolan
09bfa7b700 Merged PR 592: #2869 - fixes to agents and remove redundant prints
## Summary
*Replace this text with an explanation of what the changes are and how you implemented them. Can this impact any other parts of the codebase that we should keep in mind?*

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

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

#2869 - fixes to agents and remove redundant prints

Related work items: #2869
2025-01-27 16:19:41 +00:00
Charlie Crane
a7395c466e #2887 - Final test changes before end of day 2025-01-23 17:42:59 +00:00
Charlie Crane
30c177c272 #2887 - Additional test failure fixes 2025-01-23 17:07:15 +00:00
Charlie Crane
b9d2cd25f3 #2887 - Unit test fixes ahead of raising PR. 2025-01-23 15:28:10 +00:00
Charlie Crane
65355f83e8 #2887 - Commit before switching branch 2025-01-23 09:52:14 +00:00
Charlie Crane
fbef78db51 #2887 - Resolve conflicts from merge 2025-01-23 09:17:27 +00:00
Charlie Crane
3957142afd #2887 - Updates to Node components to use rom_config and allow for extensibility. Router and Firewall continue to have custom from_config. Some test fixes to reflect changes to functionality. 2025-01-22 17:20:38 +00:00
Marek Wolan
5563b9c62d #2869 - fixes to agents and remove redundant prints 2025-01-22 16:55:59 +00:00
Marek Wolan
d2d09abcb1 Merged PR 590: Backport 3.3.1 fixes into Core
this was already reviewed as part of 3.3.1 release process
2025-01-21 14:42:05 +00:00
Marek Wolan
9263bbf80b Merged PR 589: Extensible Agents and Actions
## Summary
This PR is a follow-on from Charlie's two branches, one for agents and one for actions. This list of changes describes work done by both Charlie and myself

- Agents are now extensible
- Refactored observation manager, action manager, and reward function to inherit from BaseModel
- Added a config schema to observation manager, action manager, and reward function
- Streamlined the way agents are created from config
- Agent config no longer requires a dummy action space if the action space is empty, the same applies for observation space and reward function
- Actions are now extensible
- Actions now support a config schema, to allow yaml data validation and default parameter values
- Action parameters are no longer defined through IDs, instead meaningful data is expected directly in the action map
- Test and example YAMLs have been updated to match the new agent and action schemas, such as:
  - Removed empty action spaces, observation spaces, or reward spaces for agent which didn't use them
  - Relabeled action parameters to match the new action config schemas, and updated the values to no longer rely on indices
  - Removed action space options which were previously used for assigning meaning to action space IDs
- Updated tests that don't use YAMLs to still use the new action and agent schemas

- I haven't checked the notebooks run and there's a couple places where find-and-replace issues persist. I will fix but we can start review in the meantime if you're bored

## Test process
unit test

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

Related work items: #2869, #2912
2025-01-21 14:39:56 +00:00
Marek Wolan
94ee16afa6 Remove todo comments that have been completed 2025-01-21 13:39:06 +00:00
Marek Wolan
dcce678045 update changelog 2025-01-21 13:20:19 +00:00
Marek Wolan
c30c5189be fixes based on PR suggestions 2025-01-21 13:17:42 +00:00
Marek Wolan
66daab3baf Backport 3.3.1 fixes into Core 2025-01-21 13:08:36 +00:00
Marek Wolan
4b79c88ae5 Fix typos and TODOs 2025-01-21 10:42:09 +00:00
Marek Wolan
18a665e562 Update actions and agents to get all tests passing post-refactor 2025-01-20 14:07:51 +00:00
Marek Wolan
c521528a0a Merge remote-tracking branch 'origin/4.0.0a1-dev' into feature/2869-Marek 2025-01-20 10:39:20 +00:00
Marek Wolan
4c0f87e8aa Fix configure actions that were accidentally combined 2025-01-20 10:23:13 +00:00
Nick Todd
8bf841cc62 Merged PR 584: Align core software with registry
## Summary
These changes align core software with the approach that support extensions.

## Test process
Passes test suite.

## 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: #2888
2025-01-20 09:41:45 +00:00