From 0ff88e36726ff7e652047ec6e3a78dc46576c6d3 Mon Sep 17 00:00:00 2001
From: Archer Bowen <Archer.Bowen@t-s.qinetiq.com>
Date: Mon, 2 Sep 2024 11:50:49 +0100
Subject: [PATCH 01/23] #2840 Initial Implementation completed and tested.

---
 src/primaite/game/agent/actions.py            | 23 +++++++++
 .../system/services/terminal/terminal.py      | 22 +++++++-
 tests/conftest.py                             |  1 +
 .../actions/test_terminal_actions.py          | 51 +++++++++++++++++++
 4 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/src/primaite/game/agent/actions.py b/src/primaite/game/agent/actions.py
index 2e6189c0..3dc1f514 100644
--- a/src/primaite/game/agent/actions.py
+++ b/src/primaite/game/agent/actions.py
@@ -1266,6 +1266,28 @@ class NodeSendRemoteCommandAction(AbstractAction):
         ]
 
 
+class NodeSendLocalCommandAction(AbstractAction):
+    """Action which sends a terminal command using a local terminal session."""
+
+    def __init__(self, manager: "ActionManager", **kwargs) -> None:
+        super().__init__(manager=manager)
+
+    def form_request(self, node_id: int, username: str, password: str, command: RequestFormat) -> RequestFormat:
+        """Return the action formatted as a request which can be ingested by the PrimAITE simulation."""
+        node_name = self.manager.get_node_name_by_idx(node_id)
+        return [
+            "network",
+            "node",
+            node_name,
+            "service",
+            "Terminal",
+            "send_local_command",
+            username,
+            password,
+            {"command": command},
+        ]
+
+
 class TerminalC2ServerAction(AbstractAction):
     """Action which causes the C2 Server to send a command to the C2 Beacon to execute the terminal command passed."""
 
@@ -1372,6 +1394,7 @@ class ActionManager:
         "SSH_TO_REMOTE": NodeSessionsRemoteLoginAction,
         "SESSIONS_REMOTE_LOGOFF": NodeSessionsRemoteLogoutAction,
         "NODE_SEND_REMOTE_COMMAND": NodeSendRemoteCommandAction,
+        "NODE_SEND_LOCAL_COMMAND": NodeSendLocalCommandAction,
     }
     """Dictionary which maps action type strings to the corresponding action class."""
 
diff --git a/src/primaite/simulator/system/services/terminal/terminal.py b/src/primaite/simulator/system/services/terminal/terminal.py
index e98e8555..9b88bbe8 100644
--- a/src/primaite/simulator/system/services/terminal/terminal.py
+++ b/src/primaite/simulator/system/services/terminal/terminal.py
@@ -208,7 +208,6 @@ class Terminal(Service):
                         status="success",
                         data={},
                     )
-            else:
                 return RequestResponse(
                     status="failure",
                     data={},
@@ -219,6 +218,27 @@ class Terminal(Service):
             request_type=RequestType(func=remote_execute_request),
         )
 
+        def local_execute_request(request: RequestFormat, context: Dict) -> RequestResponse:
+            """Executes a command using a local terminal session."""
+            command: str = request[2]["command"]
+            local_connection = self._process_local_login(username=request[0], password=request[1])
+            if local_connection:
+                outcome = local_connection.execute(command)
+                if outcome:
+                    return RequestResponse(
+                        status="success",
+                        data={"reason": outcome},
+                    )
+            return RequestResponse(
+                status="success",
+                data={"reason": "Local Terminal failed to resolve command. Potentially invalid credentials?"},
+            )
+
+        rm.add_request(
+            "send_local_command",
+            request_type=RequestType(func=local_execute_request),
+        )
+
         return rm
 
     def execute(self, command: List[Any]) -> Optional[RequestResponse]:
diff --git a/tests/conftest.py b/tests/conftest.py
index 1bbff8f2..8717abfa 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -467,6 +467,7 @@ def game_and_agent():
         {"type": "SSH_TO_REMOTE"},
         {"type": "SESSIONS_REMOTE_LOGOFF"},
         {"type": "NODE_SEND_REMOTE_COMMAND"},
+        {"type": "NODE_SEND_LOCAL_COMMAND"},
     ]
 
     action_space = ActionManager(
diff --git a/tests/integration_tests/game_layer/actions/test_terminal_actions.py b/tests/integration_tests/game_layer/actions/test_terminal_actions.py
index d011c1e8..d2ea7202 100644
--- a/tests/integration_tests/game_layer/actions/test_terminal_actions.py
+++ b/tests/integration_tests/game_layer/actions/test_terminal_actions.py
@@ -164,3 +164,54 @@ def test_change_password_logs_out_user(game_and_agent_fixture: Tuple[PrimaiteGam
 
     assert server_1.file_system.get_folder("folder123") is None
     assert server_1.file_system.get_file("folder123", "doggo.pdf") is None
+
+
+def test_local_terminal(game_and_agent_fixture: Tuple[PrimaiteGame, ProxyAgent]):
+    game, agent = game_and_agent_fixture
+
+    client_1 = game.simulation.network.get_node_by_hostname("client_1")
+    # create a new user account on server_1 that will be logged into remotely
+    client_1_usm: UserManager = client_1.software_manager.software["UserManager"]
+    client_1_usm.add_user("user123", "password", is_admin=True)
+
+    action = (
+        "NODE_SEND_LOCAL_COMMAND",
+        {
+            "node_id": 0,
+            "username": "user123",
+            "password": "password",
+            "command": ["file_system", "create", "file", "folder123", "doggo.pdf", False],
+        },
+    )
+    agent.store_action(action)
+    game.step()
+
+    assert client_1.file_system.get_folder("folder123")
+    assert client_1.file_system.get_file("folder123", "doggo.pdf")
+
+    # Change password
+    action = (
+        "NODE_ACCOUNTS_CHANGE_PASSWORD",
+        {
+            "node_id": 0,  # server_1
+            "username": "user123",
+            "current_password": "password",
+            "new_password": "different_password",
+        },
+    )
+    agent.store_action(action)
+    game.step()
+
+    action = (
+        "NODE_SEND_LOCAL_COMMAND",
+        {
+            "node_id": 0,
+            "username": "user123",
+            "password": "password",
+            "command": ["file_system", "create", "file", "folder123", "cat.pdf", False],
+        },
+    )
+    agent.store_action(action)
+    game.step()
+
+    assert client_1.file_system.get_file("folder123", "cat.pdf") is None

From fd3d3812f6d8d03b1d44261b06ff39fecd0e2209 Mon Sep 17 00:00:00 2001
From: Archer Bowen <Archer.Bowen@t-s.qinetiq.com>
Date: Mon, 2 Sep 2024 16:55:43 +0100
Subject: [PATCH 02/23] #2840 Documentation and minor bug fixes found in
 terminal and session manager.

---
 CHANGELOG.md                                  |   2 +
 .../system/services/terminal.rst              | 106 ++++++-
 .../notebooks/Terminal-Processing.ipynb       | 274 +++++++++++++++++-
 .../simulator/system/core/session_manager.py  |   2 +-
 .../system/services/terminal/terminal.py      |   8 +-
 .../actions/test_terminal_actions.py          |   1 +
 6 files changed, 385 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d08974c..2a855512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+-  New ``NODE_SEND_LOCAL_COMMAND`` action implemented which grants agents the ability to execute commands locally. (Previously limited to remote only)
+
 ### Added
 -   Random Number Generator Seeding by specifying a random number seed in the config file.
 -   Implemented Terminal service class, providing a generic terminal simulation.
diff --git a/docs/source/simulation_components/system/services/terminal.rst b/docs/source/simulation_components/system/services/terminal.rst
index f982145d..6a1b0204 100644
--- a/docs/source/simulation_components/system/services/terminal.rst
+++ b/docs/source/simulation_components/system/services/terminal.rst
@@ -30,6 +30,7 @@ Usage
  - Terminal Clients connect, execute commands and disconnect from remote nodes.
  - Ensures that users are logged in to the component before executing any commands.
  - Service runs on SSH port 22 by default.
+ - Enables Agents to send commands both remotely and locally.
 
 Implementation
 """"""""""""""
@@ -39,9 +40,110 @@ Implementation
  - Extends Service class.
   - A detailed guide on the implementation and functionality of the Terminal class can be found in the "Terminal-Processing" jupyter notebook.
 
+Command Format
+^^^^^^^^^^^^^^
+
+``Terminals`` implement their commands through leveraging the pre-existing :doc:`../../request_system`.
+
+Due to this ``Terminals`` will only accept commands passed within the ``RequestFormat``.
+
+:py:class:`primaite.game.interface.RequestFormat`
+
+For example, ``terminal`` command actions when used in ``yaml`` format are formatted as follows:
+
+.. code-block:: yaml
+    command:
+        - "file_system"
+        - "create"
+        - "file"
+        - "downloads"
+        - "cat.png"
+        - "False"
+
+**This command creates file called ``cat.png`` within the ``downloads`` folder.**
+
+This is then loaded from ``yaml`` into a dictionary containing the terminal command:
+
+.. code-block:: python
+
+    {"command":["file_system", "create", "file", "downloads", "cat.png", "False"]}
+
+Which is then parsed to the ``Terminals`` Request Manager to be executed.
+
+Game Layer Usage (Agents)
+========================
+
+The below code examples demonstrate how to use terminal related actions in yaml files.
+
+yaml
+""""
+
+``NODE_SEND_LOCAL_COMMAND``
+"""""""""""""""""""""""""""
+
+Agents can execute local commands without needing to perform a separate remote login action (``SSH_TO_REMOTE``).
+
+.. code-block:: yaml
+
+    ...
+        ...
+          action: NODE_SEND_LOCAL_COMMAND
+          options:
+            node_id: 0
+            username: admin
+            password: admin
+            command: # Example command - Creates a file called 'cat.png' in the downloads folder.
+              - "file_system"
+              - "create"
+              - "file"
+              - "downloads"
+              - "cat.png"
+              - "False"
+
+
+``SSH_TO_REMOTE``
+"""""""""""""""""
+
+Agents are able to use the terminal to login into remote nodes via ``SSH`` which allows for agents to execute commands on remote hosts.
+
+.. code-block:: yaml
+
+    ...
+        ...
+          action: SSH_TO_REMOTE
+          options:
+            node_id: 0
+            username: admin
+            password: admin
+            remote_ip: 192.168.0.10 # Example Ip Address. (The remote host's IP that will be used by ssh)
+
+
+``NODE_SEND_REMOTE_COMMAND``
+""""""""""""""""""""""""""""
+
+After remotely login into another host, a agent can use the ``NODE_SEND_REMOTE_COMMAND`` to execute commands across the network remotely.
+
+.. code-block:: yaml
+
+    ...
+        ...
+          action: NODE_SEND_REMOTE_COMMAND
+          options:
+            node_id: 0
+            remote_ip: 192.168.0.10
+            command:
+              - "file_system"
+              - "create"
+              - "file"
+              - "downloads"
+              - "cat.png"
+              - "False"
+
+
+
+Simulation Layer Usage
+======================
 
-Usage
-=====
 
 The below code examples demonstrate how to create a terminal, a remote terminal, and how to send a basic application install command to a remote node.
 
diff --git a/src/primaite/notebooks/Terminal-Processing.ipynb b/src/primaite/notebooks/Terminal-Processing.ipynb
index fdf405a7..19ce567e 100644
--- a/src/primaite/notebooks/Terminal-Processing.ipynb
+++ b/src/primaite/notebooks/Terminal-Processing.ipynb
@@ -9,6 +9,13 @@
     "© Crown-owned copyright 2024, Defence Science and Technology Laboratory UK"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Simulation Layer Implementation."
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -198,6 +205,271 @@
    "source": [
     "computer_b.user_session_manager.show(include_historic=True, include_session_id=True)"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Game Layer Implementation\n",
+    "\n",
+    "This notebook section will detail the implementation of how the game layer utilises the terminal to support different agent actions.\n",
+    "\n",
+    "The ``Terminal`` is used in a variety of different ways in the game layer. Specifically, the terminal is leveraged to implement the following actions:\n",
+    "\n",
+    "\n",
+    "|  Game Layer Action                | Simulation Layer         |\n",
+    "|-----------------------------------|--------------------------|\n",
+    "| ``NODE_SEND_LOCAL_COMMAND``       | Uses the given user credentials, creates a ``LocalTerminalSession`` and executes the given command and returns the ``RequestResponse``.\n",
+    "| ``SSH_TO_REMOTE``                 | Uses the given user credentials and remote IP to create a ``RemoteTerminalSession``.\n",
+    "| ``NODE_SEND_REMOTE_COMMAND``      | Uses the given remote IP to locate the correct ``RemoteTerminalSession``, executes the given command and returns the ``RequestsResponse``."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Game Layer Setup\n",
+    "\n",
+    "Similar to other notebooks, the next code cells create a custom proxy agent to demonstrate how these commands can be leveraged by agents in the ``UC2`` network environment.\n",
+    "\n",
+    "If you're unfamiliar with ``UC2`` then please refer to the [UC2-E2E-Demo notebook for further reference](./Data-Manipulation-E2E-Demonstration.ipynb)."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import yaml\n",
+    "from primaite.config.load import data_manipulation_config_path\n",
+    "from primaite.session.environment import PrimaiteGymEnv"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "custom_terminal_agent = \"\"\"\n",
+    "  - ref: CustomC2Agent\n",
+    "    team: RED\n",
+    "    type: ProxyAgent\n",
+    "    observation_space: null\n",
+    "    action_space:\n",
+    "      action_list:\n",
+    "        - type: DONOTHING\n",
+    "        - type: NODE_SEND_LOCAL_COMMAND\n",
+    "        - type: SSH_TO_REMOTE\n",
+    "        - type: NODE_SEND_REMOTE_COMMAND\n",
+    "      options:\n",
+    "        nodes:\n",
+    "          - node_name: client_1\n",
+    "        max_folders_per_node: 1\n",
+    "        max_files_per_folder: 1\n",
+    "        max_services_per_node: 2\n",
+    "        max_nics_per_node: 8\n",
+    "        max_acl_rules: 10\n",
+    "        ip_list:\n",
+    "          - 192.168.1.21\n",
+    "          - 192.168.1.14\n",
+    "        wildcard_list:\n",
+    "          - 0.0.0.1\n",
+    "      action_map:\n",
+    "        0:\n",
+    "          action: DONOTHING\n",
+    "          options: {}\n",
+    "        1:\n",
+    "          action: NODE_SEND_LOCAL_COMMAND\n",
+    "          options:\n",
+    "            node_id: 0\n",
+    "            username: admin\n",
+    "            password: admin\n",
+    "            command:\n",
+    "                - file_system\n",
+    "                - create\n",
+    "                - file\n",
+    "                - downloads\n",
+    "                - dog.png\n",
+    "                - False\n",
+    "        2:\n",
+    "          action: SSH_TO_REMOTE\n",
+    "          options:\n",
+    "            node_id: 0\n",
+    "            username: admin\n",
+    "            password: admin\n",
+    "            remote_ip: 192.168.10.22\n",
+    "        3:\n",
+    "          action: NODE_SEND_REMOTE_COMMAND\n",
+    "          options:\n",
+    "            node_id: 0\n",
+    "            remote_ip: 192.168.10.22\n",
+    "            command:\n",
+    "                - file_system\n",
+    "                - create\n",
+    "                - file\n",
+    "                - downloads\n",
+    "                - cat.png\n",
+    "                - False\n",
+    "    reward_function:\n",
+    "      reward_components:\n",
+    "        - type: DUMMY\n",
+    "\"\"\"\n",
+    "custom_terminal_agent_yaml = yaml.safe_load(custom_terminal_agent)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "with open(data_manipulation_config_path()) as f:\n",
+    "    cfg = yaml.safe_load(f)\n",
+    "    # removing all agents & adding the custom agent.\n",
+    "    cfg['agents'] = {}\n",
+    "    cfg['agents'] = custom_terminal_agent_yaml\n",
+    "    \n",
+    "env = PrimaiteGymEnv(env_config=cfg)\n",
+    "\n",
+    "client_1: Computer = env.game.simulation.network.get_node_by_hostname(\"client_1\")\n",
+    "client_2: Computer = env.game.simulation.network.get_node_by_hostname(\"client_2\")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Terminal Action | ``NODE_SEND_LOCAL_COMMAND`` \n",
+    "\n",
+    "The yaml snippet below shows all the relevant agent options for this action:\n",
+    "\n",
+    "```yaml\n",
+    "\n",
+    "    action_space:\n",
+    "      action_list:\n",
+    "      ...\n",
+    "        - type: NODE_SEND_LOCAL_COMMAND\n",
+    "      ...\n",
+    "      options:\n",
+    "        nodes: # Node List\n",
+    "          - node_name: client_1\n",
+    "        ...\n",
+    "    ...\n",
+    "      action_map:\n",
+    "        1:\n",
+    "          action: NODE_SEND_LOCAL_COMMAND\n",
+    "          options:\n",
+    "            node_id: 0 # Index 0 at the node list.\n",
+    "            username: admin\n",
+    "            password: admin\n",
+    "            command:\n",
+    "                - file_system\n",
+    "                - create\n",
+    "                - file\n",
+    "                - downloads\n",
+    "                - dog.png\n",
+    "                - False\n",
+    "```"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "env.step(1)\n",
+    "client_1.file_system.show(full=True)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Terminal Action | ``SSH_TO_REMOTE``  \n",
+    "\n",
+    "The yaml snippet below shows all the relevant agent options for this action:\n",
+    "\n",
+    "```yaml\n",
+    "\n",
+    "    action_space:\n",
+    "      action_list:\n",
+    "      ...\n",
+    "        - type: SSH_TO_REMOTE\n",
+    "      ...\n",
+    "      options:\n",
+    "        nodes: # Node List\n",
+    "          - node_name: client_1\n",
+    "        ...\n",
+    "    ...\n",
+    "      action_map:\n",
+    "        2:\n",
+    "          action: SSH_TO_REMOTE\n",
+    "          options:\n",
+    "            node_id: 0 # Index 0 at the node list.\n",
+    "            username: admin\n",
+    "            password: admin\n",
+    "            remote_ip: 192.168.10.22 # client_2's ip address.\n",
+    "```"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "env.step(2)\n",
+    "client_2.session_manager.show()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Terminal Action |  ``NODE_SEND_REMOTE_COMMAND``\n",
+    "\n",
+    "The yaml snippet below shows all the relevant agent options for this action:\n",
+    "\n",
+    "```yaml\n",
+    "\n",
+    "    action_space:\n",
+    "      action_list:\n",
+    "      ...\n",
+    "        - type: NODE_SEND_REMOTE_COMMAND\n",
+    "      ...\n",
+    "      options:\n",
+    "        nodes: # Node List\n",
+    "          - node_name: client_1\n",
+    "        ...\n",
+    "    ...\n",
+    "      action_map:\n",
+    "        1:\n",
+    "          action: NODE_SEND_REMOTE_COMMAND\n",
+    "          options:\n",
+    "            node_id: 0 # Index 0 at the node list.\n",
+    "            remote_ip: 192.168.10.22\n",
+    "            commands:\n",
+    "                - file_system\n",
+    "                - create\n",
+    "                - file\n",
+    "                - downloads\n",
+    "                - cat.png\n",
+    "                - False\n",
+    "```"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "env.step(3)\n",
+    "client_2.file_system.show(full=True)"
+   ]
   }
  ],
  "metadata": {
@@ -216,7 +488,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.11"
+   "version": "3.10.12"
   }
  },
  "nbformat": 4,
diff --git a/src/primaite/simulator/system/core/session_manager.py b/src/primaite/simulator/system/core/session_manager.py
index b7e2c021..677ff477 100644
--- a/src/primaite/simulator/system/core/session_manager.py
+++ b/src/primaite/simulator/system/core/session_manager.py
@@ -413,5 +413,5 @@ class SessionManager:
         table.align = "l"
         table.title = f"{self.sys_log.hostname} Session Manager"
         for session in self.sessions_by_key.values():
-            table.add_row([session.dst_ip_address, session.dst_port.value, session.protocol.name])
+            table.add_row([session.with_ip_address, session.dst_port.value, session.protocol.name])
         print(table)
diff --git a/src/primaite/simulator/system/services/terminal/terminal.py b/src/primaite/simulator/system/services/terminal/terminal.py
index 9b88bbe8..dc7da205 100644
--- a/src/primaite/simulator/system/services/terminal/terminal.py
+++ b/src/primaite/simulator/system/services/terminal/terminal.py
@@ -208,10 +208,10 @@ class Terminal(Service):
                         status="success",
                         data={},
                     )
-                return RequestResponse(
-                    status="failure",
-                    data={},
-                )
+            return RequestResponse(
+                status="failure",
+                data={},
+            )
 
         rm.add_request(
             "send_remote_command",
diff --git a/tests/integration_tests/game_layer/actions/test_terminal_actions.py b/tests/integration_tests/game_layer/actions/test_terminal_actions.py
index d2ea7202..c4247d6e 100644
--- a/tests/integration_tests/game_layer/actions/test_terminal_actions.py
+++ b/tests/integration_tests/game_layer/actions/test_terminal_actions.py
@@ -215,3 +215,4 @@ def test_local_terminal(game_and_agent_fixture: Tuple[PrimaiteGame, ProxyAgent])
     game.step()
 
     assert client_1.file_system.get_file("folder123", "cat.pdf") is None
+    client_1.session_manager.show()

From 5ab42ead273934a3132cf47c92cb784a0ccd27bb Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Mon, 9 Sep 2024 09:12:20 +0100
Subject: [PATCH 03/23] #2829: Add check for capture_nmne

---
 src/primaite/game/agent/observations/nic_observations.py | 7 +++++--
 src/primaite/game/game.py                                | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/primaite/game/agent/observations/nic_observations.py b/src/primaite/game/agent/observations/nic_observations.py
index 002ee4da..c5da8767 100644
--- a/src/primaite/game/agent/observations/nic_observations.py
+++ b/src/primaite/game/agent/observations/nic_observations.py
@@ -1,18 +1,21 @@
 # © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
 from __future__ import annotations
 
-from typing import Dict, Optional
+from typing import ClassVar, Dict, Optional
 
 from gymnasium import spaces
 from gymnasium.core import ObsType
 
 from primaite.game.agent.observations.observations import AbstractObservation, WhereType
 from primaite.game.agent.utils import access_from_nested_dict, NOT_PRESENT_IN_STATE
+from primaite.simulator.network.nmne import NMNEConfig
 from primaite.simulator.network.transmission.transport_layer import Port
 
 
 class NICObservation(AbstractObservation, identifier="NETWORK_INTERFACE"):
     """Status information about a network interface within the simulation environment."""
+    capture_nmne: ClassVar[bool] = NMNEConfig().capture_nmne
+    "A dataclass defining malicious network events to be captured."
 
     class ConfigSchema(AbstractObservation.ConfigSchema):
         """Configuration schema for NICObservation."""
@@ -164,7 +167,7 @@ class NICObservation(AbstractObservation, identifier="NETWORK_INTERFACE"):
                         for port in self.monitored_traffic[protocol]:
                             obs["TRAFFIC"][protocol][Port[port].value] = {"inbound": 0, "outbound": 0}
 
-        if self.include_nmne:
+        if self.capture_nmne and self.include_nmne:
             obs.update({"NMNE": {}})
             direction_dict = nic_state["nmne"].get("direction", {})
             inbound_keywords = direction_dict.get("inbound", {}).get("keywords", {})
diff --git a/src/primaite/game/game.py b/src/primaite/game/game.py
index 045b2467..9c0f49af 100644
--- a/src/primaite/game/game.py
+++ b/src/primaite/game/game.py
@@ -10,6 +10,7 @@ from primaite import DEFAULT_BANDWIDTH, getLogger
 from primaite.game.agent.actions import ActionManager
 from primaite.game.agent.interface import AbstractAgent, AgentSettings, ProxyAgent
 from primaite.game.agent.observations.observation_manager import ObservationManager
+from primaite.game.agent.observations import NICObservation
 from primaite.game.agent.rewards import RewardFunction, SharedReward
 from primaite.game.agent.scripted_agents.data_manipulation_bot import DataManipulationAgent
 from primaite.game.agent.scripted_agents.probabilistic_agent import ProbabilisticAgent
@@ -275,6 +276,7 @@ class PrimaiteGame:
         links_cfg = network_config.get("links", [])
         # Set the NMNE capture config
         NetworkInterface.nmne_config = NMNEConfig(**network_config.get("nmne_config", {}))
+        NICObservation.capture_nmne = NMNEConfig(**network_config.get("nmne_config", {})).capture_nmne
 
         for node_cfg in nodes_cfg:
             n_type = node_cfg["type"]

From 3cecf169bafab4b059ee27e3156f365e1bb9f3c9 Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Mon, 9 Sep 2024 16:30:36 +0100
Subject: [PATCH 04/23] #2829: Update and add nmne tests

---
 .../agent/observations/nic_observations.py    |  3 ++-
 src/primaite/game/game.py                     |  2 +-
 .../observations/test_nic_observations.py     |  8 +++++++
 .../network/test_capture_nmne.py              | 22 +++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/primaite/game/agent/observations/nic_observations.py b/src/primaite/game/agent/observations/nic_observations.py
index c5da8767..ed2bb7f9 100644
--- a/src/primaite/game/agent/observations/nic_observations.py
+++ b/src/primaite/game/agent/observations/nic_observations.py
@@ -14,8 +14,9 @@ from primaite.simulator.network.transmission.transport_layer import Port
 
 class NICObservation(AbstractObservation, identifier="NETWORK_INTERFACE"):
     """Status information about a network interface within the simulation environment."""
+
     capture_nmne: ClassVar[bool] = NMNEConfig().capture_nmne
-    "A dataclass defining malicious network events to be captured."
+    "A Boolean specifying whether malicious network events should be captured."
 
     class ConfigSchema(AbstractObservation.ConfigSchema):
         """Configuration schema for NICObservation."""
diff --git a/src/primaite/game/game.py b/src/primaite/game/game.py
index 9afdbea6..64cdf63b 100644
--- a/src/primaite/game/game.py
+++ b/src/primaite/game/game.py
@@ -9,8 +9,8 @@ from pydantic import BaseModel, ConfigDict
 from primaite import DEFAULT_BANDWIDTH, getLogger
 from primaite.game.agent.actions import ActionManager
 from primaite.game.agent.interface import AbstractAgent, AgentSettings, ProxyAgent
-from primaite.game.agent.observations.observation_manager import ObservationManager
 from primaite.game.agent.observations import NICObservation
+from primaite.game.agent.observations.observation_manager import ObservationManager
 from primaite.game.agent.rewards import RewardFunction, SharedReward
 from primaite.game.agent.scripted_agents.data_manipulation_bot import DataManipulationAgent
 from primaite.game.agent.scripted_agents.probabilistic_agent import ProbabilisticAgent
diff --git a/tests/integration_tests/game_layer/observations/test_nic_observations.py b/tests/integration_tests/game_layer/observations/test_nic_observations.py
index ef789ba7..ced598f0 100644
--- a/tests/integration_tests/game_layer/observations/test_nic_observations.py
+++ b/tests/integration_tests/game_layer/observations/test_nic_observations.py
@@ -77,6 +77,14 @@ def test_nic(simulation):
 
     nic_obs = NICObservation(where=["network", "nodes", pc.hostname, "NICs", 1], include_nmne=True)
 
+    # The Simulation object created by the fixture also creates the
+    # NICObservation class with the NICObservation.capture_nmnme class variable
+    # set to False. Under normal (non-test) circumstances this class variable
+    # is set from a config file such as data_manipulation.yaml. So although
+    # capture_nmne is set to True in the NetworkInterface class it's still False
+    # in the NICObservation class so we set it now.
+    nic_obs.capture_nmne = True
+
     # Set the NMNE configuration to capture DELETE/ENCRYPT queries as MNEs
     nmne_config = {
         "capture_nmne": True,  # Enable the capture of MNEs
diff --git a/tests/integration_tests/network/test_capture_nmne.py b/tests/integration_tests/network/test_capture_nmne.py
index debf5b1c..1499df9a 100644
--- a/tests/integration_tests/network/test_capture_nmne.py
+++ b/tests/integration_tests/network/test_capture_nmne.py
@@ -1,5 +1,11 @@
 # © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
+from itertools import product
+
+import yaml
+
+from primaite.config.load import data_manipulation_config_path
 from primaite.game.agent.observations.nic_observations import NICObservation
+from primaite.session.environment import PrimaiteGymEnv
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.host.host_node import NIC
 from primaite.simulator.network.hardware.nodes.host.server import Server
@@ -277,3 +283,19 @@ def test_capture_nmne_observations(uc2_network: Network):
         assert web_nic_obs["outbound"] == expected_nmne
         assert db_nic_obs["inbound"] == expected_nmne
         uc2_network.apply_timestep(timestep=0)
+
+
+def test_nmne_parameter_settings():
+    """
+    Check that the four permutations of the values of capture_nmne and
+    include_nmne work as expected.
+    """
+
+    with open(data_manipulation_config_path(), "r") as f:
+        cfg = yaml.safe_load(f)
+
+    DEFENDER = 3
+    for capture, include in product([True, False], [True, False]):
+        cfg["simulation"]["network"]["nmne_config"]["capture_nmne"] = capture
+        cfg["agents"][DEFENDER]["observation_space"]["options"]["components"][0]["options"]["include_nmne"] = include
+        PrimaiteGymEnv(env_config=cfg)

From c924b9ea46dcd2a701fdf6ba93a3733b72c09a99 Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Fri, 13 Sep 2024 11:54:17 +0100
Subject: [PATCH 05/23] #2871 - Initial commit of a show_history() function in
 AbstractAgent

---
 src/primaite/game/agent/interface.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/primaite/game/agent/interface.py b/src/primaite/game/agent/interface.py
index d5165a71..404c2bfe 100644
--- a/src/primaite/game/agent/interface.py
+++ b/src/primaite/game/agent/interface.py
@@ -4,6 +4,7 @@ from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING
 
 from gymnasium.core import ActType, ObsType
+from prettytable import PrettyTable
 from pydantic import BaseModel, model_validator
 
 from primaite.game.agent.actions import ActionManager
@@ -126,6 +127,27 @@ class AbstractAgent(ABC):
         self.history: List[AgentHistoryItem] = []
         self.logger = AgentLog(agent_name)
 
+    def show_history(self):
+        """
+        Print an agent action provided it's not the DONOTHING action.
+
+        :param agent_name: Name of agent (str).
+        """
+        table = PrettyTable()
+        table.field_names = ["Step", "Action", "Node", "Application", "Response"]
+        print(f"Actions for '{self.agent_name}':")
+        for item in self.history:
+            if item.action != "DONOTHING":
+                node, application = "unknown", "unknown"
+                if (node_id := item.parameters.get("node_id")) is not None:
+                    node = self.action_manager.node_names[node_id]
+                if (application_id := item.parameters.get("application_id")) is not None:
+                    application = self.action_manager.application_names[node_id][application_id]
+                if (application_name := item.parameters.get("application_name")) is not None:
+                    application = application_name
+                table.add_row([item.timestep, item.action, node, application, item.response.status])
+        print(table)
+
     def update_observation(self, state: Dict) -> ObsType:
         """
         Convert a state from the simulator into an observation for the agent using the observation space.

From cd8fc6d42d153b28b5cd731a4fe19239bfcc327d Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Fri, 13 Sep 2024 12:10:49 +0100
Subject: [PATCH 06/23] #2879: Handle generate_seed_value option

---
 src/primaite/session/environment.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/primaite/session/environment.py b/src/primaite/session/environment.py
index c66663e3..ac9415ac 100644
--- a/src/primaite/session/environment.py
+++ b/src/primaite/session/environment.py
@@ -26,14 +26,25 @@ except ModuleNotFoundError:
     _LOGGER.debug("Torch not available for importing")
 
 
-def set_random_seed(seed: int) -> Union[None, int]:
+def set_random_seed(seed: int, generate_seed_value: bool) -> Union[None, int]:
     """
     Set random number generators.
 
+    If seed is None or -1 and generate_seed_value is True randomly generate a
+    seed value.
+    If seed is > -1 and generate_seed_value is True ignore the latter and use
+    the provide seed value.
+
     :param seed: int
+    :param generate_seed_value: bool
+    :return: None or the int representing the seed used.
     """
     if seed is None or seed == -1:
-        return None
+        if generate_seed_value:
+            rng = np.random.default_rng()
+            seed = int(rng.integers(low=0, high=2**63))
+        else:
+            return None
     elif seed < -1:
         raise ValueError("Invalid random number seed")
     # Seed python RNG
@@ -65,7 +76,8 @@ class PrimaiteGymEnv(gymnasium.Env):
         """Object that returns a config corresponding to the current episode."""
         self.seed = self.episode_scheduler(0).get("game", {}).get("seed")
         """Get RNG seed from config file. NB: Must be before game instantiation."""
-        self.seed = set_random_seed(self.seed)
+        self.generate_seed_value = self.episode_scheduler(0).get("game", {}).get("generate_seed_value")
+        self.seed = set_random_seed(self.seed, self.generate_seed_value)
         self.io = PrimaiteIO.from_config(self.episode_scheduler(0).get("io_settings", {}))
         """Handles IO for the environment. This produces sys logs, agent logs, etc."""
         self.game: PrimaiteGame = PrimaiteGame.from_config(self.episode_scheduler(0))

From 6ebe50c331725c5059f269a59d87bd1dcd4077b3 Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Fri, 13 Sep 2024 12:58:37 +0100
Subject: [PATCH 07/23] #2879: Reduce max seed value to comply with python
 random seed limit

---
 src/primaite/session/environment.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/primaite/session/environment.py b/src/primaite/session/environment.py
index ac9415ac..0fd21b9f 100644
--- a/src/primaite/session/environment.py
+++ b/src/primaite/session/environment.py
@@ -42,7 +42,8 @@ def set_random_seed(seed: int, generate_seed_value: bool) -> Union[None, int]:
     if seed is None or seed == -1:
         if generate_seed_value:
             rng = np.random.default_rng()
-            seed = int(rng.integers(low=0, high=2**63))
+            # 2**32-1 is highest value for python RNG seed.
+            seed = int(rng.integers(low=0, high=2**32-1))
         else:
             return None
     elif seed < -1:

From 08fcf1df19fc811bf9a24aee04d8c5c3239f9678 Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Fri, 13 Sep 2024 12:59:41 +0100
Subject: [PATCH 08/23] #2879: Add generate_seed_value to global options.

---
 src/primaite/game/game.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/primaite/game/game.py b/src/primaite/game/game.py
index 123b6ddd..0e7b8c23 100644
--- a/src/primaite/game/game.py
+++ b/src/primaite/game/game.py
@@ -80,6 +80,8 @@ class PrimaiteGameOptions(BaseModel):
 
     seed: int = None
     """Random number seed for RNGs."""
+    generate_seed_value: bool = False
+    """Internally generated seed value."""
     max_episode_length: int = 256
     """Maximum number of episodes for the PrimAITE game."""
     ports: List[str]

From f2a0eeaca23159da9caa0cd9e55e81f5aaac6875 Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Fri, 13 Sep 2024 14:11:13 +0100
Subject: [PATCH 09/23] #2871 - Updated show_history() method to use boolean
 'include_nothing' for whether to include DONOTHING actions

---
 src/primaite/game/agent/interface.py | 31 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/primaite/game/agent/interface.py b/src/primaite/game/agent/interface.py
index 404c2bfe..0ec44d22 100644
--- a/src/primaite/game/agent/interface.py
+++ b/src/primaite/game/agent/interface.py
@@ -127,25 +127,34 @@ class AbstractAgent(ABC):
         self.history: List[AgentHistoryItem] = []
         self.logger = AgentLog(agent_name)
 
-    def show_history(self):
+    def add_agent_action(self, item: AgentHistoryItem, table: PrettyTable) -> PrettyTable:
+        """Update the given table with information from given AgentHistoryItem."""
+        node, application = "unknown", "unknown"
+        if (node_id := item.parameters.get("node_id")) is not None:
+            node = self.action_manager.node_names[node_id]
+        if (application_id := item.parameters.get("application_id")) is not None:
+            application = self.action_manager.application_names[node_id][application_id]
+        if (application_name := item.parameters.get("application_name")) is not None:
+            application = application_name
+        table.add_row([item.timestep, item.action, node, application, item.response.status])
+        return table
+
+    def show_history(self, include_nothing: bool = False):
         """
         Print an agent action provided it's not the DONOTHING action.
 
-        :param agent_name: Name of agent (str).
+        :param include_nothing: boolean for including DONOTHING actions. Default False.
         """
         table = PrettyTable()
         table.field_names = ["Step", "Action", "Node", "Application", "Response"]
         print(f"Actions for '{self.agent_name}':")
         for item in self.history:
-            if item.action != "DONOTHING":
-                node, application = "unknown", "unknown"
-                if (node_id := item.parameters.get("node_id")) is not None:
-                    node = self.action_manager.node_names[node_id]
-                if (application_id := item.parameters.get("application_id")) is not None:
-                    application = self.action_manager.application_names[node_id][application_id]
-                if (application_name := item.parameters.get("application_name")) is not None:
-                    application = application_name
-                table.add_row([item.timestep, item.action, node, application, item.response.status])
+            if item.action == "DONOTHING":
+                if include_nothing:
+                    table = self.add_agent_action(item=item, table=table)
+                else:
+                    pass
+            self.add_agent_action(item=item, table=table)
         print(table)
 
     def update_observation(self, state: Dict) -> ObsType:

From 01a2c834ce3c8ff23c90ff098ef2cce04bdd5bab Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Fri, 13 Sep 2024 14:53:15 +0100
Subject: [PATCH 10/23] #2879: Write seed value to log file.

---
 src/primaite/session/environment.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/primaite/session/environment.py b/src/primaite/session/environment.py
index 0fd21b9f..9054106e 100644
--- a/src/primaite/session/environment.py
+++ b/src/primaite/session/environment.py
@@ -62,6 +62,13 @@ def set_random_seed(seed: int, generate_seed_value: bool) -> Union[None, int]:
     return seed
 
 
+def log_seed_value(seed: int):
+    """Log the selected seed value to file."""
+    path = SIM_OUTPUT.path / "seed.log"
+    with open(path, "w") as file:
+        file.write(f"Seed value = {seed}")
+
+
 class PrimaiteGymEnv(gymnasium.Env):
     """
     Thin wrapper env to provide agents with a gymnasium API.
@@ -92,6 +99,8 @@ class PrimaiteGymEnv(gymnasium.Env):
 
         _LOGGER.info(f"PrimaiteGymEnv RNG seed = {self.seed}")
 
+        log_seed_value(self.seed)
+
     def action_masks(self) -> np.ndarray:
         """
         Return the action mask for the agent.

From 5006e41546d37cabb0a505fe0c9e3346dcaebf89 Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Fri, 13 Sep 2024 15:47:59 +0100
Subject: [PATCH 11/23] #2871 - Updated the show_history() function to receive
 a list of actions to ignore when printing the history. Defaults to ignoring
 DONOTHING actions

---
 src/primaite/game/agent/interface.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/primaite/game/agent/interface.py b/src/primaite/game/agent/interface.py
index 0ec44d22..6609dd03 100644
--- a/src/primaite/game/agent/interface.py
+++ b/src/primaite/game/agent/interface.py
@@ -139,22 +139,23 @@ class AbstractAgent(ABC):
         table.add_row([item.timestep, item.action, node, application, item.response.status])
         return table
 
-    def show_history(self, include_nothing: bool = False):
+    def show_history(self, ignored_actions: Optional[list] = None):
         """
         Print an agent action provided it's not the DONOTHING action.
 
-        :param include_nothing: boolean for including DONOTHING actions. Default False.
+        :param ignored_actions: OPTIONAL: List of actions to be ignored when displaying the history.
+                                If not provided, defaults to ignore DONOTHING actions.
         """
+        if not ignored_actions:
+            ignored_actions = ["DONOTHING"]
         table = PrettyTable()
         table.field_names = ["Step", "Action", "Node", "Application", "Response"]
         print(f"Actions for '{self.agent_name}':")
         for item in self.history:
-            if item.action == "DONOTHING":
-                if include_nothing:
-                    table = self.add_agent_action(item=item, table=table)
-                else:
-                    pass
-            self.add_agent_action(item=item, table=table)
+            if item.action in ignored_actions:
+                pass
+            else:
+                table = self.add_agent_action(item=item, table=table)
         print(table)
 
     def update_observation(self, state: Dict) -> ObsType:

From e0a10928343c650b986da8aa8cd6207786448e0f Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Mon, 16 Sep 2024 09:04:17 +0100
Subject: [PATCH 12/23] #2879: Pre-commit fix.

---
 src/primaite/session/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/primaite/session/environment.py b/src/primaite/session/environment.py
index 9054106e..07635b70 100644
--- a/src/primaite/session/environment.py
+++ b/src/primaite/session/environment.py
@@ -43,7 +43,7 @@ def set_random_seed(seed: int, generate_seed_value: bool) -> Union[None, int]:
         if generate_seed_value:
             rng = np.random.default_rng()
             # 2**32-1 is highest value for python RNG seed.
-            seed = int(rng.integers(low=0, high=2**32-1))
+            seed = int(rng.integers(low=0, high=2**32 - 1))
         else:
             return None
     elif seed < -1:

From 215ceaa6e8b5977b231d226715b70d8e88df7f14 Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Mon, 16 Sep 2024 10:08:45 +0100
Subject: [PATCH 13/23] #2879: Fix call to set_random_seed() in reset().

---
 src/primaite/session/environment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/primaite/session/environment.py b/src/primaite/session/environment.py
index 07635b70..db5425e3 100644
--- a/src/primaite/session/environment.py
+++ b/src/primaite/session/environment.py
@@ -168,7 +168,7 @@ class PrimaiteGymEnv(gymnasium.Env):
             f"avg. reward: {self.agent.reward_function.total_reward}"
         )
         if seed is not None:
-            set_random_seed(seed)
+            set_random_seed(seed, self.generate_seed_value)
         self.total_reward_per_episode[self.episode_counter] = self.agent.reward_function.total_reward
 
         if self.io.settings.save_agent_actions:

From f3ca9c55c90fe05b2e43c2c167767037578a0fb7 Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Mon, 16 Sep 2024 16:38:19 +0100
Subject: [PATCH 14/23] #2879: Update tests

---
 .../game_layer/test_RNG_seed.py               | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/integration_tests/game_layer/test_RNG_seed.py b/tests/integration_tests/game_layer/test_RNG_seed.py
index 0c6d567d..508f35e6 100644
--- a/tests/integration_tests/game_layer/test_RNG_seed.py
+++ b/tests/integration_tests/game_layer/test_RNG_seed.py
@@ -7,6 +7,7 @@ import yaml
 from primaite.config.load import data_manipulation_config_path
 from primaite.game.agent.interface import AgentHistoryItem
 from primaite.session.environment import PrimaiteGymEnv
+from primaite.simulator import SIM_OUTPUT
 
 
 @pytest.fixture()
@@ -33,6 +34,11 @@ def test_rng_seed_set(create_env):
 
     assert a == b
 
+    # Check that seed log file was created.
+    path = SIM_OUTPUT.path / "seed.log"
+    with open(path, "r") as file:
+        assert file
+
 
 def test_rng_seed_unset(create_env):
     """Test with no RNG seed."""
@@ -48,3 +54,19 @@ def test_rng_seed_unset(create_env):
     b = [item.timestep for item in env.game.agents["client_2_green_user"].history if item.action != "DONOTHING"]
 
     assert a != b
+
+
+def test_for_generated_seed():
+    """
+    Show that setting generate_seed_value to true producess a valid seed.
+    """
+    with open(data_manipulation_config_path(), "r") as f:
+        cfg = yaml.safe_load(f)
+
+    cfg["game"]["generate_seed_value"] = True
+    PrimaiteGymEnv(env_config=cfg)
+    path = SIM_OUTPUT.path / "seed.log"
+    with open(path, "r") as file:
+        data = file.read()
+
+    assert data.split(" ")[3] != None

From 078b89856535b0071c76921612b6758f6d48782c Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Tue, 17 Sep 2024 09:30:14 +0100
Subject: [PATCH 15/23] #2879: Update changelog.

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77b7bb7d..a9f6c891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 -   Log observation space data by episode and step.
 -   ACL's are no longer applied to layer-2 traffic.
+-   Random number seed values are recorded in simulation/seed.log if the seed is set in the config file
+    or `generate_seed_value` is set to `true`.
 
 ## [3.3.0] - 2024-09-04
 ### Added

From 5d7935cde083d662389198b8345fc9194e8351be Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Tue, 17 Sep 2024 09:39:32 +0100
Subject: [PATCH 16/23] #2871 - Changes to notebooks following updates to
 action history

---
 .../Command-&-Control-E2E-Demonstration.ipynb | 12 +++++-
 .../Data-Manipulation-E2E-Demonstration.ipynb | 11 ++++-
 .../Getting-Information-Out-Of-PrimAITE.ipynb | 40 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/primaite/notebooks/Command-&-Control-E2E-Demonstration.ipynb b/src/primaite/notebooks/Command-&-Control-E2E-Demonstration.ipynb
index b6b13f28..a0599ee4 100644
--- a/src/primaite/notebooks/Command-&-Control-E2E-Demonstration.ipynb
+++ b/src/primaite/notebooks/Command-&-Control-E2E-Demonstration.ipynb
@@ -1800,6 +1800,16 @@
     "\n",
     "display_obs_diffs(tcp_c2_obs, udp_c2_obs, blue_config_env.game.step_counter)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "\n",
+    "env.game.agents[\"CustomC2Agent\"].show_history()"
+   ]
   }
  ],
  "metadata": {
@@ -1818,7 +1828,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.10.11"
   }
  },
  "nbformat": 4,
diff --git a/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb b/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb
index 0460f771..c1b959f5 100644
--- a/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb
+++ b/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb
@@ -675,6 +675,15 @@
     "    print(f\"step: {env.game.step_counter}, Red action: {info['agent_actions']['data_manipulation_attacker'].action}, Blue reward:{reward:.2f}\" )"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "env.game.agents[\"data_manipulation_attacker\"].show_history(ignored_actions=[\"\"])"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -708,7 +717,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.10.11"
   }
  },
  "nbformat": 4,
diff --git a/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb b/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb
index a832f3cc..e4009822 100644
--- a/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb
+++ b/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb
@@ -144,6 +144,44 @@
     "PRIMAITE_CONFIG[\"developer_mode\"][\"enabled\"] = was_enabled\n",
     "PRIMAITE_CONFIG[\"developer_mode\"][\"output_sys_logs\"] = was_syslogs_enabled"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Viewing Agent history\n",
+    "\n",
+    "It's possible to view the actions carried out by an agent for a given training session using the `show_history()` method. By default, this will be all actions apart from DONOTHING actions."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Run the training session to generate some resultant data.\n",
+    "for i in range(100):\n",
+    "    env.step(0)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Calling `.show_history()` should show us when the Data Manipulation used the `NODE_APPLICATION_EXECUTE` action."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "attacker = env.game.agents[\"data_manipulation_attacker\"]\n",
+    "\n",
+    "attacker.show_history()"
+   ]
   }
  ],
  "metadata": {
@@ -162,7 +200,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.8"
+   "version": "3.10.11"
   }
  },
  "nbformat": 4,

From c8f6459af6022f2536580f968c04e9d32b15e596 Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Tue, 17 Sep 2024 10:09:10 +0100
Subject: [PATCH 17/23] #2871 - Changelog and documentation updates, corrected
 changes in Data manipulation demo notebook

---
 CHANGELOG.md                                                    | 1 +
 docs/source/configuration/agents.rst                            | 1 +
 .../notebooks/Data-Manipulation-E2E-Demonstration.ipynb         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44f1ec29..b7f8a26e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 -   Log observation space data by episode and step.
+-   Added `show_history` method to Agents, allowing you to view actions taken by an agent per step. By default, `DONOTHING` actions are omitted.
 
 ### Changed
 -   ACL's are no longer applied to layer-2 traffic.
diff --git a/docs/source/configuration/agents.rst b/docs/source/configuration/agents.rst
index dece94c5..0bc586e8 100644
--- a/docs/source/configuration/agents.rst
+++ b/docs/source/configuration/agents.rst
@@ -177,3 +177,4 @@ If ``True``, gymnasium flattening will be performed on the observation space bef
 -----------------
 
 Agents will record their action log for each step. This is a summary of what the agent did, along with response information from requests within the simulation.
+A log of the actions taken by the agent can be viewed using the `show_history()` function. By default, this will display all actions taken apart from ``DONOTHING``.
diff --git a/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb b/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb
index c1b959f5..13533097 100644
--- a/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb
+++ b/src/primaite/notebooks/Data-Manipulation-E2E-Demonstration.ipynb
@@ -681,7 +681,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "env.game.agents[\"data_manipulation_attacker\"].show_history(ignored_actions=[\"\"])"
+    "env.game.agents[\"data_manipulation_attacker\"].show_history()"
    ]
   },
   {

From ccb91869c4e7b62e5772c09de496c5cc96b7d35a Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Tue, 17 Sep 2024 10:17:18 +0100
Subject: [PATCH 18/23] #2871 - Minor wording change to description in
 agents.rst

---
 docs/source/configuration/agents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/configuration/agents.rst b/docs/source/configuration/agents.rst
index 0bc586e8..74571cf2 100644
--- a/docs/source/configuration/agents.rst
+++ b/docs/source/configuration/agents.rst
@@ -177,4 +177,4 @@ If ``True``, gymnasium flattening will be performed on the observation space bef
 -----------------
 
 Agents will record their action log for each step. This is a summary of what the agent did, along with response information from requests within the simulation.
-A log of the actions taken by the agent can be viewed using the `show_history()` function. By default, this will display all actions taken apart from ``DONOTHING``.
+A summary of the actions taken by the agent can be viewed using the `show_history()` function. By default, this will display all actions taken apart from ``DONOTHING``.

From 3a5b75239d64c6febe35ac4bae227e8c804a8f01 Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Tue, 17 Sep 2024 12:05:40 +0100
Subject: [PATCH 19/23] #2871 - Typo in Changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7f8a26e..b81e256b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.3.0] - 2024-09-04
+## [3.4.0]
 
 ### Added
 -   Log observation space data by episode and step.

From 8d3760b5a7e8bf53f8a7e20cabc3a5597ecd897f Mon Sep 17 00:00:00 2001
From: Charlie Crane <Charlie.Crane@t-s.qinetiq.com>
Date: Tue, 17 Sep 2024 16:19:43 +0100
Subject: [PATCH 20/23] #2871 - Fix notebook failure

---
 .../notebooks/Getting-Information-Out-Of-PrimAITE.ipynb      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb b/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb
index e4009822..6a60c1bc 100644
--- a/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb
+++ b/src/primaite/notebooks/Getting-Information-Out-Of-PrimAITE.ipynb
@@ -160,6 +160,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "with open(data_manipulation_config_path(), 'r') as f:\n",
+    "    cfg = yaml.safe_load(f)\n",
+    "\n",
+    "env = PrimaiteGymEnv(env_config=cfg)\n",
+    "\n",
     "# Run the training session to generate some resultant data.\n",
     "for i in range(100):\n",
     "    env.step(0)"

From 0c576746aa1165aac7aa6fc6eebda68a25945249 Mon Sep 17 00:00:00 2001
From: Nick Todd <nick.todd@t-s.qinetiq.com>
Date: Thu, 19 Sep 2024 11:07:00 +0100
Subject: [PATCH 21/23] #2896: Bump version.

---
 src/primaite/VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/primaite/VERSION b/src/primaite/VERSION
index 15a27998..688932aa 100644
--- a/src/primaite/VERSION
+++ b/src/primaite/VERSION
@@ -1 +1 @@
-3.3.0
+3.4.0-dev

From 88cbb783bc6cd11aed890671be0eb4fa02e371e1 Mon Sep 17 00:00:00 2001
From: Archer Bowen <Archer.Bowen@t-s.qinetiq.com>
Date: Fri, 20 Sep 2024 13:54:13 +0100
Subject: [PATCH 22/23] #2840 Fixed sphinx user guide formatting issues.

---
 docs/source/request_system.rst                     |  2 ++
 .../system/services/terminal.rst                   | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/source/request_system.rst b/docs/source/request_system.rst
index f2d2e68d..6b71bf25 100644
--- a/docs/source/request_system.rst
+++ b/docs/source/request_system.rst
@@ -2,6 +2,8 @@
 
     © Crown-owned copyright 2024, Defence Science and Technology Laboratory UK
 
+.. _request_system:
+
 Request System
 **************
 
diff --git a/docs/source/simulation_components/system/services/terminal.rst b/docs/source/simulation_components/system/services/terminal.rst
index de6eaf0a..de0bb026 100644
--- a/docs/source/simulation_components/system/services/terminal.rst
+++ b/docs/source/simulation_components/system/services/terminal.rst
@@ -38,31 +38,31 @@ Implementation
  - Manages remote connections in a dictionary by session ID.
  - Processes commands, forwarding to the ``RequestManager`` or ``SessionManager`` where appropriate.
  - Extends Service class.
-  - A detailed guide on the implementation and functionality of the Terminal class can be found in the "Terminal-Processing" jupyter notebook.
+
+A detailed guide on the implementation and functionality of the Terminal class can be found in the "Terminal-Processing" jupyter notebook.
 
 Command Format
 ^^^^^^^^^^^^^^
 
-``Terminals`` implement their commands through leveraging the pre-existing :doc:`../../request_system`.
+Terminals implement their commands through leveraging the pre-existing :ref:`request_system`.
 
-Due to this ``Terminals`` will only accept commands passed within the ``RequestFormat``.
+Due to this Terminals will only accept commands passed within the ``RequestFormat``.
 
 :py:class:`primaite.game.interface.RequestFormat`
 
 For example, ``terminal`` command actions when used in ``yaml`` format are formatted as follows:
 
 .. code-block:: yaml
+
     command:
         - "file_system"
         - "create"
         - "file"
         - "downloads"
         - "cat.png"
-        - "False"
+        - "False
 
-**This command creates file called ``cat.png`` within the ``downloads`` folder.**
-
-This is then loaded from ``yaml`` into a dictionary containing the terminal command:
+This is then loaded from yaml into a dictionary containing the terminal command:
 
 .. code-block:: python
 

From e29815305dd4eaf0294b73a6b0d4a2e3ba4ccb75 Mon Sep 17 00:00:00 2001
From: Archer Bowen <Archer.Bowen@t-s.qinetiq.com>
Date: Tue, 24 Sep 2024 11:06:38 +0100
Subject: [PATCH 23/23] #2840 Addressing PR comments.

---
 .../simulation_components/system/services/terminal.rst      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/simulation_components/system/services/terminal.rst b/docs/source/simulation_components/system/services/terminal.rst
index de0bb026..b11d74bb 100644
--- a/docs/source/simulation_components/system/services/terminal.rst
+++ b/docs/source/simulation_components/system/services/terminal.rst
@@ -26,7 +26,7 @@ Key capabilities
 Usage
 """""
 
- - Pre-Installs on any `Node` (component with the exception of `Switches`).
+ - Pre-Installs on any `Node` component (with the exception of `Switches`).
  - Terminal Clients connect, execute commands and disconnect from remote nodes.
  - Ensures that users are logged in to the component before executing any commands.
  - Service runs on SSH port 22 by default.
@@ -68,7 +68,7 @@ This is then loaded from yaml into a dictionary containing the terminal command:
 
     {"command":["file_system", "create", "file", "downloads", "cat.png", "False"]}
 
-Which is then parsed to the ``Terminals`` Request Manager to be executed.
+Which is then passed to the ``Terminals`` Request Manager to be executed.
 
 Game Layer Usage (Agents)
 ========================
@@ -121,7 +121,7 @@ Agents are able to use the terminal to login into remote nodes via ``SSH`` which
 ``NODE_SEND_REMOTE_COMMAND``
 """"""""""""""""""""""""""""
 
-After remotely login into another host, a agent can use the ``NODE_SEND_REMOTE_COMMAND`` to execute commands across the network remotely.
+After remotely logging into another host, an agent can use the ``NODE_SEND_REMOTE_COMMAND`` to execute commands across the network remotely.
 
 .. code-block:: yaml